From: akl <akl@opencascade.com>
Date: Wed, 23 Apr 2008 07:41:48 +0000 (+0000)
Subject: Fix of IPAL19621 (Qt4 porting: regress of automatic assign a set of hypotheses).
X-Git-Tag: V5_0_0~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b75d24976cdad444043f03d73f056c666055c984;p=modules%2Fsmesh.git

Fix of IPAL19621 (Qt4 porting: regress of automatic assign a set of hypotheses).
---

diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
index 627d34e17..35b8a567d 100644
--- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
@@ -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 );
 	  }