]> SALOME platform Git repositories - modules/smesh.git/commitdiff
Salome HOME
Fix of IPAL19621 (Qt4 porting: regress of automatic assign a set of hypotheses).
authorakl <akl@opencascade.com>
Wed, 23 Apr 2008 07:41:48 +0000 (07:41 +0000)
committerakl <akl@opencascade.com>
Wed, 23 Apr 2008 07:41:48 +0000 (07:41 +0000)
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx

index 627d34e1725b4b4ac39d50fc8979df41e965de48..35b8a567d54e9e93932a3b92eb82fbc2a8e6ac14 100644 (file)
@@ -173,8 +173,8 @@ namespace SMESH
          bool ok = reader.parse(source);
          file.close();
          if (ok) {
-           myHypothesesMap = QMap<std::string,HypothesisData*>( aXmlHandler->myHypothesesMap );
-            myAlgorithmsMap = QMap<std::string,HypothesisData*>( aXmlHandler->myAlgorithmsMap );
+           myHypothesesMap.unite( QMap<std::string,HypothesisData*>( aXmlHandler->myHypothesesMap ) );
+            myAlgorithmsMap.unite( QMap<std::string,HypothesisData*>( aXmlHandler->myAlgorithmsMap ) );
             myListOfHypothesesSets.splice( myListOfHypothesesSets.begin(),
                                            aXmlHandler->myListOfHypothesesSets );
          }