Skip to content
Permalink
Browse files

- Init GUI for RegularShapes (add a Toolbar:

RegularShapeDigitizeToolBar)
- Add Circle Tools (2 Points on circle, 3 Points on circle, center and a
point)
- Fix an error on QgsCircle
  • Loading branch information
lbartoletti committed Jul 19, 2017
1 parent bcc8e90 commit 6a95077f0329eee2515c4cd2782bfc464ac9238a
@@ -562,6 +562,9 @@
<file>themes/default/mActionMapSettings.svg</file>
<file>themes/default/mActionLockExtent.svg</file>
<file>icons/qgis_icon.svg</file>
<file>themes/default/mActionCircle2Points.svg</file>
<file>themes/default/mActionCircle3Points.svg</file>
<file>themes/default/mActionCircleCenterPoint.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
@@ -0,0 +1,111 @@
<?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="mActionCircle2Points.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="11.045195"
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="g6828">
<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
d="m 13.66429,4.2799464 h 3 v 3 h -3 z"
id="path4008"
inkscape:connector-curvature="0"
style="fill:#bebebe;stroke:#8c8c8c;stroke-width:0.99999994" />
<path
d="m 3.2721179,14.800269 h 3 v 3 h -3 z"
id="path4012"
inkscape:connector-curvature="0"
style="fill:#bebebe;stroke:#8c8c8c;stroke-width:0.99999994" />
</g>
</svg>
@@ -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="mActionCircle3Points.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="11.045195"
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="g6872">
<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
d="m 13.66429,4.2799464 h 3 v 3 h -3 z"
id="path4008"
inkscape:connector-curvature="0"
style="fill:#bebebe;stroke:#8c8c8c;stroke-width:0.99999994" />
<path
d="m 3.2721179,14.800269 h 3 v 3 h -3 z"
id="path4012"
inkscape:connector-curvature="0"
style="fill:#bebebe;stroke:#8c8c8c;stroke-width:0.99999994" />
<path
d="m 6.272,7.28 v -3 h -3 v 3 z"
id="path4008-7"
inkscape:connector-curvature="0"
style="fill:#bebebe;stroke:#8c8c8c;stroke-width:0.99999994" />
</g>
</svg>
@@ -0,0 +1,111 @@
<?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="mActionCircleCenterPoint.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="11.045195"
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="g4673">
<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
d="m 3.2721179,14.800269 h 3 v 3 h -3 z"
id="path4012"
inkscape:connector-curvature="0"
style="fill:#bebebe;stroke:#8c8c8c;stroke-width:0.99999994" />
<path
d="m 8.5,9.4999998 h 3 V 12.5 h -3 z"
id="path4012-6"
inkscape:connector-curvature="0"
style="fill:#bebebe;stroke:#8c8c8c;stroke-width:0.99999994" />
</g>
</svg>
@@ -132,6 +132,10 @@ SET(QGIS_APP_SRCS
qgsmaptooladdcircularstring.cpp
qgsmaptoolcircularstringcurvepoint.cpp
qgsmaptoolcircularstringradius.cpp
qgsmaptooladdcircle.cpp
qgsmaptoolcircle2points.cpp
qgsmaptoolcircle3points.cpp
qgsmaptoolcirclecenterpoint.cpp

composer/qgsattributeselectiondialog.cpp
composer/qgscomposer.cpp
@@ -283,6 +287,11 @@ SET (QGIS_APP_MOC_HDRS
qgsmaptooltextannotation.h
qgsmaptooladdcircularstring.h
qgsmaptoolcircularstringcurvepoint.h
qgsmaptooladdcircle.h
qgsmaptoolcircle2points.h
qgsmaptoolcircle3points.h
qgsmaptoolcirclecenterpoint.h


nodetool/qgsselectedfeature.h
nodetool/qgsnodeeditor.h

0 comments on commit 6a95077

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