Avoid "GROUP" redefinition on win32: add 'MeshObjectType'enum to namespace SMESH

diff --git a/src/SMESHFiltersSelection/SMESH_Type.h b/src/SMESHFiltersSelection/SMESH_Type.h
index e29c918a07dced71801bf5fa6631161bfda1e1d6..ceb41923e66016c75113eceed54f157847986c81 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_Type.h
+++ b/src/SMESHFiltersSelection/SMESH_Type.h
@@ -39,26 +39,27 @@
  #define SMESHFILTERSSELECTION_EXPORT
 #endif
 
  #define SMESHFILTERSSELECTION_EXPORT
 #endif
 

-enum MeshObjectType {
-  HYPOTHESIS,
-  ALGORITHM,
-  MESH,
-  SUBMESH,
-  MESHorSUBMESH,
-  SUBMESH_VERTEX,
-  SUBMESH_EDGE,
-  SUBMESH_FACE,
-  SUBMESH_SOLID,
-  SUBMESH_COMPOUND,
-  GROUP,
-  GROUP_NODE,
-  GROUP_EDGE,
-  GROUP_FACE,
-  GROUP_VOLUME,
-  GROUP_0D,
-  GROUP_BALL,
-  COMPONENT,
-  IDSOURCE
+namespace SMESH{
+  enum MeshObjectType {
+    HYPOTHESIS,
+    ALGORITHM,
+    MESH,
+    SUBMESH,
+    MESHorSUBMESH,
+    SUBMESH_VERTEX,
+    SUBMESH_EDGE,
+    SUBMESH_FACE,
+    SUBMESH_SOLID,
+    SUBMESH_COMPOUND,
+    GROUP,
+    GROUP_NODE,
+    GROUP_EDGE,
+    GROUP_FACE,
+    GROUP_VOLUME,
+    GROUP_0D,
+    GROUP_BALL,
+    COMPONENT,
+    IDSOURCE
+  };

 };
 };

-

 #endif
 #endif

diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
index e9b83166c25add1125c1dc2b2298a27f95208d5d..9df3ed861ebc83c2ecb3bda035f79302d1c7308f 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
@@ -30,7 +30,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SMESH_Gen)
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SMESH_Gen)
 

-SMESH_TypeFilter::SMESH_TypeFilter (MeshObjectType theType)
+SMESH_TypeFilter::SMESH_TypeFilter (SMESH::MeshObjectType theType)

 {
   myType = theType;
 }
 {
   myType = theType;
 }


@@ -88,7 +88,7 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
 
     switch (myType)
     {
 
     switch (myType)
     {

-      case HYPOTHESIS:
+      case SMESH::HYPOTHESIS:

         {
           if      (aLevel == 2 && (objFather->Tag() == SMESH::Tag_HypothesisRoot))
             // hypo definition
         {
           if      (aLevel == 2 && (objFather->Tag() == SMESH::Tag_HypothesisRoot))
             // hypo definition


@@ -101,7 +101,7 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
             Ok = true;
           break;
         }
             Ok = true;
           break;
         }

-      case ALGORITHM:
+      case SMESH::ALGORITHM:

         {
           if      (aLevel == 2 && (objFather->Tag() == SMESH::Tag_AlgorithmsRoot))
             // algo definition
         {
           if      (aLevel == 2 && (objFather->Tag() == SMESH::Tag_AlgorithmsRoot))
             // algo definition


@@ -114,13 +114,13 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
             Ok = true;
           break;
         }
             Ok = true;
           break;
         }

-      case MESH:
+      case SMESH::MESH:

         {
           if (aLevel == 1 && (obj->Tag() >= SMESH::Tag_FirstMeshRoot))
             Ok = true;
           break;
         }
         {
           if (aLevel == 1 && (obj->Tag() >= SMESH::Tag_FirstMeshRoot))
             Ok = true;
           break;
         }

-      case SUBMESH:
+      case SMESH::SUBMESH:

         {
           // see SMESH_Gen_i.cxx for tag numbers
           if (aLevel == 3 && (objFather->Tag() >= SMESH::Tag_FirstSubMesh &&
         {
           // see SMESH_Gen_i.cxx for tag numbers
           if (aLevel == 3 && (objFather->Tag() >= SMESH::Tag_FirstSubMesh &&


@@ -128,7 +128,7 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
             Ok = true;
           break;
         }
             Ok = true;
           break;
         }

-      case MESHorSUBMESH:
+      case SMESH::MESHorSUBMESH:

         {
           if (aLevel == 1 && (obj->Tag() >= SMESH::Tag_FirstMeshRoot))
             Ok = true; // mesh
         {
           if (aLevel == 1 && (obj->Tag() >= SMESH::Tag_FirstMeshRoot))
             Ok = true; // mesh


@@ -137,82 +137,82 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
             Ok = true;
           break;
         }
             Ok = true;
           break;
         }

-      case SUBMESH_VERTEX: // Label "SubMeshes on vertexes"
+      case SMESH::SUBMESH_VERTEX: // Label "SubMeshes on vertexes"

         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnVertex))
             Ok = true;
           break;
         }
         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnVertex))
             Ok = true;
           break;
         }

-      case SUBMESH_EDGE:
+      case SMESH::SUBMESH_EDGE:

         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnEdge))
             Ok = true;
           break;
         }
         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnEdge))
             Ok = true;
           break;
         }

-      case SUBMESH_FACE:
+      case SMESH::SUBMESH_FACE:

         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnFace))
             Ok = true;
           break;
         }
         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnFace))
             Ok = true;
           break;
         }

-      case SUBMESH_SOLID:
+      case SMESH::SUBMESH_SOLID:

         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnSolid))
             Ok = true;
           break;
         }
         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnSolid))
             Ok = true;
           break;
         }

-      case SUBMESH_COMPOUND:
+      case SMESH::SUBMESH_COMPOUND:

         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnCompound))
             Ok = true;
           break;
         }
         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_SubMeshOnCompound))
             Ok = true;
           break;
         }

-      case GROUP:
+      case SMESH::GROUP:

         {
           if (aLevel == 3 && (objFather->Tag() >= SMESH::Tag_FirstGroup))
             Ok = true;
           break;
         }
         {
           if (aLevel == 3 && (objFather->Tag() >= SMESH::Tag_FirstGroup))
             Ok = true;
           break;
         }

-      case GROUP_NODE:
+      case SMESH::GROUP_NODE:

         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_NodeGroups))
             Ok = true;
           break;
         }
         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_NodeGroups))
             Ok = true;
           break;
         }

-      case GROUP_EDGE:
+      case SMESH::GROUP_EDGE:

         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_EdgeGroups))
             Ok = true;
           break;
         }
         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_EdgeGroups))
             Ok = true;
           break;
         }

-      case GROUP_FACE:
+      case SMESH::GROUP_FACE:

         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_FaceGroups))
             Ok = true;
           break;
         }
         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_FaceGroups))
             Ok = true;
           break;
         }

-      case GROUP_VOLUME:
+      case SMESH::GROUP_VOLUME:

         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_VolumeGroups))
             Ok = true;
           break;
         }
         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_VolumeGroups))
             Ok = true;
           break;
         }

-      case GROUP_0D:
+      case SMESH::GROUP_0D:

         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_0DElementsGroups))
             Ok = true;
           break;
         }
         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_0DElementsGroups))
             Ok = true;
           break;
         }

-      case GROUP_BALL:
+      case SMESH::GROUP_BALL:

         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_BallElementsGroups))
             Ok = true;
           break;
         }
         {
           if (aLevel == 3 && (objFather->Tag() == SMESH::Tag_BallElementsGroups))
             Ok = true;
           break;
         }

-      case IDSOURCE:
+      case SMESH::IDSOURCE:

         {
         {

-          Ok = ( SMESH_TypeFilter(MESHorSUBMESH).isOk( theDataOwner ) ||
-                 SMESH_TypeFilter(GROUP)        .isOk( theDataOwner ));
+          Ok = ( SMESH_TypeFilter(SMESH::MESHorSUBMESH).isOk( theDataOwner ) ||
+                 SMESH_TypeFilter(SMESH::GROUP)        .isOk( theDataOwner ));

           break;
         }
     }
           break;
         }
     }


@@ -220,7 +220,7 @@ bool SMESH_TypeFilter::isOk (const SUIT_DataOwner* theDataOwner) const
   return Ok;
 }
 
   return Ok;
 }
 

-MeshObjectType SMESH_TypeFilter::type() const
+SMESH::MeshObjectType SMESH_TypeFilter::type() const

 {
   return myType;
 }
 {
   return myType;
 }

diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx
index 0821917d03a2404d97adb84b99d23f192ea65b46..7daf9b11913c337b776291984c3b0478b447697c 100644 (file)
--- a/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx
+++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx
@@ -34,14 +34,14 @@ class SUIT_DataOwner;
 class SMESHFILTERSSELECTION_EXPORT SMESH_TypeFilter : public SUIT_SelectionFilter
 {
 public:
 class SMESHFILTERSSELECTION_EXPORT SMESH_TypeFilter : public SUIT_SelectionFilter
 {
 public:

-  SMESH_TypeFilter (MeshObjectType theType);
+  SMESH_TypeFilter (SMESH::MeshObjectType theType);

   ~SMESH_TypeFilter();
 
   virtual bool isOk (const SUIT_DataOwner*) const;
   ~SMESH_TypeFilter();
 
   virtual bool isOk (const SUIT_DataOwner*) const;

-  MeshObjectType type() const;
+  SMESH::MeshObjectType type() const;

 
 protected:
 
 protected:

-  MeshObjectType myType;
+  SMESH::MeshObjectType myType;

 };
 
 #endif
 };
 
 #endif

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 0177e876d41bfacd9b7d14c5df9af6c5c13b68ed..10d66e8a778e195f5dafd47938920908985023be 100644 (file)
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -1577,7 +1577,7 @@
 
 
   bool CheckOIType(const Handle(SALOME_InteractiveObject) & theIO,
 
 
   bool CheckOIType(const Handle(SALOME_InteractiveObject) & theIO,

-                   MeshObjectType                           theType,
+                   SMESH::MeshObjectType                           theType,

                    const QString                            theInTypeName,
                    QString &                                theOutTypeName)
   {
                    const QString                            theInTypeName,
                    QString &                                theOutTypeName)
   {


@@ -1609,11 +1609,11 @@
 
     QString aTypeName;
     if (
 
     QString aTypeName;
     if (

-        CheckOIType ( theIO, HYPOTHESIS,    "Hypothesis", aTypeName ) ||
-        CheckOIType ( theIO, ALGORITHM,     "Algorithm",  aTypeName ) ||
-        CheckOIType ( theIO, MESH,          "Mesh",       aTypeName ) ||
-        CheckOIType ( theIO, SUBMESH,       "SubMesh",    aTypeName ) ||
-        CheckOIType ( theIO, GROUP,         "Group",      aTypeName )
+        CheckOIType ( theIO, SMESH::HYPOTHESIS,    "Hypothesis", aTypeName ) ||
+        CheckOIType ( theIO, SMESH::ALGORITHM,     "Algorithm",  aTypeName ) ||
+        CheckOIType ( theIO, SMESH::MESH,          "Mesh",       aTypeName ) ||
+        CheckOIType ( theIO, SMESH::SUBMESH,       "SubMesh",    aTypeName ) ||
+        CheckOIType ( theIO, SMESH::GROUP,         "Group",      aTypeName )

         )
       return aTypeName;
 
         )
       return aTypeName;
 


@@ -3997,17 +3997,17 @@ void SMESHGUI::initialize( CAM_Application* app )
   QString OB = "'ObjectBrowser'",
           View = "'" + SVTK_Viewer::Type() + "'",
           pat = "'%1'",
   QString OB = "'ObjectBrowser'",
           View = "'" + SVTK_Viewer::Type() + "'",
           pat = "'%1'",

-          mesh    = pat.arg( SMESHGUI_Selection::typeName( MESH ) ),
-          group   = pat.arg( SMESHGUI_Selection::typeName( GROUP ) ),
-          hypo    = pat.arg( SMESHGUI_Selection::typeName( HYPOTHESIS ) ),
-          algo    = pat.arg( SMESHGUI_Selection::typeName( ALGORITHM ) ),
+          mesh    = pat.arg( SMESHGUI_Selection::typeName( SMESH::MESH ) ),
+          group   = pat.arg( SMESHGUI_Selection::typeName( SMESH::GROUP ) ),
+          hypo    = pat.arg( SMESHGUI_Selection::typeName( SMESH::HYPOTHESIS ) ),
+          algo    = pat.arg( SMESHGUI_Selection::typeName( SMESH::ALGORITHM ) ),

           elems   = QString( "'%1' '%2' '%3' '%4' '%5' '%6'" ).
           elems   = QString( "'%1' '%2' '%3' '%4' '%5' '%6'" ).

-                       arg( SMESHGUI_Selection::typeName( SUBMESH_VERTEX ) ).
-                       arg( SMESHGUI_Selection::typeName( SUBMESH_EDGE ) ).
-                       arg( SMESHGUI_Selection::typeName( SUBMESH_FACE ) ).
-                       arg( SMESHGUI_Selection::typeName( SUBMESH_SOLID ) ).
-                       arg( SMESHGUI_Selection::typeName( SUBMESH_COMPOUND ) ).
-                       arg( SMESHGUI_Selection::typeName( SUBMESH ) ),
+                       arg( SMESHGUI_Selection::typeName( SMESH::SUBMESH_VERTEX ) ).
+                       arg( SMESHGUI_Selection::typeName( SMESH::SUBMESH_EDGE ) ).
+                       arg( SMESHGUI_Selection::typeName( SMESH::SUBMESH_FACE ) ).
+                       arg( SMESHGUI_Selection::typeName( SMESH::SUBMESH_SOLID ) ).
+                       arg( SMESHGUI_Selection::typeName( SMESH::SUBMESH_COMPOUND ) ).
+                       arg( SMESHGUI_Selection::typeName( SMESH::SUBMESH ) ),

           subMesh = elems,
           mesh_part = mesh + " " + subMesh + " " + group,
           mesh_group = mesh + " " + group,
           subMesh = elems,
           mesh_part = mesh + " " + subMesh + " " + group,
           mesh_group = mesh + " " + group,


@@ -6396,11 +6396,11 @@ bool SMESHGUI::renameAllowed( const QString& entry) const {
 
   // check type to prevent renaming of inappropriate objects
   int aType = SMESHGUI_Selection::type(qPrintable(entry), SMESH::GetActiveStudyDocument());
 
   // check type to prevent renaming of inappropriate objects
   int aType = SMESHGUI_Selection::type(qPrintable(entry), SMESH::GetActiveStudyDocument());

-  if (aType == MESH || aType == GROUP ||
-      aType == SUBMESH || aType == SUBMESH_COMPOUND ||
-      aType == SUBMESH_SOLID || aType == SUBMESH_FACE ||
-      aType == SUBMESH_EDGE || aType == SUBMESH_VERTEX ||
-      aType == HYPOTHESIS || aType == ALGORITHM)
+  if (aType == SMESH::MESH || aType == SMESH::GROUP ||
+      aType == SMESH::SUBMESH || aType == SMESH::SUBMESH_COMPOUND ||
+      aType == SMESH::SUBMESH_SOLID || aType == SMESH::SUBMESH_FACE ||
+      aType == SMESH::SUBMESH_EDGE || aType == SMESH::SUBMESH_VERTEX ||
+      aType == SMESH::HYPOTHESIS || aType == SMESH::ALGORITHM)

     return true;
 
   return false;
     return true;
 
   return false;


@@ -6443,11 +6443,11 @@ bool SMESHGUI::renameObject( const QString& entry, const QString& name) {
       aName = anAttr;
       // check type to prevent renaming of inappropriate objects
       int aType = SMESHGUI_Selection::type( qPrintable(entry), SMESH::GetActiveStudyDocument() );
       aName = anAttr;
       // check type to prevent renaming of inappropriate objects
       int aType = SMESHGUI_Selection::type( qPrintable(entry), SMESH::GetActiveStudyDocument() );

-      if (aType == MESH || aType == GROUP ||
-          aType == SUBMESH || aType == SUBMESH_COMPOUND ||
-          aType == SUBMESH_SOLID || aType == SUBMESH_FACE ||
-          aType == SUBMESH_EDGE || aType == SUBMESH_VERTEX ||
-          aType == HYPOTHESIS || aType == ALGORITHM) {
+      if (aType == SMESH::MESH || aType == SMESH::GROUP ||
+          aType == SMESH::SUBMESH || aType == SMESH::SUBMESH_COMPOUND ||
+          aType == SMESH::SUBMESH_SOLID || aType == SMESH::SUBMESH_FACE ||
+          aType == SMESH::SUBMESH_EDGE || aType == SMESH::SUBMESH_VERTEX ||
+          aType == SMESH::HYPOTHESIS || aType == SMESH::ALGORITHM) {

         if ( !name.isEmpty() ) {
           SMESHGUI::GetSMESHGen()->SetName(obj->GetIOR().c_str(), qPrintable(name) );
 
         if ( !name.isEmpty() ) {
           SMESHGUI::GetSMESHGen()->SetName(obj->GetIOR().c_str(), qPrintable(name) );
 

diff --git a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
index edee4cecbda29c16d215f47a606bab0bdb28bf3e..51e19437060dbbf5f05c1ae0899ba9ae0d94b7a4 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
@@ -206,7 +206,7 @@ void SMESHGUI_BuildCompoundDlg::Init()
 
   myMesh = SMESH::SMESH_Mesh::_nil();
 
 
   myMesh = SMESH::SMESH_Mesh::_nil();
 

-  myMeshFilter = new SMESH_TypeFilter (MESH);
+  myMeshFilter = new SMESH_TypeFilter (SMESH::MESH);

 
   myMeshArray = new SMESH::mesh_array();
 
 
   myMeshArray = new SMESH::mesh_array();
 

diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
index a5575b8797bae2cfc2667da3d4755df98ca9817e..eac1ae86cf4903fd1670db4b1109c56fbca87ca4 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
@@ -193,7 +193,7 @@ void SMESHGUI_ConvToQuadOp::selectionDone()
 SUIT_SelectionFilter* SMESHGUI_ConvToQuadOp::createFilter( const int theId ) const
 {
   if ( theId == 0 )
 SUIT_SelectionFilter* SMESHGUI_ConvToQuadOp::createFilter( const int theId ) const
 {
   if ( theId == 0 )

-    return new SMESH_TypeFilter( MESHorSUBMESH );
+    return new SMESH_TypeFilter( SMESH::MESHorSUBMESH );

   else
     return 0;
 }
   else
     return 0;
 }

diff --git a/src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
index 7c3d1d62c74519145ddec26d54b877f7df059c40..dab7a224c7c4dcbfb7c5ece96d8b56d23b74d766 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
@@ -219,7 +219,7 @@ SMESHGUI_CopyMeshDlg::SMESHGUI_CopyMeshDlg( SMESHGUI* theModule )
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   // Selection filter
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   // Selection filter

-  myIdSourceFilter = new SMESH_TypeFilter( IDSOURCE );
+  myIdSourceFilter = new SMESH_TypeFilter( SMESH::IDSOURCE );

 
   myHelpFileName = "copy_mesh_page.html";
 
 
   myHelpFileName = "copy_mesh_page.html";
 

diff --git a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
index ac5a1c686b0bfbba699b15325f67e154384246e5..fc44b4f71b69445734049456513ef7477ce68500 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
@@ -176,7 +176,7 @@ void SMESHGUI_DeleteGroupDlg::Init ()
   connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(onClose()));
 
   // set selection mode
   connect(mySMESHGUI, SIGNAL(SignalCloseAllDialogs()), SLOT(onClose()));
 
   // set selection mode

-  mySelectionMgr->installFilter(new SMESH_TypeFilter(GROUP));
+  mySelectionMgr->installFilter(new SMESH_TypeFilter(SMESH::GROUP));

   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     aViewWindow->SetSelectionMode(ActorSelection);
   onSelectionDone();
   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     aViewWindow->SetSelectionMode(ActorSelection);
   onSelectionDone();


@@ -323,7 +323,7 @@ void SMESHGUI_DeleteGroupDlg::enterEvent (QEvent*)
   setEnabled(true);
   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     aViewWindow->SetSelectionMode(ActorSelection);
   setEnabled(true);
   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     aViewWindow->SetSelectionMode(ActorSelection);

-  mySelectionMgr->installFilter(new SMESH_TypeFilter (GROUP));
+  mySelectionMgr->installFilter(new SMESH_TypeFilter (SMESH::GROUP));

 }
 
 //=================================================================================
 }
 
 //=================================================================================

diff --git a/src/SMESHGUI/SMESHGUI_Dialog.cxx b/src/SMESHGUI/SMESHGUI_Dialog.cxx
index 958f609ffecba6ab305279fed245d0506c02bb48..4669dadf90ef1b5eb05ee146739ceddf4c06f316 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Dialog.cxx
+++ b/src/SMESHGUI/SMESHGUI_Dialog.cxx
@@ -46,9 +46,9 @@ SMESHGUI_Dialog::SMESHGUI_Dialog( QWidget* parent, const bool modal,
 : LightApp_Dialog( parent == 0 ? desktop() : parent, "", modal, allowResize, flags )
 {
   int pr = prefix( "SMESH" );
 : LightApp_Dialog( parent == 0 ? desktop() : parent, "", modal, allowResize, flags )
 {
   int pr = prefix( "SMESH" );

-  typeName( pr + MESH ) = tr( "DLG_MESH" );
-  typeName( pr + HYPOTHESIS ) = tr( "DLG_HYPO" );
-  typeName( pr + ALGORITHM ) = tr( "DLG_ALGO" );
+  typeName( pr + SMESH::MESH ) = tr( "DLG_MESH" );
+  typeName( pr + SMESH::HYPOTHESIS ) = tr( "DLG_HYPO" );
+  typeName( pr + SMESH::ALGORITHM ) = tr( "DLG_ALGO" );

   setButtonText(1, tr("SMESH_BUT_APPLY_AND_CLOSE")); //rename OK to Apply and Close
   if ( flags & Close )
     setButtonPosition( Right, Close );
   setButtonText(1, tr("SMESH_BUT_APPLY_AND_CLOSE")); //rename OK to Apply and Close
   if ( flags & Close )
     setButtonPosition( Right, Close );

diff --git a/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
index e49250afe0f51aaa60079cedcbe390defd6209ea..1ee5ab8c9af6dc321ffc7a2398c707d2932ed009 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx
@@ -249,7 +249,7 @@ void SMESHGUI_DuplicateNodesDlg::Init()
   myGroups3.clear();
   
   // Set selection mode
   myGroups3.clear();
   
   // Set selection mode

-  mySelectionMgr->installFilter(new SMESH_TypeFilter(GROUP));
+  mySelectionMgr->installFilter(new SMESH_TypeFilter(SMESH::GROUP));

   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     aViewWindow->SetSelectionMode(ActorSelection);
   
   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     aViewWindow->SetSelectionMode(ActorSelection);
   


@@ -571,7 +571,7 @@ void SMESHGUI_DuplicateNodesDlg::enterEvent (QEvent*)
     // Set selection mode
     if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
       aViewWindow->SetSelectionMode(ActorSelection);
     // Set selection mode
     if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
       aViewWindow->SetSelectionMode(ActorSelection);

-    mySelectionMgr->installFilter(new SMESH_TypeFilter (GROUP));
+    mySelectionMgr->installFilter(new SMESH_TypeFilter (SMESH::GROUP));

   }
 }
 
   }
 }
 

diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
index 4ec84dce95e8c3384d93871a4497acd0daa5bd3d..f7bd76f7fe8474fe05cde8084087207b46e50f04 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
@@ -323,16 +323,16 @@ SMESHGUI_ExtrusionAlongPathDlg::SMESHGUI_ExtrusionAlongPathDlg( SMESHGUI* theMod
   mySMESHGUI->SetActiveDialogBox(this);
 
   // Costruction of the logical filter for the elements: mesh/sub-mesh/group
   mySMESHGUI->SetActiveDialogBox(this);
 
   // Costruction of the logical filter for the elements: mesh/sub-mesh/group

-  SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (MESHorSUBMESH);
-  SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (GROUP);
+  SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (SMESH::MESHorSUBMESH);
+  SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (SMESH::GROUP);

 
   QList<SUIT_SelectionFilter*> aListOfFilters;
   if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);
   if (aSmeshGroupFilter)    aListOfFilters.append(aSmeshGroupFilter);
 
   myElementsFilter = new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR);
 
   QList<SUIT_SelectionFilter*> aListOfFilters;
   if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);
   if (aSmeshGroupFilter)    aListOfFilters.append(aSmeshGroupFilter);
 
   myElementsFilter = new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR);

-  //myPathMeshFilter = new SMESH_TypeFilter (MESH);
-  myPathMeshFilter = new SMESH_TypeFilter(MESHorSUBMESH);
+  //myPathMeshFilter = new SMESH_TypeFilter (SMESH::MESH);
+  myPathMeshFilter = new SMESH_TypeFilter(SMESH::MESHorSUBMESH);

 
   myHelpFileName = "extrusion_along_path_page.html";
 
 
   myHelpFileName = "extrusion_along_path_page.html";
 


@@ -978,8 +978,8 @@ void SMESHGUI_ExtrusionAlongPathDlg::SetEditCurrentArgument (QToolButton* button
     if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
       aViewWindow->SetSelectionMode(NodeSelection);
 
     if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
       aViewWindow->SetSelectionMode(NodeSelection);
 

-    SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter(MESHorSUBMESH);
-    SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter(GROUP);
+    SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter(SMESH::MESHorSUBMESH);
+    SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter(SMESH::GROUP);

     SMESH_NumberFilter* aVertexFilter      = new SMESH_NumberFilter ("GEOM", TopAbs_SHAPE,
                                                                      -1, TopAbs_VERTEX);
     QList<SUIT_SelectionFilter*> aListOfFilters;
     SMESH_NumberFilter* aVertexFilter      = new SMESH_NumberFilter ("GEOM", TopAbs_SHAPE,
                                                                      -1, TopAbs_VERTEX);
     QList<SUIT_SelectionFilter*> aListOfFilters;

diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
index fa367fd510ea421b7f88718e342b4df85053d1cd..54c18157e8d3d2d1a33d3ca9629c2aa7502eed55 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
@@ -281,19 +281,19 @@ SMESHGUI_ExtrusionDlg::SMESHGUI_ExtrusionDlg (SMESHGUI* theModule)
 
   // Costruction of the logical filter for the elements: mesh/sub-mesh/group
   QList<SUIT_SelectionFilter*> aListOfFilters;
 
   // Costruction of the logical filter for the elements: mesh/sub-mesh/group
   QList<SUIT_SelectionFilter*> aListOfFilters;

-  aListOfFilters.append(new SMESH_TypeFilter (MESH));
-  aListOfFilters.append(new SMESH_TypeFilter (SUBMESH_VERTEX));
-  aListOfFilters.append(new SMESH_TypeFilter (GROUP_NODE));
+  aListOfFilters.append(new SMESH_TypeFilter (SMESH::MESH));
+  aListOfFilters.append(new SMESH_TypeFilter (SMESH::SUBMESH_VERTEX));
+  aListOfFilters.append(new SMESH_TypeFilter (SMESH::GROUP_NODE));

   myMeshOrSubMeshOrGroupFilter0D =
     new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR, /*takeOwnership=*/true);
   myMeshOrSubMeshOrGroupFilter0D =
     new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR, /*takeOwnership=*/true);

-  aListOfFilters[0] = new SMESH_TypeFilter (MESH);
-  aListOfFilters[1] = new SMESH_TypeFilter (SUBMESH_EDGE);
-  aListOfFilters[2] = new SMESH_TypeFilter (GROUP_EDGE);
+  aListOfFilters[0] = new SMESH_TypeFilter (SMESH::MESH);
+  aListOfFilters[1] = new SMESH_TypeFilter (SMESH::SUBMESH_EDGE);
+  aListOfFilters[2] = new SMESH_TypeFilter (SMESH::GROUP_EDGE);

   myMeshOrSubMeshOrGroupFilter1D =
     new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR, /*takeOwnership=*/true);
   myMeshOrSubMeshOrGroupFilter1D =
     new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR, /*takeOwnership=*/true);

-  aListOfFilters[0] = new SMESH_TypeFilter (MESH);
-  aListOfFilters[1] = new SMESH_TypeFilter (SUBMESH_FACE);
-  aListOfFilters[2] = new SMESH_TypeFilter (GROUP_FACE);
+  aListOfFilters[0] = new SMESH_TypeFilter (SMESH::MESH);
+  aListOfFilters[1] = new SMESH_TypeFilter (SMESH::SUBMESH_FACE);
+  aListOfFilters[2] = new SMESH_TypeFilter (SMESH::GROUP_FACE);

   myMeshOrSubMeshOrGroupFilter2D =
     new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR, /*takeOwnership=*/true);
 
   myMeshOrSubMeshOrGroupFilter2D =
     new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR, /*takeOwnership=*/true);
 

diff --git a/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx b/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
index 89515cad680d0f4f2ac47ea4e9d91b8e547251cf..3936eea86d8c23acaecca085a4b54acba4041e39 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
@@ -242,8 +242,8 @@ SMESHGUI_FindElemByPointOp::SMESHGUI_FindElemByPointOp()
   myHelpFileName = "find_element_by_point_page.html";
 
   QList<SUIT_SelectionFilter*> filters;
   myHelpFileName = "find_element_by_point_page.html";
 
   QList<SUIT_SelectionFilter*> filters;

-  filters.append( new SMESH_TypeFilter( MESH ) );
-  filters.append( new SMESH_TypeFilter( GROUP ) );
+  filters.append( new SMESH_TypeFilter( SMESH::MESH ) );
+  filters.append( new SMESH_TypeFilter( SMESH::GROUP ) );

   myFilter = new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
 
   myPreview = new SMESH::MeshPreviewStruct();
   myFilter = new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
 
   myPreview = new SMESH::MeshPreviewStruct();

diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index 41270689a12924e118b3c720ce20376b02a5e8bd..84c4b83026a49d1412a3a46872548311c12ba2f3 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@ -444,7 +444,7 @@ void SMESHGUI_GroupDlg::initDialog( bool create)
   mySMESHGUI->SetState(800);
 
   mySelectionMode = grpNoSelection;
   mySMESHGUI->SetState(800);
 
   mySelectionMode = grpNoSelection;

-  myMeshFilter = new SMESH_TypeFilter(MESH);
+  myMeshFilter = new SMESH_TypeFilter(SMESH::MESH);

   mySubMeshFilter = new SMESH_LogicalFilter(QList<SUIT_SelectionFilter*>(),
                                             SMESH_LogicalFilter::LO_OR,
                                             /*takeOwnership=*/true);
   mySubMeshFilter = new SMESH_LogicalFilter(QList<SUIT_SelectionFilter*>(),
                                             SMESH_LogicalFilter::LO_OR,
                                             /*takeOwnership=*/true);


@@ -835,15 +835,15 @@ void SMESHGUI_GroupDlg::setSelectionMode (int theMode)
 
       SMESH_TypeFilter* f = 0;
       switch (myTypeId) {
 
       SMESH_TypeFilter* f = 0;
       switch (myTypeId) {

-      case grpNodeSelection:   f = new SMESH_TypeFilter(SUBMESH); break;
-      case grpEdgeSelection:   f = new SMESH_TypeFilter(SUBMESH_EDGE); break;
-      case grpFaceSelection:   f = new SMESH_TypeFilter(SUBMESH_FACE); break;
-      case grpVolumeSelection: f = new SMESH_TypeFilter(SUBMESH_SOLID); break;
-      default:                 f = new SMESH_TypeFilter(SUBMESH);
+      case grpNodeSelection:   f = new SMESH_TypeFilter(SMESH::SUBMESH); break;
+      case grpEdgeSelection:   f = new SMESH_TypeFilter(SMESH::SUBMESH_EDGE); break;
+      case grpFaceSelection:   f = new SMESH_TypeFilter(SMESH::SUBMESH_FACE); break;
+      case grpVolumeSelection: f = new SMESH_TypeFilter(SMESH::SUBMESH_SOLID); break;
+      default:                 f = new SMESH_TypeFilter(SMESH::SUBMESH);

       }
       QList<SUIT_SelectionFilter*> filtList;
       filtList.append( f );
       }
       QList<SUIT_SelectionFilter*> filtList;
       filtList.append( f );

-      filtList.append( new SMESH_TypeFilter(SUBMESH_COMPOUND));
+      filtList.append( new SMESH_TypeFilter(SMESH::SUBMESH_COMPOUND));

       mySubMeshFilter->setFilters( filtList );
 
       mySelectionMgr->installFilter( mySubMeshFilter );
       mySubMeshFilter->setFilters( filtList );
 
       mySelectionMgr->installFilter( mySubMeshFilter );


@@ -855,12 +855,12 @@ void SMESHGUI_GroupDlg::setSelectionMode (int theMode)
 
       SMESH_TypeFilter* f = 0;
       switch (myTypeId) {
 
       SMESH_TypeFilter* f = 0;
       switch (myTypeId) {

-      case grpNodeSelection:   f = new SMESH_TypeFilter(GROUP_NODE); break;
-      case grpBallSelection:   f = new SMESH_TypeFilter(GROUP_BALL); break;
-      case grpEdgeSelection:   f = new SMESH_TypeFilter(GROUP_EDGE); break;
-      case grpFaceSelection:   f = new SMESH_TypeFilter(GROUP_FACE); break;
-      case grpVolumeSelection: f = new SMESH_TypeFilter(GROUP_VOLUME); break;
-      default:                 f = new SMESH_TypeFilter(GROUP);
+      case grpNodeSelection:   f = new SMESH_TypeFilter(SMESH::GROUP_NODE); break;
+      case grpBallSelection:   f = new SMESH_TypeFilter(SMESH::GROUP_BALL); break;
+      case grpEdgeSelection:   f = new SMESH_TypeFilter(SMESH::GROUP_EDGE); break;
+      case grpFaceSelection:   f = new SMESH_TypeFilter(SMESH::GROUP_FACE); break;
+      case grpVolumeSelection: f = new SMESH_TypeFilter(SMESH::GROUP_VOLUME); break;
+      default:                 f = new SMESH_TypeFilter(SMESH::GROUP);

       }
       QList<SUIT_SelectionFilter*> filtList;
       filtList.append( f );
       }
       QList<SUIT_SelectionFilter*> filtList;
       filtList.append( f );

diff --git a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
index e62b015c2f53d0b0221642f1294a0cc3dbb6fc61..f4cde4f1b1c3c2323cd9a07ece977c49dbab32ac 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
@@ -419,7 +419,7 @@ SUIT_SelectionFilter* SMESHGUI_GroupOnShapeOp::createFilter( const int theId ) c
   if ( theId == _ELEM_GEOM || theId == _NODE_GEOM )
     return new GEOM_SelectionFilter( (SalomeApp_Study*)study(), true );
   else if ( theId == _MESH )
   if ( theId == _ELEM_GEOM || theId == _NODE_GEOM )
     return new GEOM_SelectionFilter( (SalomeApp_Study*)study(), true );
   else if ( theId == _MESH )

-    return new SMESH_TypeFilter( MESH );
+    return new SMESH_TypeFilter( SMESH::MESH );

   else
     return ( SUIT_SelectionFilter*) 0;
 }
   else
     return ( SUIT_SelectionFilter*) 0;
 }

diff --git a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
index 8588a3c563b2c9208beed71bc45676552fed8d29..87b3ed7cdac8c2f29395f43ba5695b6a455037d1 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
@@ -233,7 +233,7 @@ void SMESHGUI_GroupOpDlg::Init()
   // set selection mode
   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     aViewWindow->SetSelectionMode(ActorSelection);
   // set selection mode
   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     aViewWindow->SetSelectionMode(ActorSelection);

-  mySelectionMgr->installFilter(new SMESH_TypeFilter (GROUP));
+  mySelectionMgr->installFilter(new SMESH_TypeFilter (SMESH::GROUP));

 }
 
 /*!
 }
 
 /*!


@@ -464,7 +464,7 @@ void SMESHGUI_GroupOpDlg::enterEvent(QEvent*)
   setEnabled(true);
   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     aViewWindow->SetSelectionMode(ActorSelection);
   setEnabled(true);
   if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
     aViewWindow->SetSelectionMode(ActorSelection);

-  mySelectionMgr->installFilter(new SMESH_TypeFilter (GROUP));
+  mySelectionMgr->installFilter(new SMESH_TypeFilter (SMESH::GROUP));

 }
 
 /*!
 }
 
 /*!

diff --git a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx
index 8cdc5b0ec3968c2a0f4d7b39e89bc7b1cfcbe425..3ef76bb2dfee32ea57ae91693bc4a5593bb412a3 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx
@@ -217,8 +217,8 @@ void SMESHGUI_Make2DFrom3DDlg::onGroupChecked()
 
 SMESHGUI_Make2DFrom3DOp::SMESHGUI_Make2DFrom3DOp()
   : SMESHGUI_SelectionOp(),
 
 SMESHGUI_Make2DFrom3DOp::SMESHGUI_Make2DFrom3DOp()
   : SMESHGUI_SelectionOp(),

-    myMeshFilter(MESH),
-    myGroupFilter(GROUP)
+    myMeshFilter(SMESH::MESH),
+    myGroupFilter(SMESH::GROUP)

 {
 }
 
 {
 }
 

diff --git a/src/SMESHGUI/SMESHGUI_Measurements.cxx b/src/SMESHGUI/SMESHGUI_Measurements.cxx
index 4e94217ed96c33d046b0feb3c723858f019c40c4..ff9394490d5982e07b2b8f9d5bc1abd4f11a2bea 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Measurements.cxx
+++ b/src/SMESHGUI/SMESHGUI_Measurements.cxx
@@ -190,8 +190,8 @@ SMESHGUI_MinDistance::SMESHGUI_MinDistance( QWidget* parent )
   connect( mySecondTgt, SIGNAL( textEdited( QString ) ), this, SLOT( secondEdited() ) );
 
   QList<SUIT_SelectionFilter*> filters;
   connect( mySecondTgt, SIGNAL( textEdited( QString ) ), this, SLOT( secondEdited() ) );
 
   QList<SUIT_SelectionFilter*> filters;

-  filters.append( new SMESH_TypeFilter( MESHorSUBMESH ) );
-  filters.append( new SMESH_TypeFilter( GROUP ) );
+  filters.append( new SMESH_TypeFilter( SMESH::MESHorSUBMESH ) );
+  filters.append( new SMESH_TypeFilter( SMESH::GROUP ) );

   myFilter = new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
 
   mySecondTgt->setEnabled( mySecond->checkedId() != OriginTgt );
   myFilter = new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
 
   mySecondTgt->setEnabled( mySecond->checkedId() != OriginTgt );


@@ -706,8 +706,8 @@ SMESHGUI_BoundingBox::SMESHGUI_BoundingBox( QWidget* parent )
   connect( mySource,     SIGNAL( textEdited( QString ) ), this, SLOT( sourceEdited() ) );
 
   QList<SUIT_SelectionFilter*> filters;
   connect( mySource,     SIGNAL( textEdited( QString ) ), this, SLOT( sourceEdited() ) );
 
   QList<SUIT_SelectionFilter*> filters;

-  filters.append( new SMESH_TypeFilter( MESHorSUBMESH ) );
-  filters.append( new SMESH_TypeFilter( GROUP ) );
+  filters.append( new SMESH_TypeFilter( SMESH::MESHorSUBMESH ) );
+  filters.append( new SMESH_TypeFilter( SMESH::GROUP ) );

   myFilter = new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
 
   clear();
   myFilter = new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
 
   clear();

diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
index 7446b54b2d58ba9ac8c33bb122f14c71c1d8856b..877d6b6d42f7869a2ad1bdfd71fedf115319c790 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MergeDlg.cxx
@@ -1291,8 +1291,8 @@ void SMESHGUI_MergeDlg::onTypeChanged (int id)
     SMESH::UpdateView();
 
     // Costruction of the logical filter
     SMESH::UpdateView();
 
     // Costruction of the logical filter

-    SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (MESHorSUBMESH);
-    SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (GROUP);
+    SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (SMESH::MESHorSUBMESH);
+    SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (SMESH::GROUP);

     
     QList<SUIT_SelectionFilter*> aListOfFilters;
     if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);
     
     QList<SUIT_SelectionFilter*> aListOfFilters;
     if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);

diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index 9ad1a47fc5ae4d4a5ae928f3d6d315ce80107e92..7a494110a0c4c88ff3e94aabdcd0dfe28b92ad0b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -297,9 +297,9 @@ SUIT_SelectionFilter* SMESHGUI_MeshOp::createFilter( const int theId ) const
     return new GEOM_SelectionFilter( (SalomeApp_Study*)study(), true );
   }
   else if ( theId == SMESHGUI_MeshDlg::Obj && !myToCreate )
     return new GEOM_SelectionFilter( (SalomeApp_Study*)study(), true );
   }
   else if ( theId == SMESHGUI_MeshDlg::Obj && !myToCreate )

-    return new SMESH_TypeFilter( MESHorSUBMESH );
+    return new SMESH_TypeFilter( SMESH::MESHorSUBMESH );

   else if ( theId == SMESHGUI_MeshDlg::Mesh )
   else if ( theId == SMESHGUI_MeshDlg::Mesh )

-    return new SMESH_TypeFilter( MESH );
+    return new SMESH_TypeFilter( SMESH::MESH );

   else
     return 0;
 }
   else
     return 0;
 }

diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
index a12ca8fbe1fed72b8fa009a7d0efc5d2047877ce..b6aa6c3e2e34abc60f335fc596e7435a52e36bc6 100755 (executable)
--- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
@@ -998,12 +998,12 @@ void SMESHGUI_MultiEditDlg::setSelectionMode()
   if (mySubmeshChk->isChecked()) {
     if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
       aViewWindow->SetSelectionMode(ActorSelection);
   if (mySubmeshChk->isChecked()) {
     if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
       aViewWindow->SetSelectionMode(ActorSelection);

-    mySelectionMgr->installFilter(new SMESH_TypeFilter(SUBMESH));
+    mySelectionMgr->installFilter(new SMESH_TypeFilter(SMESH::SUBMESH));

   }
   else if (myGroupChk->isChecked()) {
     if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
       aViewWindow->SetSelectionMode(ActorSelection);
   }
   else if (myGroupChk->isChecked()) {
     if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
       aViewWindow->SetSelectionMode(ActorSelection);

-    mySelectionMgr->installFilter(new SMESH_TypeFilter(GROUP));
+    mySelectionMgr->installFilter(new SMESH_TypeFilter(SMESH::GROUP));

   }
 
   if (entityType()) {
   }
 
   if (entityType()) {

diff --git a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
index 278fe0b9694ead3ea379873735bc6021e2b657b1..96d061cc6ef24874bbd0e903dac1a2352ac2f341 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
@@ -182,7 +182,7 @@ void SMESHGUI_RenumberingDlg::Init()
 
   myMesh = SMESH::SMESH_Mesh::_nil();
 
 
   myMesh = SMESH::SMESH_Mesh::_nil();
 

-  myMeshFilter = new SMESH_TypeFilter (MESH);
+  myMeshFilter = new SMESH_TypeFilter (SMESH::MESH);

 
   /* signals and slots connections */
   connect(buttonOk,     SIGNAL(clicked()), this, SLOT(ClickOnOk()));
 
   /* signals and slots connections */
   connect(buttonOk,     SIGNAL(clicked()), this, SLOT(ClickOnOk()));

diff --git a/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx b/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx
index cc5db9fe246e3b915eca3750b677f69fc65b916a..5b8c90e2750447e5595fb7a8c174744d00c292df 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ReorientFacesDlg.cxx
@@ -401,22 +401,22 @@ SUIT_SelectionFilter* SMESHGUI_ReorientFacesOp::createFilter( const int what ) c
   case EObject:
     {
       QList<SUIT_SelectionFilter*> filters;
   case EObject:
     {
       QList<SUIT_SelectionFilter*> filters;

-      filters.append( new SMESH_TypeFilter( MESH ));
-      filters.append( new SMESH_TypeFilter( SUBMESH_FACE ));
-      filters.append( new SMESH_TypeFilter( GROUP_FACE ));
+      filters.append( new SMESH_TypeFilter( SMESH::MESH ));
+      filters.append( new SMESH_TypeFilter( SMESH::SUBMESH_FACE ));
+      filters.append( new SMESH_TypeFilter( SMESH::GROUP_FACE ));

       return new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
     }
   case EPoint:
     {
       QList<SUIT_SelectionFilter*> filters;
       return new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
     }
   case EPoint:
     {
       QList<SUIT_SelectionFilter*> filters;

-      filters.append( new SMESH_TypeFilter( IDSOURCE ));
+      filters.append( new SMESH_TypeFilter( SMESH::IDSOURCE ));

       filters.append( new SMESH_NumberFilter( "GEOM",TopAbs_VERTEX, 1, TopAbs_VERTEX ));
       return new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
     }
   case EFace:
   case EDirection:
     {
       filters.append( new SMESH_NumberFilter( "GEOM",TopAbs_VERTEX, 1, TopAbs_VERTEX ));
       return new SMESH_LogicalFilter( filters, SMESH_LogicalFilter::LO_OR );
     }
   case EFace:
   case EDirection:
     {

-      return new SMESH_TypeFilter( IDSOURCE );
+      return new SMESH_TypeFilter( SMESH::IDSOURCE );

     }
   }
   return NULL;
     }
   }
   return NULL;

diff --git a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
index 2d198bb68353e9c17a704300da46e4c4f53587ce..f85e4eade0ae701c196507e88233cc9a8fb8759f 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
@@ -301,8 +301,8 @@ SMESHGUI_RevolutionDlg::SMESHGUI_RevolutionDlg( SMESHGUI* theModule )
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   // Costruction of the logical filter
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   // Costruction of the logical filter

-  SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (MESHorSUBMESH);
-  SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (GROUP);
+  SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (SMESH::MESHorSUBMESH);
+  SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (SMESH::GROUP);

 
   QList<SUIT_SelectionFilter*> aListOfFilters;
   if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);
 
   QList<SUIT_SelectionFilter*> aListOfFilters;
   if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);

diff --git a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
index f257c3c87471b0e16345e2fcbc402cf524f75ca2..0e0690c018c93550cdd9f6a0094cd2776bf65fa9 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
@@ -281,8 +281,8 @@ SMESHGUI_RotationDlg::SMESHGUI_RotationDlg( SMESHGUI* theModule ) :
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   // Costruction of the logical filter
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   // Costruction of the logical filter

-  SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (MESHorSUBMESH);
-  SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (GROUP);
+  SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (SMESH::MESHorSUBMESH);
+  SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (SMESH::GROUP);

 
   QList<SUIT_SelectionFilter*> aListOfFilters;
   if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);
 
   QList<SUIT_SelectionFilter*> aListOfFilters;
   if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);

diff --git a/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx b/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
index 1e3cd9f9542c7f6720342feee0dd965690519897..b74a31f123f70efe12e516691805c8885528d648 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ScaleDlg.cxx
@@ -285,8 +285,8 @@ SMESHGUI_ScaleDlg::SMESHGUI_ScaleDlg( SMESHGUI* theModule ) :
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   // Costruction of the logical filter
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   // Costruction of the logical filter

-  SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (MESHorSUBMESH);
-  SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (GROUP);
+  SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (SMESH::MESHorSUBMESH);
+  SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (SMESH::GROUP);

 
   QList<SUIT_SelectionFilter*> aListOfFilters;
   if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);
 
   QList<SUIT_SelectionFilter*> aListOfFilters;
   if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);

diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx
index 8fff50e3ca6bd80df6765f8e38f7f5c948130ee1..efa3c236148fb3fdd621d82b67d9f9039fd4e99b 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Selection.cxx
+++ b/src/SMESHGUI/SMESHGUI_Selection.cxx
@@ -551,7 +551,7 @@ int SMESHGUI_Selection::type( const QString& entry, _PTR(Study) study )
     return -1;
 
   if( objComponent->GetIOR()==obj->GetIOR() )
     return -1;
 
   if( objComponent->GetIOR()==obj->GetIOR() )

-    return COMPONENT;
+    return SMESH::COMPONENT;

 
   int aLevel = obj->Depth() - objComponent->Depth(),
       aFTag = objFather->Tag(),
 
   int aLevel = obj->Depth() - objComponent->Depth(),
       aFTag = objFather->Tag(),


@@ -562,16 +562,16 @@ int SMESHGUI_Selection::type( const QString& entry, _PTR(Study) study )
   {
   case 1:
     if (anOTag >= SMESH::Tag_FirstMeshRoot)
   {
   case 1:
     if (anOTag >= SMESH::Tag_FirstMeshRoot)

-      res = MESH;
+      res = SMESH::MESH;

     break;
   case 2:
     switch (aFTag)
     {
     case SMESH::Tag_HypothesisRoot:
     break;
   case 2:
     switch (aFTag)
     {
     case SMESH::Tag_HypothesisRoot:

-      res = HYPOTHESIS;
+      res = SMESH::HYPOTHESIS;

       break;
     case SMESH::Tag_AlgorithmsRoot:
       break;
     case SMESH::Tag_AlgorithmsRoot:

-      res = ALGORITHM;
+      res = SMESH::ALGORITHM;

       break;
     }
     break;
       break;
     }
     break;


@@ -579,25 +579,25 @@ int SMESHGUI_Selection::type( const QString& entry, _PTR(Study) study )
     switch (aFTag)
     {
     case SMESH::Tag_SubMeshOnVertex:
     switch (aFTag)
     {
     case SMESH::Tag_SubMeshOnVertex:

-      res = SUBMESH_VERTEX;
+      res = SMESH::SUBMESH_VERTEX;

       break;
     case SMESH::Tag_SubMeshOnEdge:
       break;
     case SMESH::Tag_SubMeshOnEdge:

-      res = SUBMESH_EDGE;
+      res = SMESH::SUBMESH_EDGE;

       break;
     case SMESH::Tag_SubMeshOnFace:
       break;
     case SMESH::Tag_SubMeshOnFace:

-      res = SUBMESH_FACE;
+      res = SMESH::SUBMESH_FACE;

       break;
     case SMESH::Tag_SubMeshOnSolid:
       break;
     case SMESH::Tag_SubMeshOnSolid:

-      res = SUBMESH_SOLID;
+      res = SMESH::SUBMESH_SOLID;

       break;
     case SMESH::Tag_SubMeshOnCompound:
       break;
     case SMESH::Tag_SubMeshOnCompound:

-      res = SUBMESH_COMPOUND;
+      res = SMESH::SUBMESH_COMPOUND;

       break;
     default:
       if (aFTag >= SMESH::Tag_FirstGroup)
       break;
     default:
       if (aFTag >= SMESH::Tag_FirstGroup)

-        res = GROUP;
+        res = SMESH::GROUP;

       else
       else

-        res = SUBMESH;
+        res = SMESH::SUBMESH;

     }
     break;
   }
     }
     break;
   }


@@ -614,29 +614,29 @@ QString SMESHGUI_Selection::typeName( const int t )
 {
   switch( t )
   {
 {
   switch( t )
   {

-  case HYPOTHESIS:
+  case SMESH::HYPOTHESIS:

     return "Hypothesis";
     return "Hypothesis";

-  case ALGORITHM:
+  case SMESH::ALGORITHM:

     return "Algorithm";
     return "Algorithm";

-  case MESH:
+  case SMESH::MESH:

     return "Mesh";
     return "Mesh";

-  case SUBMESH:
+  case SMESH::SUBMESH:

     return "SubMesh";
     return "SubMesh";

-  case MESHorSUBMESH:
+  case SMESH::MESHorSUBMESH:

     return "Mesh or submesh";
     return "Mesh or submesh";

-  case SUBMESH_VERTEX:
+  case SMESH::SUBMESH_VERTEX:

     return "Mesh vertex";
     return "Mesh vertex";

-  case SUBMESH_EDGE:
+  case SMESH::SUBMESH_EDGE:

     return "Mesh edge";
     return "Mesh edge";

-  case SUBMESH_FACE:
+  case SMESH::SUBMESH_FACE:

     return "Mesh face";
     return "Mesh face";

-  case SUBMESH_SOLID:
+  case SMESH::SUBMESH_SOLID:

     return "Mesh solid";
     return "Mesh solid";

-  case SUBMESH_COMPOUND:
+  case SMESH::SUBMESH_COMPOUND:

     return "Mesh compound";
     return "Mesh compound";

-  case GROUP:
+  case SMESH::GROUP:

     return "Group";
     return "Group";

-  case COMPONENT:
+  case SMESH::COMPONENT:

     return "Component";
   default:
     return "Unknown";
     return "Component";
   default:
     return "Unknown";

diff --git a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
index 2eb9b521e218f9a2038d93280e3f0389611622b5..61aaae845cf012b2524d7ca67dc37706f5ded7f9 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
@@ -263,7 +263,7 @@ SMESHGUI_SmoothingDlg::SMESHGUI_SmoothingDlg( SMESHGUI* theModule )
 
   // Costruction of the logical filter for the elements: mesh/sub-mesh/group
   QList<SUIT_SelectionFilter*> aListOfFilters;
 
   // Costruction of the logical filter for the elements: mesh/sub-mesh/group
   QList<SUIT_SelectionFilter*> aListOfFilters;

-  aListOfFilters << new SMESH_TypeFilter(MESHorSUBMESH) << new SMESH_TypeFilter(GROUP);
+  aListOfFilters << new SMESH_TypeFilter(SMESH::MESHorSUBMESH) << new SMESH_TypeFilter(SMESH::GROUP);

 
   myMeshOrSubMeshOrGroupFilter =
     new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR);
 
   myMeshOrSubMeshOrGroupFilter =
     new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR);

diff --git a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
index 5f4b1e20667aace70103915098c0533a4342bc06..5ab4f3f2274e4040c0c8ea3c66163b5243ba0a81 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
@@ -284,8 +284,8 @@ SMESHGUI_SymmetryDlg::SMESHGUI_SymmetryDlg( SMESHGUI* theModule )
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   // Costruction of the logical filter
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   // Costruction of the logical filter

-  SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (MESHorSUBMESH);
-  SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (GROUP);
+  SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (SMESH::MESHorSUBMESH);
+  SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (SMESH::GROUP);

 
   QList<SUIT_SelectionFilter*> aListOfFilters;
   if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);
 
   QList<SUIT_SelectionFilter*> aListOfFilters;
   if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);

diff --git a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
index 31ff3a796bc8b733043caf32945176b08df20fe4..eaee5140990689efda0982ea4da32b5adbc8f69a 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
@@ -288,8 +288,8 @@ SMESHGUI_TranslationDlg::SMESHGUI_TranslationDlg( SMESHGUI* theModule ) :
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   // Costruction of the logical filter
   mySMESHGUI->SetActiveDialogBox((QDialog*)this);
 
   // Costruction of the logical filter

-  SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (MESHorSUBMESH);
-  SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (GROUP);
+  SMESH_TypeFilter* aMeshOrSubMeshFilter = new SMESH_TypeFilter (SMESH::MESHorSUBMESH);
+  SMESH_TypeFilter* aSmeshGroupFilter    = new SMESH_TypeFilter (SMESH::GROUP);

 
   QList<SUIT_SelectionFilter*> aListOfFilters;
   if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);
 
   QList<SUIT_SelectionFilter*> aListOfFilters;
   if (aMeshOrSubMeshFilter) aListOfFilters.append(aMeshOrSubMeshFilter);

diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
index 1efeb01621c3959b987576933abbdd42feea899b..1466fc8b681e3b6d82d6c2b8d4b4ae928d7bb13d 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@ -72,7 +72,7 @@ StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg
 //================================================================================
 
 StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg
 //================================================================================
 
 StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg

-( MeshObjectType objType, QWidget* parent, bool multiSelection )
+( SMESH::MeshObjectType objType, QWidget* parent, bool multiSelection )

   : QWidget( parent ), myMultiSelection( multiSelection )
 {
   myFilter = new SMESH_TypeFilter( objType );
   : QWidget( parent ), myMultiSelection( multiSelection )
 {
   myFilter = new SMESH_TypeFilter( objType );

diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h
index 26448cf22df51c49fd48c7133ff0ecb2c6b43663..5ffd0bca1a08d60ec3b5aed834b7a129ccaf5cd7 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h
+++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h
@@ -58,7 +58,7 @@ public:
                                          QWidget*              parent,
                                          bool                  multiSelection=false,
                                          bool                  stretch=true);
                                          QWidget*              parent,
                                          bool                  multiSelection=false,
                                          bool                  stretch=true);

-  StdMeshersGUI_ObjectReferenceParamWdg( MeshObjectType objType,
+  StdMeshersGUI_ObjectReferenceParamWdg( SMESH::MeshObjectType objType,

                                          QWidget*       parent,
                                          bool           multiSelection=false);
   ~StdMeshersGUI_ObjectReferenceParamWdg();
                                          QWidget*       parent,
                                          bool           multiSelection=false);
   ~StdMeshersGUI_ObjectReferenceParamWdg();

diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
index 87727c20d76a21c0559487858cc777f044f4766b..127be9f4e53ce440c19d085a0fd3aa788a6b844f 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
@@ -1006,7 +1006,7 @@ bool StdMeshersGUI_StdHypothesisCreator::stdParams( ListOfStdParams& p ) const
     customWidgets()->append( newObjRefParamWdg( filterForShapeOfDim( 1 ),
                                                h->GetSourceEdge()));
     item.myName = tr( "SMESH_SOURCE_MESH" ); p.append( item );
     customWidgets()->append( newObjRefParamWdg( filterForShapeOfDim( 1 ),
                                                h->GetSourceEdge()));
     item.myName = tr( "SMESH_SOURCE_MESH" ); p.append( item );

-    customWidgets()->append( newObjRefParamWdg( new SMESH_TypeFilter( MESH ),
+    customWidgets()->append( newObjRefParamWdg( new SMESH_TypeFilter( SMESH::MESH ),

                                                h->GetSourceMesh()));
     item.myName = tr( "SMESH_SOURCE_VERTEX" ); p.append( item );
     customWidgets()->append( newObjRefParamWdg( filterForShapeOfDim( 0 ),
                                                h->GetSourceMesh()));
     item.myName = tr( "SMESH_SOURCE_VERTEX" ); p.append( item );
     customWidgets()->append( newObjRefParamWdg( filterForShapeOfDim( 0 ),


@@ -1024,7 +1024,7 @@ bool StdMeshersGUI_StdHypothesisCreator::stdParams( ListOfStdParams& p ) const
     customWidgets()->append( newObjRefParamWdg( filterForShapeOfDim( 2 ),
                                                h->GetSourceFace()));
     item.myName = tr( "SMESH_SOURCE_MESH" ); p.append( item );
     customWidgets()->append( newObjRefParamWdg( filterForShapeOfDim( 2 ),
                                                h->GetSourceFace()));
     item.myName = tr( "SMESH_SOURCE_MESH" ); p.append( item );

-    customWidgets()->append( newObjRefParamWdg( new SMESH_TypeFilter( MESH ),
+    customWidgets()->append( newObjRefParamWdg( new SMESH_TypeFilter( SMESH::MESH ),

                                                h->GetSourceMesh()));
     item.myName = tr( "SMESH_SOURCE_VERTEX1" ); p.append( item );
     customWidgets()->append( newObjRefParamWdg( filterForShapeOfDim( 0 ),
                                                h->GetSourceMesh()));
     item.myName = tr( "SMESH_SOURCE_VERTEX1" ); p.append( item );
     customWidgets()->append( newObjRefParamWdg( filterForShapeOfDim( 0 ),


@@ -1048,7 +1048,7 @@ bool StdMeshersGUI_StdHypothesisCreator::stdParams( ListOfStdParams& p ) const
     customWidgets()->append( newObjRefParamWdg( filterForShapeOfDim( 3, TopAbs_FACE, 6, true ),
                                                h->GetSource3DShape()));
     item.myName = tr( "SMESH_SOURCE_MESH" ); p.append( item );
     customWidgets()->append( newObjRefParamWdg( filterForShapeOfDim( 3, TopAbs_FACE, 6, true ),
                                                h->GetSource3DShape()));
     item.myName = tr( "SMESH_SOURCE_MESH" ); p.append( item );

-    customWidgets()->append( newObjRefParamWdg( new SMESH_TypeFilter( MESH ),
+    customWidgets()->append( newObjRefParamWdg( new SMESH_TypeFilter( SMESH::MESH ),

                                                h->GetSourceMesh()));
     item.myName = tr( "SMESH_SOURCE_VERTEX1" ); p.append( item );
     customWidgets()->append( newObjRefParamWdg( filterForShapeOfDim( 0 ),
                                                h->GetSourceMesh()));
     item.myName = tr( "SMESH_SOURCE_VERTEX1" ); p.append( item );
     customWidgets()->append( newObjRefParamWdg( filterForShapeOfDim( 0 ),


@@ -1073,7 +1073,7 @@ bool StdMeshersGUI_StdHypothesisCreator::stdParams( ListOfStdParams& p ) const
     h->GetCopySourceMesh(toCopyMesh, toCopyGroups);
 
     item.myName = tr( "SMESH_SOURCE_EDGES" ); p.append( item );
     h->GetCopySourceMesh(toCopyMesh, toCopyGroups);
 
     item.myName = tr( "SMESH_SOURCE_EDGES" ); p.append( item );

-    customWidgets()->append( newObjRefParamWdg( new SMESH_TypeFilter( GROUP_EDGE ), 
+    customWidgets()->append( newObjRefParamWdg( new SMESH_TypeFilter( SMESH::GROUP_EDGE ), 

                                                 groupEntries));
 
     item.myName = tr( "SMESH_COPY_MESH" ); p.append( item );
                                                 groupEntries));
 
     item.myName = tr( "SMESH_COPY_MESH" ); p.append( item );


@@ -1098,7 +1098,7 @@ bool StdMeshersGUI_StdHypothesisCreator::stdParams( ListOfStdParams& p ) const
     h->GetCopySourceMesh(toCopyMesh, toCopyGroups);
 
     item.myName = tr( "SMESH_SOURCE_FACES" ); p.append( item );
     h->GetCopySourceMesh(toCopyMesh, toCopyGroups);
 
     item.myName = tr( "SMESH_SOURCE_FACES" ); p.append( item );

-    customWidgets()->append( newObjRefParamWdg( new SMESH_TypeFilter( GROUP_FACE ), 
+    customWidgets()->append( newObjRefParamWdg( new SMESH_TypeFilter( SMESH::GROUP_FACE ), 

                                                 groupEntries));
 
     item.myName = tr( "SMESH_COPY_MESH" ); p.append( item );
                                                 groupEntries));
 
     item.myName = tr( "SMESH_COPY_MESH" ); p.append( item );