Skip to content
Permalink
Browse files

Other average methods 3d mesh (#33426)

[FEATURE] [MESH] add new 3d stacked mesh averaging methods (top, bottom, sigma, depth, height, elevation)

see https://fvwiki.tuflow.com/index.php?title=Depth_Averaging_Results for description of the methods. method can be selected for 3d stacked mesh dataset in the new widget added for QGIS 3.12 in the mesh layer styling dialog
  • Loading branch information
PeterPetrik committed Dec 20, 2019
1 parent cdc9a84 commit d211de2204fc5d350f40a23f6b49759b391d4e28
@@ -698,6 +698,14 @@
<file>themes/default/processingAlgorithm.svg</file>
<file>themes/default/processingResult.svg</file>
<file>themes/default/search.svg</file>
<file>themes/default/mesh/Depth.svg</file>
<file>themes/default/mesh/Elevation.svg</file>
<file>themes/default/mesh/Height.svg</file>
<file>themes/default/mesh/MultiBottom.svg</file>
<file>themes/default/mesh/MultiTop.svg</file>
<file>themes/default/mesh/Sigma.svg</file>
<file>themes/default/mesh/SingleTop.svg</file>
<file>themes/default/mesh/SingleBottom.svg</file>
<file>themes/default/mActionNew3DMap.svg</file>
<file>themes/default/mActionNewMap.svg</file>
<file>themes/default/mActionNext.svg</file>
@@ -0,0 +1,189 @@
<?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"
inkscape:version="1.0beta2 (2b71d25, 2019-12-03)"
sodipodi:docname="Depth.svg"
id="svg3391"
version="1.1"
viewBox="0 0 172.05501 141.061"
height="141.061mm"
width="172.05501mm">
<metadata
id="metadata3397">
<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="defs3395" />
<sodipodi:namedview
inkscape:current-layer="svg3391"
inkscape:window-maximized="0"
inkscape:window-y="23"
inkscape:window-x="0"
inkscape:cy="413.2611"
inkscape:cx="-48.433273"
inkscape:zoom="0.27972783"
fit-margin-bottom="0"
fit-margin-right="0"
fit-margin-left="0"
fit-margin-top="0"
showgrid="false"
id="namedview3393"
inkscape:window-height="1046"
inkscape:window-width="1713"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
guidetolerance="10"
gridtolerance="10"
objecttolerance="10"
borderopacity="1"
inkscape:document-rotation="0"
bordercolor="#666666"
pagecolor="#ffffff" />
<path
inkscape:connector-curvature="0"
id="path3345"
d="M 0,0 H 172.055 V 141.061 H 0 Z"
fill="#fff" />
<path
inkscape:connector-curvature="0"
id="path3347"
fill="#00fa00"
d="M 27.792,22.872 46.128,22.671 45.811,40.066 Z M 84.29,21.942 83.687,40.217 45.811,40.066 46.128,22.671 Z" />
<path
inkscape:connector-curvature="0"
id="path3349"
fill="#00fa00"
d="m 84.29,21.942 -0.603,18.275 44.402,-0.141 0.025,-17.93 z" />
<path
inkscape:connector-curvature="0"
id="path3351"
fill="#00fa00"
d="m 157.794,21.953 -7.51,18.113 -22.195,0.01 0.025,-17.93 z m -111.983,18.113 20.778,23.337 16.899,0.106 0.2,-23.292 z" />
<path
inkscape:connector-curvature="0"
id="path3353"
fill="#00fa00"
d="m 128.079,63.817 -44.591,-0.308 0.2,-23.292 44.401,-0.141 z" />
<path
inkscape:connector-curvature="0"
id="path3355"
fill="#00fa00"
d="m 128.089,40.076 22.195,-0.01 -7.421,23.401 -14.784,0.35 z" />
<path
inkscape:connector-curvature="0"
id="path3357"
fill="none"
d="m 71.966,71.362 11.737,-0.11 -0.094,17.497 z m 56.113,-0.232 -0.02,31.226 11.792,-31.145 z m -44.47,17.619 0.094,-17.496 44.376,-0.123 -0.02,31.226 -36.135,0.151 z" />
<path
inkscape:connector-curvature="0"
id="path3359"
fill="none"
d="m 91.924,102.507 36.135,-0.15 -4.838,13.909 -6.804,14.665 -3.629,2.57 -3.78,-2.72 -7.559,-12.247 z" />
<g
transform="translate(-20.864,-39.158)"
id="g3371"
stroke="#000"
fill="none">
<path
inkscape:connector-curvature="0"
id="path3361"
stroke-width=".265"
d="m 148.923,141.514 0.055,-94.191" />
<path
inkscape:connector-curvature="0"
id="path3363"
stroke-width=".268"
d="M 171.148,79.224 29.633,79.526" />
<path
inkscape:connector-curvature="0"
id="path3365"
stroke-width=".265"
d="m 104.473,127.907 0.036,-81.004 M 66.675,79.224 v 0 l 0.101,-32.238" />
<path
inkscape:connector-curvature="0"
id="path3367"
stroke-width=".273"
d="M 160.715,110.369 H 29.331" />
<path
inkscape:connector-curvature="0"
id="path3369"
stroke-width=".277"
d="M 148.923,141.514 30.087,141.816" />
</g>
<g
transform="translate(-20.864,-39.158)"
id="g3389">
<path
inkscape:connector-curvature="0"
id="path3373"
stroke-linejoin="bevel"
stroke-linecap="round"
stroke-width="2.3"
stroke="#820300"
fill="#50166a"
overflow="visible"
font-family="sans-serif"
font-weight="400"
color="#000"
d="m 30.318,46.764 -0.162,0.209 c 22.724,17.605 39.94,35.416 53.207,51.887 16.759,20.806 27.22,39.476 34.533,52.907 3.657,6.715 6.527,12.12 9.008,15.834 1.24,1.856 2.383,3.29 3.487,4.255 1.103,0.966 2.178,1.466 3.261,1.42 1.084,-0.045 2.153,-0.637 3.254,-1.789 1.102,-1.152 2.243,-2.868 3.48,-5.203 2.476,-4.669 5.338,-11.808 8.985,-21.814 7.294,-20.013 17.727,-51.492 34.45,-97.557 l -0.249,-0.09 c -1.78,4.907 -3.49,9.848 -5.133,14.427 -13.777,38.418 -22.801,65.256 -29.316,83.13 -3.646,10.002 -6.506,17.134 -8.969,21.78 -1.231,2.322 -2.363,4.023 -3.437,5.146 -1.074,1.123 -2.081,1.665 -3.076,1.707 -0.995,0.042 -2,-0.416 -3.075,-1.356 -1.074,-0.94 -2.21,-2.356 -3.443,-4.203 -2.468,-3.693 -5.337,-9.098 -8.994,-15.814 C 110.814,138.206 100.343,119.518 83.57,98.694 70.29,82.207 53.06,64.381 30.318,46.763 Z"
style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;isolation:auto;mix-blend-mode:normal;solid-color:#000000;solid-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path3375"
stroke-linecap="round"
stroke-width="2"
stroke="#0000fd"
fill="none"
d="M 183.82,46.914 30.156,46.973" />
<text
id="text3379"
stroke-width=".265"
font-family="sans-serif"
font-size="10.583"
font-weight="400"
y="78.619003"
x="29.18"
style="line-height:1.25"><tspan
id="tspan3377"
y="78.619003"
x="29.18">-1m</tspan></text>
<text
id="text3383"
stroke-width=".265"
font-family="sans-serif"
font-size="10.583"
font-weight="400"
y="109.462"
x="28.726"
style="line-height:1.25"><tspan
id="tspan3381"
y="109.462"
x="28.726">-2m</tspan></text>
<text
id="text3387"
stroke-width=".265"
font-family="sans-serif"
font-size="10.583"
font-weight="400"
y="140.91"
x="29.330999"
style="line-height:1.25"><tspan
id="tspan3385"
y="140.91"
x="29.330999">-3m</tspan></text>
</g>
</svg>
@@ -0,0 +1,184 @@
<?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"
inkscape:version="1.0beta2 (2b71d25, 2019-12-03)"
sodipodi:docname="Elevation.svg"
id="svg2776"
version="1.1"
viewBox="0 0 172.05501 141.061"
height="141.061mm"
width="172.05501mm">
<metadata
id="metadata2782">
<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="defs2780" />
<sodipodi:namedview
inkscape:current-layer="svg2776"
inkscape:window-maximized="0"
inkscape:window-y="23"
inkscape:window-x="0"
inkscape:cy="413.2611"
inkscape:cx="-48.433273"
inkscape:zoom="0.27972783"
fit-margin-bottom="0"
fit-margin-right="0"
fit-margin-left="0"
fit-margin-top="0"
showgrid="false"
id="namedview2778"
inkscape:window-height="1038"
inkscape:window-width="1637"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
guidetolerance="10"
gridtolerance="10"
objecttolerance="10"
borderopacity="1"
inkscape:document-rotation="0"
bordercolor="#666666"
pagecolor="#ffffff" />
<path
inkscape:connector-curvature="0"
id="path2732"
d="M 0,0 H 172.055 V 141.061 H 0 Z"
fill="#fff" />
<path
inkscape:connector-curvature="0"
id="path2734"
fill="#00fa00"
d="m 25.64,20.936 20.488,0.014 -0.317,19.116 z m 57.789,-0.5 0.258,19.781 -37.876,-0.151 0.317,-19.116 z" />
<path
inkscape:connector-curvature="0"
id="path2736"
fill="#00fa00"
d="m 83.429,20.436 0.258,19.781 44.402,-0.141 0.455,-19.435 z m 74.58,-0.204 -7.725,19.834 -22.195,0.01 0.455,-19.435 z M 45.811,40.066 71.967,71.362 83.703,71.252 83.687,40.217 Z" />
<path
inkscape:connector-curvature="0"
id="path2738"
fill="#00fa00"
d="M 128.079,71.13 83.703,71.253 83.687,40.217 128.089,40.076 Z" />
<path
inkscape:connector-curvature="0"
id="path2740"
fill="#00fa00"
d="m 128.089,40.076 22.195,-0.01 -15.81,48.354 -6.395,-17.29 z m -56.123,31.286 11.737,-0.11 -0.094,17.497 z" />
<path
inkscape:connector-curvature="0"
id="path2742"
fill="#00fa00"
d="m 128.079,71.13 -0.02,17.46 6.415,-0.17 z m -44.47,17.619 0.094,-17.496 44.376,-0.123 -0.02,17.46 z" />
<path
inkscape:connector-curvature="0"
id="path2744"
fill="none"
d="m 91.924,102.507 36.135,-0.15 -4.838,13.909 -6.804,14.665 -3.629,2.57 -3.78,-2.72 -7.559,-12.247 z" />
<g
transform="translate(-20.864,-39.158)"
id="g2756"
stroke="#000"
fill="none">
<path
inkscape:connector-curvature="0"
id="path2746"
stroke-width=".265"
d="m 148.923,141.514 0.055,-94.191" />
<path
inkscape:connector-curvature="0"
id="path2748"
stroke-width=".268"
d="M 171.148,79.224 29.633,79.526" />
<path
inkscape:connector-curvature="0"
id="path2750"
stroke-width=".265"
d="m 104.473,127.907 0.036,-81.004 M 66.675,79.224 v 0 l 0.101,-32.238" />
<path
inkscape:connector-curvature="0"
id="path2752"
stroke-width=".273"
d="M 160.715,110.369 H 29.331" />
<path
inkscape:connector-curvature="0"
id="path2754"
stroke-width=".277"
d="M 148.923,141.514 30.087,141.816" />
</g>
<g
transform="translate(-20.864,-39.158)"
id="g2774">
<path
inkscape:connector-curvature="0"
id="path2758"
stroke-linejoin="bevel"
stroke-linecap="round"
stroke-width="2.3"
stroke="#820300"
fill="#50166a"
overflow="visible"
font-family="sans-serif"
font-weight="400"
color="#000"
d="m 30.318,46.764 -0.162,0.209 c 22.724,17.605 39.94,35.416 53.207,51.887 16.759,20.806 27.22,39.476 34.533,52.907 3.657,6.715 6.527,12.12 9.008,15.834 1.24,1.856 2.383,3.29 3.487,4.255 1.103,0.966 2.178,1.466 3.261,1.42 1.084,-0.045 2.153,-0.637 3.254,-1.789 1.102,-1.152 2.243,-2.868 3.48,-5.203 2.476,-4.669 5.338,-11.808 8.985,-21.814 7.294,-20.013 17.727,-51.492 34.45,-97.557 l -0.249,-0.09 c -1.78,4.907 -3.49,9.848 -5.133,14.427 -13.777,38.418 -22.801,65.256 -29.316,83.13 -3.646,10.002 -6.506,17.134 -8.969,21.78 -1.231,2.322 -2.363,4.023 -3.437,5.146 -1.074,1.123 -2.081,1.665 -3.076,1.707 -0.995,0.042 -2,-0.416 -3.075,-1.356 -1.074,-0.94 -2.21,-2.356 -3.443,-4.203 -2.468,-3.693 -5.337,-9.098 -8.994,-15.814 C 110.814,138.206 100.343,119.518 83.57,98.694 70.29,82.207 53.06,64.381 30.318,46.763 Z"
style="line-height:normal;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;isolation:auto;mix-blend-mode:normal;solid-color:#000000;solid-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path2760"
stroke-linecap="round"
stroke-width="2"
stroke="#0000fd"
fill="none"
d="M 183.82,46.914 30.156,46.973" />
<text
id="text2764"
stroke-width=".265"
font-family="sans-serif"
font-size="10.583"
font-weight="400"
y="78.619003"
x="29.18"
style="line-height:1.25"><tspan
id="tspan2762"
y="78.619003"
x="29.18">-1m</tspan></text>
<text
id="text2768"
stroke-width=".265"
font-family="sans-serif"
font-size="10.583"
font-weight="400"
y="109.462"
x="28.726"
style="line-height:1.25"><tspan
id="tspan2766"
y="109.462"
x="28.726">-2m</tspan></text>
<text
id="text2772"
stroke-width=".265"
font-family="sans-serif"
font-size="10.583"
font-weight="400"
y="140.91"
x="29.330999"
style="line-height:1.25"><tspan
id="tspan2770"
y="140.91"
x="29.330999">-3m</tspan></text>
</g>
</svg>

0 comments on commit d211de2

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