X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetShapeSelector.cpp;h=bdd7bba7a1323f37e7fd169f0818493abf2a0019;hb=aea15db62bec148b6bfd5db468c682b1695c3449;hp=3dc5460c20280216dde3d8f9f897c61ddaf30a62;hpb=9e9c9a449415e86c8635345460e3db6701799ef2;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp
index 3dc5460c2..bdd7bba7a 100644
--- a/src/PartSet/PartSet_WidgetShapeSelector.cpp
+++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp
@@ -11,10 +11,14 @@
 #include <ModelAPI_Validator.h>
 
 #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>
 
 PartSet_WidgetShapeSelector::PartSet_WidgetShapeSelector(QWidget* theParent,
@@ -23,99 +27,82 @@ PartSet_WidgetShapeSelector::PartSet_WidgetShapeSelector(QWidget* theParent,
                                                          const std::string& theParentId)
 : ModuleBase_WidgetShapeSelector(theParent, theWorkshop, theData, theParentId)
 {
+  myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"), true);
+}
+
+PartSet_WidgetShapeSelector::~PartSet_WidgetShapeSelector()
+{
+  delete myExternalObjectMgr;
 }
 
 bool PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomShapePtr theShape)
 {
   ObjectPtr aSelectedObject = theSelectedObject;
-  GeomShapePtr aShape = theShape;
+  //GeomShapePtr aShape = theShape;
 
   FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(aSelectedObject);
   if (aSelectedFeature == myFeature)  // In order to avoid selection of the same object
     return false;
+  // Do check using of external feature
   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;
+
+  // Do check that we can use external feature
+  if ((aSPFeature.get() != NULL) && aSPFeature->isExternal() && (!myExternalObjectMgr->useExternal()))
+    return false;
+
+  if (aSPFeature.get() == NULL && theShape.get() != NULL && !theShape->isNull() && myExternalObjectMgr->useExternal()) {
+    aSelectedObject = myExternalObjectMgr->externalObject(theSelectedObject, theShape, sketch());
   } 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);
-        }*/
-
-        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;
-      }
+    if (theShape.get()) {
+      setPointAttribute(theSelectedObject, theShape);
+      return true;
     }
   }
-  return ModuleBase_WidgetShapeSelector::setObject(aSelectedObject, aShape);
+  return ModuleBase_WidgetShapeSelector::setObject(aSelectedObject, theShape);
 }
 
 //********************************************************************
 void PartSet_WidgetShapeSelector::restoreAttributeValue(const bool theValid)
 {
   ModuleBase_WidgetShapeSelector::restoreAttributeValue(theValid);
-  removeExternal();
+  myExternalObjectMgr->removeExternal(sketch(), myFeature);
 }
 
 //********************************************************************
-void PartSet_WidgetShapeSelector::createExternal(ObjectPtr theSelectedObject,
-                                                 GeomShapePtr theShape)
+void PartSet_WidgetShapeSelector::setPointAttribute(ObjectPtr theSelectedObject, GeomShapePtr theShape)
 {
-  ObjectPtr aObj = PartSet_Tools::createFixedObjectByExternal(theShape->impl<TopoDS_Shape>(),
-                                                              theSelectedObject, mySketch);
-  if (aObj != myExternalObject) {
-    removeExternal();
-    myExternalObject = aObj;
-  }
-}
+  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);
+    }*/
 
-//********************************************************************
-void PartSet_WidgetShapeSelector::removeExternal()
-{
-  if (myExternalObject.get()) {
-    DocumentPtr aDoc = myExternalObject->document();
-    FeaturePtr aFeature = ModelAPI_Feature::feature(myExternalObject);
-    if (aFeature.get() != NULL) {
-      QObjectPtrList anObjects;
-      anObjects.append(aFeature);
-      // the external feature should be removed with all references, sketch feature should be ignored
-      std::set<FeaturePtr> anIgnoredFeatures;
-      anIgnoredFeatures.insert(sketch());
-      XGUI_Workshop::deleteFeatures(anObjects, anIgnoredFeatures);
+    AttributePtr aPntAttr;
+    if (!aShapeIsResult) {
+      TopoDS_Shape aTDSShape = theShape->impl<TopoDS_Shape>();
+      aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theSelectedObject, aTDSShape, mySketch);
     }
-    myExternalObject = ObjectPtr();
+    // 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 (theSelectedObject)
+      aRefAttr->setObject(theSelectedObject);
   }
 }