[Dive4elements-commits] [PATCH] FixWQCurveGenerator: Remove second y axis (Q?), reference axis by enums id

Wald Commits scm-commit at wald.intevation.org
Wed Jun 26 14:48:11 CEST 2013


# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1372251288 -7200
# Node ID b9c5bb510b395321f9f127e27628626e521bb9fe
# Parent  0341504e9debc8c50b5ec04b7c948d677678feb5
FixWQCurveGenerator: Remove second y axis (Q?), reference axis by enums id.

diff -r 0341504e9deb -r b9c5bb510b39 artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java	Wed Jun 26 14:42:16 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixWQCurveGenerator.java	Wed Jun 26 14:54:48 2013 +0200
@@ -94,8 +94,7 @@
     public static final double EPSILON = 0.001d;
 
     public static enum YAXIS {
-        W(0),
-        Q(1);
+        W(0);
         public int idx;
         private YAXIS(int c) {
             idx = c;
@@ -219,7 +218,7 @@
                     qwd.getW());
             textAnnos.add(anno);
 
-            addAxisSeries(series, 0, visible);
+            addAxisSeries(series, YAXIS.W.idx, visible);
             if(visible && ThemeUtil.parseShowPointLabel(doc)) {
                 RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, doc);
                 flysAnno.setTextAnnotations(textAnnos);
@@ -252,7 +251,7 @@
                     qwd.getW());
             textAnnos.add(anno);
 
-            addAxisSeries(series, 0, visible);
+            addAxisSeries(series, YAXIS.W.idx, visible);
             if(visible && ThemeUtil.parseShowPointLabel(doc)) {
                 RiverAnnotation flysAnno = new RiverAnnotation(null, null, null, doc);
                 flysAnno.setTextAnnotations(textAnnos);
@@ -317,7 +316,7 @@
                     0.0 ,  // start
                     maxQ); // end
 
-            addAxisSeries(series, 0, visible);
+            addAxisSeries(series, YAXIS.W.idx, visible);
         }
         else {
             logger.warn("doWQCurveOut: maxQ <= 0");
@@ -529,7 +528,7 @@
             textAnnos.add(anno);
         }
 
-        addAxisSeries(series, 0, visible);
+        addAxisSeries(series, YAXIS.W.idx, visible);
         if (visible && ThemeUtil.parseShowPointLabel(theme)) {
             RiverAnnotation flysAnno =
                     new RiverAnnotation(null, null, null, theme);


More information about the Dive4elements-commits mailing list