X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_Operation.cxx;h=52fbcd1739a140a21570c64536dbfa19d6a2e97e;hb=de7cf9bb0a7a41d6487013c87f4a54d0664cd303;hp=1b132b68f5e71b1efb16e6c8eb16fb3e774bb454;hpb=5415c85f8250d50b54c869ad712ef53796c58a29;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_Operation.cxx b/src/HYDROGUI/HYDROGUI_Operation.cxx
index 1b132b68..52fbcd17 100644
--- 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 )
 {
@@ -122,6 +140,24 @@ void HYDROGUI_Operation::processCancel()
 {
 }
 
+void HYDROGUI_Operation::startDocOperation()
+{
+  // Open transaction in the model document
+  doc()->StartOperation();
+}
+
+void HYDROGUI_Operation::abortDocOperation()
+{
+  // Abort transaction in the model document
+  doc()->AbortOperation();
+}
+
+void HYDROGUI_Operation::commitDocOperation()
+{
+  // Commit transaction in the model document
+  doc()->CommitOperation( HYDROGUI_Tool::ToExtString( getName() ) );
+}
+
 Handle_HYDROData_Document HYDROGUI_Operation::doc() const
 {
   return HYDROData_Document::Document( myModule->getStudyId() );
@@ -131,8 +167,7 @@ void HYDROGUI_Operation::onApply()
 {
   QApplication::setOverrideCursor( Qt::WaitCursor );
 
-  // Open transaction in the model document
-  doc()->StartOperation();
+  startDocOperation();
 
   int anUpdateFlags = 0;
   QString anErrorMsg;
@@ -159,16 +194,12 @@ void HYDROGUI_Operation::onApply()
   if ( aResult )
   {
     module()->update( anUpdateFlags );
-
-    // Commit transaction in the model document
-    doc()->CommitOperation( HYDROGUI_Tool::ToExtString( getName() ) );
+    commitDocOperation();
     commit();
   }
   else
   {
-    // Abort transaction in the model document
-    doc()->AbortOperation();
-
+    abortDocOperation();
     QString aMsg = tr( "INPUT_VALID_DATA" );
     if( !anErrorMsg.isEmpty() )
       aMsg.prepend( anErrorMsg + "\n" );