refs #1457

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

diff --git a/src/HYDROGUI/HYDROGUI_Operation.cxx b/src/HYDROGUI/HYDROGUI_Operation.cxx
index 38281c81545b5abb08e2b6ac2a65c66c8e38ea47..30caab310ad1451e56a17b3c4a5b576259ce93c6 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Operation.cxx
+++ b/src/HYDROGUI/HYDROGUI_Operation.cxx
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -51,7 +47,8 @@ HYDROGUI_Operation::HYDROGUI_Operation( HYDROGUI_Module* theModule )
   myIsPrintErrorMessage( true ),
   myIsTransactionOpened( false ),
   myPreviewManager( 0 ),
-  myPreviewZLayer( -1 )
+  myPreviewZLayer( -1 ),
+  myIsApplyAndClose( true )
 {
   connect( this, SIGNAL( helpContextModule( const QString&, const QString&,
                                             const QString& ) ),
@@ -78,6 +75,7 @@ HYDROGUI_InputPanel* HYDROGUI_Operation::inputPanel() const
   if( !myPanel )
   {
     ( ( HYDROGUI_Operation* )this )->myPanel = createInputPanel();
+    connect( myPanel, SIGNAL( panelApplyAndClose() ), this, SLOT( onApplyAndClose() ) );
     connect( myPanel, SIGNAL( panelApply() ),  this, SLOT( onApply() ) );
     connect( myPanel, SIGNAL( panelCancel() ), this, SLOT( onCancel() ) );
     connect( myPanel, SIGNAL( panelHelp() ), this, SLOT( onHelp() ) );
@@ -205,12 +203,76 @@ void HYDROGUI_Operation::restoreCursor()
   }
 }
 
+void HYDROGUI_Operation::setIsApplyAndClose( const bool theFlag )
+{
+  myIsApplyAndClose = theFlag;
+}
+
+bool HYDROGUI_Operation::isApplyAndClose() const
+{
+  return myIsApplyAndClose;
+}
+
+void HYDROGUI_Operation::apply()
+{
+  QApplication::setOverrideCursor( Qt::WaitCursor );
+
+  startDocOperation();
+
+  int anUpdateFlags = 0;
+  QString anErrorMsg;
+
+  bool aResult = false;
+  QStringList aBrowseObjectsEntries;
+
+  try
+  {
+    aResult = processApply( anUpdateFlags, anErrorMsg, aBrowseObjectsEntries );
+  }
+  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();
+    browseObjects( aBrowseObjectsEntries, myIsApplyAndClose );
+
+    if ( !myIsApplyAndClose && inputPanel() )
+      start();
+  }
+  else if( !anErrorMsg.isEmpty() )
+  {
+    // Abort document opeartion only if requested
+    if ( isToAbortOnApply() )
+      abortDocOperation();
+
+    printErrorMessage( anErrorMsg );
+ 
+    // If the operation has no input panel - do abort
+    if ( !inputPanel() ) {
+      abort();
+    }
+  } 
+}
+
 void HYDROGUI_Operation::startOperation()
 {
   LightApp_Operation::startOperation();
   myModule->getActiveOperations().push( this );
 
-  if( inputPanel() )
+  if( myIsApplyAndClose && inputPanel() )
   {
     myModule->getApp()->desktop()->addDockWidget( Qt::RightDockWidgetArea, inputPanel() );
     inputPanel()->show();
@@ -226,7 +288,8 @@ void HYDROGUI_Operation::abortOperation()
 void HYDROGUI_Operation::commitOperation()
 {
   LightApp_Operation::commitOperation();
-  closeInputPanel();
+  if ( myIsApplyAndClose )
+    closeInputPanel();
 }
 
 void HYDROGUI_Operation::stopOperation()
@@ -327,60 +390,21 @@ void HYDROGUI_Operation::commitDocOperation()
   }
 }
 
-Handle_HYDROData_Document HYDROGUI_Operation::doc() const
+Handle(HYDROData_Document) HYDROGUI_Operation::doc() const
 {
   return HYDROData_Document::Document( myModule->getStudyId() );
 }
 
-void HYDROGUI_Operation::onApply()
+void HYDROGUI_Operation::onApplyAndClose()
 {
-  QApplication::setOverrideCursor( Qt::WaitCursor );
-
-  startDocOperation();
-
-  int anUpdateFlags = 0;
-  QString anErrorMsg;
-
-  bool aResult = false;
-  QStringList aBrowseObjectsEntries;
-
-  try
-  {
-    aResult = processApply( anUpdateFlags, anErrorMsg, aBrowseObjectsEntries );
-  }
-  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();
-    browseObjects( aBrowseObjectsEntries );
-  }
-  else
-  {
-    // Abort document opeartion only if requested
-    if ( isToAbortOnApply() )
-      abortDocOperation();
+  myIsApplyAndClose = true;
+  apply();
+}
 
-    printErrorMessage( anErrorMsg );
- 
-    // If the operation has no input panel - do abort
-    if ( !inputPanel() ) {
-      abort();
-    }
-  }
+void HYDROGUI_Operation::onApply()
+{
+  myIsApplyAndClose = false;
+  apply();
 }
 
 void HYDROGUI_Operation::setPrintErrorMessage( const bool theIsPrint )
@@ -408,6 +432,9 @@ void HYDROGUI_Operation::onCancel()
 {
   processCancel();
   abort();
+  if ( myPanel )
+    abortOperation();
+  myIsApplyAndClose = true;
 }
 
 void HYDROGUI_Operation::onHelp()
@@ -422,8 +449,12 @@ QString HYDROGUI_Operation::getHelpComponent() const
 
 QString HYDROGUI_Operation::getHelpFile() const
 {
-   QString aFileName = ((myName.isEmpty())? operationName() : myName);
-   return aFileName.replace(QRegExp("\\s"), "_").append(".html");
+  QString aFileName = ((myName.isEmpty())? operationName() : myName);
+  aFileName = aFileName.toLower();
+  aFileName = aFileName.replace(QRegExp("\\s"), "_").append(".html");
+  aFileName.remove( "create_" );
+  aFileName.remove( "edit_" );
+  return aFileName;
 }
 
 QString HYDROGUI_Operation::getHelpContext() const
@@ -431,9 +462,9 @@ QString HYDROGUI_Operation::getHelpContext() const
    return QString();
 }
 
-void HYDROGUI_Operation::browseObjects( const QStringList& theBrowseObjectsEntries )
+void HYDROGUI_Operation::browseObjects( const QStringList& theBrowseObjectsEntries,
+                                        const bool theIsApplyAndClose/* = true*/ )
 {
-  bool isApplyAndClose = true;
   bool isOptimizedBrowse = true;
-  module()->getApp()->browseObjects( theBrowseObjectsEntries, isApplyAndClose, isOptimizedBrowse );
+  module()->getApp()->browseObjects( theBrowseObjectsEntries, theIsApplyAndClose, isOptimizedBrowse );
 }