Skip to content
Snippets Groups Projects
Commit 5c3cea63 authored by Adrian Knobloch's avatar Adrian Knobloch
Browse files

Fix duplicated proxz entries for statecharts

parent 9c2e7b9a
No related branches found
No related tags found
1 merge request!47Fix duplicated proxz entries for statecharts
......@@ -498,22 +498,21 @@ void StateTreeModel::generateBaseClasses(const StatechartGroupPtr& group)
doxyFile /= group->getName().toStdString() + ".dox";
generateGroupDocString(group, QString::fromStdString(doxyFile.string()));
std::vector<std::string> proxies;
proxies.push_back("ArmarXCoreInterfaces.systemObserver");
proxies.push_back("ArmarXCoreInterfaces.conditionHandler");
std::set<std::string> proxies;
proxies.insert("ArmarXCoreInterfaces.systemObserver");
proxies.insert("ArmarXCoreInterfaces.conditionHandler");
for (QString p : group->getProxies())
{
proxies.push_back(p.toUtf8().data());
proxies.insert(p.toUtf8().data());
}
std::sort(proxies.begin(), proxies.end());
std::unique(proxies.begin(), proxies.end());
Ice::StringSeq proxyVec(proxies.begin(), proxies.end());
if (group->contextGenerationEnabled())
{
std::set<std::string> innerVariantTypes = getVariantOfStatesWithNoCpp(group);
StatechartGroupGenerator::generateStatechartContextFile(packageFinder.getBuildDir(),
group->getPackageName().toUtf8().data(),
group->getName().toUtf8().data(),
proxies,
proxyVec,
variantInfo,
innerVariantTypes,
false);
......@@ -523,7 +522,7 @@ void StateTreeModel::generateBaseClasses(const StatechartGroupPtr& group)
for (StateTreeNodePtr node : group->getRootNode()->getChildren())
{
generateBaseClass(node, packageFinder.getBuildDir(), variantInfo, proxies);
generateBaseClass(node, packageFinder.getBuildDir(), variantInfo, proxyVec);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment