0021382]: EDF 1985 SMESH: Read/write of .mesh files (GMF format)

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_HypothesesUtils.cxx

diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
index c1411fa2c126862e4d8c135e0193c209e5350b14..fde2ae60951f9965bf5af25aecd8ef3f8698d3a5 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -219,16 +219,16 @@ namespace SMESH
           file.close();
           if (ok) {
 
-           THypothesisDataMap::ConstIterator it1 = aXmlHandler->myHypothesesMap.begin();
-           
-           for( ;it1 != aXmlHandler->myHypothesesMap.end(); it1++)
-             myHypothesesMap.insert( it1.key(), it1.value() );
-           
-           
-           it1 = aXmlHandler->myAlgorithmsMap.begin();
-           for( ;it1 != aXmlHandler->myAlgorithmsMap.end(); it1++)
-             myAlgorithmsMap.insert( it1.key(), it1.value() );
-           
+            THypothesisDataMap::ConstIterator it1 = aXmlHandler->myHypothesesMap.begin();
+            
+            for( ;it1 != aXmlHandler->myHypothesesMap.end(); it1++)
+              myHypothesesMap.insert( it1.key(), it1.value() );
+            
+            
+            it1 = aXmlHandler->myAlgorithmsMap.begin();
+            for( ;it1 != aXmlHandler->myAlgorithmsMap.end(); it1++)
+              myAlgorithmsMap.insert( it1.key(), it1.value() );
+            
             QList<HypothesesSet*>::iterator it, pos = myListOfHypothesesSets.begin();
             for ( it = aXmlHandler->myListOfHypothesesSets.begin(); 
                   it != aXmlHandler->myListOfHypothesesSets.end();
@@ -282,6 +282,7 @@ namespace SMESH
     THypothesisDataMap::ConstIterator anIter;
     for ( anIter = pMap.begin(); anIter != pMap.end(); anIter++ ) {
       HypothesisData* aData = anIter.value();
+      if(!aData || aData->Label.isEmpty()) continue;
       if ( ( theDim < 0 || aData->Dim.contains( theDim ) ) && aData->IsAux == isAux) {
         if (checkGeometry) {
           if (aData->IsNeedGeometry == isNeedGeometry)
@@ -450,6 +451,12 @@ namespace SMESH
               // map hypothesis creator to a hypothesis name
               // BUG 0020378
               //myHypCreatorMap[aHypType] = aCreator;
+
+              //rnv : This dynamic property of the QObject stores the name of the plugin.
+              //      It is used to obtain plugin root dir environment variable
+              //      in the SMESHGUI_HypothesisDlg class. Plugin root dir environment 
+              //      variable is used to display documentation.
+              aCreator->setProperty(PLUGIN_NAME,aHypData->PluginName);
             }
           }
         }