X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModuleBase%2FModuleBase_OperationFeature.h;h=a13b2fa80e5b49c24a542b909a2ed96852a64c2d;hb=9c0937c3fce2633ae166b8a70fe43998f4babd1d;hp=ab0ce8c900ab13485f5ecf6333ff950674daf10b;hpb=1a121b1e8e39095614e936eb0b8f606f9d8cdaf2;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_OperationFeature.h b/src/ModuleBase/ModuleBase_OperationFeature.h
index ab0ce8c90..a13b2fa80 100755
--- a/src/ModuleBase/ModuleBase_OperationFeature.h
+++ b/src/ModuleBase/ModuleBase_OperationFeature.h
@@ -12,7 +12,6 @@
 
 #include <ModuleBase.h>
 #include <ModuleBase_Operation.h>
-#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_Object.h>
 #include <ModelAPI_CompositeFeature.h>
@@ -26,6 +25,8 @@
 class ModuleBase_ModelWidget;
 class ModuleBase_ISelection;
 class ModuleBase_IViewer;
+class ModuleBase_IWorkshop;
+class ModuleBase_ViewerPrs;
 
 class QKeyEvent;
 
@@ -67,9 +68,10 @@ Q_OBJECT
   /// Change the operation mode from create to edit.
   /// The transaction and the operation name in the model history of transaction are the same.
   /// It updates the edit state in the widgets of property panel
-  /// \param theRestartTransaction if true, the current model transaction is committed and
+  /// \param isEditState boolean state whether the operation should become editing or creating
+  // \param theRestartTransaction if true, the current model transaction is committed and
   /// the new one is started
-  void setEditOperation(const bool theRestartTransaction);
+  void setEditOperation(const bool& isEditState/*const bool theRestartTransaction*/);
 
   /// Returns the operation feature
   /// \return the feature
@@ -91,23 +93,28 @@ 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
+  void setPreselection(const QList<std::shared_ptr<ModuleBase_ViewerPrs>>& theValues);
 
   /// \brief Set property pane to the operation
   /// \param theProp a property panel instance
   virtual void setPropertyPanel(ModuleBase_IPropertyPanel* theProp);
 
-  /// \return Currently installed property panel
+  // \return Currently installed property panel
   //ModuleBase_IPropertyPanel* propertyPanel() const { return myPropertyPanel; }
 
-  /// Activates widgets by preselection if it is accepted. Emits signal if the activation is correct
-  virtual void activateByPreselection();
+  /// Activates widgets by preselection if it is accepted.
+  /// \param theGreedAttributeId a greed attribute id if there is in the current feature
+  /// \return last filled widget
+  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);
 
@@ -122,10 +129,6 @@ Q_OBJECT
   /// \return theFeature a feature
   FeaturePtr previousCurrentFeature();
 
-signals:
-  /// The operation is filled with existing preselection
-  void activatedByPreselection(); 
-
  public slots:
   /// Starts operation
   /// Public slot. Verifies whether operation can be started and starts operation.
@@ -172,11 +175,11 @@ signals:
   /// Editing feature flag
   bool myIsEditing;
 
-  /// List of pre-selected object 
-  QList<ModuleBase_ViewerPrs> myPreSelection;
+  /// 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;