Skip to content
Permalink
Browse files

Use toolbar or status bar for snapping config

  • Loading branch information
3nids authored and m-kuhn committed Oct 20, 2016
1 parent f3482d2 commit 64d3c788f19acc19ca428274a355ae696e344f77
Showing with 12,138 additions and 585 deletions.
  1. +9 −0 images/images.qrc
  2. +105 −0 images/themes/default/mIconSnapping.svg
  3. +1,133 −0 images/themes/default/mIconSnappingActiveLayer.svg
  4. +1,363 −0 images/themes/default/mIconSnappingAdvanced.svg
  5. +1,167 −0 images/themes/default/mIconSnappingAllLayers.svg
  6. +1,124 −0 images/themes/default/mIconSnappingIntersection.svg
  7. +1,105 −0 images/themes/default/mIconSnappingSegment.svg
  8. +1,120 −0 images/themes/default/mIconSnappingVertex.svg
  9. +1,126 −0 images/themes/default/mIconSnappingVertexAndSegment.svg
  10. +1,118 −0 images/themes/default/mIconTopologicalEditing.svg
  11. +1 −0 python/core/core.sip
  12. +0 −2 python/core/qgsmaplayermodel.sip
  13. +9 −29 python/core/qgsproject.sip
  14. +238 −0 python/core/qgssnappingconfig.sip
  15. +13 −23 python/core/qgssnappingutils.sip
  16. +4 −0 src/app/CMakeLists.txt
  17. +57 −6 src/app/qgisapp.cpp
  18. +20 −14 src/app/qgisapp.h
  19. +9 −12 src/app/qgsmaptooloffsetcurve.cpp
  20. +12 −2 src/app/qgsoptions.cpp
  21. +9 −7 src/app/qgssnappingdialog.cpp
  22. +636 −0 src/app/qgssnappinglayertreemodel.cpp
  23. +94 −0 src/app/qgssnappinglayertreemodel.h
  24. +476 −0 src/app/qgssnappingwidget.cpp
  25. +130 −0 src/app/qgssnappingwidget.h
  26. +3 −0 src/core/CMakeLists.txt
  27. +33 −129 src/core/qgsproject.cpp
  28. +44 −35 src/core/qgsproject.h
  29. +509 −0 src/core/qgssnappingconfig.cpp
  30. +245 −0 src/core/qgssnappingconfig.h
  31. +48 −186 src/core/qgssnappingutils.cpp
  32. +21 −31 src/core/qgssnappingutils.h
  33. +6 −5 src/gui/qgsmapcanvastracer.cpp
  34. +20 −18 src/gui/qgsmapmouseevent.cpp
  35. +12 −1 src/ui/qgisapp.ui
  36. +72 −60 src/ui/qgsoptionsbase.ui
  37. +27 −13 tests/src/core/testqgssnappingutils.cpp
  38. +20 −12 tests/src/python/test_layer_dependencies.py
@@ -574,6 +574,15 @@
<file>themes/default/mIconClearText.svg</file>
<file>themes/default/mIconClearTextHover.svg</file>
<file>themes/default/rendererPointClusterSymbol.svg</file>
<file>themes/default/mIconSnapping.svg</file>
<file>themes/default/mIconSnappingActiveLayer.svg</file>
<file>themes/default/mIconSnappingAdvanced.svg</file>
<file>themes/default/mIconSnappingAllLayers.svg</file>
<file>themes/default/mIconSnappingVertexAndSegment.svg</file>
<file>themes/default/mIconSnappingVertex.svg</file>
<file>themes/default/mIconSnappingSegment.svg</file>
<file>themes/default/mIconTopologicalEditing.svg</file>
<file>themes/default/mIconSnappingIntersection.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generated by IcoMoon.io -->

<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"
version="1.1"
width="24"
height="24"
viewBox="0 0 24 24"
id="svg4136"
inkscape:version="0.91 r13725"
sodipodi:docname="mIconSnapping.svg">
<metadata
id="metadata4154">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs4152" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="2560"
inkscape:window-height="1343"
id="namedview4150"
showgrid="true"
inkscape:zoom="25.875689"
inkscape:cx="-2.0772384"
inkscape:cy="12.333477"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg4136">
<inkscape:grid
type="xygrid"
id="grid5544" />
</sodipodi:namedview>
<g
id="g4138"
transform="translate(0,-488)" />
<path
d="m 366.643,-210.599 c 0,29.563 -11.51,57.365 -32.379,78.244 -20.941,20.921 -48.712,32.44 -78.285,32.44 -61.02,0 -110.663,-49.644 -110.663,-110.684 l 0,-124.099 -99.052,0 0,124.099 c 0,115.682 94.085,209.715 209.715,209.715 56.033,0 108.718,-21.781 148.326,-61.379 39.608,-39.639 61.43,-92.324 61.43,-148.337 l 0,-124.099 -99.103,0 0,124.099 z"
id="path4140"
inkscape:connector-curvature="0"
style="fill:#000000" />
<path
d="m 384.645,-379.6 0,-9.922 -9.882,0 z"
id="path4142"
inkscape:connector-curvature="0"
style="fill:#000000" />
<path
d="m 454.523,-349.422 9.913,0 0,-113.695 -97.577,0 0,113.695 87.664,0 z m -67.84,-91.935 57.938,0 0,72.837 -57.938,0 0,-72.837 z"
id="path4144"
inkscape:connector-curvature="0"
style="fill:#000000" />
<path
d="m 251.453,-361.382 99.871,-84.582 -84.316,44.667 -24.852,-47.698 -83.978,67.154 75.111,-25.794 z"
id="path4146"
inkscape:connector-curvature="0"
style="fill:#000000" />
<path
d="m 136.233,-349.422 9.892,0 0,-113.695 -97.546,0 0,113.695 87.654,0 z m -67.86,-91.935 57.948,0 0,72.837 -57.948,0 0,-72.837 z"
id="path4148"
inkscape:connector-curvature="0"
style="fill:#000000" />
<rect
style="display:inline;opacity:1;fill:#bebebe;fill-opacity:1;stroke:#8c8c8c;stroke-width:1.24999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect4563-1"
width="3.75"
height="3.75"
x="2.625"
y="2.375" />
<path
style="fill:none;fill-rule:evenodd;stroke:#8c8c8c;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 19.5,8.75 0,6 c 0,3 -2,5 -5,5 l -5,0 c -3,0 -5,-2 -5,-5 l 0,-6"
id="path5546"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccc" />
<rect
style="display:inline;opacity:1;fill:#bebebe;fill-opacity:1;stroke:#8c8c8c;stroke-width:1.24999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect4563-1-3"
width="3.75"
height="3.75"
x="17.625"
y="2.375" />
</svg>

0 comments on commit 64d3c78

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