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 7655a045f..78ff4b5aa 100644 Binary files a/src/app/valentina/share/resources/cursor/pointcontact_cursor.png and b/src/app/valentina/share/resources/cursor/pointcontact_cursor.png differ 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 a77475755..8da68d052 100644 Binary files a/src/app/valentina/share/resources/cursor/pointcontact_cursor@2x.png and b/src/app/valentina/share/resources/cursor/pointcontact_cursor@2x.png differ 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 d6943bfda..4bda4d0d3 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/point_of_contact.png and b/src/app/valentina/share/resources/toolicon/32x32/point_of_contact.png differ 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 eeb04c441..22741df38 100644 Binary files a/src/app/valentina/share/resources/toolicon/32x32/point_of_contact@2x.png and b/src/app/valentina/share/resources/toolicon/32x32/point_of_contact@2x.png differ 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);