ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-03 14:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Manage concurrent hypotheses sets properly

Browse Source
This commit is contained in:
vsr 2013-10-18 11:05:26 +00:00
parent ed55bd5c25
commit d726924388
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/smesh_setenv.py
View File

@ -36,7 +36,7 @@ def set_env(args):
pass pass
# find plugins # find plugins
plugin_list = [] plugin_list = ["StdMeshers"]
resource_path_list = [] resource_path_list = []
for env_var in os.environ.keys(): for env_var in os.environ.keys():
value = os.environ[env_var] value = os.environ[env_var]
@ -78,7 +78,6 @@ def set_env(args):
pass pass
pass pass
break break
plugin_list.append("StdMeshers")
os.environ["SMESH_MeshersList"] = ":".join(plugin_list) os.environ["SMESH_MeshersList"] = ":".join(plugin_list)
os.environ["SalomeAppConfig"] = os.environ["SalomeAppConfig"] + psep + psep.join(resource_path_list) os.environ["SalomeAppConfig"] = os.environ["SalomeAppConfig"] + psep + psep.join(resource_path_list)

6
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
View File

@ -224,18 +224,17 @@ namespace SMESH
for( ;it1 != aXmlHandler->myHypothesesMap.end(); it1++) for( ;it1 != aXmlHandler->myHypothesesMap.end(); it1++)
myHypothesesMap.insert( it1.key(), it1.value() ); myHypothesesMap.insert( it1.key(), it1.value() );
it1 = aXmlHandler->myAlgorithmsMap.begin(); it1 = aXmlHandler->myAlgorithmsMap.begin();
for( ;it1 != aXmlHandler->myAlgorithmsMap.end(); it1++) for( ;it1 != aXmlHandler->myAlgorithmsMap.end(); it1++)
myAlgorithmsMap.insert( it1.key(), it1.value() ); myAlgorithmsMap.insert( it1.key(), it1.value() );
QList<HypothesesSet*>::iterator it, pos = myListOfHypothesesSets.begin(); QList<HypothesesSet*>::iterator it;
for ( it = aXmlHandler->myListOfHypothesesSets.begin(); for ( it = aXmlHandler->myListOfHypothesesSets.begin();
it != aXmlHandler->myListOfHypothesesSets.end(); it != aXmlHandler->myListOfHypothesesSets.end();
++it ) ++it )
{ {
(*it)->setIsCustom( i == 0 ); (*it)->setIsCustom( i == 0 );
myListOfHypothesesSets.insert( pos, *it ); myListOfHypothesesSets.append( *it );
} }
} }
else { else {
@ -316,6 +315,7 @@ namespace SMESH
aSetNameList.append( mangledHypoSetName( aSet )); aSetNameList.append( mangledHypoSetName( aSet ));
} }
} }
aSetNameList.removeDuplicates();
aSetNameList.sort(); aSetNameList.sort();
// reverse order of aSetNameList // reverse order of aSetNameList