PAL10513. Desable tabs according to shape dimention at edition as well

diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index c5b03f9b08076bbef387363b18d8a88ab1861f4a..72baa938a5f5dc72d3a279b98da0297deeb4397e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -276,49 +276,51 @@ void SMESHGUI_MeshOp::selectionDone()
   // Enable tabs according to shape dimension
 
   int shapeDim = 3;
   // Enable tabs according to shape dimension
 
   int shapeDim = 3;

-  if ( myToCreate )
+  try

   {
   {

-    try
-    {
-      QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom );
-      _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.latin1() );
-      if ( pGeom ) {
-        GEOM::GEOM_Object_var aGeomVar =
-          GEOM::GEOM_Object::_narrow( _CAST( SObject,pGeom )->GetObject() );
-        if ( !aGeomVar->_is_nil() ) {
-          shapeDim = 0;
-          switch ( aGeomVar->GetShapeType() ) {
-          case GEOM::SOLID:
-          case GEOM::SHELL:  shapeDim = 3; break;
-          case GEOM::FACE:   shapeDim = 2; break;
-          case GEOM::WIRE:   
-          case GEOM::EDGE:   shapeDim = 1; break;
-          case GEOM::VERTEX: shapeDim = 0; break;
-          default:
-            TopoDS_Shape aShape;
-            if ( GEOMBase::GetShape(aGeomVar, aShape)) {
-              TopExp_Explorer exp( aShape, TopAbs_SHELL );
-              if ( exp.More() )
-                shapeDim = 3;
-              else if ( exp.Init( aShape, TopAbs_FACE ), exp.More() )
-                shapeDim = 2;
-              else if ( exp.Init( aShape, TopAbs_EDGE ), exp.More() )
-                shapeDim = 1;
-              else
-                shapeDim = 0;
-            }
-          }
-        }
-      }
+    GEOM::GEOM_Object_var aGeomVar;
+    QString aGeomEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Geom );
+    _PTR(SObject) pGeom = studyDS()->FindObjectID( aGeomEntry.latin1() );
+    if ( pGeom ) {
+      aGeomVar = GEOM::GEOM_Object::_narrow( _CAST( SObject,pGeom )->GetObject() );

     }
     }

-    catch ( const SALOME::SALOME_Exception& S_ex )
-    {
-      SalomeApp_Tools::QtCatchCorbaException( S_ex );
+    else {
+      QString anObjEntry = myDlg->selectedObject( SMESHGUI_MeshDlg::Obj );
+      _PTR(SObject) pObj = studyDS()->FindObjectID( anObjEntry.latin1() );
+      aGeomVar = SMESH::GetShapeOnMeshOrSubMesh( pObj );

     }
     }

-    catch ( ... )
-    {
+    if ( !aGeomVar->_is_nil() ) {
+      shapeDim = 0;
+      switch ( aGeomVar->GetShapeType() ) {
+      case GEOM::SOLID:
+      case GEOM::SHELL:  shapeDim = 3; break;
+      case GEOM::FACE:   shapeDim = 2; break;
+      case GEOM::WIRE:   
+      case GEOM::EDGE:   shapeDim = 1; break;
+      case GEOM::VERTEX: shapeDim = 0; break;
+      default:
+        TopoDS_Shape aShape;
+        if ( GEOMBase::GetShape(aGeomVar, aShape)) {
+          TopExp_Explorer exp( aShape, TopAbs_SHELL );
+          if ( exp.More() )
+            shapeDim = 3;
+          else if ( exp.Init( aShape, TopAbs_FACE ), exp.More() )
+            shapeDim = 2;
+          else if ( exp.Init( aShape, TopAbs_EDGE ), exp.More() )
+            shapeDim = 1;
+          else
+            shapeDim = 0;
+        }
+      }

     }
   }
     }
   }

+  catch ( const SALOME::SALOME_Exception& S_ex )
+  {
+    SalomeApp_Tools::QtCatchCorbaException( S_ex );
+  }
+  catch ( ... )
+  {
+  }

   myDlg->setMaxHypoDim( shapeDim );
 }
 
   myDlg->setMaxHypoDim( shapeDim );
 }