Union of validator and filter functionalities.

Widget sketch label is improved to use the planar face validator.

diff --git a/src/GeomValidators/GeomValidators_Face.cpp b/src/GeomValidators/GeomValidators_Face.cpp
index 6f260861836fdba6a22847f0a77ffce16e55a4dc..821b45cb0755d58d8e11b839b9167a4817beb3d1 100644 (file)
--- a/src/GeomValidators/GeomValidators_Face.cpp
+++ b/src/GeomValidators/GeomValidators_Face.cpp
@@ -31,7 +31,7 @@ GeomAbs_SurfaceType GeomValidators_Face::faceType(const std::string& theType)
 }
 
 bool GeomValidators_Face::isValid(const AttributePtr& theAttribute,
-                                       const std::list<std::string>& theArguments) const
+                                  const std::list<std::string>& theArguments) const
 {
   bool aValid = false;
 
@@ -59,5 +59,7 @@ bool GeomValidators_Face::isValid(const AttributePtr& theAttribute,
       }
     }
   }
+  else
+    aValid = true; // an empty face selected is valid.
   return aValid;
 }

diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp
index 03ccb8984e47be420ea1d0c204d1374a0dc98cda..4e1f21b91afd30e2121a6e55db511d24dd1566cf 100644 (file)
--- a/src/Model/Model_AttributeSelection.cpp
+++ b/src/Model/Model_AttributeSelection.cpp
@@ -86,6 +86,13 @@ void Model_AttributeSelection::setValue(const ResultPtr& theContext,
   TDF_Label aSelLab = selectionLabel();
   aSelLab.ForgetAttribute(kSIMPLE_REF_ID);
   aSelLab.ForgetAttribute(kCONSTUCTION_SIMPLE_REF_ID);
+  if (!theContext.get()) {
+    // to keep the reference attribute label
+    TDF_Label aRefLab = myRef.myRef->Label();
+    aSelLab.ForgetAllAttributes(true);
+    myRef.myRef = TDF_Reference::Set(aSelLab, aSelLab);
+    return;
+  }
   if (theContext->groupName() == ModelAPI_ResultBody::group()) {
     // do not select the whole shape for body:it is already must be in the data framework
     if (theContext->shape().get() && theContext->shape()->isEqual(theSubShape)) {

diff --git a/src/ModuleBase/ModuleBase_WidgetValidated.cpp b/src/ModuleBase/ModuleBase_WidgetValidated.cpp
index 97723530bd21371533a04ec5474ced4baa4936f1..506eeca2a858427465374e62b80fc41f18cc8bb5 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetValidated.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetValidated.cpp
@@ -24,6 +24,7 @@ ModuleBase_WidgetValidated::~ModuleBase_WidgetValidated()
 {
 }
 
+//********************************************************************
 bool ModuleBase_WidgetValidated::setSelection(ModuleBase_ViewerPrs theValue)
 {
   bool isDone = false;
@@ -37,13 +38,19 @@ bool ModuleBase_WidgetValidated::setSelection(ModuleBase_ViewerPrs theValue)
   return isDone;
 }
 
+//********************************************************************
 bool ModuleBase_WidgetValidated::isValid(const Handle_SelectMgr_EntityOwner& theOwner)
 {
+  // stores the current values of the widget attribute
   backupAttributeValue(true);
 
+  // saves the owner value to the widget attribute
   setSelection(theOwner);
+
+  // checks the attribute validity
   bool aValid = isValidAttribute();
 
+  // restores the current values of the widget attribute
   backupAttributeValue(false);
 
   return aValid;

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp
index 96435f627a95826200c5ed20017793ba04989e46..636a0ff5b8ad4ec50ce06eda45843c07db03134f 100644 (file)
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@ -19,6 +19,7 @@
 #include <ModuleBase_Operation.h>
 #include <ModuleBase_ViewerPrs.h>
 #include <ModuleBase_Tools.h>
+#include <ModuleBase_IModule.h>
 
 #include <GeomAlgoAPI_FaceBuilder.h>
 #include <GeomDataAPI_Point.h>
@@ -46,7 +47,7 @@
 PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent,
                                                      const Config_WidgetAPI* theData,
                                                      const std::string& theParentId)
-    : ModuleBase_ModelWidget(theParent, theData, theParentId),
+    : ModuleBase_WidgetValidated(theParent, theData, theParentId),
       myPreviewDisplayed(false),
       myWorkshop(NULL)
 {
@@ -81,41 +82,43 @@ QList<QWidget*> PartSet_WidgetSketchLabel::getControls() const
 
 void PartSet_WidgetSketchLabel::onPlaneSelected()
 {
+
   XGUI_Selection* aSelection = myWorkshop->selector()->selection();
   QList<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
   if (!aSelected.empty()) {
     ModuleBase_ViewerPrs aPrs = aSelected.first();
-    TopoDS_Shape aShape = aPrs.shape();
-    if (!aShape.IsNull()) {
-      std::shared_ptr<GeomAPI_Dir> aDir = setSketchPlane(aShape);
-      if (aDir) {
-        erasePreviewPlanes();
+    Handle(SelectMgr_EntityOwner) anOwner = aSelected.first().owner();
+    if (isValid(anOwner)) {
+      setSelection(anOwner);
 
-        if (aPrs.object() && (feature() != aPrs.object())) {
-          DataPtr aData = feature()->data();
-          AttributeSelectionPtr aSelAttr = 
-            std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
-            (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID()));
-          if (aSelAttr) {
-            ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aPrs.object());
-            if (aRes) {
-              GeomShapePtr aShapePtr(new GeomAPI_Shape());
-              aShapePtr->setImpl(new TopoDS_Shape(aShape));
-              aSelAttr->setValue(aRes, aShapePtr);
-            }
+      TopoDS_Shape aShape = aPrs.shape();
+      if (!aShape.IsNull()) {
+        erasePreviewPlanes();
+        DataPtr aData = feature()->data();
+        AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
+                                  (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID()));
+        if (aSelAttr) {
+          GeomShapePtr aShapePtr = aSelAttr->value();
+          if (aShapePtr.get() == NULL || aShapePtr->isNull()) {
+            std::shared_ptr<GeomAPI_Shape> aGShape(new GeomAPI_Shape);
+            aGShape->setImpl(new TopoDS_Shape(aShape));
+            // get plane parameters
+            std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape);
+            std::shared_ptr<GeomAPI_Dir> aDir = aPlane->direction();
+
+            myWorkshop->viewer()->setViewProjection(aDir->x(), aDir->y(), aDir->z());
           }
-        } else
-          myWorkshop->viewer()->setViewProjection(aDir->x(), aDir->y(), aDir->z());
+        }
 
         // Clear text in the label
         myLabel->setText("");
         myLabel->setToolTip("");
         disconnect(myWorkshop->selector(), SIGNAL(selectionChanged()), 
                    this, SLOT(onPlaneSelected()));
+        activateFilters(myWorkshop->module()->workshop(), false);
 
         // Clear selection mode and define sketching mode
-        XGUI_Displayer* aDisp = myWorkshop->displayer();
-        aDisp->removeSelectionFilter(myFaceFilter);
+        //XGUI_Displayer* aDisp = myWorkshop->displayer();
         //aDisp->closeLocalContexts();
         emit planeSelected(plane());
         setSketchingMode();
@@ -147,12 +150,61 @@ void PartSet_WidgetSketchLabel::enableFocusProcessing()
   myLabel->installEventFilter(this);
 }
 
+void PartSet_WidgetSketchLabel::backupAttributeValue(const bool isBackup)
+{
+  // it is not necessary to save the previous plane value because the plane is chosen once
+  if (!isBackup) {
+    DataPtr aData = feature()->data();
+    AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
+      (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID()));
+    if (aSelAttr) {
+      ResultPtr anEmptyResult;
+      GeomShapePtr anEmptyShape;
+      aSelAttr->setValue(anEmptyResult, anEmptyShape);
+    }
+  }
+}
+
+bool PartSet_WidgetSketchLabel::setSelection(const Handle_SelectMgr_EntityOwner& theOwner)
+{
+  bool isOwnerSet = false;
+
+  ModuleBase_ViewerPrs aPrs;
+  myWorkshop->selector()->selection()->fillPresentation(aPrs, theOwner);
+
+  const TopoDS_Shape& aShape = aPrs.shape();
+  std::shared_ptr<GeomAPI_Dir> aDir;
+
+  if (aPrs.object() && (feature() != aPrs.object())) {
+    DataPtr aData = feature()->data();
+    AttributeSelectionPtr aSelAttr = 
+      std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
+      (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID()));
+    if (aSelAttr) {
+      ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aPrs.object());
+      if (aRes) {
+        GeomShapePtr aShapePtr(new GeomAPI_Shape());
+        aShapePtr->setImpl(new TopoDS_Shape(aShape));
+        aSelAttr->setValue(aRes, aShapePtr);
+        isOwnerSet = true;
+      }
+    }
+  }
+  else if (!aShape.IsNull()) {
+    aDir = setSketchPlane(aShape);
+    isOwnerSet = aDir;
+  }
+  return isOwnerSet;
+}
+
 void PartSet_WidgetSketchLabel::activateCustom()
 {
   std::shared_ptr<GeomAPI_Pln> aPlane = plane();
   if (aPlane) {
     //setSketchingMode();
     // In order to avoid Opening/Closing of context too often
+    // it can be useful for a delay on the property panel filling
+    // it is possible that it is not necessary anymore, but it requires a check
     mySelectionTimer->start(20);
   } else {
     // We have to select a plane before any operation
@@ -161,9 +213,6 @@ void PartSet_WidgetSketchLabel::activateCustom()
     XGUI_Displayer* aDisp = myWorkshop->displayer();
     //aDisp->openLocalContext();
     //aDisp->activateObjects(QIntList());
-    if (myFaceFilter.IsNull())
-      myFaceFilter = new StdSelect_FaceFilter(StdSelect_Plane);
-    aDisp->addSelectionFilter(myFaceFilter);
     QIntList aModes;
     aModes << TopAbs_FACE;
     aDisp->activateObjects(aModes);
@@ -172,6 +221,8 @@ void PartSet_WidgetSketchLabel::activateCustom()
     myLabel->setToolTip(myTooltip);
 
     connect(myWorkshop->selector(), SIGNAL(selectionChanged()), this, SLOT(onPlaneSelected()));
+    activateFilters(myWorkshop->module()->workshop(), true);
+
     aDisp->updateViewer();
   }
 }
@@ -180,9 +231,7 @@ void PartSet_WidgetSketchLabel::deactivate()
 {
   // Do not set selection mode if the widget was activated for a small moment 
   mySelectionTimer->stop();
-  XGUI_Displayer* aDisp = myWorkshop->displayer();
-  aDisp->removeSelectionFilter(myFaceFilter);
-  //aDisp->removeSelectionFilter(mySketchFilter);
+  //XGUI_Displayer* aDisp = myWorkshop->displayer();
   //aDisp->closeLocalContexts();
   erasePreviewPlanes();
 }

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.h b/src/PartSet/PartSet_WidgetSketchLabel.h
index 9da513f5d2a3bc2527cf0eebc9b3693d5627716b..3e277c68ddd585b59468e6ce4cc2335259eebc3c 100644 (file)
--- a/src/PartSet/PartSet_WidgetSketchLabel.h
+++ b/src/PartSet/PartSet_WidgetSketchLabel.h
@@ -9,14 +9,13 @@
 
 #include "PartSet.h"
 
-#include <ModuleBase_ModelWidget.h>
+#include <ModuleBase_WidgetValidated.h>
 #include <ModuleBase_ViewerFilters.h>
 
 #include <GeomAPI_Pnt.h>
 #include <GeomAPI_Dir.h>
 #include <GeomAPI_AISObject.h>
 
-#include <StdSelect_FaceFilter.hxx>
 #include <TopoDS_Shape.hxx>
 
 class QLabel;
@@ -35,7 +34,7 @@ class XGUI_Workshop;
 * A model widget implementation for a label which provides specific behaviour 
 * for sketcher starting and launching operations
 */
-class PARTSET_EXPORT PartSet_WidgetSketchLabel : public ModuleBase_ModelWidget
+class PARTSET_EXPORT PartSet_WidgetSketchLabel : public ModuleBase_WidgetValidated
 {
 Q_OBJECT
  public:
@@ -80,6 +79,17 @@ signals:
   void planeSelected(const std::shared_ptr<GeomAPI_Pln>& thePln);
 
 protected:
+  /// Creates a backup of the current values of the attribute
+  /// It should be realized in the specific widget because of different
+  /// parameters of the current attribute
+  /// \param isBackup a boolean flag, if true, store values from the attribute
+  /// to backup, otherwise set the backed up values to the attribute
+  virtual void backupAttributeValue(const bool isBackup);
+
+  /// Fills the attribute with the value of the selected owner
+  /// \param theOwner a selected owner
+  virtual bool setSelection(const Handle_SelectMgr_EntityOwner& theOwner);
+
   /// Saves the internal parameters to the given feature
   /// \return True in success
   virtual bool storeValueCustom() const
@@ -128,8 +138,6 @@ protected:
   AISObjectPtr myXYPlane;
   bool myPreviewDisplayed;
 
-  Handle(StdSelect_FaceFilter) myFaceFilter;
-
   QTimer* mySelectionTimer;
 };
 

diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml
index 1c7974d6db8ce0a37dc876c5c85e93ddcb342c42..4abd354b0ffa3a276aaa14c40a299ba977ea6c51 100644 (file)
--- a/src/SketchPlugin/plugin-Sketch.xml
+++ b/src/SketchPlugin/plugin-Sketch.xml
@@ -10,7 +10,9 @@
         title="Sketch"
         tooltip="Create a new sketch"
         icon=":icons/sketch.png">
-        <sketch-start-label title="Select a plane on which to create a sketch" tooltip="Select a plane on which to create a sketch"/> 
+        <sketch-start-label id="External" title="Select a plane on which to create a sketch" tooltip="Select a plane on which to create a sketch">
+          <validator id="GeomValidators_Face" parameters="plane"/>
+        </sketch-start-label>
       <!--icon=":pictures/x_point.png"-->
       </feature>
       <feature id="SketchPoint" title="Point" tooltip="Create a new point" icon=":icons/point.png">