X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FPartSet%2FPartSet_Tools.cpp;h=24a726a90df03bf938282248b2ab5637556dc8c4;hb=329d73a7dbce38e38063ff41186be492e3529ab5;hp=ca6b10adbdb8d105719c93f9674978e34d4c982c;hpb=0efdf638cf1e7bc36c6ef9d566a154c087a3eaec;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Tools.cpp b/src/PartSet/PartSet_Tools.cpp index ca6b10adb..24a726a90 100644 --- a/src/PartSet/PartSet_Tools.cpp +++ b/src/PartSet/PartSet_Tools.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include @@ -138,31 +138,31 @@ void PartSet_Tools::convertTo3D(const double theX, const double theY, FeaturePtr PartSet_Tools::nearestFeature(QPoint thePoint, Handle_V3d_View theView, FeaturePtr theSketch, - const std::list& theFeatures) + const std::list& theFeatures) { double aX, anY; gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(thePoint, theView); PartSet_Tools::convertTo2D(aPoint, theSketch, theView, aX, anY); FeaturePtr aFeature; - std::list::const_iterator anIt = theFeatures.begin(), aLast = theFeatures.end(); + std::list::const_iterator anIt = theFeatures.begin(), aLast = theFeatures.end(); FeaturePtr aDeltaFeature; double aMinDelta = -1; - XGUI_ViewerPrs aPrs; + ModuleBase_ViewerPrs aPrs; for (; anIt != aLast; anIt++) { aPrs = *anIt; - if (!aPrs.feature()) + if (!aPrs.result()) continue; boost::shared_ptr aSketchFeature = - boost::dynamic_pointer_cast(aPrs.feature()); + boost::dynamic_pointer_cast(aPrs.result()); if (!aSketchFeature) continue; double aDelta = aSketchFeature->distanceToPoint( boost::shared_ptr(new GeomAPI_Pnt2d(aX, anY))); if (aMinDelta < 0 || aMinDelta > aDelta) { aMinDelta = aDelta; - aDeltaFeature = aPrs.feature(); + aDeltaFeature = aPrs.result(); } } return aDeltaFeature;