aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolved issue #771. Improve tool Point at intersection of arc and line.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-10-25 11:27:43 +03:00
parent ce0fb4cdd5
commit 19fb13affe
19 changed files with 323 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

523
src/app/valentina/mainwindow.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1100</width> <width>1100</width>
<height>700</height> <height>709</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -21,8 +21,8 @@
<locale language="Saho" country="Eritrea"/> <locale language="Saho" country="Eritrea"/>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget">
<layout class="QGridLayout" name="gridLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item row="0" column="0"> <item>
<widget class="QToolBox" name="toolBox"> <widget class="QToolBox" name="toolBox">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -48,15 +48,15 @@
<string>Export details skiping the Layout stage</string> <string>Export details skiping the Layout stage</string>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>6</number> <number>7</number>
</property> </property>
<widget class="QWidget" name="page"> <widget class="QWidget" name="page">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>126</width> <width>140</width>
<height>351</height> <height>282</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -78,244 +78,7 @@
<attribute name="toolTip"> <attribute name="toolTip">
<string>Point</string> <string>Point</string>
</attribute> </attribute>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout_8">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="2" column="1">
<widget class="QToolButton" name="toolButtonAlongLine">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point at distance along line</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/along_line.png</normaloff>:/toolicon/32x32/along_line.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QToolButton" name="toolButtonNormal">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point along perpendicular</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/normal.png</normaloff>:/toolicon/32x32/normal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QToolButton" name="toolButtonBisector">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point along bisector</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/bisector.png</normaloff>:/toolicon/32x32/bisector.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QToolButton" name="toolButtonShoulderPoint">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Special point on shoulder</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/shoulder.png</normaloff>:/toolicon/32x32/shoulder.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QToolButton" name="toolButtonPointOfContact">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point at intersection of arc and line</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/point_of_contact.png</normaloff>:/toolicon/32x32/point_of_contact.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QToolButton" name="toolButtonTriangle">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Triangle tool</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/triangle.png</normaloff>:/toolicon/32x32/triangle.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QToolButton" name="toolButtonPointOfIntersection">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point from X and Y of two other points</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/point_of_intersection.png</normaloff>:/toolicon/32x32/point_of_intersection.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="9" column="0">
<widget class="QToolButton" name="toolButtonHeight">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Perpendicular point along line</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/height.png</normaloff>:/toolicon/32x32/height.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QToolButton" name="toolButtonLineIntersectAxis">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point intersect line and axis</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/line_intersect_axis.png</normaloff>:/toolicon/32x32/line_intersect_axis.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QToolButton" name="toolButtonPointerPoint"> <widget class="QToolButton" name="toolButtonPointerPoint">
<property name="enabled"> <property name="enabled">
@ -342,7 +105,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<widget class="QToolButton" name="toolButtonEndLine"> <widget class="QToolButton" name="toolButtonEndLine">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -368,7 +131,215 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0"> <item row="1" column="1">
<widget class="QToolButton" name="toolButtonAlongLine">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point at distance along line</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/along_line.png</normaloff>:/toolicon/32x32/along_line.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QToolButton" name="toolButtonNormal">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point along perpendicular</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/normal.png</normaloff>:/toolicon/32x32/normal.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QToolButton" name="toolButtonBisector">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point along bisector</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/bisector.png</normaloff>:/toolicon/32x32/bisector.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QToolButton" name="toolButtonShoulderPoint">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Special point on shoulder</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/shoulder.png</normaloff>:/toolicon/32x32/shoulder.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QToolButton" name="toolButtonTriangle">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Triangle tool</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/triangle.png</normaloff>:/toolicon/32x32/triangle.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QToolButton" name="toolButtonPointOfIntersection">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point from X and Y of two other points</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/point_of_intersection.png</normaloff>:/toolicon/32x32/point_of_intersection.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QToolButton" name="toolButtonHeight">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Perpendicular point along line</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/height.png</normaloff>:/toolicon/32x32/height.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QToolButton" name="toolButtonLineIntersectAxis">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Point intersect line and axis</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="share/resources/toolicon.qrc">
<normaloff>:/toolicon/32x32/line_intersect_axis.png</normaloff>:/toolicon/32x32/line_intersect_axis.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QToolButton" name="toolButtonMidpoint"> <widget class="QToolButton" name="toolButtonMidpoint">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -773,7 +744,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>140</width> <width>140</width>
<height>243</height> <height>282</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -796,7 +767,33 @@
<string>Arc</string> <string>Arc</string>
</attribute> </attribute>
<layout class="QFormLayout" name="formLayout_4"> <layout class="QFormLayout" name="formLayout_4">
<item row="2" column="0"> <item row="0" column="0">
<widget class="QToolButton" name="toolButtonPointerArc">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Tool pointer</string>
</property>
<property name="text">
<string notr="true">...</string>
</property>
<property name="icon">
<iconset resource="../../libs/vmisc/share/resources/icon.qrc">
<normaloff>:/icon/32x32/arrow_cursor.png</normaloff>:/icon/32x32/arrow_cursor.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QToolButton" name="toolButtonArc"> <widget class="QToolButton" name="toolButtonArc">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -822,7 +819,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="1">
<widget class="QToolButton" name="toolButtonArcCutPoint"> <widget class="QToolButton" name="toolButtonArcCutPoint">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -848,7 +845,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<widget class="QToolButton" name="toolButtonArcIntersectAxis"> <widget class="QToolButton" name="toolButtonArcIntersectAxis">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -874,7 +871,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="1">
<widget class="QToolButton" name="toolButtonPointOfIntersectionArcs"> <widget class="QToolButton" name="toolButtonPointOfIntersectionArcs">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -900,7 +897,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="3" column="0">
<widget class="QToolButton" name="toolButtonPointOfIntersectionCircles"> <widget class="QToolButton" name="toolButtonPointOfIntersectionCircles">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -926,7 +923,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="3" column="1">
<widget class="QToolButton" name="toolButtonPointFromCircleAndTangent"> <widget class="QToolButton" name="toolButtonPointFromCircleAndTangent">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -952,7 +949,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="4" column="0">
<widget class="QToolButton" name="toolButtonPointFromArcAndTangent"> <widget class="QToolButton" name="toolButtonPointFromArcAndTangent">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -978,7 +975,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="4" column="1">
<widget class="QToolButton" name="toolButtonArcWithLength"> <widget class="QToolButton" name="toolButtonArcWithLength">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -1004,20 +1001,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0"> <item row="5" column="0">
<widget class="QToolButton" name="toolButtonPointerArc"> <widget class="QToolButton" name="toolButtonPointOfContact">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Tool pointer</string> <string>Point from tangent circle and segment</string>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">...</string> <string notr="true">...</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../../libs/vmisc/share/resources/icon.qrc"> <iconset resource="share/resources/toolicon.qrc">
<normaloff>:/icon/32x32/arrow_cursor.png</normaloff>:/icon/32x32/arrow_cursor.png</iconset> <normaloff>:/toolicon/32x32/point_of_contact.png</normaloff>:/toolicon/32x32/point_of_contact.png</iconset>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
@ -1121,7 +1118,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>140</width> <width>140</width>
<height>324</height> <height>333</height>
</rect> </rect>
</property> </property>
<attribute name="icon"> <attribute name="icon">
@ -1561,7 +1558,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>140</width> <width>140</width>
<height>324</height> <height>333</height>
</rect> </rect>
</property> </property>
<attribute name="icon"> <attribute name="icon">
@ -1634,7 +1631,7 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item>
<widget class="VMainGraphicsView" name="view"> <widget class="VMainGraphicsView" name="view">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>

BIN
src/app/valentina/share/resources/cursor/pointcontact_cursor.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 581 B

After

Width:  |  Height:  |  Size: 695 B

BIN
src/app/valentina/share/resources/cursor/pointcontact_cursor@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/app/valentina/share/resources/toolicon/32x32/point_of_contact.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
src/app/valentina/share/resources/toolicon/32x32/point_of_contact@2x.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

54
src/app/valentina/share/resources/toolicon/svg/point_of_contact.svg
View File

@ -13,11 +13,11 @@
width="32" width="32"
height="32" height="32"
id="svg2985" id="svg2985"
inkscape:version="0.48.4 r9939" inkscape:version="0.92.2 (unknown)"
sodipodi:docname="point_of_contact.svg" 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-filename="/home/dismine/CAD/Valentina_l/valentina/src/app/valentina/share/resources/toolicon/32x32/point_of_contact@2x.png"
inkscape:export-xdpi="92" inkscape:export-xdpi="192"
inkscape:export-ydpi="92"> inkscape:export-ydpi="192">
<sodipodi:namedview <sodipodi:namedview
pagecolor="#ffffff" pagecolor="#ffffff"
bordercolor="#666666" bordercolor="#666666"
@ -27,16 +27,16 @@
guidetolerance="10" guidetolerance="10"
inkscape:pageopacity="0" inkscape:pageopacity="0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:window-width="1301" inkscape:window-width="1855"
inkscape:window-height="852" inkscape:window-height="1056"
id="namedview12" id="namedview12"
showgrid="false" showgrid="false"
inkscape:zoom="0.98901497" inkscape:zoom="7.9121197"
inkscape:cx="-271.46872" inkscape:cx="-46.542135"
inkscape:cy="-114.65974" inkscape:cy="-6.793811"
inkscape:window-x="75" inkscape:window-x="65"
inkscape:window-y="34" inkscape:window-y="24"
inkscape:window-maximized="0" inkscape:window-maximized="1"
inkscape:current-layer="svg2985" /> inkscape:current-layer="svg2985" />
<defs <defs
id="defs2987" /> id="defs2987" />
@ -48,7 +48,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@ -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" 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" 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 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" />
<path
sodipodi:type="arc"
style="fill:none;stroke:#00b400;stroke-width:1.05548632;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:6.33291754, 2.11097251;stroke-dashoffset:0;stroke-opacity:1"
id="path2991"
sodipodi:cx="16.367296"
sodipodi:cy="12.59937"
sodipodi:rx="10.853663"
sodipodi:ry="10.940184"
d="M 12.330901,22.754878 A 10.853663,10.940184 0 0 1 6.2885708,8.5396962 10.853663,10.940184 0 0 1 20.386033,2.4367493 10.853663,10.940184 0 0 1 26.453063,16.641238 10.853663,10.940184 0 0 1 12.36623,22.769072"
sodipodi:start="1.9518432"
sodipodi:end="1.9483391"
sodipodi:open="true" />
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
style="fill:none;stroke:#000000;stroke-width:2.01399994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" style="fill:none;stroke:#000000;stroke-width:2.01399994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
@ -67,18 +79,6 @@
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" 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-9" id="path2985-2-9"
d="m 4.4164272,20.301891 a 1.7373301,1.7294948 0 0 1 -3.47466002,0 1.7373301,1.7294948 0 1 1 3.47466002,0 z" /> d="m 4.4164272,20.301891 a 1.7373301,1.7294948 0 0 1 -3.47466002,0 1.7373301,1.7294948 0 1 1 3.47466002,0 z" />
<path
sodipodi:type="arc"
style="fill:none;stroke:#0700ff;stroke-width:2.01399994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:5.03499999"
id="path2995"
sodipodi:cx="41.694916"
sodipodi:cy="9.0847454"
sodipodi:rx="15.839976"
sodipodi:ry="16.511644"
d="M 27.984434,17.353807 A 15.839976,16.511644 0 0 1 51.053641,-4.2367903 L 41.694916,9.0847454 z"
sodipodi:start="2.6170678"
sodipodi:end="5.3444756"
transform="matrix(-0.25880394,-0.96592988,0.96592988,-0.25880394,21.443611,50.610156)" />
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
style="fill:#ff0034;fill-opacity:1;stroke:#ff0034;stroke-width:1.56700003;stroke-linejoin:round;stroke-miterlimit:4.9000001;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" style="fill:#ff0034;fill-opacity:1;stroke:#ff0034;stroke-width:1.56700003;stroke-linejoin:round;stroke-miterlimit:4.9000001;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
@ -86,7 +86,7 @@
d="m 15.058467,22.645282 a 1.7373301,1.7294948 0 0 1 -3.47466,0 1.7373301,1.7294948 0 1 1 3.47466,0 z" /> d="m 15.058467,22.645282 a 1.7373301,1.7294948 0 0 1 -3.47466,0 1.7373301,1.7294948 0 1 1 3.47466,0 z" />
<path <path
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
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" style="fill:#000000;fill-opacity:1;stroke:#370000;stroke-width:1.56700003;stroke-linejoin:round;stroke-miterlimit:4.9000001;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.93950177"
id="path2985-2-2" id="path2985-2-2"
d="m 20.964155,8.0421479 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" />
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

2
src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.cpp
View File

@ -47,7 +47,7 @@ VisToolPointFromCircleAndTangent::VisToolPointFromCircleAndTangent(const VContai
: VisLine(data, parent), object2Id(NULL_ID), cRadius(0), crossPoint(CrossCirclesPoint::FirstPoint), : VisLine(data, parent), object2Id(NULL_ID), cRadius(0), crossPoint(CrossCirclesPoint::FirstPoint),
point(nullptr), tangent(nullptr), cCenter(nullptr), cPath(nullptr), tangent2(nullptr) point(nullptr), tangent(nullptr), cCenter(nullptr), cPath(nullptr), tangent2(nullptr)
{ {
cPath = InitItem<VScaledEllipse>(Qt::darkGreen, this); cPath = InitItem<QGraphicsEllipseItem>(Qt::darkGreen, this);
point = InitPoint(mainColor, this); point = InitPoint(mainColor, this);
tangent = InitPoint(supportColor, this); tangent = InitPoint(supportColor, this);
cCenter = InitPoint(supportColor, this); //-V656 cCenter = InitPoint(supportColor, this); //-V656

16
src/libs/vtools/visualization/line/vistoolpointfromcircleandtangent.h
View File

@ -58,14 +58,14 @@ public:
enum { Type = UserType + static_cast<int>(Vis::ToolPointFromCircleAndTangent)}; enum { Type = UserType + static_cast<int>(Vis::ToolPointFromCircleAndTangent)};
private: private:
Q_DISABLE_COPY(VisToolPointFromCircleAndTangent) Q_DISABLE_COPY(VisToolPointFromCircleAndTangent)
quint32 object2Id; quint32 object2Id;
qreal cRadius; qreal cRadius;
CrossCirclesPoint crossPoint; CrossCirclesPoint crossPoint;
VScaledEllipse *point; VScaledEllipse *point;
VScaledEllipse *tangent; VScaledEllipse *tangent;
VScaledEllipse *cCenter; VScaledEllipse *cCenter;
VScaledEllipse *cPath; QGraphicsEllipseItem *cPath;
VScaledLine *tangent2; VScaledLine *tangent2;
void FindRays(const QPointF &p, const QPointF &center, qreal radius); void FindRays(const QPointF &p, const QPointF &center, qreal radius);
}; };

2
src/libs/vtools/visualization/line/vistoolpointofcontact.cpp
View File

@ -50,7 +50,7 @@ VisToolPointOfContact::VisToolPointOfContact(const VContainer *data, QGraphicsIt
arc_point = InitPoint(supportColor, this); arc_point = InitPoint(supportColor, this);
lineP1 = InitPoint(supportColor, this); lineP1 = InitPoint(supportColor, this);
lineP2 = InitPoint(supportColor, this); lineP2 = InitPoint(supportColor, this);
circle = InitItem<VScaledEllipse>(supportColor, this); circle = InitItem<QGraphicsEllipseItem>(supportColor, this);
point = InitPoint(mainColor, this); point = InitPoint(mainColor, this);
} }

16
src/libs/vtools/visualization/line/vistoolpointofcontact.h
View File

@ -54,14 +54,14 @@ public:
enum { Type = UserType + static_cast<int>(Vis::ToolPointOfContact)}; enum { Type = UserType + static_cast<int>(Vis::ToolPointOfContact)};
private: private:
Q_DISABLE_COPY(VisToolPointOfContact) Q_DISABLE_COPY(VisToolPointOfContact)
quint32 lineP2Id; quint32 lineP2Id;
quint32 radiusId; quint32 radiusId;
VScaledEllipse *point; VScaledEllipse *point;
VScaledEllipse *lineP1; VScaledEllipse *lineP1;
VScaledEllipse *lineP2; VScaledEllipse *lineP2;
VScaledEllipse *arc_point; VScaledEllipse *arc_point;
VScaledEllipse *circle; QGraphicsEllipseItem *circle;
qreal radius; qreal radius;
}; };

4
src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp
View File

@ -52,8 +52,8 @@ VisToolPointOfIntersectionCircles::VisToolPointOfIntersectionCircles(const VCont
{ {
this->setPen(QPen(Qt::NoPen)); // don't use parent this time this->setPen(QPen(Qt::NoPen)); // don't use parent this time
c1Path = InitItem<VScaledEllipse>(Qt::darkGreen, this); c1Path = InitItem<QGraphicsEllipseItem>(Qt::darkGreen, this);
c2Path = InitItem<VScaledEllipse>(Qt::darkRed, this); c2Path = InitItem<QGraphicsEllipseItem>(Qt::darkRed, this);
point = InitPoint(mainColor, this); point = InitPoint(mainColor, this);
c1Center = InitPoint(supportColor, this); c1Center = InitPoint(supportColor, this);
c2Center = InitPoint(supportColor, this); //-V656 c2Center = InitPoint(supportColor, this); //-V656

18
src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h
View File

@ -59,15 +59,15 @@ public:
enum { Type = UserType + static_cast<int>(Vis::ToolPointOfIntersectionCircles)}; enum { Type = UserType + static_cast<int>(Vis::ToolPointOfIntersectionCircles)};
private: private:
Q_DISABLE_COPY(VisToolPointOfIntersectionCircles) Q_DISABLE_COPY(VisToolPointOfIntersectionCircles)
quint32 object2Id; quint32 object2Id;
qreal c1Radius; qreal c1Radius;
qreal c2Radius; qreal c2Radius;
CrossCirclesPoint crossPoint; CrossCirclesPoint crossPoint;
VScaledEllipse *point; VScaledEllipse *point;
VScaledEllipse *c1Center; VScaledEllipse *c1Center;
VScaledEllipse *c2Center; VScaledEllipse *c2Center;
VScaledEllipse *c1Path; QGraphicsEllipseItem *c1Path;
VScaledEllipse *c2Path; QGraphicsEllipseItem *c2Path;
}; };
#endif // VISTOOLPOINTOFINTERSECTIONCIRCLES_H #endif // VISTOOLPOINTOFINTERSECTIONCIRCLES_H

1
src/libs/vtools/visualization/path/vistoolarcwithlength.cpp
View File

@ -40,6 +40,7 @@
#include "../vgeometry/vpointf.h" #include "../vgeometry/vpointf.h"
#include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vcontainer.h"
#include "../visualization.h" #include "../visualization.h"
#include "../vwidgets/scalesceneitems.h"
#include "vispath.h" #include "vispath.h"
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

1
src/libs/vtools/visualization/path/vistoolellipticalarc.cpp
View File

@ -38,6 +38,7 @@
#include "../vgeometry/vpointf.h" #include "../vgeometry/vpointf.h"
#include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vcontainer.h"
#include "../visualization.h" #include "../visualization.h"
#include "../vwidgets/scalesceneitems.h"
#include "vispath.h" #include "vispath.h"
VisToolEllipticalArc::VisToolEllipticalArc(const VContainer *data, QGraphicsItem *parent) VisToolEllipticalArc::VisToolEllipticalArc(const VContainer *data, QGraphicsItem *parent)

1
src/libs/vtools/visualization/path/vistoolpointofintersectioncurves.cpp
View File

@ -41,6 +41,7 @@
#include "../vmisc/vabstractapplication.h" #include "../vmisc/vabstractapplication.h"
#include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vcontainer.h"
#include "../vwidgets/vmaingraphicsscene.h" #include "../vwidgets/vmaingraphicsscene.h"
#include "../vwidgets/scalesceneitems.h"
#include "../visualization.h" #include "../visualization.h"
#include "visualization/path/vispath.h" #include "visualization/path/vispath.h"

1
src/libs/vtools/visualization/path/vistoolspline.cpp
View File

@ -41,6 +41,7 @@
#include "../vgeometry/vspline.h" #include "../vgeometry/vspline.h"
#include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vcontainer.h"
#include "../vwidgets/vcontrolpointspline.h" #include "../vwidgets/vcontrolpointspline.h"
#include "../vwidgets/scalesceneitems.h"
#include "../visualization.h" #include "../visualization.h"
#include "vispath.h" #include "vispath.h"

1
src/libs/vtools/visualization/path/vistoolsplinepath.cpp
View File

@ -42,6 +42,7 @@
#include "../vgeometry/vsplinepoint.h" #include "../vgeometry/vsplinepoint.h"
#include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vcontainer.h"
#include "../vwidgets/vcontrolpointspline.h" #include "../vwidgets/vcontrolpointspline.h"
#include "../vwidgets/scalesceneitems.h"
#include "../visualization.h" #include "../visualization.h"
#include "vispath.h" #include "vispath.h"

2
src/libs/vtools/visualization/visualization.cpp
View File

@ -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) SCASSERT (point != nullptr)

2
src/libs/vtools/visualization/visualization.h
View File

@ -94,7 +94,7 @@ protected:
virtual void AddOnScene()=0; virtual void AddOnScene()=0;
VScaledEllipse *InitPoint(const QColor &color, QGraphicsItem *parent, qreal z = 0) const; 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); Qt::PenStyle style = Qt::SolidLine);
virtual void DrawLine(VScaledLine *lineItem, const QLineF &line, const QColor &color, virtual void DrawLine(VScaledLine *lineItem, const QLineF &line, const QColor &color,
Qt::PenStyle style = Qt::SolidLine); Qt::PenStyle style = Qt::SolidLine);