- std::set<std::string>::iterator aGIter = aJoined->myGroups.begin();
- for (; aGIter != aJoined->myGroups.end(); aGIter++) {
- myGroups.insert(*aGIter);
+
+ const std::list<std::pair<std::shared_ptr<ModelAPI_Document>, std::string>>& aJGroups =
+ aJoined->groups();
+
+ std::list<std::pair<std::shared_ptr<ModelAPI_Document>, std::string>>::iterator aGIter;
+ std::list<std::pair<std::shared_ptr<ModelAPI_Document>, std::string>>::const_iterator aJIter;
+ for (aJIter = aJGroups.cbegin(); aJIter != aJGroups.cend(); aJIter++) {
+ for (aGIter = myGroups.begin(); aGIter != myGroups.end(); aGIter++) {
+ if (aGIter->first == aJIter->first && aGIter->second == aJIter->second)
+ break; // exists, so no need to insert
+ }
+ if (aGIter == myGroups.end())
+ myGroups.push_back(*aJIter);