Mercurial > gemma

changeset 4320:baa3759f27f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
client: opacity for WMS-Layers
author Fadi Abbud <fadi.abbud@intevation.de>
date Wed, 04 Sep 2019 12:40:21 +0200
parents 0d516bac1aae
children 6dfbf534818b
files client/src/components/systemconfiguration/ColorSettings.vue
diffstat 1 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/systemconfiguration/ColorSettings.vue	Wed Sep 04 12:21:36 2019 +0200
+++ b/client/src/components/systemconfiguration/ColorSettings.vue	Wed Sep 04 12:40:21 2019 +0200
@@ -26,7 +26,12 @@
               <div class="card-body p-0">
                 <chrome-picker
                   v-model="f.strokeColor"
-                  :class="{ hide: f.noOpacity }"
+                  :class="{
+                    hide:
+                      f.noOpacity ||
+                      f.name === 'Distance Marks' ||
+                      f.name === 'Distance Marks, Axis'
+                  }"
                 />
               </div>
             </div>
@@ -144,14 +149,12 @@
         {
           name: "Distance Marks, Axis",
           strokeColor: initSColor,
-          fillColor: initSColor,
-          noOpacity: true
+          fillColor: initSColor
         },
         {
           name: "Distance Marks",
           strokeColor: initSColor,
-          fillColor: initSColor,
-          noOpacity: true
+          fillColor: initSColor
         },
         {
           name: "Waterway profiles",
@@ -260,10 +263,7 @@
           : initFColor;
       // Now we do not handle alpha-color value for WMS-Layers
       // ToDo: implementation in front-backend.
-      let strokeCForWMS = feature.strokeColor.hex || feature.strokeColor,
-        fillCForWMS = feature.fillColor
-          ? feature.fillColor.hex || feature.fillColor
-          : initFColor;
+      let strokeCForWMS = feature.strokeColor.hex || feature.strokeColor;
       let noChangeMsg = name => {
         displayInfo({
           title: name + ":",
@@ -413,12 +413,12 @@
         case "Distance Marks, Axis": {
           if (
             strokeCForWMS !== this.config.distance_marks_stroke ||
-            fillCForWMS !== this.config.distance_marks_fill
+            fillC !== this.config.distance_marks_fill
           ) {
             this.$store
               .dispatch("application/saveConfig", {
                 distance_marks_stroke: strokeCForWMS,
-                distance_marks_fill: fillCForWMS
+                distance_marks_fill: fillC
               })
               .finally(() => this.$store.dispatch("application/loadConfig"));
           } else {
@@ -429,12 +429,12 @@
         case "Distance Marks": {
           if (
             strokeCForWMS !== this.config.distance_marks_ashore_stroke ||
-            fillCForWMS !== this.config.distance_marks_ashore_fill
+            fillC !== this.config.distance_marks_ashore_fill
           ) {
             this.$store
               .dispatch("application/saveConfig", {
                 distance_marks_ashore_stroke: strokeCForWMS,
-                distance_marks_ashore_fill: fillCForWMS
+                distance_marks_ashore_fill: fillC
               })
               .finally(() => this.$store.dispatch("application/loadConfig"));
           } else {