From 19fb13affe2208a18aa9c5f065e4a662ddf2e4df Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 25 Oct 2017 11:27:43 +0300 Subject: [PATCH] Resolved issue #771. Improve tool Point at intersection of arc and line. --HG-- branch : develop --- src/app/valentina/mainwindow.ui | 523 +++++++++--------- .../resources/cursor/pointcontact_cursor.png | Bin 581 -> 695 bytes .../cursor/pointcontact_cursor@2x.png | Bin 1349 -> 1513 bytes .../toolicon/32x32/point_of_contact.png | Bin 1465 -> 1042 bytes .../toolicon/32x32/point_of_contact@2x.png | Bin 2023 -> 2295 bytes .../toolicon/svg/point_of_contact.svg | 54 +- .../line/vistoolpointfromcircleandtangent.cpp | 2 +- .../line/vistoolpointfromcircleandtangent.h | 16 +- .../line/vistoolpointofcontact.cpp | 2 +- .../line/vistoolpointofcontact.h | 16 +- .../vistoolpointofintersectioncircles.cpp | 4 +- .../line/vistoolpointofintersectioncircles.h | 18 +- .../path/vistoolarcwithlength.cpp | 1 + .../path/vistoolellipticalarc.cpp | 1 + .../path/vistoolpointofintersectioncurves.cpp | 1 + .../visualization/path/vistoolspline.cpp | 1 + .../visualization/path/vistoolsplinepath.cpp | 1 + .../vtools/visualization/visualization.cpp | 2 +- src/libs/vtools/visualization/visualization.h | 2 +- 19 files changed, 323 insertions(+), 321 deletions(-) diff --git a/src/app/valentina/mainwindow.ui b/src/app/valentina/mainwindow.ui index 3ac5c3541..b81b324b6 100644 --- a/src/app/valentina/mainwindow.ui +++ b/src/app/valentina/mainwindow.ui @@ -7,7 +7,7 @@ 0 0 1100 - 700 + 709 @@ -21,8 +21,8 @@ - - + + true @@ -48,15 +48,15 @@ Export details skiping the Layout stage - 6 + 7 0 0 - 126 - 351 + 140 + 282 @@ -78,244 +78,7 @@ Point - - - QFormLayout::AllNonFixedFieldsGrow - - - - - false - - - Point at distance along line - - - ... - - - - :/toolicon/32x32/along_line.png:/toolicon/32x32/along_line.png - - - - 32 - 32 - - - - true - - - - - - - false - - - Point along perpendicular - - - ... - - - - :/toolicon/32x32/normal.png:/toolicon/32x32/normal.png - - - - 32 - 32 - - - - true - - - - - - - false - - - Point along bisector - - - ... - - - - :/toolicon/32x32/bisector.png:/toolicon/32x32/bisector.png - - - - 32 - 32 - - - - true - - - - - - - false - - - Special point on shoulder - - - ... - - - - :/toolicon/32x32/shoulder.png:/toolicon/32x32/shoulder.png - - - - 32 - 32 - - - - true - - - - - - - false - - - Point at intersection of arc and line - - - ... - - - - :/toolicon/32x32/point_of_contact.png:/toolicon/32x32/point_of_contact.png - - - - 32 - 32 - - - - true - - - - - - - false - - - Triangle tool - - - ... - - - - :/toolicon/32x32/triangle.png:/toolicon/32x32/triangle.png - - - - 32 - 32 - - - - true - - - - - - - false - - - Point from X and Y of two other points - - - ... - - - - :/toolicon/32x32/point_of_intersection.png:/toolicon/32x32/point_of_intersection.png - - - - 32 - 32 - - - - true - - - - - - - false - - - Perpendicular point along line - - - ... - - - - :/toolicon/32x32/height.png:/toolicon/32x32/height.png - - - - 32 - 32 - - - - true - - - - - - - false - - - Point intersect line and axis - - - ... - - - - :/toolicon/32x32/line_intersect_axis.png:/toolicon/32x32/line_intersect_axis.png - - - - 32 - 32 - - - - true - - - + @@ -342,7 +105,7 @@ - + false @@ -368,7 +131,215 @@ - + + + + false + + + Point at distance along line + + + ... + + + + :/toolicon/32x32/along_line.png:/toolicon/32x32/along_line.png + + + + 32 + 32 + + + + true + + + + + + + false + + + Point along perpendicular + + + ... + + + + :/toolicon/32x32/normal.png:/toolicon/32x32/normal.png + + + + 32 + 32 + + + + true + + + + + + + false + + + Point along bisector + + + ... + + + + :/toolicon/32x32/bisector.png:/toolicon/32x32/bisector.png + + + + 32 + 32 + + + + true + + + + + + + false + + + Special point on shoulder + + + ... + + + + :/toolicon/32x32/shoulder.png:/toolicon/32x32/shoulder.png + + + + 32 + 32 + + + + true + + + + + + + false + + + Triangle tool + + + ... + + + + :/toolicon/32x32/triangle.png:/toolicon/32x32/triangle.png + + + + 32 + 32 + + + + true + + + + + + + false + + + Point from X and Y of two other points + + + ... + + + + :/toolicon/32x32/point_of_intersection.png:/toolicon/32x32/point_of_intersection.png + + + + 32 + 32 + + + + true + + + + + + + false + + + Perpendicular point along line + + + ... + + + + :/toolicon/32x32/height.png:/toolicon/32x32/height.png + + + + 32 + 32 + + + + true + + + + + + + false + + + Point intersect line and axis + + + ... + + + + :/toolicon/32x32/line_intersect_axis.png:/toolicon/32x32/line_intersect_axis.png + + + + 32 + 32 + + + + true + + + + false @@ -773,7 +744,7 @@ 0 0 140 - 243 + 282 @@ -796,7 +767,33 @@ Arc - + + + + false + + + Tool pointer + + + ... + + + + :/icon/32x32/arrow_cursor.png:/icon/32x32/arrow_cursor.png + + + + 32 + 32 + + + + true + + + + false @@ -822,7 +819,7 @@ - + false @@ -848,7 +845,7 @@ - + false @@ -874,7 +871,7 @@ - + false @@ -900,7 +897,7 @@ - + false @@ -926,7 +923,7 @@ - + false @@ -952,7 +949,7 @@ - + false @@ -978,7 +975,7 @@ - + false @@ -1004,20 +1001,20 @@ - - + + false - Tool pointer + Point from tangent circle and segment ... - - :/icon/32x32/arrow_cursor.png:/icon/32x32/arrow_cursor.png + + :/toolicon/32x32/point_of_contact.png:/toolicon/32x32/point_of_contact.png @@ -1121,7 +1118,7 @@ 0 0 140 - 324 + 333 @@ -1561,7 +1558,7 @@ 0 0 140 - 324 + 333 @@ -1634,7 +1631,7 @@ - + false diff --git a/src/app/valentina/share/resources/cursor/pointcontact_cursor.png b/src/app/valentina/share/resources/cursor/pointcontact_cursor.png index 7655a045fbfff8227892970a992183e47b4a8d5e..78ff4b5aaac0ca0464dcc90367d2778c0f989ae9 100644 GIT binary patch delta 672 zcmV;R0$=^b1h)l{BYyw{b3#c}2nYxWdPyYX$@4opT)A1I2DhUWNQb|OJXbQ2fl7NaK z;(&@EGQR=Jj>rWlD3HO0A)eU1t>Y95I{*069ocFhA0M55=60pe~uWR2jH&} z!Ebh=Km0V<4 zM#Efy6dp}Ae>G=w2t_iM#8V00S7&Q|`IVe7DlvURaX>V+9YG&<%U=G%BIS+1>UioQ zN0zes0fVtFjS`;aDv_QV=L&9$b{4gAp^bxXOS)-g-pM_x^gC}T_v`)~M~i6=JJ_;@ zu#vBcq<<@p8|-MT-5zN<6KUQ%V{)Gp`fQD-7R2^97TX-^d6D7rI8VY+6S^dug2la9 z_f7ag(kW-vY4TD^mqW(m>w`RX|0>ejHYA0YhKvlidb(7gLu3+nac4c>R??8+Vo3lw zB0z)e_her!hnG{cmd#aV0>CFcM(-BVb)>84E*WG0-0=gspB^mDAhLu20000E^SD)^*$~Ei=;^| z>E#wb<2~QId+|Kq?*sqyHznY7l7J8>Cy59FRS|-jv_V# zbPTax2hb5jBS7qkW&p7w)|v#whKK@)1rZgn<%nM`0Jap-DnLNl;?^C|j-&vBOqk~5 zqJv($r~ooi0YBRVAV`(dJbr4>CxfP3^rVOP#|Pk20J|CiRyX-@7_mW1pp=Vx9dtj> zP$>tYkM*h*z<)aM1Mus;XwWkkU8}Vgz~w%y`5e#ZZPXtHunNop`x?m&x^B>DosyJ6 z7Yv%Qk=G2M3`_z$n`s_{@&nOOcF+TZrn*s2+t=qg*yh8_BX9#4wmAHz$h`&OYnf9^Hs6O0 zI`5(@28|gs=b-T{+D%-k5cCTF!z5S792O=VKF_3ivDU@SC5vEWKV0BsFhN00000NkvXXu0mjfnWg)p diff --git a/src/app/valentina/share/resources/cursor/pointcontact_cursor@2x.png b/src/app/valentina/share/resources/cursor/pointcontact_cursor@2x.png index a77475755e1106b1026d6effdafa017ebdea70d6..8da68d05270ef68a6bb732663aa923e507cb3c50 100644 GIT binary patch delta 1496 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 diff --git a/src/app/valentina/share/resources/toolicon/32x32/point_of_contact.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_contact.png index d6943bfdacd55924371b87a1c7d921b0b9e1745a..4bda4d0d350911a0234d380ee94448834ab81dd1 100644 GIT binary patch literal 1042 zcmV+t1nv8YP)Kpwfp*#wB^KWZ z#>8mU#JKRWa-lISG%?XGFeWCh4G}a(!lDs`&a{eXDv<=6NQlO$X^e<~R>1Nug|>5C zP(a%0v{Milev`Ag=luTv-~HeJJ?CEjW1@l;X>-Lqf;z!WL8+JyD=YnQHBMnzn zQ1T}ABAaBT(Ijq<;3UR_ElQpCtBiFbZ&;zDp!hinB56-+?Kj(^IPdyqvow28#v#p? zU0U)6F&XPM`_>jy3(~fDpx?xEqc@PTO2$r&lB3dZcB_m|88;U$Zc;DpPiZqpmHdK< ziqQ!(w##__l9HdJQCwP8uBli~!6q}%t;?FrVj$^8kuNkFb6Mhzij41N+&}Pg?h3S6 zq)|z}cng_W%R9CFP|Nx{t{uk0ry}(uGmy1aQhB~;#k|$WGo8%q<q-#h) zFb;$Hr+`bT3t18stA@+bb>i?{%GTvYkcMx+eTtwL_}W226yTnG`E=9 zHSDUPtA;~$JaK-qS!&b=(K*tpWE|C!d!L8}UhAWB4<*Mb>*d|?%mrC5DfOX-AsCk=DkUVH=E7A{lES8+kJn2bkxe} zw$8QyFkKuG9)thx_;ca1(L3b6DF7huL`TN1FdB^->jDKZ&}88lQIO1BVz6O%z0+El>|A!g99JHi+x4Bmod3Nbm2Mq=JV$OP#9X#s(> zMAxF4T$RPko%}Jun#@)0%$8CHMfKVEpbD@fd^xpbST75(1k8Fb6Lr z0M9hLEe|$$0eI6ybLnm1tz`kQVJiufsE~lA9O&u>2?Zj9$pT$Xqv=`T0$}9cL*1~Dk5z#w_p3J$C&wiPpewWTDD4ChoJYFegcOIN=If)5Cx+`jSQoLWNN2dC;151h4VK>!;slA8E@@#P0Qt=gCF{}y+0T^znVcG0ZtYilBJu|TQn>uSp>SsbsbI=@4a5IJLa z=jNKM1(NPd$l@{2|+w$=7aLY+is`_biZ-}Pj zHFx&xw7}-|ePIWwr$5Sdbv^3U-FMxkHg-)xSxIFddZfpZ#mnQYdbe-Ur-7k97>KfM8>hQ5Pv0})lFI##_kv+bBiGNFZ9Pi7JltcCZ7*4DA z{HaJyOVG;*qABXL#@5J;xNXn*ZuONT7lQK6Pk8O{byH}lHHQC^qzhi0DRr`O%&4#3 z7vD-Y2B+tzj`NPMcfViyeZ=JhzA}xjB6m#AkroyAsb9?#RsVYGd2d~u;QiXaWuuw5 zp2!9d3wug$Wo@i+^Y(1@m3I_Mw%m=|QM7XZo*cgD*nwB0F5H{%X^76vdhY9y00mbg z@gr^&-6^=3C+FB`&Q*qNGj4JacCydLxJZ?u$v=(FJh%BCPdU`09u=14UF}c29#xz) gyzVfII@_+?nyJj%?NlY+X}a#>6;a`}VJW%)1F29Jk^lez diff --git a/src/app/valentina/share/resources/toolicon/32x32/point_of_contact@2x.png b/src/app/valentina/share/resources/toolicon/32x32/point_of_contact@2x.png index eeb04c441a7f52e2e134fd5cdd3fbcd0ad3223da..22741df38a2b511698092ca3a32f58b52cd7f916 100644 GIT binary patch delta 2284 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 diff --git a/src/app/valentina/share/resources/toolicon/svg/point_of_contact.svg b/src/app/valentina/share/resources/toolicon/svg/point_of_contact.svg index 2bc59916a..9ec3e5a43 100644 --- a/src/app/valentina/share/resources/toolicon/svg/point_of_contact.svg +++ b/src/app/valentina/share/resources/toolicon/svg/point_of_contact.svg @@ -13,11 +13,11 @@ width="32" height="32" id="svg2985" - inkscape:version="0.48.4 r9939" + inkscape:version="0.92.2 (unknown)" sodipodi:docname="point_of_contact.svg" - inkscape:export-filename="/home/dismine/CAD/Valentina/src/app/share/resources/icon/32x32/point_of_contact.png" - inkscape:export-xdpi="92" - inkscape:export-ydpi="92"> + inkscape:export-filename="/home/dismine/CAD/Valentina_l/valentina/src/app/valentina/share/resources/toolicon/32x32/point_of_contact@2x.png" + inkscape:export-xdpi="192" + inkscape:export-ydpi="192"> @@ -48,7 +48,7 @@ image/svg+xml - + @@ -57,6 +57,18 @@ style="fill:#000000;fill-opacity:1;stroke:#370000;stroke-width:1.56700003;stroke-linejoin:round;stroke-miterlimit:4.9000001;stroke-opacity:0.93950177;stroke-dasharray:none;stroke-dashoffset:0" id="path2985-2" d="m 31.028791,26.922787 a 1.7373301,1.7294948 0 0 1 -3.47466,0 1.7373301,1.7294948 0 1 1 3.47466,0 z" /> + - + d="m 18.31,12.592131 a 1.7373301,1.7294948 0 0 1 -3.47466,0 1.7373301,1.7294948 0 1 1 3.47466,0 z" /> diff --git a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp index 843cedccb..810a7f56a 100644 --- a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp @@ -47,7 +47,7 @@ VisToolPointFromCircleAndTangent::VisToolPointFromCircleAndTangent(const VContai : VisLine(data, parent), object2Id(NULL_ID), cRadius(0), crossPoint(CrossCirclesPoint::FirstPoint), point(nullptr), tangent(nullptr), cCenter(nullptr), cPath(nullptr), tangent2(nullptr) { - cPath = InitItem(Qt::darkGreen, this); + cPath = InitItem(Qt::darkGreen, this); point = InitPoint(mainColor, this); tangent = InitPoint(supportColor, this); cCenter = InitPoint(supportColor, this); //-V656 diff --git a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h index 4ac21df4d..67af271f2 100644 --- a/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h +++ b/src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h @@ -58,14 +58,14 @@ public: enum { Type = UserType + static_cast(Vis::ToolPointFromCircleAndTangent)}; private: Q_DISABLE_COPY(VisToolPointFromCircleAndTangent) - quint32 object2Id; - qreal cRadius; - CrossCirclesPoint crossPoint; - VScaledEllipse *point; - VScaledEllipse *tangent; - VScaledEllipse *cCenter; - VScaledEllipse *cPath; - VScaledLine *tangent2; + quint32 object2Id; + qreal cRadius; + CrossCirclesPoint crossPoint; + VScaledEllipse *point; + VScaledEllipse *tangent; + VScaledEllipse *cCenter; + QGraphicsEllipseItem *cPath; + VScaledLine *tangent2; void FindRays(const QPointF &p, const QPointF ¢er, qreal radius); }; diff --git a/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp b/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp index 843024a00..2d7e49666 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofcontact.cpp @@ -50,7 +50,7 @@ VisToolPointOfContact::VisToolPointOfContact(const VContainer *data, QGraphicsIt arc_point = InitPoint(supportColor, this); lineP1 = InitPoint(supportColor, this); lineP2 = InitPoint(supportColor, this); - circle = InitItem(supportColor, this); + circle = InitItem(supportColor, this); point = InitPoint(mainColor, this); } diff --git a/src/libs/vtools/visualization/line/vistoolpointofcontact.h b/src/libs/vtools/visualization/line/vistoolpointofcontact.h index 264c6e2a1..67a587b44 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofcontact.h +++ b/src/libs/vtools/visualization/line/vistoolpointofcontact.h @@ -54,14 +54,14 @@ public: enum { Type = UserType + static_cast(Vis::ToolPointOfContact)}; private: Q_DISABLE_COPY(VisToolPointOfContact) - quint32 lineP2Id; - quint32 radiusId; - VScaledEllipse *point; - VScaledEllipse *lineP1; - VScaledEllipse *lineP2; - VScaledEllipse *arc_point; - VScaledEllipse *circle; - qreal radius; + quint32 lineP2Id; + quint32 radiusId; + VScaledEllipse *point; + VScaledEllipse *lineP1; + VScaledEllipse *lineP2; + VScaledEllipse *arc_point; + QGraphicsEllipseItem *circle; + qreal radius; }; diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp index 09a80a67b..526469859 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp @@ -52,8 +52,8 @@ VisToolPointOfIntersectionCircles::VisToolPointOfIntersectionCircles(const VCont { this->setPen(QPen(Qt::NoPen)); // don't use parent this time - c1Path = InitItem(Qt::darkGreen, this); - c2Path = InitItem(Qt::darkRed, this); + c1Path = InitItem(Qt::darkGreen, this); + c2Path = InitItem(Qt::darkRed, this); point = InitPoint(mainColor, this); c1Center = InitPoint(supportColor, this); c2Center = InitPoint(supportColor, this); //-V656 diff --git a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h index 44415e53d..94d95a28d 100644 --- a/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h +++ b/src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h @@ -59,15 +59,15 @@ public: enum { Type = UserType + static_cast(Vis::ToolPointOfIntersectionCircles)}; private: Q_DISABLE_COPY(VisToolPointOfIntersectionCircles) - quint32 object2Id; - qreal c1Radius; - qreal c2Radius; - CrossCirclesPoint crossPoint; - VScaledEllipse *point; - VScaledEllipse *c1Center; - VScaledEllipse *c2Center; - VScaledEllipse *c1Path; - VScaledEllipse *c2Path; + quint32 object2Id; + qreal c1Radius; + qreal c2Radius; + CrossCirclesPoint crossPoint; + VScaledEllipse *point; + VScaledEllipse *c1Center; + VScaledEllipse *c2Center; + QGraphicsEllipseItem *c1Path; + QGraphicsEllipseItem *c2Path; }; #endif // VISTOOLPOINTOFINTERSECTIONCIRCLES_H diff --git a/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp index 5cc0f4490..b546f360c 100644 --- a/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp +++ b/src/libs/vtools/visualization/path/vistoolarcwithlength.cpp @@ -40,6 +40,7 @@ #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" #include "../visualization.h" +#include "../vwidgets/scalesceneitems.h" #include "vispath.h" //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/visualization/path/vistoolellipticalarc.cpp b/src/libs/vtools/visualization/path/vistoolellipticalarc.cpp index bc76b22ef..7cdf35d77 100644 --- a/src/libs/vtools/visualization/path/vistoolellipticalarc.cpp +++ b/src/libs/vtools/visualization/path/vistoolellipticalarc.cpp @@ -38,6 +38,7 @@ #include "../vgeometry/vpointf.h" #include "../vpatterndb/vcontainer.h" #include "../visualization.h" +#include "../vwidgets/scalesceneitems.h" #include "vispath.h" VisToolEllipticalArc::VisToolEllipticalArc(const VContainer *data, QGraphicsItem *parent) diff --git a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp index 61025b82d..cd2d6afe2 100644 --- a/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp +++ b/src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp @@ -41,6 +41,7 @@ #include "../vmisc/vabstractapplication.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vmaingraphicsscene.h" +#include "../vwidgets/scalesceneitems.h" #include "../visualization.h" #include "visualization/path/vispath.h" diff --git a/src/libs/vtools/visualization/path/vistoolspline.cpp b/src/libs/vtools/visualization/path/vistoolspline.cpp index ab3c84804..8dee321d9 100644 --- a/src/libs/vtools/visualization/path/vistoolspline.cpp +++ b/src/libs/vtools/visualization/path/vistoolspline.cpp @@ -41,6 +41,7 @@ #include "../vgeometry/vspline.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vcontrolpointspline.h" +#include "../vwidgets/scalesceneitems.h" #include "../visualization.h" #include "vispath.h" diff --git a/src/libs/vtools/visualization/path/vistoolsplinepath.cpp b/src/libs/vtools/visualization/path/vistoolsplinepath.cpp index 8cb595997..4cc311a92 100644 --- a/src/libs/vtools/visualization/path/vistoolsplinepath.cpp +++ b/src/libs/vtools/visualization/path/vistoolsplinepath.cpp @@ -42,6 +42,7 @@ #include "../vgeometry/vsplinepoint.h" #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vcontrolpointspline.h" +#include "../vwidgets/scalesceneitems.h" #include "../visualization.h" #include "vispath.h" diff --git a/src/libs/vtools/visualization/visualization.cpp b/src/libs/vtools/visualization/visualization.cpp index 1fcfc6ce1..020f2c7fa 100644 --- a/src/libs/vtools/visualization/visualization.cpp +++ b/src/libs/vtools/visualization/visualization.cpp @@ -192,7 +192,7 @@ qreal Visualization::FindValFromUser(const QString &expression, } //--------------------------------------------------------------------------------------------------------------------- -void Visualization::DrawPoint(VScaledEllipse *point, const QPointF &pos, const QColor &color, Qt::PenStyle style) +void Visualization::DrawPoint(QGraphicsEllipseItem *point, const QPointF &pos, const QColor &color, Qt::PenStyle style) { SCASSERT (point != nullptr) diff --git a/src/libs/vtools/visualization/visualization.h b/src/libs/vtools/visualization/visualization.h index 5878bd9aa..cde9e529c 100644 --- a/src/libs/vtools/visualization/visualization.h +++ b/src/libs/vtools/visualization/visualization.h @@ -94,7 +94,7 @@ protected: virtual void AddOnScene()=0; VScaledEllipse *InitPoint(const QColor &color, QGraphicsItem *parent, qreal z = 0) const; - void DrawPoint(VScaledEllipse *point, const QPointF &pos, const QColor &color, + void DrawPoint(QGraphicsEllipseItem *point, const QPointF &pos, const QColor &color, Qt::PenStyle style = Qt::SolidLine); virtual void DrawLine(VScaledLine *lineItem, const QLineF &line, const QColor &color, Qt::PenStyle style = Qt::SolidLine);