Fix for the bug #45: check and warning when the same image is used in 2 arguments.

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_Operation.cxx

diff --git a/src/HYDROGUI/HYDROGUI_Operation.cxx b/src/HYDROGUI/HYDROGUI_Operation.cxx
index 3183b3b82b8af70118e8c0409844a9e51e0f5971..1f308ea385607a04eaca1ef28e51ddbceb4d92a0 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operation.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operation.cxx
@@ -94,17 +94,25 @@ void HYDROGUI_Operation::startOperation()
 void HYDROGUI_Operation::abortOperation()
 {
   LightApp_Operation::abortOperation();
-
-  if( inputPanel() )
-    inputPanel()->hide();
+  closeInputPanel();
 }
 
 void HYDROGUI_Operation::commitOperation()
 {
   LightApp_Operation::commitOperation();
+  closeInputPanel();
+}
 
-  if( inputPanel() )
-    inputPanel()->hide();
+void HYDROGUI_Operation::setDialogActive( const bool active )
+{
+  LightApp_Operation::setDialogActive( active );
+  if( myPanel )
+  {
+    if( active )
+    {
+      myPanel->show();
+    }
+  }
 }
 
 HYDROGUI_InputPanel* HYDROGUI_Operation::createInputPanel() const
@@ -112,6 +120,16 @@ HYDROGUI_InputPanel* HYDROGUI_Operation::createInputPanel() const
   return NULL;
 }
 
+void HYDROGUI_Operation::closeInputPanel()
+{
+  if( myPanel )
+  {
+    myModule->getApp()->desktop()->removeDockWidget( myPanel );
+    delete myPanel;
+    myPanel = 0;
+  }
+}
+
 bool HYDROGUI_Operation::processApply( int& theUpdateFlags,
                                        QString& theErrorMsg )
 {
@@ -125,19 +143,22 @@ void HYDROGUI_Operation::processCancel()
 void HYDROGUI_Operation::startDocOperation()
 {
   // Open transaction in the model document
-  doc()->StartOperation();
+  if ( !doc()->IsOperation() )
+    doc()->StartOperation();
 }
 
 void HYDROGUI_Operation::abortDocOperation()
 {
   // Abort transaction in the model document
-  doc()->AbortOperation();
+  if ( doc()->IsOperation() )
+    doc()->AbortOperation();
 }
 
 void HYDROGUI_Operation::commitDocOperation()
 {
   // Commit transaction in the model document
-  doc()->CommitOperation( HYDROGUI_Tool::ToExtString( getName() ) );
+  if ( doc()->IsOperation() )
+    doc()->CommitOperation( HYDROGUI_Tool::ToExtString( getName() ) );
 }
 
 Handle_HYDROData_Document HYDROGUI_Operation::doc() const