Skip to content
Permalink
Browse files

Merge pull request #7313 from PeterPetrik/mesh_layer_styling_gui

[mesh] [feature] App widgets for styling mesh layers
  • Loading branch information
wonder-sk committed Jun 28, 2018
2 parents 9643d52 + 79d761d commit 97addfc2cce1c94cd8565d4b4bbb35a429e3d59f
Showing with 5,666 additions and 199 deletions.
  1. +3 −0 images/images.qrc
  2. +170 −0 images/themes/default/propertyicons/meshcontours.svg
  3. +207 −0 images/themes/default/propertyicons/meshframe.svg
  4. +213 −0 images/themes/default/propertyicons/meshvectors.svg
  5. +2 −0 python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in
  6. +7 −41 python/core/auto_generated/mesh/qgsmeshrenderersettings.sip.in
  7. +7 −0 python/core/auto_generated/raster/qgscolorrampshader.sip.in
  8. +107 −0 python/gui/auto_generated/raster/qgscolorrampshaderwidget.sip.in
  9. +10 −0 python/gui/auto_generated/raster/qgssinglebandpseudocolorrendererwidget.sip.in
  10. +1 −0 python/gui/gui_auto.sip
  11. +18 −0 src/app/CMakeLists.txt
  12. +324 −0 src/app/mesh/qgsmeshdatasetgrouptreeview.cpp
  13. +137 −0 src/app/mesh/qgsmeshdatasetgrouptreeview.h
  14. +197 −0 src/app/mesh/qgsmeshlayerproperties.cpp
  15. +72 −0 src/app/mesh/qgsmeshlayerproperties.h
  16. +146 −0 src/app/mesh/qgsmeshrendereractivedatasetwidget.cpp
  17. +82 −0 src/app/mesh/qgsmeshrendereractivedatasetwidget.h
  18. +73 −0 src/app/mesh/qgsmeshrenderermeshsettingswidget.cpp
  19. +72 −0 src/app/mesh/qgsmeshrenderermeshsettingswidget.h
  20. +145 −0 src/app/mesh/qgsmeshrendererscalarsettingswidget.cpp
  21. +75 −0 src/app/mesh/qgsmeshrendererscalarsettingswidget.h
  22. +155 −0 src/app/mesh/qgsmeshrenderervectorsettingswidget.cpp
  23. +75 −0 src/app/mesh/qgsmeshrenderervectorsettingswidget.h
  24. +137 −0 src/app/mesh/qgsrenderermeshpropertieswidget.cpp
  25. +69 −0 src/app/mesh/qgsrenderermeshpropertieswidget.h
  26. +12 −0 src/app/qgisapp.cpp
  27. +32 −2 src/app/qgslayerstylingwidget.cpp
  28. +2 −0 src/app/qgslayerstylingwidget.h
  29. +2 −0 src/core/mesh/qgsmeshdataprovider.h
  30. +2 −0 src/core/mesh/qgsmeshlayer.cpp
  31. +32 −21 src/core/mesh/qgsmeshlayerrenderer.cpp
  32. +2 −1 src/core/mesh/qgsmeshlayerrenderer.h
  33. +3 −0 src/core/mesh/qgsmeshmemorydataprovider.cpp
  34. +6 −28 src/core/mesh/qgsmeshrenderersettings.cpp
  35. +9 −41 src/core/mesh/qgsmeshrenderersettings.h
  36. +1 −9 src/core/mesh/qgsmeshvectorrenderer.cpp
  37. +0 −4 src/core/mesh/qgsmeshvectorrenderer.h
  38. +14 −2 src/core/raster/qgscolorrampshader.cpp
  39. +6 −0 src/core/raster/qgscolorrampshader.h
  40. +2 −0 src/gui/CMakeLists.txt
  41. +778 −0 src/gui/raster/qgscolorrampshaderwidget.cpp
  42. +145 −0 src/gui/raster/qgscolorrampshaderwidget.h
  43. +12 −3 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  44. +6 −0 src/gui/raster/qgssinglebandpseudocolorrendererwidget.h
  45. +12 −1 src/providers/mdal/qgsmdalprovider.cpp
  46. +2 −0 src/ui/CMakeLists.txt
  47. +467 −0 src/ui/mesh/qgsmeshlayerpropertiesbase.ui
  48. +86 −0 src/ui/mesh/qgsmeshrendereractivedatasetwidgetbase.ui
  49. +75 −0 src/ui/mesh/qgsmeshrenderermeshsettingswidgetbase.ui
  50. +78 −0 src/ui/mesh/qgsmeshrendererscalarsettingswidgetbase.ui
  51. +233 −0 src/ui/mesh/qgsmeshrenderervectorsettingswidgetbase.ui
  52. +335 −0 src/ui/mesh/qgsrenderermeshpropswidgetbase.ui
  53. +322 −0 src/ui/qgscolorrampshaderwidgetbase.ui
  54. +164 −46 src/ui/qgsrasterlayerpropertiesbase.ui
  55. +28 −0 src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
  56. +294 −0 src/ui/raster/qgscolorrampshaderwidgetbase.ui
  57. BIN ...expected_quad_and_triangle_face_scalar_dataset/expected_quad_and_triangle_face_scalar_dataset.png
  58. BIN ...cted_quad_and_triangle_vertex_scalar_dataset/expected_quad_and_triangle_vertex_scalar_dataset.png
@@ -518,6 +518,9 @@
<file>themes/default/propertyicons/labeltext.svg</file>
<file>themes/default/propertyicons/locale.svg</file>
<file>themes/default/propertyicons/map_tools.svg</file>
<file>themes/default/propertyicons/meshcontours.svg</file>
<file>themes/default/propertyicons/meshframe.svg</file>
<file>themes/default/propertyicons/meshvectors.svg</file>
<file>themes/default/propertyicons/metadata.svg</file>
<file>themes/default/propertyicons/network_and_proxy.svg</file>
<file>themes/default/propertyicons/overlay.svg</file>
@@ -0,0 +1,170 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
id="svg2"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="list_icons.svg">
<defs
id="defs4">
<marker
inkscape:stockid="TriangleOutM"
orient="auto"
refY="0.0"
refX="0.0"
id="TriangleOutM"
style="overflow:visible">
<path
id="path3940"
d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
transform="scale(0.4)" />
</marker>
<marker
inkscape:stockid="Arrow1Send"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow1Send"
style="overflow:visible;">
<path
id="path3810"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
transform="scale(0.2) rotate(180) translate(6,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow1Mend"
style="overflow:visible;">
<path
id="path3804"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
transform="scale(0.4) rotate(180) translate(10,0)" />
</marker>
<marker
inkscape:stockid="Arrow2Lend"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Lend"
style="overflow:visible;">
<path
id="path3816"
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(1.1) rotate(180) translate(1,0)" />
</marker>
<marker
inkscape:stockid="TriangleOutL"
orient="auto"
refY="0.0"
refX="0.0"
id="TriangleOutL"
style="overflow:visible">
<path
id="path3937"
d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
transform="scale(0.8)" />
</marker>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective3771" />
<linearGradient
id="linearGradient3755">
<stop
id="stop3767"
offset="0"
style="stop-color:#0000ff;stop-opacity:0.50196081;" />
<stop
id="stop3765"
offset="0.34999999"
style="stop-color:#00ffff;stop-opacity:0.50196081;" />
<stop
id="stop3763"
offset="0.5"
style="stop-color:#00ff00;stop-opacity:0.50196081;" />
<stop
style="stop-color:#ffff00;stop-opacity:0.50196081;"
offset="0.64999998"
id="stop3769" />
<stop
style="stop-color:#ff0000;stop-opacity:0.50980395;"
offset="1"
id="stop3759" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3755"
id="linearGradient3761"
x1="-0.044642858"
y1="0.071428955"
x2="15.955357"
y2="16.053572"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="22.4"
inkscape:cx="10.67143"
inkscape:cy="2.9092772"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1920"
inkscape:window-height="994"
inkscape:window-x="-4"
inkscape:window-y="-3"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<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>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1036.3622)">
<rect
style="fill:url(#linearGradient3761);stroke:none;fill-opacity:1.0"
id="rect2985"
width="16"
height="16"
x="-0.044642858"
y="0.017857092"
transform="translate(0,1036.3622)" />
</g>
</svg>
@@ -0,0 +1,207 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
id="svg2"
version="1.1"
inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
sodipodi:docname="meshframe.svg"
inkscape:export-filename="/home/martin/lutra/qgis-crayfish-plugin/plugin/list_icons_d.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4">
<marker
inkscape:stockid="TriangleOutM"
orient="auto"
refY="0.0"
refX="0.0"
id="TriangleOutM"
style="overflow:visible">
<path
id="path3940"
d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
transform="scale(0.4)" />
</marker>
<marker
inkscape:stockid="Arrow1Send"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow1Send"
style="overflow:visible;">
<path
id="path3810"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
transform="scale(0.2) rotate(180) translate(6,0)" />
</marker>
<marker
inkscape:stockid="Arrow1Mend"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow1Mend"
style="overflow:visible;">
<path
id="path3804"
d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
transform="scale(0.4) rotate(180) translate(10,0)" />
</marker>
<marker
inkscape:stockid="Arrow2Lend"
orient="auto"
refY="0.0"
refX="0.0"
id="Arrow2Lend"
style="overflow:visible;">
<path
id="path3816"
style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
transform="scale(1.1) rotate(180) translate(1,0)" />
</marker>
<marker
inkscape:stockid="TriangleOutL"
orient="auto"
refY="0.0"
refX="0.0"
id="TriangleOutL"
style="overflow:visible">
<path
id="path3937"
d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
transform="scale(0.8)" />
</marker>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 8 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="16 : 8 : 1"
inkscape:persp3d-origin="8 : 5.3333333 : 1"
id="perspective3771" />
<linearGradient
id="linearGradient3755">
<stop
id="stop3767"
offset="0"
style="stop-color:#0000ff;stop-opacity:0.50196081;" />
<stop
id="stop3765"
offset="0.34999999"
style="stop-color:#00ffff;stop-opacity:0.50196081;" />
<stop
id="stop3763"
offset="0.5"
style="stop-color:#00ff00;stop-opacity:0.50196081;" />
<stop
style="stop-color:#ffff00;stop-opacity:0.50196081;"
offset="0.64999998"
id="stop3769" />
<stop
style="stop-color:#ff0000;stop-opacity:0.50980395;"
offset="1"
id="stop3759" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3755"
id="linearGradient3761"
x1="-0.044642858"
y1="0.071428955"
x2="15.955357"
y2="16.053572"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="31.678384"
inkscape:cx="6.3745751"
inkscape:cy="6.2123922"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1920"
inkscape:window-height="1015"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
showguides="true"
inkscape:guide-bbox="true" />
<metadata
id="metadata7">
<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>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1036.3622)">
<path
style="fill:#666666;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 2.7463522,1038.4726 -0.063134,12.1219"
id="path111"
inkscape:connector-curvature="0" />
<path
style="fill:#666666;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 6.2818858,1038.4725 -0.063134,12.1219"
id="path111-6"
inkscape:connector-curvature="0" />
<path
style="fill:#666666;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 9.5964489,1038.5042 -0.063134,12.1219"
id="path111-2"
inkscape:connector-curvature="0" />
<path
style="fill:#666666;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 12.942579,1038.5356 -0.06313,12.1219"
id="path111-9"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1.04660463px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 2.1764118,1050.0579 11.2098392,0.063 v 0 0 0 0 0"
id="path1015"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1.04660463px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 2.2012383,1046.121 11.2098387,0.063 v 0 0 0 0 0"
id="path1015-2"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1.04660463px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 2.1921954,1039.0093 11.2098396,0.063 v 0 0 0 0 0"
id="path1015-7"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1.04660463px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 2.2237627,1042.7026 11.2098393,0.063 v 0 0 0 0 0"
id="path1015-0"
inkscape:connector-curvature="0" />
</g>
</svg>

0 comments on commit 97addfc

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