Skip to content
Permalink
Browse files

[Style dock] Add support for raster layers

  • Loading branch information
NathanW2 committed May 18, 2016
1 parent 13f053b commit 3ace8e62fd482c694d74cf6777f316d35261bf6c
Showing with 3,533 additions and 918 deletions.
  1. +4 −0 images/images.qrc
  2. +158 −0 images/themes/default/styleicons/multibandcolor.svg
  3. +98 −0 images/themes/default/styleicons/paletted.svg
  4. +93 −0 images/themes/default/styleicons/singlebandgray.svg
  5. +105 −0 images/themes/default/styleicons/singlebandpseudocolor.svg
  6. +2 −0 python/gui/gui.sip
  7. +7 −0 python/gui/raster/qgsrasterhistogramwidget.sip
  8. +8 −0 python/gui/raster/qgsrasterrendererwidget.sip
  9. +33 −0 python/gui/raster/qgsrastertransparencywidget.sip
  10. +43 −0 python/gui/raster/qgsrendererrasterpropertieswidget.sip
  11. +2 −1 src/app/qgisapp.cpp
  12. +204 −94 src/app/qgsmapstylingwidget.cpp
  13. +15 −13 src/app/qgsmapstylingwidget.h
  14. +8 −0 src/core/raster/qgsrasterrendererregistry.cpp
  15. +1 −0 src/core/raster/qgsrasterrendererregistry.h
  16. +4 −0 src/gui/CMakeLists.txt
  17. +9 −0 src/gui/raster/qgsmultibandcolorrendererwidget.cpp
  18. +2 −0 src/gui/raster/qgspalettedrendererwidget.cpp
  19. +2 −1 src/gui/raster/qgsrasterhistogramwidget.cpp
  20. +7 −0 src/gui/raster/qgsrasterhistogramwidget.h
  21. +8 −0 src/gui/raster/qgsrasterrendererwidget.h
  22. +663 −0 src/gui/raster/qgsrastertransparencywidget.cpp
  23. +102 −0 src/gui/raster/qgsrastertransparencywidget.h
  24. +257 −0 src/gui/raster/qgsrendererrasterpropertieswidget.cpp
  25. +76 −0 src/gui/raster/qgsrendererrasterpropertieswidget.h
  26. +6 −0 src/gui/raster/qgssinglebandgrayrendererwidget.cpp
  27. +25 −0 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  28. +2 −0 src/gui/raster/qgssinglebandpseudocolorrendererwidget.h
  29. +2 −1 src/ui/CMakeLists.txt
  30. +97 −126 src/ui/qgscategorizedsymbolrendererv2widget.ui
  31. +210 −0 src/ui/qgsmapstylingwidgetbase.ui
  32. +72 −82 src/ui/qgsmultibandcolorrendererwidgetbase.ui
  33. +5 −2 src/ui/qgspalettedrendererwidgetbase.ui
  34. +89 −178 src/ui/qgsrasterhistogramwidgetbase.ui
  35. +5 −15 src/ui/qgsrasterminmaxwidgetbase.ui
  36. +398 −0 src/ui/qgsrendererrasterpropswidgetbase.ui
  37. +21 −22 src/ui/qgsrendererv2propsdialogbase.ui
  38. +25 −35 src/ui/qgssinglebandgrayrendererwidgetbase.ui
  39. +264 −348 src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
  40. +401 −0 src/ui/raster/qgsrastertransparencywidget.ui
@@ -584,6 +584,10 @@
<file>themes/default/multieditSameValues.svg</file>
<file>themes/default/locked_repeating.svg</file>
<file>themes/default/sort.svg</file>
<file>themes/default/styleicons/multibandcolor.svg</file>
<file>themes/default/styleicons/paletted.svg</file>
<file>themes/default/styleicons/singlebandgray.svg</file>
<file>themes/default/styleicons/singlebandpseudocolor.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
@@ -0,0 +1,158 @@
<?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"
viewBox="0 0 16 16"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="rasterMultiband.svg">
<defs
id="defs4">
<linearGradient
id="linearGradient4253"
inkscape:collect="always">
<stop
id="stop4255"
offset="0"
style="stop-color:#000000;stop-opacity:1" />
<stop
id="stop4257"
offset="1"
style="stop-color:#0000ff;stop-opacity:1" />
</linearGradient>
<linearGradient
id="linearGradient4247"
inkscape:collect="always">
<stop
id="stop4249"
offset="0"
style="stop-color:#001e00;stop-opacity:1" />
<stop
id="stop4251"
offset="1"
style="stop-color:#00ff00;stop-opacity:1" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient4191">
<stop
style="stop-color:#1e0000;stop-opacity:1"
offset="0"
id="stop4193" />
<stop
style="stop-color:#ff0000;stop-opacity:1"
offset="1"
id="stop4195" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4191"
id="linearGradient4197"
x1="3"
y1="1039.3622"
x2="13"
y2="1039.3622"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.91739254,0,0,1.0343191,1.182132,-33.908714)" />
<linearGradient
gradientTransform="matrix(0.91739254,0,0,1.0343191,0.66085998,-31.16999)"
inkscape:collect="always"
xlink:href="#linearGradient4247"
id="linearGradient4197-9"
x1="3"
y1="1039.3622"
x2="13"
y2="1039.3622"
gradientUnits="userSpaceOnUse" />
<linearGradient
gradientTransform="matrix(0.91739254,0,0,1.3790921,0.66085998,-386.0143)"
inkscape:collect="always"
xlink:href="#linearGradient4253"
id="linearGradient4197-9-6"
x1="3"
y1="1039.3622"
x2="13"
y2="1039.3622"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.6"
inkscape:cx="-10.581282"
inkscape:cy="13.754625"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
inkscape:window-width="1865"
inkscape:window-height="1056"
inkscape:window-x="55"
inkscape:window-y="24"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid4136" />
</sodipodi:namedview>
<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)">
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#5a5a5a;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4138-0-3-2"
width="11"
height="11"
x="2.5"
y="1038.8622" />
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4197);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.09954119;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4138"
width="10"
height="3"
x="3"
y="1039.3622" />
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4197-9);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.09954119;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4138-0"
width="10"
height="3"
x="3"
y="1042.3622" />
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4197-9-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.09954119;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4138-0-3"
width="10"
height="4"
x="3"
y="1045.3622" />
</g>
</svg>
@@ -0,0 +1,98 @@
<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
viewBox="0 0 16 16"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="rasterPalette.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.9195959"
inkscape:cx="-7.3673017"
inkscape:cy="-13.313744"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
inkscape:window-width="1865"
inkscape:window-height="1056"
inkscape:window-x="55"
inkscape:window-y="24"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid4136" />
</sodipodi:namedview>
<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)">
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00aeba;fill-opacity:1;fill-rule:evenodd;stroke:#0044ba;stroke-width:1.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4138"
width="2.9004588"
height="2.9004588"
x="2.5497706"
y="1037.912" />
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00ba58;fill-opacity:1;fill-rule:evenodd;stroke:#005338;stroke-width:1.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4138-9"
width="2.9004588"
height="2.9004588"
x="2.5813379"
y="1042.8579" />
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ba0c00;fill-opacity:1;fill-rule:evenodd;stroke:#540c00;stroke-width:1.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4138-9-8"
width="2.9004588"
height="2.9004588"
x="2.5813379"
y="1047.9402" />
<path
style="fill:none;fill-rule:evenodd;stroke:#8c8c8c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 7,1039.8622 7,0"
id="path4211"
inkscape:connector-curvature="0" />
<path
style="fill:none;fill-rule:evenodd;stroke:#8c8c8c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 7,1044.8622 3,0"
id="path4213"
inkscape:connector-curvature="0" />
<path
style="fill:none;fill-rule:evenodd;stroke:#8c8c8c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 7,1049.8622 7,0"
id="path4215"
inkscape:connector-curvature="0" />
</g>
</svg>
@@ -0,0 +1,93 @@
<?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"
viewBox="0 0 16 16"
id="svg2"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="rasterSinglebandGray.svg">
<defs
id="defs4">
<linearGradient
id="linearGradient4247"
inkscape:collect="always">
<stop
id="stop4249"
offset="0"
style="stop-color:#000000;stop-opacity:1" />
<stop
id="stop4251"
offset="1"
style="stop-color:#ffffff;stop-opacity:1" />
</linearGradient>
<linearGradient
gradientTransform="translate(7.5262449e-8,5.0000261)"
inkscape:collect="always"
xlink:href="#linearGradient4247"
id="linearGradient4197-9"
x1="3"
y1="1039.3622"
x2="13"
y2="1039.3622"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.959798"
inkscape:cx="-74.02131"
inkscape:cy="28.46481"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
inkscape:window-width="1865"
inkscape:window-height="1056"
inkscape:window-x="55"
inkscape:window-y="24"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid4136" />
</sodipodi:namedview>
<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)">
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4197-9);fill-opacity:1;fill-rule:evenodd;stroke:#5a5a5a;stroke-width:1.09954119;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4138-0"
width="10.900459"
height="10.900458"
x="2.5497706"
y="1038.912" />
</g>
</svg>

0 comments on commit 3ace8e6

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