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 a5207b64c5e71ea5f74eecd4b9494a1adbff185b..66e34ce1399691c7028015da0597c0ce3b27fb6b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Selection.cxx
+++ b/src/SMESHGUI/SMESHGUI_Selection.cxx
@@ -111,6 +111,7 @@ QVariant SMESHGUI_Selection::parameter( const int ind, const QString& p ) const
   else if ( p=="elemTypes" )     val = QVariant( elemTypes( ind ) );
   else if ( p=="isAutoColor" )   val = QVariant( isAutoColor( ind ) );
   else if ( p=="numberOfNodes" ) val = QVariant( numberOfNodes( ind ) );
+  else if ( p=="dim" )           val = QVariant( dim( ind ) );
   else if ( p=="labeledTypes" )  val = QVariant( labeledTypes( ind ) );
   else if ( p=="shrinkMode" )    val = QVariant( shrinkMode( ind ) );
   else if ( p=="entityMode" )    val = QVariant( entityMode( ind ) );
@@ -297,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;
     }
   }
@@ -396,6 +401,41 @@ int SMESHGUI_Selection::numberOfNodes( int ind ) const
   return 0;
 }
 
+//================================================================================
+/*!
+ * \brief return dimension of elements of the selected object
+ *
+ *  \retval int - 0 for 0D elements, -1 for an empty object (the rest as usual)
+ */
+//================================================================================
+
+int SMESHGUI_Selection::dim( int ind ) const
+{
+  int dim = -1;
+  if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
+  {
+    _PTR(SObject) sobj = SMESH::GetActiveStudyDocument()->FindObjectID( entry( ind ).toLatin1().data() );
+    CORBA::Object_var obj = SMESH::SObjectToObject( sobj, SMESH::GetActiveStudyDocument() );
+
+    if ( ! CORBA::is_nil( obj )) {
+      SMESH::SMESH_IDSource_var idSrc = SMESH::SMESH_IDSource::_narrow( obj );
+      if ( ! idSrc->_is_nil() )
+      {
+        SMESH::array_of_ElementType_var types = idSrc->GetTypes();
+        for ( int i = 0; i < types->length(); ++ i)
+          switch ( types[i] ) {
+          case SMESH::EDGE  : dim = std::max( dim, 1 ); break;
+          case SMESH::FACE  : dim = std::max( dim, 2 ); break;
+          case SMESH::VOLUME: dim = std::max( dim, 3 ); break;
+          case SMESH::ELEM0D: dim = std::max( dim, 0 ); break;
+          default:;
+          }
+      }
+    }
+  }
+  return dim;
+}
+
 //=======================================================================
 //function : isComputable
 //purpose  : 
@@ -625,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 "";
 }