Fix regression in unit tests

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

diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.h b/src/ModuleBase/ModuleBase_WidgetSelector.h
index 4f3dd6e4af2807bd3b9c4d8fe96cec5a714d7a22..cb7d76e42ab1ada09ee8def3cacde5cd607ecadc 100755 (executable)
--- a/src/ModuleBase/ModuleBase_WidgetSelector.h
+++ b/src/ModuleBase/ModuleBase_WidgetSelector.h
@@ -42,25 +42,21 @@ Q_OBJECT
   /// Defines if it is supposed that the widget should interact with the viewer.
   virtual bool isViewerSelector() { return true; }
 
+  /// Activate or deactivate selection and selection filters
+  void activateSelectionAndFilters(bool toActivate);
+
   /// Checks the widget validity. By default, it returns true.
-  /// \param theValue a selected presentation in the view
+  /// \param thePrs a selected presentation in the view
   /// \return a boolean value
   virtual bool isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs);
 
   /// Fills the attribute with the value of the selected owner
-  /// \param theOwner a selected owner
+  /// \param thePrs a selected owner
   virtual bool setSelectionCustom(const ModuleBase_ViewerPrs& thePrs);
 
   /// The methiod called when widget is deactivated
   virtual void deactivate();
 
-  //TODO: nds stabilization hotfix
-  virtual void disconnectSignals();
-
-protected:
-  /// Activate or deactivate selection
-  void activateSelection(bool toActivate);
-
  private slots:
    /// Slot which is called on selection event
   void onSelectionChanged();
@@ -69,7 +65,7 @@ protected:
   /// Set an empty value to attribute
   virtual void clearAttribute() = 0;
 
-  // Update focus after the attribute value change
+  /// Update focus after the attribute value change
   virtual void updateFocus() = 0;
 
   /// Return the attribute values wrapped in a list of viewer presentations
@@ -94,9 +90,13 @@ protected:
    /// The methiod called when widget is activated
   virtual void activateCustom();
 
-  /// Returns true if selected shape corresponds to requested shape types
+  /// Returns true if selected shape corresponds to requested shape types.
+  /// If the widget type of shapes contains the faces item, the result is converted
+  /// to construction result and the method returns true if there is at least one face
+  /// in the construction.
   /// \param theShape a shape
-  bool acceptSubShape(const TopoDS_Shape& theShape) const;
+  /// \param theResult a selected result
+  bool acceptSubShape(const GeomShapePtr& theShape, const ResultPtr& theResult) const;
 
   /// Return an object and geom shape by the viewer presentation
   /// \param thePrs a selection
@@ -107,9 +107,6 @@ protected:
                                 GeomShapePtr& theShape);
 
   //----------- Class members -------------
-protected:
-  /// Reference to workshop
-  ModuleBase_IWorkshop* myWorkshop;
 };
 
 #endif