X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_HypothesesUtils.cxx;h=96f59ae8af1c8c99463bb220e114fb358b7a0377;hb=317741e60dd7db682685ae97a87ee1da18f5b830;hp=8f4d0e782ba511a70ec32df4e04a723ab096fede;hpb=8616118fe1c2fef49d88367eaa0dba3aebdcf1ab;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
index 8f4d0e782..96f59ae8a 100644
--- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
@@ -193,7 +193,9 @@ namespace SMESH{
   }
 
 
-  QStringList GetAvailableHypotheses(const bool isAlgo)
+  QStringList GetAvailableHypotheses( const bool isAlgo, 
+                                      const int theDim,                          
+                                      const bool isAux )
   {
     QStringList aHypList;
 
@@ -201,20 +203,14 @@ namespace SMESH{
     InitAvailableHypotheses();
 
     // fill list of hypotheses/algorithms
+    THypothesisDataMap* pMap = isAlgo ? &myAlgorithmsMap : &myHypothesesMap;
     THypothesisDataMap::iterator anIter;
-    if (isAlgo) {
-      anIter = myAlgorithmsMap.begin();
-      for (; anIter != myAlgorithmsMap.end(); anIter++) {
-	aHypList.append(((*anIter).first).c_str());
-      }
-    }
-    else {
-      anIter = myHypothesesMap.begin();
-      for (; anIter != myHypothesesMap.end(); anIter++) {
-	aHypList.append(((*anIter).first).c_str());
-      }
+    for ( anIter = pMap->begin(); anIter != pMap->end(); anIter++ )
+    {
+      HypothesisData* aData = (*anIter).second;
+      if ( ( theDim < 0 || aData->Dim.contains( theDim ) ) && aData->IsAux == isAux )
+        aHypList.append(((*anIter).first).c_str());
     }
-
     return aHypList;
   }
 
@@ -254,9 +250,8 @@ namespace SMESH{
 
       // 2. Get names of plugin libraries
       HypothesisData* aHypData = GetHypothesisData(aHypType);
-      if (!aHypData) {
-	return aCreator;
-      }
+      if (!aHypData) 
+        return aCreator;
       QString aClientLibName = aHypData->ClientLibName;
       QString aServerLibName = aHypData->ServerLibName;
 
@@ -424,63 +419,27 @@ namespace SMESH{
 
     try {
       _PTR(Study) aStudy = GetActiveStudyDocument();
-      SMESH_Hypothesis_var anHyp = IObjectToInterface<SMESH_Hypothesis>(IObject);
-      if (IObject->hasReference())
+      _PTR(SObject) aHypObj = aStudy->FindObjectID( IObject->getEntry() );
+      if( aHypObj )
       {
-        if(MYDEBUG) MESSAGE("HAS REFERENCE " << IObject->getEntry());
-	_PTR(SObject) aHypSObj = aStudy->FindObjectID(IObject->getReference());
-	if (aHypSObj) {
-	  _PTR(SObject) MorSM = SMESH::GetMeshOrSubmesh(aHypSObj);
-	  if (MorSM) {
-	    GEOM::GEOM_Object_var aShape = SMESH::GetShapeOnMeshOrSubMesh(MorSM);
-	    if (!aShape->_is_nil()){
-	      SMESH::SMESH_Mesh_var aMesh =
-		SMESH::SObjectToInterface<SMESH::SMESH_Mesh>(MorSM);
-	      SMESH::SMESH_subMesh_var aSubMesh =
-		SMESH::SObjectToInterface<SMESH::SMESH_subMesh>(MorSM);
-
-	      if (!aSubMesh->_is_nil())
-		aMesh = aSubMesh->GetFather();
-
-	      if (!aMesh->_is_nil()) {
-		res = aMesh->RemoveHypothesis(aShape, anHyp);
-		if (res < SMESH::HYP_UNKNOWN_FATAL) {
-                  _PTR(SObject) meshSO = SMESH::FindSObject(aMesh);
-                  if (meshSO)
-                    SMESH::ModifiedMesh(meshSO, false);
-                }
-		if (res > SMESH::HYP_OK) {
-		  wc.suspend();
-		  processHypothesisStatus(res, anHyp, false);
-		  wc.resume();
-		}
-	      }
-	    }
-	  }
+	_PTR(SObject) MorSM = SMESH::GetMeshOrSubmesh( aHypObj );
+	_PTR(SObject) aRealHypo;
+	if( aHypObj->ReferencedObject( aRealHypo ) )
+	{
+	  SMESH_Hypothesis_var hypo = SMESH_Hypothesis::_narrow( SObjectToObject( aRealHypo ) );
+	  RemoveHypothesisOrAlgorithmOnMesh( MorSM, hypo );
+	}
+	else
+	{
+	  SMESH_Hypothesis_var hypo = SMESH_Hypothesis::_narrow( SObjectToObject( aHypObj ) );
+	  SObjectList meshList = GetMeshesUsingAlgoOrHypothesis( hypo );
+	  for( int i = 0; i < meshList.size(); i++ )
+	    RemoveHypothesisOrAlgorithmOnMesh( meshList[ i ], hypo );
 	}
-      }
-      else if (IObject->hasEntry())
-      {
-        if(MYDEBUG) MESSAGE("IObject entry HAS ENTRY " << IObject->getEntry());
-        SObjectList meshList = GetMeshesUsingAlgoOrHypothesis(anHyp);
-        for ( int i = 0; i < meshList.size(); ++i ) {
-          SMESH::SMESH_Mesh_var aMesh = 
-            SMESH::SObjectToInterface<SMESH::SMESH_Mesh>( meshList[ i ]);
-          GEOM::GEOM_Object_var aShape = SMESH::GetShapeOnMeshOrSubMesh( meshList[ i ]);
-          if ( ! aMesh->_is_nil() && !aShape->_is_nil() ) {
-            res = aMesh->RemoveHypothesis(aShape, anHyp);
-            if ( res < SMESH::HYP_UNKNOWN_FATAL )
-              SMESH::ModifiedMesh( meshList[ i ], false);
-            if ( res > SMESH::HYP_OK ) {
-              wc.suspend();
-              processHypothesisStatus( res, anHyp, false );
-              wc.resume();
-            }
-          }
-        }
       }
     }
-    catch(const SALOME::SALOME_Exception& S_ex) {
+    catch(const SALOME::SALOME_Exception& S_ex)
+    {
       wc.suspend();
       SalomeApp_Tools::QtCatchCorbaException(S_ex);
       res = SMESH::HYP_UNKNOWN_FATAL;
@@ -544,7 +503,7 @@ namespace SMESH{
 	if(MYDEBUG) MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency number ="<<listSO.size());
 	for (unsigned int i = 0; i < listSO.size(); i++) {
 	  _PTR(SObject) SO = listSO[i];
-	  if (!SO) {
+	  if (SO) {
 	    _PTR(SObject) aFather = SO->GetFather();
 	    if (aFather) {
 	      _PTR(SObject) SOfatherFather = aFather->GetFather();