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

diff --git a/src/HYDROGUI/HYDROGUI_Operation.cxx b/src/HYDROGUI/HYDROGUI_Operation.cxx
index b19684ab..52fbcd17 100644
--- a/src/HYDROGUI/HYDROGUI_Operation.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operation.cxx
@@ -36,6 +36,8 @@
 #include <SUIT_MessageBox.h>
 #include <SUIT_Study.h>
 
+#include <QApplication>
+
 HYDROGUI_Operation::HYDROGUI_Operation( HYDROGUI_Module* theModule )
 : LightApp_Operation(),
   myModule( theModule ),
@@ -82,8 +84,6 @@ void HYDROGUI_Operation::startOperation()
 {
   LightApp_Operation::startOperation();
 
-  doc()->StartOperation();
-
   if( inputPanel() )
   {
     myModule->getApp()->desktop()->addDockWidget( Qt::RightDockWidgetArea, inputPanel() );
@@ -93,22 +93,26 @@ void HYDROGUI_Operation::startOperation()
 
 void HYDROGUI_Operation::abortOperation()
 {
-  doc()->AbortOperation();
-
   LightApp_Operation::abortOperation();
-
-  if( inputPanel() )
-    inputPanel()->hide();
+  closeInputPanel();
 }
 
 void HYDROGUI_Operation::commitOperation()
 {
-  doc()->CommitOperation( HYDROGUI_Tool::ToExtString( getName() ) );
-
   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
@@ -116,7 +120,18 @@ HYDROGUI_InputPanel* HYDROGUI_Operation::createInputPanel() const
   return NULL;
 }
 
-bool HYDROGUI_Operation::processApply( int& theUpdateFlags )
+void HYDROGUI_Operation::closeInputPanel()
+{
+  if( myPanel )
+  {
+    myModule->getApp()->desktop()->removeDockWidget( myPanel );
+    delete myPanel;
+    myPanel = 0;
+  }
+}
+
+bool HYDROGUI_Operation::processApply( int& theUpdateFlags,
+                                       QString& theErrorMsg )
 {
   return false;
 }
@@ -125,36 +140,72 @@ void HYDROGUI_Operation::processCancel()
 {
 }
 
-Handle_HYDROData_Document HYDROGUI_Operation::doc() const
+void HYDROGUI_Operation::startDocOperation()
+{
+  // Open transaction in the model document
+  doc()->StartOperation();
+}
+
+void HYDROGUI_Operation::abortDocOperation()
 {
-  int aStudyId = myModule->application()->activeStudy()->id();
-  return HYDROData_Document::Document( aStudyId );
+  // Abort transaction in the model document
+  doc()->AbortOperation();
 }
 
-Handle_HYDROData_Object HYDROGUI_Operation::findObjectByName( const QString& theName, int theKind ) const
+void HYDROGUI_Operation::commitDocOperation()
 {
-  HYDROData_Iterator anIt( doc(), theKind );
-  for( ; anIt.More(); anIt.Next() )
-  {
-    if( anIt.Current()->GetName() == theName )
-      return anIt.Current();
-  }
-  return Handle_HYDROData_Object();
+  // 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() );
 }
 
 void HYDROGUI_Operation::onApply()
 {
+  QApplication::setOverrideCursor( Qt::WaitCursor );
+
+  startDocOperation();
+
   int anUpdateFlags = 0;
-  if( processApply( anUpdateFlags ) )
+  QString anErrorMsg;
+
+  bool aResult = false;
+  
+  try
+  {
+    aResult = processApply( anUpdateFlags, anErrorMsg );
+  }
+  catch ( Standard_Failure )
+  {
+    Handle(Standard_Failure) aFailure = Standard_Failure::Caught();
+    anErrorMsg = aFailure->GetMessageString();
+    aResult = false;
+  }
+  catch ( ... )
+  {
+    aResult = false;
+  }
+  
+  QApplication::restoreOverrideCursor();
+
+  if ( aResult )
   {
     module()->update( anUpdateFlags );
+    commitDocOperation();
     commit();
   }
   else
   {
+    abortDocOperation();
+    QString aMsg = tr( "INPUT_VALID_DATA" );
+    if( !anErrorMsg.isEmpty() )
+      aMsg.prepend( anErrorMsg + "\n" );
     SUIT_MessageBox::critical( module()->getApp()->desktop(),
                                tr( "INSUFFICIENT_INPUT_DATA" ),
-                               tr( "INPUT_VALID_DATA" ) ); 
+                               aMsg ); 
   }
 }