Error after Close Study with Change Clipping dialog box opened. Sometimes it either...

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_MeshOp.cxx

diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index 5f37e57621c459566946dad6f5f5977f03b1fd4b..fbe5bae2707399a02c498bf6d83c0c34896f253e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -65,6 +65,7 @@
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Shell.hxx>
 #include <TopExp_Explorer.hxx>
+#include <BRep_Tool.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>
@@ -509,7 +510,7 @@ void SMESHGUI_MeshOp::selectionDone()
               shapeDim = (shapeDim < 2) ? 2 : shapeDim;
               TopoDS_Shape aShape;
               if (GEOMBase::GetShape(aGeomVar, aShape)) {
-                if (aShape.Closed())
+                if (/*aShape.Closed()*/BRep_Tool::IsClosed(aShape))
                   shapeDim = 3;
               }
             }
@@ -527,7 +528,7 @@ void SMESHGUI_MeshOp::selectionDone()
                   //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())
+                    if (/*exp.Current().Closed()*/BRep_Tool::IsClosed(exp.Current()))
                       shapeDim = 3;
                   }
                 }
@@ -594,8 +595,7 @@ void SMESHGUI_MeshOp::selectionDone()
         // a global algorithm that does not support submeshes
         if ( char* algoName = isSubmeshIgnored() ) {
           SUIT_MessageBox::warning( myDlg, tr( "SMESH_ERROR" ),
-                                    tr(QString("SUBMESH_NOT_ALLOWED")
-                                       .toLatin1().data() ).arg(algoName));
+                                    tr("SUBMESH_NOT_ALLOWED").arg(algoName));
           CORBA::string_free( algoName );
           myDlg->selectObject( "", SMESHGUI_MeshDlg::Mesh, "" );
           selectObject( _PTR(SObject)() );