X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetShapeSelector.cpp;h=a4dbf44f6f70884839b7e4e019812914989f153b;hb=1834431e0e067cbb4616f42679562d56af528f5e;hp=3dc5460c20280216dde3d8f9f897c61ddaf30a62;hpb=ce9008bdda3fa14d6fa6c61360541249ccf43ce0;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp index 3dc5460c2..a4dbf44f6 100644 --- a/src/PartSet/PartSet_WidgetShapeSelector.cpp +++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp @@ -11,111 +11,166 @@ #include #include +#include #include +#include #include +#include + #include +#include +#include +#include +#include +#include +#include + PartSet_WidgetShapeSelector::PartSet_WidgetShapeSelector(QWidget* theParent, ModuleBase_IWorkshop* theWorkshop, const Config_WidgetAPI* theData, 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 aSPFeature = std::dynamic_pointer_cast(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(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(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(); - aPntAttr = PartSet_Tools::findAttributeBy2dPoint(aSelectedObject, aTDSShape, mySketch); + if (theShape.get()) { + setPointAttribute(theSelectedObject, theShape); + return true; + } + } + return ModuleBase_WidgetShapeSelector::setObject(aSelectedObject, theShape); +} + +//******************************************************************** +GeomShapePtr PartSet_WidgetShapeSelector::getShape() const +{ + // an empty shape by default + GeomShapePtr aShape; + + // 1. find an attribute value in attribute reference attribute value + DataPtr aData = myFeature->data(); + AttributePtr aAttr = aData->attribute(attributeID()); + AttributeRefAttrPtr aRefAttr = + std::dynamic_pointer_cast(aAttr); + if (aRefAttr) { + if (!aRefAttr->isObject()) { + AttributePtr anAttribute = aRefAttr->attr(); + if (anAttribute.get()) { + XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); + XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); + + // 2. find visualized vertices of the attribute and if the attribute of the vertex is + // the same, return it + FeaturePtr anAttributeFeature = ModelAPI_Feature::feature(anAttribute->owner()); + // 2.1 get visualized results of the feature + const std::list& aResList = anAttributeFeature->results(); + std::list::const_iterator anIt = aResList.begin(), aLast = aResList.end(); + for (; anIt != aLast; anIt++) { + AISObjectPtr aAISObj = aDisplayer->getAISObject(*anIt); + if (aAISObj.get() != NULL) { + Handle(AIS_InteractiveObject) anAISIO = aAISObj->impl(); + // 2.2 find selected owners of a visualizedd object + SelectMgr_IndexedMapOfOwner aSelectedOwners; + aConnector->workshop()->selector()->selection()->entityOwners(anAISIO, aSelectedOwners); + for (Standard_Integer i = 1, n = aSelectedOwners.Extent(); i <= n; i++) { + Handle(SelectMgr_EntityOwner) anOwner = aSelectedOwners(i); + if (!anOwner.IsNull()) { + Handle(StdSelect_BRepOwner) aBRepOwner = Handle(StdSelect_BRepOwner)::DownCast(anOwner); + if (!aBRepOwner.IsNull() && aBRepOwner->HasShape()) { + const TopoDS_Shape& aBRepShape = aBRepOwner->Shape(); + if (aBRepShape.ShapeType() == TopAbs_VERTEX) { + // 2.3 if the owner is vertex and an attribute of the vertex is equal to the initial + // attribute, returns the shape + AttributePtr aPntAttr = PartSet_Tools::findAttributeBy2dPoint(anAttributeFeature, + aBRepShape, sketch()); + if (aPntAttr.get() != NULL && aPntAttr == anAttribute) { + aShape = std::shared_ptr(new GeomAPI_Shape); + aShape->setImpl(new TopoDS_Shape(aBRepShape)); + break; + } + } + } + } + } + } } - // 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); + if (!aShape.get()) + aShape = ModuleBase_WidgetShapeSelector::getShape(); + return aShape; } //******************************************************************** 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(), - theSelectedObject, mySketch); - if (aObj != myExternalObject) { - removeExternal(); - myExternalObject = aObj; - } -} + DataPtr aData = myFeature->data(); + AttributePtr aAttr = aData->attribute(attributeID()); + AttributeRefAttrPtr aRefAttr = + std::dynamic_pointer_cast(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(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 anIgnoredFeatures; - anIgnoredFeatures.insert(sketch()); - XGUI_Workshop::deleteFeatures(anObjects, anIgnoredFeatures); + AttributePtr aPntAttr; + if (!aShapeIsResult) { + TopoDS_Shape aTDSShape = theShape->impl(); + 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 + aRefAttr->setObject(theSelectedObject); } }