"2.11 Constraint with a point from the intersection between an outer edge and plane...

[modules/shaper.git] / src / PartSet / PartSet_WidgetShapeSelector.cpp

diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 488a265..8bc3368
--- a/src/PartSet/PartSet_WidgetShapeSelector.cpp
+++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp
@@ -5,6 +5,8 @@
 // Author:      Vitaly Smetannikov
 
 #include "PartSet_WidgetShapeSelector.h"
+#include "PartSet_Module.h"
+#include "PartSet_SketcherMgr.h"
 
 #include <ModelAPI_AttributeRefAttr.h>
 #include <ModelAPI_Session.h>
@@ -13,22 +15,16 @@
 #include <ModuleBase_Definitions.h>
 #include <Config_WidgetAPI.h>
 
-#include <PartSet_Tools.h>
 #include <PartSet_ExternalObjectsMgr.h>
 #include <SketchPlugin_Feature.h>
 
-#include <SketchPlugin_ConstraintRigid.h>
-
 #include <XGUI_Workshop.h>
 
 #include <XGUI_ModuleConnector.h>
 #include <XGUI_Displayer.h>
 #include <XGUI_SelectionMgr.h>
 #include <XGUI_Selection.h>
-#include <SelectMgr_IndexedMapOfOwner.hxx>
-#include <StdSelect_BRepOwner.hxx>
-
-//#define DEBUG_EMPTY_SHAPE
+#include <XGUI_Tools.h>
 
 PartSet_WidgetShapeSelector::PartSet_WidgetShapeSelector(QWidget* theParent,
                                                          ModuleBase_IWorkshop* theWorkshop,
@@ -36,6 +32,7 @@ PartSet_WidgetShapeSelector::PartSet_WidgetShapeSelector(QWidget* theParent,
                                                          const std::string& theParentId)
 : ModuleBase_WidgetShapeSelector(theParent, theWorkshop, theData, theParentId)
 {
+  myUseSketchPlane = theData->getBooleanAttribute("use_sketch_plane", true);
   myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"), true);
 }
 
@@ -44,6 +41,17 @@ PartSet_WidgetShapeSelector::~PartSet_WidgetShapeSelector()
   delete myExternalObjectMgr;
 }
 
+//********************************************************************
+void PartSet_WidgetShapeSelector::activateSelectionAndFilters(bool toActivate)
+{
+  ModuleBase_WidgetShapeSelector::activateSelectionAndFilters(toActivate);
+  if (!myUseSketchPlane) {
+    XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop);
+    PartSet_Module* aModule = dynamic_cast<PartSet_Module*>(aWorkshop->module());
+    aModule->sketchMgr()->activatePlaneFilter(false);
+  }
+}
+
 //********************************************************************
 bool PartSet_WidgetShapeSelector::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
 {
@@ -55,33 +63,6 @@ bool PartSet_WidgetShapeSelector::isValidSelectionCustom(const ModuleBase_Viewer
   return aValid;
 }
 
-//********************************************************************
-void PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomShapePtr theShape)
-{
-  FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theSelectedObject);
-  // Do check using of external feature
-  std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
-          std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
-  // Processing of sketch object
-#ifdef DEBUG_EMPTY_SHAPE
-  if (aSPFeature.get() != NULL && theShape.get()) {
-    setPointAttribute(theSelectedObject, theShape);
-#else
-  if (aSPFeature.get() != NULL) {
-    GeomShapePtr aShape = theShape;
-    if (!aShape.get()) {
-      ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theSelectedObject);
-      if (aResult.get()) {
-        aShape = aResult->shape();
-      }
-    }
-    setPointAttribute(theSelectedObject, aShape);
-#endif
-  }
-  else
-    ModuleBase_WidgetShapeSelector::setObject(theSelectedObject, theShape);
-}
-
 void PartSet_WidgetShapeSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs,
                                                    ObjectPtr& theObject,
                                                    GeomShapePtr& theShape)
@@ -101,63 +82,14 @@ void PartSet_WidgetShapeSelector::getGeomSelection(const ModuleBase_ViewerPrs& t
         aShape = aResult->shape();
     }
     if (aShape.get() != NULL && !aShape->isNull())
-      theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch());
+      theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate);
   }
 }
 
-//********************************************************************
-GeomShapePtr PartSet_WidgetShapeSelector::getShape() const
-{
-  // an empty shape by default
-  DataPtr aData = myFeature->data();
-  AttributePtr anAttribute = aData->attribute(attributeID());
-  GeomShapePtr aShape = PartSet_Tools::findShapeBy2DPoint(anAttribute, myWorkshop);
-
-  if (!aShape.get())
-    aShape = ModuleBase_WidgetShapeSelector::getShape();
-  return aShape;
-}
-
 //********************************************************************
 void PartSet_WidgetShapeSelector::restoreAttributeValue(const bool theValid)
 {
   ModuleBase_WidgetShapeSelector::restoreAttributeValue(theValid);
-  myExternalObjectMgr->removeExternal(sketch(), myFeature);
+  myExternalObjectMgr->removeExternal(sketch(), myFeature, myWorkshop, true);
 }
 
-//********************************************************************
-void PartSet_WidgetShapeSelector::setPointAttribute(ObjectPtr theSelectedObject, GeomShapePtr theShape)
-{
-  DataPtr aData = myFeature->data();
-  AttributePtr aAttr = aData->attribute(attributeID());
-  AttributeRefAttrPtr aRefAttr = 
-    std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(aAttr);
-  if (aRefAttr) {
-    // it is possible that the point feature is selected. It should be used itself
-    // instead of searching an attribute for the shape
-    bool aShapeIsResult = false;
-    /*ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theSelectedObject);
-    if (aResult.get() != NULL) {
-      GeomShapePtr aShapePtr = aResult->shape();
-      // it is important to call isEqual of the shape of result.
-      // It is a GeomAPI_Vertex shape for the point. The shape of the parameter is 
-      // GeomAPI_Shape. It is important to use the realization of the isEqual method from
-      // GeomAPI_Vertex class
-      aShapeIsResult = aShapePtr.get() != NULL && aShapePtr->isEqual(theShape);
-    }*/
-
-    AttributePtr aPntAttr;
-    if (!aShapeIsResult) {
-      TopoDS_Shape aTDSShape = theShape->impl<TopoDS_Shape>();
-      aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theSelectedObject, aTDSShape, mySketch);
-    }
-    // this is an alternative, whether the attribute should be set or object in the attribute
-    // the first check is the attribute because the object already exist
-    // the object is set only if there is no selected attribute
-    // test case is - preselection for distance operation, which contains two points selected on lines
-    if (aPntAttr)
-      aRefAttr->setAttr(aPntAttr);
-    else
-      aRefAttr->setObject(theSelectedObject);
-  }
-}