X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchCreator.h;h=60a3cf30ea04b00a3775d2830107640fc556d1d9;hb=7b7716a3d09dd4532f2580e43039bcf71adb4a97;hp=a9a479eddd70c7f9be49419c69b7d1fb41453647;hpb=22b9a67e18cbd5d8eabba1ab85f26f5bad963c30;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetSketchCreator.h b/src/PartSet/PartSet_WidgetSketchCreator.h
index a9a479edd..60a3cf30e 100644
--- a/src/PartSet/PartSet_WidgetSketchCreator.h
+++ b/src/PartSet/PartSet_WidgetSketchCreator.h
@@ -12,9 +12,7 @@
 #include <ModuleBase_WidgetSelector.h>
 
 class QLabel;
-class QLineEdit;
 class PartSet_Module;
-class ModelAPI_Tools;
 class ModuleBase_Operation;
 class ModuleBase_IWorkshop;
 class PartSet_PreviewPlanes;
@@ -56,25 +54,41 @@ public:
   /// This value should be processed in the widget according to the needs
   /// \param theValues the wrapped selection values
   /// \param theToValidate a validation of the values flag
-  virtual bool setSelection(QList<ModuleBase_ViewerPrs>& theValues,
+  virtual bool setSelection(QList<std::shared_ptr<ModuleBase_ViewerPrs>>& theValues,
                             const bool theToValidate);
 
   /// Editing mode depends on mode of current operation. This value is defined by it.
   virtual void setEditingMode(bool isEditing);
 
-  /// Check if the current and the parent operations are a composite. If the parent operation contains
-  /// attribute selection list, the method returns false if it is invalid in this attibute validator
-  /// \param theWorkshop a current workshop
-  /// \return boolean value
-  static bool canCommitCurrentSketch(ModuleBase_IWorkshop* theWorkshop);
+  /// Checks all widget validator if the owner is valid. Firstly it checks custom widget validating,
+  /// next, the attribute's validating. It trying on the give selection to current attribute by
+  /// setting the value inside and calling validators. After this, the previous attribute value is
+  /// restored.The valid/invalid value is cashed.
+  /// \param theValue a selected presentation in the view
+  /// \return a boolean value
+  virtual bool isValidSelection(const std::shared_ptr<ModuleBase_ViewerPrs>& theValue);
 
 protected:
+  /// If there is no operation in current session, start operation for modify parameters
+  /// \return true if the operation was not opened
+  void openExtrusionTransaction();
+
+  /// Checks whether the selection presentation contains preview planes
+  /// \param theValue a selection information
+  /// \return a boolean value
+  virtual bool isValidSelectionCustom(const std::shared_ptr<ModuleBase_ViewerPrs>& theValue);
+
   /// Saves the internal parameters to the given feature
   /// \return True in success
-  virtual bool storeValueCustom() const;
+  virtual bool storeValueCustom();
 
   virtual bool restoreValueCustom();
 
+  /// Retunrs attribute, which should be validated. In default implementation,
+  /// this is an attribute of ID
+  /// \return an attribute
+  virtual AttributePtr attribute() const;
+
   /// Sets the selection control visible and set the current widget as active in property panel
   /// It leads to connect to onSelectionChanged slot
   void activateSelectionControl();
@@ -85,18 +99,26 @@ protected:
 
   /// Retunrs a list of possible shape types
   /// \return a list of shapes
-  virtual QIntList getShapeTypes() const;
+  virtual QIntList shapeTypes() const;
 
   /// Emits model changed info, updates the current control by selection change
   /// \param theDone a state whether the selection is set
   void updateOnSelectionChanged(const bool theDone);
 
+protected slots:
+  /// Slot which is called on selection event
+  virtual void onSelectionChanged();
+
 private:
   /// Returns true if the selection mode is active. This is when composition feature has no
   ///  a sub-object and the attribute list is empty
   /// \return boolean value
   bool isSelectionMode() const;
 
+  /// Returns true if the current composite feature contains at least one sub-object
+  /// \return boolean value
+  bool hasSubObjects() const;
+
 private slots:
   void onResumed(ModuleBase_Operation* theOp);
 
@@ -104,24 +126,34 @@ private:
   /// Append new Sketch, set the selected plane for the sketch and start Edit operation.
   /// \param theValues a selection list
   /// \return true if the sketch is started
-  bool startSketchOperation(const QList<ModuleBase_ViewerPrs>& theValues);
+  bool startSketchOperation(const QList<std::shared_ptr<ModuleBase_ViewerPrs>>& theValues);
+
+  /// Sets the sub-object to list of base.
+  static void setSketchObjectToList(const CompositeFeaturePtr& theFeature,
+                                    const AttributePtr& theAttribute);
+
+  /// Calls validator for attribute list and warn if it is not valid
+  /// \return true if validation succeed
+  bool validateSelectionList() const;
 
-  /// Appends the selection to the sketch base attribute 
-  /// \param theValue a selection value from the viewer
-  /// \return true if the value is set
-  bool setBaseAttributeSelection(const ModuleBase_ViewerPrs& theValue);
+  /// Change enable state of controls in the model widget by the attribute identifier
+  /// \param theModelWidget a model widget
+  /// \param theEnabled a state if the controls should be enabled/disabled
+  void setEnabledModelWidget(ModuleBase_ModelWidget* theModelWidget,
+                             const bool theEnabled);
 
 private:
   std::string myAttributeListID;
 
   PartSet_Module* myModule;
 
+  /// Flag if the attribute() should return the attribute list ID or XML attribute
+  /// to store selection and check validation
+  bool myIsCustomAttribute;
+
   /// Label of the widget
   QLabel* myLabel;
 
-  /// Input control of the widget
-  QLineEdit* myTextLine;
-
   /// List of accepting shapes types
   QStringList myShapeTypes;