From 53a5c770b43256db1191dda004fce23a2ab0a39d Mon Sep 17 00:00:00 2001 From: vsv Date: Thu, 28 Dec 2017 15:36:13 +0300 Subject: [PATCH] Update icons for group feature --- src/SketcherPrs/SketcherPrs_PositionMgr.cpp | 9 ++++----- src/XGUI/pictures/edge32.png | Bin 412 -> 746 bytes src/XGUI/pictures/face32.png | Bin 772 -> 566 bytes src/XGUI/pictures/solid32.png | Bin 772 -> 1077 bytes src/XGUI/pictures/vertex32.png | Bin 990 -> 491 bytes 5 files changed, 4 insertions(+), 5 deletions(-) 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 cb8bc1de836165b2f5f946360905d56687820056..feb3b48025950f924b04d43c6c059813a0598351 100644 GIT binary patch delta 664 zcmV;J0%!f41L_5kBnkm@Qb$4nuFf3kks%rj4#NNd4#NS*Z>VIEMkjv)T1iAfR9HvF zl*?-qQ51)hx`>8i5vA@#5ZAiU)<+eoRD7F;E(HZ~qiyY?>8|myu(m#05#0G_xOU-6 zM0D?>DQS|K$>h;w9vLUeuji&-8Nwl^p86K4=ySn1BBPYwH96wi6l;Xz+VP&_-5ZA?02{W(Wq5u3f+?q{7H%-#~ydbRXmR9j*<2WrGk6yk- zbmS_=XCEV%&!buQkILpc!OFiOLtLkGS=@WJggqly5KBBk#>jtznmXdxR-YWx308JO z1U)>`^u1wCH!v}mMCimQ;#53M_f&k$wyLKct2(&j4ao3o?x7;>_DR}syN1UQpL0lyWgY@Hodfhy%%m^JVD=F(?Lh@cDF@?u(BNy)IgY4 zKBO5MCKs16K*fJ=(r(Y{RNVLOQ-1WHHqh|ga4Ma~L}DJ1GnWx-71t=el@}45(=DtN z1Vh}Lc>{No&k;U(acj40IW#!;{nloVJbxbX;w9a{q&Uq#$io16z8>Pcy z3^%`9SSb+k%dsPdp<|l9`R=oH&gr$U)47*<5y3gVz)EyUj*2~8c!TIUS~=}@QM~E7 zA9td#gq4y93$N+le!cZ?&tx<7+U-vp#lkUV4Sf0W9iP8`!|GZJzGLkx7tK@DKvY=+ yLE3{G(+jNZgbXg%3#?QLD^1)KwrB#|)}3k}r(01edvJ=R$9ky9ss0U1d|K~z{r?Uq3b!Y~j;djPi< zZ{s4_ryF-Jy{RDd1R`#|f#61I{h3Zn(k6B@2?+V{k%Wo=^H7+o*5(PnYGvN=wbo7V zS(&qSl}Z$@O~+xwXVwDBd}e_iydc5j@j()k9+#IFHUtJq@VLD2<=(REhPr1Sm)DO1 c4hhqL0dA1^M6Oy!X#fBK07*qoM6N<$f^kBRo&W#< diff --git a/src/XGUI/pictures/face32.png b/src/XGUI/pictures/face32.png index 44bc549a2e81b1f19e7c79c2cb98e01ed15cff6a..6b0551dca851ac97683016244695e388323011e5 100644 GIT binary patch delta 483 zcmV<90UZ8>2DSu{Bnkm@Qb$4nuFf3kks%rj4#NNd4#NS*Z>VIEMkjv(rb$FWR9Hvt z*4-;ZaU92Su_bOLkAH@(#f>q?Hf|_Sw@S@0wz={bNRcG%Lh>-J6gDzRlM9NA36ZTm zoY^Qxa^b>_i;v$?E9u)=SU;s*yjs0$-#%C8oIC)3ii|vwktZ_pL`I&-$P*cPB4b)4 ze1mu-jQd3FM^f=9qU?Xh*SnvQF-<<=4;;WWFbXqcv^rq2Ix`z^!eAM}@c1N>u?Raw z-QQFe;HFC$~xLsEptw+*$n z5xo;G_(Kxbf^kI~7fCD~U!&681;Jv^&H$CB0oIvCoJw!lk3D}YI=p>>@9GX!E#282 zV3}UP(fuoS!;gyO5$orP+<@GG+<<>JprA$%+ngJhFZdXt^>-1$|L6H;HRHGajY4q+*B6c}4idcnE7OC?D zpCfi}WE^oQt#@@I6Np`Iom_I|L# za{-&E_Jgs63wF03DV`e`(U8u8jb#`(lOPyZ&}3b{^0oUkZ_8^^73{X4?E}O<8ZTpW|Pvkh~Y*S=p9RIJEMn4xJB?6Fq{;y@RE(?r6zcP zB+F>ZC(mj<$*HPCz9*5HBizi)6RNF265t^YC7Q?i!24R4KSuWrZ#@)%x4s)qC{emR z{J`)6z2j+|UDh*v7g-^2kj66%=T@K4aP2^6cj?ySHyW}scx4Aek7ieK1CED~dPV4; z&gwjTNw_}sf)MSvl;5GYmoNkVEweO#wjwadxx0^^E+6aZGrRyFJ4NPW4(ACE)7Xl@ zD8cS?tV=0a1YZHZfF;Bt1oDWr*}te0_=?mw2NwvQ&=-VrhjK{0sD4J^)B1$ir0@s$ zi++UpMJ%wD_r^Ag;$|9K5$6e}fN2ajx#Y;Xa?s}@*mK>-IsFHM;oGG*#t b6T^H191}~TON>lD00000NkvXXu0mjfXv0l5 diff --git a/src/XGUI/pictures/solid32.png b/src/XGUI/pictures/solid32.png index 6db2ffdd6d94ec70e87806b466d44c18241c08fb..9d86c9bfb021c1b23a1fa3bffc86b0979bed6cdc 100644 GIT binary patch delta 998 zcmVVIEMkjv*rAb6VR9HvF zmU~RiVHn4=u`zS2-2RZ#FlEU75+%2EIVl}yq>ED%DoZZ$hY1rFX2XV!P3f{>m`$B7 zCq?JfIbyCMigPL^mt1oB!@i#Pm)hZd&)JUh^T%iJZ{Od}^L*dueSXh*9RU1Sgrb}X zML7|Qav~JvL@3(AaKC>B8l3@!dWKP2HEh+jJ-2C=&ju9es-QJi)6e;MoM4OGf?|ve zjevvKY;>FC(}9DF0}3Zf-?I(^uSR z{KBDo`3;8VA2_BlV0^?{3=33Yi2qWI36G{wd~8nmlbowXlzchdLRMn$g<_P{y@#gu z4e}qq=3shBT?_VI(85g-fq}I1l#_Xw9+x6j@6Xr_POv2Vss^LOA~9O2#=*;FxZco; zYtKJQNlNN}NBe*LgS77dm3+|rC3GBTpsoJ^A36$GdwU@BN02_<{Fer9R-^lrxrje}8n;_OUH{o8?29O@eTxy) zsMBJTQA~}>lK;H{sz8saeo$wekUlL@$6La7d+DxOYCdLwmA+F3t{J-6z#6*^-24Xy zmQiRv7bkx(O1scNnduX}*KUDJppruKxj2DQYA|+*0XCS{VAF2&r9l>xmX3zT1`5sR;si!# z40uz+UA$wW!L%EFW>fMV){`@YVu`*=G7x*~C`StbY=2LH|MK1My#ANdJIZ z5A?Zf(0r)Ge>tCsCk4}&e=nN3k}3{ZaOm=1%alT}*&qjG^w0YTwEVl2NAPzBIq&cm z3D>}LFw0|Gr~I9@_xx{|#UPi1@wMk*ycG?9Z@c~i1*2PDK6lMOS+8)g*;--A|0i!h z4i*Pl4t4-Ap6`Gpf%HG^h?LhL%cn}Wn%flT2Q=k`> z{?9Bi@1H3loREuxfe8yMmi7z z0qcdIba%iyU~xQa-?_iQQW9KD)7=3Rw;uhg5*Q0Era_LNxdUL8){Na}eizML0cvZ2 zeE(nECE$jvXJ`rC9FWpI>o2g{2m4%q);s(&(DHmaudrO2IRI1hOY#9x5TzJ(ymu{wa30BE@f5X(Ruxuak( b0tN;Efh7xN6dBbd00000NkvXXu0mjf@Bu!F diff --git a/src/XGUI/pictures/vertex32.png b/src/XGUI/pictures/vertex32.png index edce228a7156a347304e3ee5b78a38d2eaa0fc21..3bd208636c3473f9eb50933047bb35ad084388f0 100644 GIT binary patch delta 407 zcmcb|{+fA$3KwH>kh>GZx^prwCn`#D^Brbj;5*ECJby*XL^t(%#%NC$$B+p3qvvhC zof0LE6@FiEK0)w>h@hY#>$OQP-_pXC`&Du+nH;GicwG6*BGy|XoP`?-I+k^vSg3zR zX6uW(uNO3~7i_=7Yro@X{D%X=Odr-~Tya^fCS`hYMW>suN!Fr3;oeywp^(*g4?VxW z-SVfNlqMmw8t*XYr@lCbyN3qhxK1Uq5@Yo255M-I4jC>hU=> z(-#DuT6=H7{Zlh0zZWtwy7|hKEmu5wrt^{SwnzAFcy8?OShmez>gNq_rYFu1doX3) zgfCt@>Z|`Jyf0Zaaixje#vqI1Ir};~=i0b!FMbidL2%wigGX-?E#|ta%q(`Z*x0u2 zW9E;oRkQbA?sU^!UD0{s(K4_jLskX+`&*g*pId5a*k5j+U6l|Q&Zur#$a@{^Dy@o4 krHU$3_4}$={oH(k-=g8-=P5~5e;9zk)78&qol`;+0A#1d3;+NC delta 912 zcmV;B18@B61KtOaB#|)}3k}r(01edvJ=R$9ky9ss16xT%K~z{r?UqYOR8bhmCnD%E z<>)*W%U+9U>n7Sv(>XI~>YOv9QxI62sE~>Z0wEzNh|&tN0yl0f3Nd&9yNV&1H!X;!Q>?9QfUhhh`PZY zUBJ)8C(x5_$2&l`Zabiyh?1FKK!A$dg}9snL!rptDk2zd*hGXPNwkwydT+qo0GKj) zu|%zFc6OPPEG!^!Lkn4ATz(Bk>bB=H;M*;KuE4+-N6v$J888A&PWhO;tJ?uCMglzE zQp!^$L{<3EN+QU_{s0pPOdc11z+d}Xwkz5E0!it=p2@^Jo*DN9XDDKrlXnzLh z^qz1SXdx439v8oXbrcgywy;2=^$e#G-$P7ppp9Bqlc*%TJYGS#!}UG_k775Bd^0&X z%B!o7tWc7L1q3{f;xphi70+dN0L6!ZxpNpeIBx?K%EW*XRG>&7xNiEGd<@3SIC4O( zl394*O?MU0TkSt1*>I&&%Pkf&AWX067SNC7z}<=o#V9r$?pU0{*wTEI>Y#Upjr~Pb mflqQm?*%oj7{$mlT&{mqz$^6a)MTds0000