X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Selection.cxx;h=ba08f55700c5b64fd6edd155bd4bc21d37f8d9c8;hb=7756cec8c769a15c556cd6bf650345aefd4d7e1d;hp=c37d3559f7be5d6b2cf152e32092c4fe9eea1e6f;hpb=8fccf870d3387fa0974af92cf19d52a9e5c311fa;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx
index c37d3559f..ba08f5570 100644
--- a/src/SMESHGUI/SMESHGUI_Selection.cxx
+++ b/src/SMESHGUI/SMESHGUI_Selection.cxx
@@ -29,6 +29,7 @@
 #include "SMESHGUI_Utils.h"
 #include "SMESHGUI_VTKUtils.h"
 #include "SMESHGUI_GEOMGenUtils.h"
+#include "SMESHGUI_ComputeDlg.h"
 
 #include <SMESH_Type.h>
 #include <SMESH_Actor.h>
@@ -113,10 +114,12 @@ QVariant SMESHGUI_Selection::parameter( const int ind, const QString& p ) const
   else if ( p=="controlMode" )   val = QVariant( controlMode( ind ) );
   else if ( p=="displayMode" )   val = QVariant( displayMode( ind ) );
   else if ( p=="isComputable" )  val = QVariant( isComputable( ind ) );
+  else if ( p=="isPreComputable" )  val = QVariant( isPreComputable( ind ) );
   else if ( p=="hasReference" )  val = QVariant( hasReference( ind ) );
   else if ( p=="isImported" )    val = QVariant( isImported( ind ) );
   else if ( p=="facesOrientationMode" ) val = QVariant( facesOrientationMode( ind ) );
   else if ( p=="groupType" )     val = QVariant( groupType( ind ) );
+  else if ( p=="quadratic2DMode") val =  QVariant(quadratic2DMode(ind));
 
   if( val.isValid() )
     return val;
@@ -139,7 +142,7 @@ SMESH_Actor* SMESHGUI_Selection::getActor( int ind ) const
 
 //=======================================================================
 //function : elemTypes
-//purpose  : may return {'Edge' 'Face' 'Volume'} at most
+//purpose  : may return {'Elem0d' 'Edge' 'Face' 'Volume'} at most
 //=======================================================================
 
 QList<QVariant> SMESHGUI_Selection::elemTypes( int ind ) const
@@ -149,6 +152,7 @@ QList<QVariant> SMESHGUI_Selection::elemTypes( int ind ) const
   if ( actor ) {
     TVisualObjPtr object = actor->GetObject();
     if ( object ) {
+      if ( object->GetNbEntities( SMDSAbs_0DElement )) types.append( "Elem0d" );
       if ( object->GetNbEntities( SMDSAbs_Edge )) types.append( "Edge" );
       if ( object->GetNbEntities( SMDSAbs_Face )) types.append( "Face" );
       if ( object->GetNbEntities( SMDSAbs_Volume )) types.append( "Volume" );
@@ -192,6 +196,24 @@ QString SMESHGUI_Selection::displayMode( int ind ) const
   return "Unknown";
 }
 
+
+//=======================================================================
+//function : quadratic2DMode
+//purpose  : return SMESH_Actor::EQuadratic2DRepresentation
+//=======================================================================
+QString SMESHGUI_Selection::quadratic2DMode( int ind ) const
+{
+  SMESH_Actor* actor = getActor( ind );
+  if ( actor ) {
+    switch( actor->GetQuadratic2DRepresentation() ) {
+    case SMESH_Actor::eLines:    return "eLines";
+    case SMESH_Actor::eArcs: return "eArcs";
+    default: break;
+    }
+  }
+  return "Unknown";
+}
+
 //=======================================================================
 //function : shrinkMode
 //purpose  : return either 'IsSrunk', 'IsNotShrunk' or 'IsNotShrinkable'
@@ -210,7 +232,7 @@ QString SMESHGUI_Selection::shrinkMode( int ind ) const
 
 //=======================================================================
 //function : entityMode
-//purpose  : may return {'Edge' 'Face' 'Volume'} at most
+//purpose  : may return {'Elem0d' 'Edge' 'Face' 'Volume'} at most
 //=======================================================================
 
 QList<QVariant> SMESHGUI_Selection::entityMode( int ind ) const
@@ -219,9 +241,10 @@ QList<QVariant> SMESHGUI_Selection::entityMode( int ind ) const
   SMESH_Actor* actor = getActor( ind );
   if ( actor ) {
     unsigned int aMode = actor->GetEntityMode();
-    if ( aMode & SMESH_Actor::eVolumes) types.append( "Volume");
-    if ( aMode & SMESH_Actor::eFaces  ) types.append( "Face"  );
-    if ( aMode & SMESH_Actor::eEdges  ) types.append( "Edge"  );
+    if ( aMode & SMESH_Actor::eVolumes    ) types.append( "Volume" );
+    if ( aMode & SMESH_Actor::eFaces      ) types.append( "Face"   );
+    if ( aMode & SMESH_Actor::eEdges      ) types.append( "Edge"   );
+    if ( aMode & SMESH_Actor::e0DElements ) types.append( "Elem0d" );
   }
   return types;
 }
@@ -365,6 +388,23 @@ QVariant SMESHGUI_Selection::isComputable( int ind ) const
   return QVariant( false );
 }
 
+//=======================================================================
+//function : isPreComputable
+//purpose  : 
+//=======================================================================
+
+QVariant SMESHGUI_Selection::isPreComputable( int ind ) const
+{
+  if ( ind >= 0 && ind < myTypes.count() && myTypes[ind] != "Unknown" )
+  {
+    QMap<int,int> modeMap;
+    _PTR(SObject) pMesh = SMESH::GetActiveStudyDocument()->FindObjectID( entry( ind ).toLatin1().data() );
+    SMESHGUI_PrecomputeOp::getAssignedAlgos( pMesh, modeMap );
+    return QVariant( modeMap.size() > 1 );
+  }
+  return QVariant( false );
+}
+
 //=======================================================================
 //function : hasReference
 //purpose  : 
@@ -548,3 +588,4 @@ QString SMESHGUI_Selection::groupType( int ind ) const
   }
   return type;
 }
+