diff --git a/bin/smesh_setenv.py b/bin/smesh_setenv.py index aa78a39f5..9311968b0 100644 --- a/bin/smesh_setenv.py +++ b/bin/smesh_setenv.py @@ -36,7 +36,7 @@ def set_env(args): pass # find plugins - plugin_list = [] + plugin_list = ["StdMeshers"] resource_path_list = [] for env_var in os.environ.keys(): value = os.environ[env_var] @@ -78,7 +78,6 @@ def set_env(args): pass pass break - plugin_list.append("StdMeshers") os.environ["SMESH_MeshersList"] = ":".join(plugin_list) os.environ["SalomeAppConfig"] = os.environ["SalomeAppConfig"] + psep + psep.join(resource_path_list) diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx index 8dd81441a..7898e44e4 100644 --- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx +++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx @@ -224,18 +224,17 @@ namespace SMESH 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::iterator it, pos = myListOfHypothesesSets.begin(); + QList::iterator it; for ( it = aXmlHandler->myListOfHypothesesSets.begin(); it != aXmlHandler->myListOfHypothesesSets.end(); ++it ) { (*it)->setIsCustom( i == 0 ); - myListOfHypothesesSets.insert( pos, *it ); + myListOfHypothesesSets.append( *it ); } } else { @@ -316,6 +315,7 @@ namespace SMESH aSetNameList.append( mangledHypoSetName( aSet )); } } + aSetNameList.removeDuplicates(); aSetNameList.sort(); // reverse order of aSetNameList