X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetShapeSelector.cpp;h=8bc3368bd8d86a9ff545420f8a69a1d7ed5d3c4e;hb=031179ada6681b874314c450eeda806f9f8abd28;hp=fdda90f35cfba242aab573574a7695c001917c08;hpb=f7afacd2ae12567fe07ae122a35996601b1f2b38;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp
old mode 100644
new mode 100755
index fdda90f35..8bc3368bd
--- a/src/PartSet/PartSet_WidgetShapeSelector.cpp
+++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp
@@ -5,100 +5,91 @@
 // Author:      Vitaly Smetannikov
 
 #include "PartSet_WidgetShapeSelector.h"
+#include "PartSet_Module.h"
+#include "PartSet_SketcherMgr.h"
 
 #include <ModelAPI_AttributeRefAttr.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Validator.h>
 
-#include <PartSet_Tools.h>
+#include <ModuleBase_Definitions.h>
+#include <Config_WidgetAPI.h>
+
+#include <PartSet_ExternalObjectsMgr.h>
 #include <SketchPlugin_Feature.h>
 
-bool PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomShapePtr theShape)
-{
-  ObjectPtr aSelectedObject = theSelectedObject;
-  GeomShapePtr aShape = theShape;
+#include <XGUI_Workshop.h>
 
-  FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aSelectedObject);
-  if (aSelectedFeature == myFeature)  // In order to avoid selection of the same object
-    return false;
-  std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
-          std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
-  if (aSPFeature.get() == NULL && aShape.get() != NULL && !aShape->isNull()) {
-    // Processing of external (non-sketch) object
-    createExternal(theSelectedObject, theShape);
-    if (myExternalObject)
-      aSelectedObject = myExternalObject;
-    else
-      return false;
-  } else {
-    // Processing of sketch object
-    DataPtr aData = myFeature->data();
-    if (aShape) {
-      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);
-        }*/
+#include <XGUI_ModuleConnector.h>
+#include <XGUI_Displayer.h>
+#include <XGUI_SelectionMgr.h>
+#include <XGUI_Selection.h>
+#include <XGUI_Tools.h>
 
-        AttributePtr aPntAttr;
-        if (!aShapeIsResult) {
-          TopoDS_Shape aTDSShape = aShape->impl<TopoDS_Shape>();
-          aPntAttr = PartSet_Tools::findAttributeBy2dPoint(aSelectedObject, 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 if (aSelectedObject)
-          aRefAttr->setObject(aSelectedObject);
-        return true;
-      }
-    }
-  }
-  return ModuleBase_WidgetShapeSelector::setObject(aSelectedObject, aShape);
+PartSet_WidgetShapeSelector::PartSet_WidgetShapeSelector(QWidget* theParent,
+                                                         ModuleBase_IWorkshop* theWorkshop,
+                                                         const Config_WidgetAPI* theData,
+                                                         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);
 }
 
-//********************************************************************
-void PartSet_WidgetShapeSelector::restoreAttributeValue(const bool theValid)
+PartSet_WidgetShapeSelector::~PartSet_WidgetShapeSelector()
 {
-  ModuleBase_WidgetShapeSelector::restoreAttributeValue(theValid);
-  removeExternal();
+  delete myExternalObjectMgr;
 }
 
 //********************************************************************
-void PartSet_WidgetShapeSelector::createExternal(ObjectPtr theSelectedObject,
-                                                 GeomShapePtr theShape)
+void PartSet_WidgetShapeSelector::activateSelectionAndFilters(bool toActivate)
 {
-  ObjectPtr aObj = PartSet_Tools::createFixedObjectByExternal(theShape->impl<TopoDS_Shape>(),
-                                                              theSelectedObject, mySketch);
-  if (aObj != myExternalObject) {
-    removeExternal();
-    myExternalObject = aObj;
+  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);
   }
 }
 
 //********************************************************************
-void PartSet_WidgetShapeSelector::removeExternal()
+bool PartSet_WidgetShapeSelector::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
+{
+  bool aValid = ModuleBase_WidgetShapeSelector::isValidSelectionCustom(thePrs);
+  if (aValid) {
+    ObjectPtr anObject = myWorkshop->selection()->getResult(thePrs);
+    aValid = myExternalObjectMgr->isValidObject(anObject);
+  }
+  return aValid;
+}
+
+void PartSet_WidgetShapeSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs,
+                                                   ObjectPtr& theObject,
+                                                   GeomShapePtr& theShape)
 {
-  if (myExternalObject.get()) {
-    DocumentPtr aDoc = myExternalObject->document();
-    FeaturePtr aFeature = ModelAPI_Feature::feature(myExternalObject);
-    if (aFeature.get() != NULL) {
-      aDoc->removeFeature(aFeature);
+  ModuleBase_WidgetShapeSelector::getGeomSelection(thePrs, theObject, theShape);
+
+  FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theObject);
+  std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
+          std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
+  // there is no a sketch feature is selected, but the shape exists, try to create an exernal object
+  // TODO: unite with the same functionality in PartSet_WidgetShapeSelector
+  if (aSPFeature.get() == NULL && myExternalObjectMgr->useExternal()) {
+    GeomShapePtr aShape = theShape;
+    if (!aShape.get()) {
+      ResultPtr aResult = myWorkshop->selection()->getResult(thePrs);
+      if (aResult.get())
+        aShape = aResult->shape();
     }
-    myExternalObject = NULL;
+    if (aShape.get() != NULL && !aShape->isNull())
+      theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate);
   }
 }
+
+//********************************************************************
+void PartSet_WidgetShapeSelector::restoreAttributeValue(const bool theValid)
+{
+  ModuleBase_WidgetShapeSelector::restoreAttributeValue(theValid);
+  myExternalObjectMgr->removeExternal(sketch(), myFeature, myWorkshop, true);
+}
+