Implementation of Groups support by the SHAPER-STUDY module

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

diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index cb6efcb78ff64343ce12e6cfa97f83f62356bc76..9e30fe25af9c7727f6db73a69dee26e2802b9569 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -338,10 +338,10 @@ bool SMESHGUI_MeshOp::isSubshapeOk() const
   myDlg->selectedObject(SMESHGUI_MeshDlg::Geom, aGEOMs);
 
   if (aGEOMs.count() > 0) {
-    GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen();
+    GEOM::GEOM_Gen_var geomGen = mainGeom->GetGen();
     if (geomGen->_is_nil()) return false;
 
-    GEOM::GEOM_IGroupOperations_wrap op = geomGen->GetIGroupOperations();
+    GEOM::GEOM_IGroupOperations_ptr op = geomGen->GetIGroupOperations();
     if (op->_is_nil()) return false;
 
     // check all selected shapes
@@ -1461,6 +1461,7 @@ void SMESHGUI_MeshOp::setFilteredAlgoData()
   updateHypoSets(); // it sets myAvailableHypData by curMeshType
 
   // restore current algorithms according to changed myAvailableHypData
+  algosAvailable.clear();
   for ( int dim = 0; dim <= 3; ++dim )
   {
     int algoIndex = myAvailableHypData[ dim ][ Algo ].indexOf( curAlgos[ dim ]);
@@ -1855,7 +1856,7 @@ bool SMESHGUI_MeshOp::createSubMesh( QString& theMess, QStringList& theEntryList
     // create a GEOM group
     GEOM::GEOM_Gen_var geomGen = SMESH::GetGEOMGen();
     if (!geomGen->_is_nil()) {
-      GEOM::GEOM_IGroupOperations_wrap op =
+      GEOM::GEOM_IGroupOperations_ptr op =
         geomGen->GetIGroupOperations();
       if (!op->_is_nil()) {
         // check and add all selected GEOM objects: they must be