Mercurial > gemma
changeset 4899:b2d88c680691 fairway-marks-import
merge with default
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Wed, 05 Feb 2020 11:14:02 +0100 |
parents | 79a5d0c0d2f5 (current diff) af38a19f615a (diff) |
children | bbcea42bba87 |
files | |
diffstat | 2 files changed, 34 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/fairway/Fairwayprofile.vue Mon Feb 03 15:08:06 2020 +0100 +++ b/client/src/components/fairway/Fairwayprofile.vue Wed Feb 05 11:14:02 2020 +0100 @@ -566,6 +566,16 @@ } this.drawFairway({ graph, xScale, yScaleRight, offsetY }); }, + /** + * Draws Fairway rectangle + * + * start end + * ____________ + * [___________] customDepth | referenceDepth + * + * Starting point is the 0 line of the diagram + * + */ drawFairway({ graph, xScale, yScaleRight, offsetY }) { if (this.fairwayData === undefined) { return; @@ -655,8 +665,8 @@ .scaleLinear() .domain([ this.waterlevel - - (this.maxAlt * 100 + (this.waterlevel - this.refWaterlevel)), - this.waterlevel + this.maxAlt * 0.1 * 100 + (this.maxAlt * 110 + (this.waterlevel - this.refWaterlevel)), + this.waterlevel + this.maxAlt * 10 ]) .rangeRound([height, 0]); @@ -723,6 +733,13 @@ graph.selectAll(".domain").attr("stroke", "black"); return { xScale, yScaleRight, graph }; }, + /** + * Draws a rectangle for the waterlevel + * (0,0) (totalLength,0) + * ____________ + * [____________] + * (0,height) (totalLength, height) + */ drawWaterlevel({ graph, xScale, yScaleRight, height, offsetY }) { let waterArea = d3 .area() @@ -742,6 +759,21 @@ .attr("d", waterArea) .attr("transform", `translate(0 ${-offsetY})`); }, + /** + * + * Draws the ground level + * + * (x, y + ΔWaterlevel) + * + * ΔWaterlevel is the difference between the current waterlevel and the reference level + * + * Is the current level higher as the reference level ΔWaterlevel is positive, which in + * turn means that the distance between the surface and the ground is increased. + * + * Is the current level below the reference level ΔWaterlevel is negative, which in turn means + * that the distance between the surface and the ground is decreased. + * + */ drawProfile({ graph, xScale,
--- a/client/src/components/importconfiguration/ImportDetails.vue Mon Feb 03 15:08:06 2020 +0100 +++ b/client/src/components/importconfiguration/ImportDetails.vue Wed Feb 05 11:14:02 2020 +0100 @@ -38,9 +38,6 @@ <option :value="$options.IMPORTTYPES.GAUGEMEASUREMENT"> <translate>Gauge measurement</translate> </option> - <option :value="$options.IMPORTTYPES.FAIRWAYMARKS"> - <translate>Fairwaymarks</translate> - </option> </optgroup> <optgroup :label="onetimeLabel"> <option :value="$options.IMPORTTYPES.SOUNDINGRESULTS">