Implementation of the "0021374: EDF 1898 SMESH: Extrusion of a node to have an edge...

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

diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx
index b0ec372bf92084d9929510462913fe6116d914a1..66e34ce1399691c7028015da0597c0ce3b27fb6b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Selection.cxx
+++ b/src/SMESHGUI/SMESHGUI_Selection.cxx
@@ -298,6 +298,10 @@ QString SMESHGUI_Selection::controlMode( int ind ) const
     case SMESH_Actor::eBareBorderVolume:      mode = "eBareBorderVolume";      break;
     case SMESH_Actor::eOverConstrainedFace:   mode = "eOverConstrainedFace";   break;
     case SMESH_Actor::eOverConstrainedVolume: mode = "eOverConstrainedVolume"; break;
+    case SMESH_Actor::eCoincidentNodes:       mode = "eCoincidentNodes";       break;
+    case SMESH_Actor::eCoincidentElems1D:     mode = "eCoincidentElems1D";     break;
+    case SMESH_Actor::eCoincidentElems2D:     mode = "eCoincidentElems2D";     break;
+    case SMESH_Actor::eCoincidentElems3D:     mode = "eCoincidentElems3D";     break;
     default:break;
     }
   }
@@ -661,17 +665,19 @@ QString SMESHGUI_Selection::groupType( int ind ) const
 {
   QString e = entry( ind );
   _PTR(SObject) SO = SMESH::GetActiveStudyDocument()->FindObjectID( e.toLatin1().constData() );
-  QString type;
   if( SO )
   {
-    CORBA::Object_var obj = SMESH::SObjectToObject( SO );
-  
-    SMESH::SMESH_Group_var aGroup = SMESH::SMESH_Group::_narrow( obj );
-    SMESH::SMESH_GroupOnGeom_var aGroupOnGeom = SMESH::SMESH_GroupOnGeom::_narrow( obj );
-    if( !aGroup->_is_nil() )
-      type = QString( "Group" );
-    else if ( !aGroupOnGeom->_is_nil() )
-      type = QString( "GroupOnGeom" );
+    SMESH::SMESH_Group_var g = SMESH::SObjectToInterface<SMESH::SMESH_Group>( SO );
+    if( !g->_is_nil() )
+      return "Group";
+
+    SMESH::SMESH_GroupOnGeom_var gog = SMESH::SObjectToInterface<SMESH::SMESH_GroupOnGeom>( SO );
+    if( !gog->_is_nil() )
+      return "GroupOnGeom";
+
+    SMESH::SMESH_GroupOnFilter_var gof = SMESH::SObjectToInterface<SMESH::SMESH_GroupOnFilter>(SO);
+    if ( !gof->_is_nil() )
+      return "GroupOnFilter";
   }
-  return type;
+  return "";
 }