Method isValid is redefined to allow other operations is started above this one.

diff --git a/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx b/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx
index 64da71a7fb7508a540ba5b2065ccdf0cb8c8e27a..1ed50e77719f74314ed3c3d49d40403599fc1840 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddSubMeshOp.cxx
@@ -62,6 +62,7 @@ SMESHGUI_AddSubMeshOp::SMESHGUI_AddSubMeshOp()
   myHypothesisFilter( 0 ),
   myAlgorithmFilter( 0 )
 {
+  setAutoResumed( true );
 }
 
 //=================================================================================
@@ -357,3 +358,16 @@ SMESH::SMESH_subMesh_var SMESHGUI_AddSubMeshOp::addSubMesh( SMESH::SMESH_Mesh_pt
 
   return aSubMesh._retn();
 }
+
+//=================================================================================
+// function : isValid
+// purpose  :
+//=================================================================================
+bool SMESHGUI_AddSubMeshOp::isValid( SUIT_Operation* theOtherOp ) const
+{
+  if ( theOtherOp && theOtherOp->inherits( "SMESHGUI_InitMeshOp" ) )
+    return true;
+  else
+    return false;
+
+}

diff --git a/src/SMESHGUI/SMESHGUI_AddSubMeshOp.h b/src/SMESHGUI/SMESHGUI_AddSubMeshOp.h
index a9124eb71a7c0d1f37990e35166e1695835fd2ae..6cbc324ed3ac38c18edfc3e88c7d4b9347c02533 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AddSubMeshOp.h
+++ b/src/SMESHGUI/SMESHGUI_AddSubMeshOp.h
@@ -53,6 +53,7 @@ public:
 
   virtual SalomeApp_Dialog* dlg() const;
   void    init();
+  virtual bool isValid( SUIT_Operation* theOtherOp ) const;
   
 protected:
   virtual void startOperation();

diff --git a/src/SMESHGUI/SMESHGUI_InitMeshOp.cxx b/src/SMESHGUI/SMESHGUI_InitMeshOp.cxx
index 064d8174dc3245dc4400ab73b90a80de6dbef35b..1165258e7fbe642cb47aecdf4bbe1b3742bb1432 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_InitMeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_InitMeshOp.cxx
@@ -60,6 +60,7 @@ SMESHGUI_InitMeshOp::SMESHGUI_InitMeshOp()
   myHypothesisFilter( 0 ),
   myAlgorithmFilter( 0 )
 {
+  setAutoResumed( true );
 }
 
 //=================================================================================
@@ -321,3 +322,29 @@ void SMESHGUI_InitMeshOp::onSelectionChanged( int id )
       myDlg->clearSelection( id );
   }
 }
+
+//=================================================================================
+// function : isValid
+// purpose  :
+//=================================================================================
+bool SMESHGUI_InitMeshOp::isValid( SUIT_Operation* theOtherOp ) const
+{
+  if ( theOtherOp && theOtherOp->inherits( "SMESHGUI_AddSubMeshOp" ) )
+    return true;
+  else
+    return false;
+    
+}
+
+
+
+
+
+
+
+
+
+
+
+
+

diff --git a/src/SMESHGUI/SMESHGUI_InitMeshOp.h b/src/SMESHGUI/SMESHGUI_InitMeshOp.h
index 27ce68d1a6cf51030380a6d69d721050c68266da..f81b776a5182c6a8a92cb260932e02e649f62e10 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_InitMeshOp.h
+++ b/src/SMESHGUI/SMESHGUI_InitMeshOp.h
@@ -53,6 +53,8 @@ public:
   virtual SalomeApp_Dialog* dlg() const;
   void    init();
   QString defaultMeshName() const;
+
+  virtual bool isValid( SUIT_Operation* theOtherOp ) const;
   
 protected:
   virtual void startOperation();