From: vsv Date: Thu, 28 Dec 2017 12:36:13 +0000 (+0300) Subject: Update icons for group feature X-Git-Tag: V_2.10.1~7 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=53a5c770b43256db1191dda004fce23a2ab0a39d;p=modules%2Fshaper.git Update icons for group feature --- diff --git a/src/SketcherPrs/SketcherPrs_PositionMgr.cpp b/src/SketcherPrs/SketcherPrs_PositionMgr.cpp index 669d67745..b3c76ddef 100644 --- a/src/SketcherPrs/SketcherPrs_PositionMgr.cpp +++ b/src/SketcherPrs/SketcherPrs_PositionMgr.cpp @@ -373,7 +373,8 @@ gp_Pnt SketcherPrs_PositionMgr::getPointPosition( const std::array& aPos = getPositionIndex(thePnt, thePrs); // Angle size of a symbol - double aAngleStep = PI * 50./180.; + //double aAngleStep = PI * 50./180.; + double aAngleStep = PI/4.; std::list::const_iterator aItVec; std::list aAngles; @@ -396,7 +397,7 @@ gp_Pnt SketcherPrs_PositionMgr::getPointPosition( } } } - if ((aMinAng * 2) >= aAngleStep) { + if (aMinAng >= aAngleStep) { aVectors.push_back(aVec); aAngles.push_back(aMinAng); } @@ -408,9 +409,7 @@ gp_Pnt SketcherPrs_PositionMgr::getPointPosition( // directly inside of the angle if (aAngles.size() >= aPos[1]) { int aId = aPos[0]; - std::list::iterator aVIt = aVectors.begin(); - std::advance(aVIt, aId); - aVecPos = *aVIt; + aVecPos = *(std::next(aVectors.begin(), aId)); gp_Vec aShift = aVecPos.Rotated(aRotAx, aAngleStep); aShift.Normalize(); diff --git a/src/XGUI/pictures/edge32.png b/src/XGUI/pictures/edge32.png index cb8bc1de8..feb3b4802 100644 Binary files a/src/XGUI/pictures/edge32.png and b/src/XGUI/pictures/edge32.png differ diff --git a/src/XGUI/pictures/face32.png b/src/XGUI/pictures/face32.png index 44bc549a2..6b0551dca 100644 Binary files a/src/XGUI/pictures/face32.png and b/src/XGUI/pictures/face32.png differ diff --git a/src/XGUI/pictures/solid32.png b/src/XGUI/pictures/solid32.png index 6db2ffdd6..9d86c9bfb 100644 Binary files a/src/XGUI/pictures/solid32.png and b/src/XGUI/pictures/solid32.png differ diff --git a/src/XGUI/pictures/vertex32.png b/src/XGUI/pictures/vertex32.png index edce228a7..3bd208636 100644 Binary files a/src/XGUI/pictures/vertex32.png and b/src/XGUI/pictures/vertex32.png differ