X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Tools.cpp;h=8a4c158f3935ca4a311730804b968411d35990c2;hb=857b1f72d9703c46c6c8c9bb239821d314344c86;hp=ebd22fdef4bb2f141db3a920f0634712224e269f;hpb=ac74c1787b8167700108d058e7ec4cb942dc9b78;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Tools.cpp b/src/PartSet/PartSet_Tools.cpp index ebd22fdef..8a4c158f3 100755 --- a/src/PartSet/PartSet_Tools.cpp +++ b/src/PartSet/PartSet_Tools.cpp @@ -178,68 +178,6 @@ std::shared_ptr PartSet_Tools::convertTo3D(const double theX, const return aPnt2d->to3D(aC->pnt(), aX->dir(), aY); } -ObjectPtr PartSet_Tools::nearestFeature(QPoint thePoint, Handle_V3d_View theView, - FeaturePtr theSketch, - const QList& theSelected, - const QList& theHighlighted) -{ - // firstly it finds the feature in the list of highlight - ObjectPtr aDeltaObject = nearestFeature(thePoint, theView, theSketch, theHighlighted); - if (!aDeltaObject) - // secondly it finds the feature in the list of selected objects - aDeltaObject = nearestFeature(thePoint, theView, theSketch, theSelected); - - return aDeltaObject; -} - -ObjectPtr PartSet_Tools::nearestFeature(QPoint thePoint, Handle_V3d_View theView, - FeaturePtr theSketch, - const QList& thePresentations) -{ - ObjectPtr aDeltaObject; - - CompositeFeaturePtr aSketch = - std::dynamic_pointer_cast(theSketch); - // 1. find it in the selected list by the selected point - if (!aDeltaObject) { - double aX, anY; - gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(thePoint, theView); - PartSet_Tools::convertTo2D(aPoint, theSketch, theView, aX, anY); - - FeaturePtr aFeature; - double aMinDelta = -1; - ModuleBase_ViewerPrs aPrs; - foreach (ModuleBase_ViewerPrs aPrs, thePresentations) { - if (!aPrs.object()) - continue; - FeaturePtr aFeature = ModelAPI_Feature::feature(aPrs.object()); - std::shared_ptr aSketchFeature = std::dynamic_pointer_cast< - SketchPlugin_Feature>(aFeature); - if (!aSketchFeature || !aSketch->isSub(aSketchFeature)) - continue; - - double aDelta = aSketchFeature->distanceToPoint( - std::shared_ptr(new GeomAPI_Pnt2d(aX, anY))); - if (aMinDelta < 0 || aMinDelta > aDelta) { - aMinDelta = aDelta; - // TODO aDeltaObject = aPrs.result(); - } - } - } - // 2. if the object is not found, returns the first selected sketch feature - if (!aDeltaObject && thePresentations.size() > 0) { - // there can be some highlighted objects, e.g. a result of boolean operation and a sketch point - foreach (ModuleBase_ViewerPrs aPrs, thePresentations) { - if (!aPrs.object()) - continue; - FeaturePtr aFeature = ModelAPI_Feature::feature(aPrs.object()); - if (aFeature && aSketch->isSub(aFeature)) - aDeltaObject = aPrs.object(); - } - } - return aDeltaObject; -} - std::shared_ptr PartSet_Tools::document() { return ModelAPI_Session::get()->moduleDocument();