Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab.

diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx
index 756a76899cc464a304d03afbd5044c47e9ccd0d9..644c6fbfae139e2f8cb2e12ed229c66eac3fe762 100644 (file)
--- a/src/SMESH/SMESH_subMesh.cxx
+++ b/src/SMESH/SMESH_subMesh.cxx
@@ -498,6 +498,11 @@ bool SMESH_subMesh::CanAddHypothesis(const SMESH_Hypothesis* theHypothesis) cons
 {
   int aHypDim   = theHypothesis->GetDim();
   int aShapeDim = SMESH_Gen::GetShapeDim(_subShape);
+  if (aHypDim == 3 && aShapeDim == 3) {
+    // check case of open shell
+    if (_subShape.ShapeType() == TopAbs_SHELL && !_subShape.Closed())
+      return false;
+  }
   if ( aHypDim <= aShapeDim )
     return true;
 

diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index 14fed46e849792a8beba33a79563a3b1569fa8e5..4d27d31aed8ae5c2fbcedc828f461b4db9deb33a 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -61,7 +61,9 @@
 #include <QLineEdit>
 
 // OCCT includes
+#include <TopoDS.hxx>
 #include <TopoDS_Shape.hxx>
+#include <TopoDS_Shell.hxx>
 #include <TopExp_Explorer.hxx>
 
 // IDL includes
@@ -453,24 +455,42 @@ void SMESHGUI_MeshOp::selectionDone()
         for (int iss = 0; iss < aSeq->length() && shapeDim < 3; iss++) {
           GEOM::GEOM_Object_var aGeomVar = aSeq[iss];
           switch ( aGeomVar->GetShapeType() ) {
-          case GEOM::SOLID:
-          case GEOM::SHELL:  shapeDim = 3; break;
+          case GEOM::SOLID:  shapeDim = 3; break;
+          case GEOM::SHELL:
+            {
+              //shapeDim = 3; // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab
+              shapeDim = (shapeDim < 2) ? 2 : shapeDim;
+              TopoDS_Shape aShape;
+              if (GEOMBase::GetShape(aGeomVar, aShape)) {
+                if (aShape.Closed())
+                  shapeDim = 3;
+              }
+            }
+            break;
           case GEOM::FACE:   shapeDim = (shapeDim < 2) ? 2 : shapeDim; break;
           case GEOM::WIRE:
           case GEOM::EDGE:   shapeDim = (shapeDim < 1) ? 1 : shapeDim; break;
           case GEOM::VERTEX: 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 = (shapeDim < 2) ? 2 : shapeDim;
-              else if ( exp.Init( aShape, TopAbs_EDGE ), exp.More() )
-                shapeDim = (shapeDim < 1) ? 1 : shapeDim;
-              else
-                ;//shapeDim = 0;
+            {
+              TopoDS_Shape aShape;
+              if (GEOMBase::GetShape(aGeomVar, aShape)) {
+                TopExp_Explorer exp (aShape, TopAbs_SHELL);
+                if (exp.More()) {
+                  //shapeDim = 3; // Bug 0016155: EDF PAL 447: If the shape is a Shell, disable 3D tab
+                  shapeDim = (shapeDim < 2) ? 2 : shapeDim;
+                  for (; exp.More() && shapeDim == 2; exp.Next()) {
+                    if (exp.Current().Closed())
+                      shapeDim = 3;
+                  }
+                }
+                else if ( exp.Init( aShape, TopAbs_FACE ), exp.More() )
+                  shapeDim = (shapeDim < 2) ? 2 : shapeDim;
+                else if ( exp.Init( aShape, TopAbs_EDGE ), exp.More() )
+                  shapeDim = (shapeDim < 1) ? 1 : shapeDim;
+                else
+                  ;//shapeDim = 0;
+              }
             }
           }
         }