X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_OperationFeature.h;h=14ce24a86c0b0b79c1a35cc4f0bd70f4868727f4;hb=4c74e5b864eef28128e27b3ece944990ca8f3fbe;hp=268b1d7590bb633b5a2e60d14f97afa35a42159a;hpb=49d5a27258260087aad5e7ca30d6863e08a186d1;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_OperationFeature.h b/src/ModuleBase/ModuleBase_OperationFeature.h
old mode 100755
new mode 100644
index 268b1d759..14ce24a86
--- a/src/ModuleBase/ModuleBase_OperationFeature.h
+++ b/src/ModuleBase/ModuleBase_OperationFeature.h
@@ -1,11 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-/*
- * ModuleBase_OperationFeature.h
- *
- *  Created on: Apr 2, 2014
- *      Author: sbh
- */
+// Copyright (C) 2014-2019  CEA/DEN, 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
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef ModuleBase_OperationFeature_H
 #define ModuleBase_OperationFeature_H
@@ -93,10 +103,9 @@ Q_OBJECT
   virtual bool isDisplayedOnStart(ObjectPtr theObject);
 
   /// Initialisation of operation with preliminary selection
-  /// \param theSelection an instance of Selection class
-  /// \param theViewer a viewer to have the viewer the eye position
-  virtual void initSelection(ModuleBase_ISelection* theSelection,
-                             ModuleBase_IViewer* theViewer);
+  /// \param thePreSelected a container of selected presentations
+  virtual void initSelection(
+                  const QList<std::shared_ptr<ModuleBase_ViewerPrs>>& thePreSelected);
 
   /// Fill internal map by preselection
   /// \param theValues a list of preselection
@@ -115,7 +124,7 @@ Q_OBJECT
   virtual ModuleBase_ModelWidget* activateByPreselection(const std::string& theGreedAttributeId);
 
   /// If the operation works with feature which is sub-feature of another one
-  /// then this variable has to be initialised by parent feature 
+  /// then this variable has to be initialised by parent feature
   /// before operation feature creating
   void setParentFeature(CompositeFeaturePtr theParent);
 
@@ -130,6 +139,19 @@ Q_OBJECT
   /// \return theFeature a feature
   FeaturePtr previousCurrentFeature();
 
+  /// Set whether the operation should be aborted. By default the state is false in operation
+  /// \param theState abort state
+  void setNeedToBeAborted(const bool theState)  { myNeedToBeAborted = theState; }
+
+  /// Returns valid state of the operation
+  /// \return custom validity state (it is almost always true)
+  bool isNeedToBeAborted() const { return myNeedToBeAborted; }
+
+  /// Call this function on launch of a nested operation
+  /// when transaction has to be reopened on resume of main operation
+  /// By default transaction is not reopened on resuming
+  void openTransactionOnResume() { myRestartTransactionOnResume = true; }
+
  public slots:
   /// Starts operation
   /// Public slot. Verifies whether operation can be started and starts operation.
@@ -157,6 +179,9 @@ Q_OBJECT
   /// Hide feature/results if they were hided on start
   virtual void stopOperation();
 
+  /// Virtual method called after operation resume (see resume() method for more description)
+  virtual void resumeOperation();
+
   /// Creates an operation new feature
   /// \param theFlushMessage the flag whether the create message should be flushed
   /// \returns the created feature
@@ -176,17 +201,22 @@ Q_OBJECT
   /// Editing feature flag
   bool myIsEditing;
 
-  /// List of pre-selected object 
+  /// State used only if the operation should not be commited
+  bool myNeedToBeAborted;
+
+  /// List of pre-selected object
   QList<std::shared_ptr<ModuleBase_ViewerPrs>> myPreSelection;
 
   /// If the operation works with feature which is sub-feature of another one
-  /// then this variable has to be initialised by parent feature 
+  /// then this variable has to be initialised by parent feature
   /// before operation feature creating
   CompositeFeaturePtr myParentFeature;
 
   /// Last current feature before editing operation. It is cashed when Edit operation is started
   /// in order to restore the document current feature on commit/abort this operation.
   FeaturePtr myPreviousCurrentFeature;
+
+  bool myRestartTransactionOnResume;
 };
 
 #endif