Skip to content
Permalink
Browse files

- Add QgsMapToolRegularPolygonCenterCorner and change

QgsMapToolRegularPolygonCenterPoint
- Add QgsMapToolCircle2TangentsPoint
  • Loading branch information
lbartoletti committed Oct 3, 2017
1 parent 4c8171d commit 0204302aaa9bd121315233152bc158d8f7b78fd4
@@ -578,12 +578,14 @@
<file>themes/default/mActionRectangleExtent.svg</file>
<file>themes/default/mActionRectangle3Points.svg</file>
<file>themes/default/mActionRectangleCenter.svg</file>
<file>themes/default/mActionRegularPolygonCenterPoint.svg</file>
<file>themes/default/mActionRegularPolygonCenterCorner.svg</file>
<file>themes/default/mActionRegularPolygon2Points.svg</file>
<file>themes/default/mActionSquareCenter.svg</file>
<file>themes/default/mActionCircle3Tangents.svg</file>
<file>themes/default/mActionAddGeoPackageLayer.svg</file>
<file>icons/qgis_icon.svg</file>
<file>themes/default/mActionCircle2TangentsPoint.svg</file>
<file>themes/default/mActionRegularPolygonCenterPoint.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
@@ -0,0 +1,116 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="24"
viewBox="0 0 24 24"
width="24"
version="1.1"
id="svg4016"
sodipodi:docname="mActionCircle2TangentsPoint.svg"
inkscape:version="0.92.1 r15371">
<metadata
id="metadata4022">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4020" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1680"
inkscape:window-height="991"
id="namedview4018"
showgrid="false"
inkscape:zoom="31.083333"
inkscape:cx="-0.32745931"
inkscape:cy="16.341225"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg4016"
inkscape:measure-start="7.94638,12.8686"
inkscape:measure-end="4.08579,12.8365" />
<linearGradient
gradientUnits="userSpaceOnUse"
x1="-10"
x2="-10"
y1="15"
y2="21"
id="linearGradient3996">
<stop
offset="0"
stop-color="#555753"
id="stop3992" />
<stop
offset="1"
stop-color="#555753"
stop-opacity="0"
id="stop3994" />
</linearGradient>
<g
id="g4531">
<circle
r="7.430634"
style="fill:none;stroke:#8cbe8c;stroke-width:3.13873196;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
cy="11"
cx="10"
id="path4032" />
<g
transform="translate(33)"
id="g4004">
<rect
height="11"
rx="2.0114901"
width="11"
x="-20"
y="13"
id="rect3998"
style="fill:#c4a000" />
<path
d="m -15,14 v 2.0625 c -0.537663,0.111041 -1.024662,0.383291 -1.375,0.78125 l -1.78125,-1.03125 -0.5,0.875 1.78125,1.03125 C -16.957063,17.966182 -17,18.225145 -17,18.5 c 0,0.274855 0.04294,0.533818 0.125,0.78125 l -1.78125,1.03125 0.5,0.875 1.78125,-1.03125 c 0.352503,0.40042 0.832682,0.670182 1.375,0.78125 V 23 h 1 v -2.0625 c 0.537663,-0.111041 1.024662,-0.383291 1.375,-0.78125 l 1.78125,1.03125 0.5,-0.875 -1.78125,-1.03125 C -12.042937,19.033818 -12,18.774855 -12,18.5 c 0,-0.274855 -0.04294,-0.533818 -0.125,-0.78125 l 1.78125,-1.03125 -0.5,-0.875 -1.78125,1.03125 C -12.977503,16.44333 -13.457682,16.173568 -14,16.0625 V 14 Z m 0.5,3.5 c 0.552,0 1,0.448 1,1 0,0.552 -0.448,1 -1,1 -0.552,0 -1,-0.448 -1,-1 0,-0.552 0.448,-1 1,-1 z"
id="path4000"
inkscape:connector-curvature="0"
style="fill:#fcffff" />
<path
d="m -19,19 9,-0.0096 c 0,0 0,0 0,-2 C -10,14 -11,14 -14.5,14 c -3.5,0 -4.5,0 -4.5,3 0,2 0,2 0,2 z"
id="path4002"
inkscape:connector-curvature="0"
style="opacity:0.3;fill:#fcffff;fill-rule:evenodd" />
</g>
<path
inkscape:connector-curvature="0"
id="path4501"
d="M 3.491401,18.096279 2.1386259,7.9583643"
style="fill:none;stroke:#8c8c8c;stroke-width:3.13899994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path4501-6"
d="m 11.427835,2.3970039 7.707332,6.723418"
style="fill:none;stroke:#8c8c8c;stroke-width:3.13899994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<path
d="M 4.2345845,3.4624663 V 0.46246623 h -3 V 3.4624663 Z"
id="path4008-7"
inkscape:connector-curvature="0"
style="fill:#bebebe;stroke:#8c8c8c;stroke-width:0.99999994" />
</g>
</svg>
@@ -0,0 +1,122 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="24"
viewBox="0 0 24 24"
width="24"
version="1.1"
id="svg4016"
sodipodi:docname="mActionRegularPolygonCenterPoint.svg"
inkscape:version="0.92.1 r15371">
<metadata
id="metadata4022">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4020" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1680"
inkscape:window-height="991"
id="namedview4018"
showgrid="false"
inkscape:zoom="31.083333"
inkscape:cx="7.1707899"
inkscape:cy="13.088849"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg4016"
inkscape:measure-start="7.94638,12.8686"
inkscape:measure-end="4.08579,12.8365" />
<linearGradient
gradientUnits="userSpaceOnUse"
x1="-10"
x2="-10"
y1="15"
y2="21"
id="linearGradient3996">
<stop
offset="0"
stop-color="#555753"
id="stop3992" />
<stop
offset="1"
stop-color="#555753"
stop-opacity="0"
id="stop3994" />
</linearGradient>
<g
id="g4510">
<path
inkscape:transform-center-y="0.064125878"
inkscape:transform-center-x="0.75844594"
d="M 18.756051,5.9746749 19,16.0625 9.4812931,19.411818 3.3544594,11.393987 9.0865748,3.0893753 Z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="true"
sodipodi:arg2="-0.024177838"
sodipodi:arg1="-0.65249637"
sodipodi:r2="6.9443798"
sodipodi:r1="8.583725"
sodipodi:cy="11.186471"
sodipodi:cx="11.935676"
sodipodi:sides="5"
id="path4494"
style="fill:none;stroke:#8cbe8c;stroke-width:3.13899994;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:type="star" />
<g
transform="translate(33)"
id="g4004">
<rect
height="11"
rx="2.0114901"
width="11"
x="-20"
y="13"
id="rect3998"
style="fill:#c4a000" />
<path
d="m -15,14 v 2.0625 c -0.537663,0.111041 -1.024662,0.383291 -1.375,0.78125 l -1.78125,-1.03125 -0.5,0.875 1.78125,1.03125 C -16.957063,17.966182 -17,18.225145 -17,18.5 c 0,0.274855 0.04294,0.533818 0.125,0.78125 l -1.78125,1.03125 0.5,0.875 1.78125,-1.03125 c 0.352503,0.40042 0.832682,0.670182 1.375,0.78125 V 23 h 1 v -2.0625 c 0.537663,-0.111041 1.024662,-0.383291 1.375,-0.78125 l 1.78125,1.03125 0.5,-0.875 -1.78125,-1.03125 C -12.042937,19.033818 -12,18.774855 -12,18.5 c 0,-0.274855 -0.04294,-0.533818 -0.125,-0.78125 l 1.78125,-1.03125 -0.5,-0.875 -1.78125,1.03125 C -12.977503,16.44333 -13.457682,16.173568 -14,16.0625 V 14 Z m 0.5,3.5 c 0.552,0 1,0.448 1,1 0,0.552 -0.448,1 -1,1 -0.552,0 -1,-0.448 -1,-1 0,-0.552 0.448,-1 1,-1 z"
id="path4000"
inkscape:connector-curvature="0"
style="fill:#fcffff" />
<path
d="m -19,19 9,-0.0096 c 0,0 0,0 0,-2 C -10,14 -11,14 -14.5,14 c -3.5,0 -4.5,0 -4.5,3 0,2 0,2 0,2 z"
id="path4002"
inkscape:connector-curvature="0"
style="opacity:0.3;fill:#fcffff;fill-rule:evenodd" />
</g>
<path
d="m 1.9959781,9.9343162 h 3 v 2.9999998 h -3 z"
id="path4008"
inkscape:connector-curvature="0"
style="fill:#bebebe;stroke:#8c8c8c;stroke-width:0.99999994" />
<path
d="m 10.510724,9.6126005 h 3 v 3.0000005 h -3 z"
id="path4012"
inkscape:connector-curvature="0"
style="fill:#bebebe;stroke:#8c8c8c;stroke-width:1" />
</g>
</svg>
@@ -42,7 +42,7 @@
id="namedview4018"
showgrid="false"
inkscape:zoom="31.083333"
inkscape:cx="7.1707899"
inkscape:cx="2.0715941"
inkscape:cy="13.088849"
inkscape:window-x="0"
inkscape:window-y="0"
@@ -68,7 +68,7 @@
id="stop3994" />
</linearGradient>
<g
id="g4510">
id="g4506">
<path
inkscape:transform-center-y="0.064125878"
inkscape:transform-center-x="0.75844594"
@@ -109,7 +109,7 @@
style="opacity:0.3;fill:#fcffff;fill-rule:evenodd" />
</g>
<path
d="m 1.9959781,9.9343162 h 3 v 2.9999998 h -3 z"
d="m 4.6662194,5.7841821 h 3 v 2.9999998 h -3 z"
id="path4008"
inkscape:connector-curvature="0"
style="fill:#bebebe;stroke:#8c8c8c;stroke-width:0.99999994" />
@@ -135,6 +135,7 @@ SET(QGIS_APP_SRCS
qgsmaptoolcircle2points.cpp
qgsmaptoolcircle3points.cpp
qgsmaptoolcircle3tangents.cpp
qgsmaptoolcircle2tangentspoint.cpp
qgsmaptoolcirclecenterpoint.cpp
qgsmaptooladdellipse.cpp
qgsmaptoolellipsefoci.cpp
@@ -149,6 +150,7 @@ SET(QGIS_APP_SRCS
qgsmaptoolsquarecenter.cpp
qgsmaptoolregularpolygon2points.cpp
qgsmaptoolregularpolygoncenterpoint.cpp
qgsmaptoolregularpolygoncentercorner.cpp

composer/qgsattributeselectiondialog.cpp
composer/qgscomposer.cpp
@@ -310,6 +312,7 @@ SET (QGIS_APP_MOC_HDRS
qgsmaptoolcircle2points.h
qgsmaptoolcircle3points.h
qgsmaptoolcircle3tangents.h
qgsmaptoolcircle2tangentspoint.h
qgsmaptoolcirclecenterpoint.h
qgsmaptooladdellipse.h
qgsmaptoolellipsefoci.h
@@ -324,6 +327,7 @@ SET (QGIS_APP_MOC_HDRS
qgsmaptoolsquarecenter.h
qgsmaptoolregularpolygon2points.h
qgsmaptoolregularpolygoncenterpoint.h
qgsmaptoolregularpolygoncentercorner.h

nodetool/qgsselectedfeature.h
nodetool/qgsnodeeditor.h

0 comments on commit 0204302

Please sign in to comment.
You can’t perform that action at this time.