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

diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp
index bd9e1ce81..bdd7bba7a 100644
--- a/src/PartSet/PartSet_WidgetShapeSelector.cpp
+++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp
@@ -9,119 +9,100 @@
 #include <ModelAPI_AttributeRefAttr.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Validator.h>
-#include <ModelAPI_RefAttrValidator.h>
-#include <ModelAPI_ResultValidator.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>
 
-bool PartSet_WidgetShapeSelector::storeValueCustom() const
+PartSet_WidgetShapeSelector::PartSet_WidgetShapeSelector(QWidget* theParent,
+                                                         ModuleBase_IWorkshop* theWorkshop,
+                                                         const Config_WidgetAPI* theData,
+                                                         const std::string& theParentId)
+: ModuleBase_WidgetShapeSelector(theParent, theWorkshop, theData, theParentId)
 {
-  if (!mySelectedObject)
-    return false;
+  myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"), true);
+}
 
-  FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(mySelectedObject);
+PartSet_WidgetShapeSelector::~PartSet_WidgetShapeSelector()
+{
+  delete myExternalObjectMgr;
+}
+
+bool PartSet_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject, GeomShapePtr theShape)
+{
+  ObjectPtr aSelectedObject = theSelectedObject;
+  //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) && (!myShape->isNull())) {
-    // Processing of external (non-sketch) object
-    ObjectPtr aObj = PartSet_Tools::createFixedObjectByExternal(myShape->impl<TopoDS_Shape>(),
-                                                                mySelectedObject, mySketch);
-    if (aObj) {
-      PartSet_WidgetShapeSelector* that = (PartSet_WidgetShapeSelector*) this;
-      that->mySelectedObject = aObj;
-    } 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 (myShape) {
-      AttributePtr aAttr = aData->attribute(attributeID());
-      AttributeRefAttrPtr aRefAttr = 
-        std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(aAttr);
-      if (aRefAttr) {
-        TopoDS_Shape aShape = myShape->impl<TopoDS_Shape>();
-        AttributePtr aPntAttr = PartSet_Tools::findAttributeBy2dPoint(mySelectedObject, aShape, 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 (mySelectedObject)
-          aRefAttr->setObject(mySelectedObject);
-        updateObject(myFeature);
-        return true;
-      }
+    if (theShape.get()) {
+      setPointAttribute(theSelectedObject, theShape);
+      return true;
     }
   }
-  return ModuleBase_WidgetShapeSelector::storeValueCustom();
+  return ModuleBase_WidgetShapeSelector::setObject(aSelectedObject, theShape);
 }
 
 //********************************************************************
-bool PartSet_WidgetShapeSelector::isValid(ObjectPtr theObj, std::shared_ptr<GeomAPI_Shape> theShape)
+void PartSet_WidgetShapeSelector::restoreAttributeValue(const bool theValid)
 {
-  // the method is redefined to analize the selected shape in validators
-  SessionPtr aMgr = ModelAPI_Session::get();
-  ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
-  std::list<ModelAPI_Validator*> aValidators;
-  std::list<std::list<std::string> > anArguments;
-  aFactory->validators(parentID(), attributeID(), aValidators, anArguments);
-
-  // Check the type of selected object
-  std::list<ModelAPI_Validator*>::iterator aValidator = aValidators.begin();
-  bool isValid = true;
-  for (; aValidator != aValidators.end(); aValidator++) {
-    const ModelAPI_ResultValidator* aResValidator =
-        dynamic_cast<const ModelAPI_ResultValidator*>(*aValidator);
-    if (aResValidator) {
-      isValid = false;
-      if (aResValidator->isValid(theObj)) {
-        isValid = true;
-        break;
-      }
-    }
-  }
-  if (!isValid)
-    return false;
+  ModuleBase_WidgetShapeSelector::restoreAttributeValue(theValid);
+  myExternalObjectMgr->removeExternal(sketch(), myFeature);
+}
 
-  // Check the acceptability of the object and shape as validator attribute
-  AttributePtr aPntAttr;
+//********************************************************************
+void PartSet_WidgetShapeSelector::setPointAttribute(ObjectPtr theSelectedObject, GeomShapePtr theShape)
+{
   DataPtr aData = myFeature->data();
-  if (theShape.get() != NULL) {
-    AttributePtr aAttr = aData->attribute(attributeID());
-    AttributeRefAttrPtr aRefAttr = 
-      std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(aAttr);
-    if (aRefAttr) {
-      TopoDS_Shape aShape = theShape->impl<TopoDS_Shape>();
-      aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theObj, aShape, mySketch);
-    }
-  }
-  // Check the acceptability of the object as attribute
-  aValidator = aValidators.begin();
-  std::list<std::list<std::string> >::iterator aArgs = anArguments.begin();
-  for (; aValidator != aValidators.end(); aValidator++, aArgs++) {
-    const ModelAPI_RefAttrValidator* aAttrValidator =
-        dynamic_cast<const ModelAPI_RefAttrValidator*>(*aValidator);
-    if (aAttrValidator) {
-      if (aPntAttr.get() != NULL)
-      {
-        if (!aAttrValidator->isValid(myFeature, *aArgs, aPntAttr)) {
-          return false;
-        }
-      }
-      else
-      {
-        if (!aAttrValidator->isValid(myFeature, *aArgs, theObj)) {
-          return false;
-        }
-      }
+  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 if (theSelectedObject)
+      aRefAttr->setObject(theSelectedObject);
   }
-  return true;
 }
-