Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1

[modules/shaper.git] / src / ModuleBase / ModuleBase_Operation.h

diff --git a/src/ModuleBase/ModuleBase_Operation.h b/src/ModuleBase/ModuleBase_Operation.h
index 208e3503581df161ca6895fc7981cc60a8da9818..4e76077f249ac3872ca617d237320f1987d07547 100644 (file)
--- a/src/ModuleBase/ModuleBase_Operation.h
+++ b/src/ModuleBase/ModuleBase_Operation.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 /*
  * ModuleBase_Operation.h
  *
@@ -23,7 +25,6 @@ class ModuleBase_OperationDescription;
 class ModuleBase_IPropertyPanel;
 class ModuleBase_ISelection;
 class ModuleBase_IViewer;
-class ModuleBase_WidgetValueFeature;
 
 class QKeyEvent;
 
@@ -127,8 +128,8 @@ Q_OBJECT
 
   ModuleBase_IPropertyPanel* propertyPanel() const { return myPropertyPanel; }
 
-  /// Activates widgets by preselection if it is accepted
-  virtual bool activateByPreselection();
+  /// Activates widgets by preselection if it is accepted. Emits signal if the activation is correct
+  virtual void activateByPreselection();
 
   /// If the operation works with feature which is sub-feature of another one
   /// then this variable has to be initialised by parent feature 
@@ -143,6 +144,7 @@ signals:
   void stopped();  /// the operation is aborted or committed
   void resumed();  /// the operation is resumed
   void postponed();  /// the operation is postponed
+  void activatedByPreselection(); /// the operation is filled with existing preselection
 
  public slots:
   /// Starts operation
@@ -209,7 +211,7 @@ signals:
   virtual void afterCommitOperation() {}
 
   /// Send update message by loop
-  //void flushUpdated();
+  void flushUpdated();
 
   /// Send created message by loop
   void flushCreated();
@@ -264,7 +266,7 @@ signals:
   QStringList myNestedFeatures;
 
   /// List of pre-selected object 
-  QList<ModuleBase_WidgetValueFeature*> myPreSelection;
+  QList<ModuleBase_ViewerPrs> myPreSelection;
 
   /// Access to property panel
   ModuleBase_IPropertyPanel* myPropertyPanel;