X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_ExternalObjectsMgr.cpp;h=d2df7c96db9bc2c761e8249b0bb72736a6c45a6c;hb=384c819a1edf4b726e3a523c1ffd2b5e6b16a4c0;hp=793940ccab1e13b733d4cef8ba3c6ab6a40a1d2d;hpb=016814c4673909dcd7fd9591694cf599623dfbc7;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_ExternalObjectsMgr.cpp b/src/PartSet/PartSet_ExternalObjectsMgr.cpp index 793940cca..d2df7c96d 100755 --- a/src/PartSet/PartSet_ExternalObjectsMgr.cpp +++ b/src/PartSet/PartSet_ExternalObjectsMgr.cpp @@ -19,6 +19,8 @@ // #include "PartSet_ExternalObjectsMgr.h" + +#include "PartSet_CenterPrs.h" #include "PartSet_Tools.h" #include @@ -83,12 +85,40 @@ ObjectPtr PartSet_ExternalObjectsMgr::externalObject(const ObjectPtr& theSelecte return aSelectedObject; } +ObjectPtr PartSet_ExternalObjectsMgr::externalCenterObject(const ModuleBase_ViewerPrsPtr& thePrs, + const CompositeFeaturePtr& theSketch, + const bool theTemporary) +{ + if (!thePrs.get() || thePrs->interactive().IsNull()) + return ObjectPtr(); + + Handle(PartSet_CenterPrs) aAIS = Handle(PartSet_CenterPrs)::DownCast(thePrs->interactive()); + if (aAIS.IsNull()) + return ObjectPtr(); + + gp_Pnt aPntComp = aAIS->Component()->Pnt(); + GeomVertexPtr aVertPtr(new GeomAPI_Vertex(aPntComp.X(), aPntComp.Y(), aPntComp.Z())); + TopoDS_Shape aShape = aVertPtr->impl(); + + ResultPtr aSelectedObject = + PartSet_Tools::findFixedObjectByExternal(aShape, aAIS->object(), theSketch); + if (!aSelectedObject.get()) + { + FeaturePtr aCreatedFeature; + aSelectedObject = PartSet_Tools::createFixedByExternalCenter(aAIS->object(), aAIS->edge(), + aAIS->centerType(), theSketch, theTemporary, aCreatedFeature); + if (aCreatedFeature.get() && theTemporary) + myExternalObjectValidated = aCreatedFeature; + } + return aSelectedObject; +} + void PartSet_ExternalObjectsMgr::getGeomSelection(const ModuleBase_ViewerPrsPtr& thePrs, - ObjectPtr& theObject, - GeomShapePtr& theShape, - ModuleBase_IWorkshop* theWorkshop, - const CompositeFeaturePtr& theSketch, - const bool isInValidate) + ObjectPtr& theObject, + GeomShapePtr& theShape, + ModuleBase_IWorkshop* theWorkshop, + const CompositeFeaturePtr& theSketch, + const bool isInValidate) { FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theObject); std::shared_ptr aSPFeature = @@ -110,6 +140,9 @@ void PartSet_ExternalObjectsMgr::getGeomSelection(const ModuleBase_ViewerPrsPtr& if (aShape.get() != NULL && !aShape->isNull()) anExternalObject = externalObject(theObject, aShape, theSketch, isInValidate); + if (!anExternalObject.get()) { + anExternalObject = externalCenterObject(thePrs, theSketch, isInValidate); + } } else { /// use objects of found selection anExternalObject = theObject;