diff gwt-client/src/test/java/test/bundu/BunduBezugswstRunner.java @ 9442:173f188569c6

little improvements
author gernotbelger
date Mon, 20 Aug 2018 18:20:15 +0200
parents ce0a48b93f4b
children 86e522bc7f36
line wrap: on
line diff
--- a/gwt-client/src/test/java/test/bundu/BunduBezugswstRunner.java	Mon Aug 20 17:30:13 2018 +0200
+++ b/gwt-client/src/test/java/test/bundu/BunduBezugswstRunner.java	Mon Aug 20 18:20:15 2018 +0200
@@ -41,18 +41,19 @@
     private final String calcChoice;
     private final double step;
     private final List<Segment> segments;
-    private final int qSectorStart;
-    private final int qSectorEnd;
+    private final String qSectorStart;
+    private final String qSectorEnd;
     private final int[] events;
+    private final String function;
 
     public BunduBezugswstRunner(final IFilenameMapper file, final double from, final double to, final double step, final River river, final int bezugsjahr,
-            final String fixationChoice, final int gaugeRangeQsectorStart_q1, final int gaugeRangeQsectorEnd_q2, final int[] events, final int years_length,
-            final List<Segment> segments, final String calcChoice, final boolean fehlvolumina, final String sounding)
+            final String fixationChoice, final String function, final String abflussklasseFrom, final String abflussklasseTo, final int[] events,
+            final int years_length, final List<Segment> segments, final String calcChoice, final boolean fehlvolumina, final String sounding)
             throws ConnectionException, ServerException {
         super(AbstractModuleRunner.Infotype.bundu, test.bundu.BunduBerechnungsartenTester.CalcMode.bundu_bezugswst, file, from, to, river);
         this.fixationChoice = fixationChoice;
-        this.qSectorStart = gaugeRangeQsectorStart_q1;
-        this.qSectorEnd = gaugeRangeQsectorEnd_q2;
+        this.qSectorStart = abflussklasseFrom;
+        this.qSectorEnd = abflussklasseTo;
         this.bezugsjahr = bezugsjahr;
         this.years_length = years_length;
         this.fehlvolumina = fehlvolumina;
@@ -61,6 +62,7 @@
         this.step = step;
         this.segments = segments;
         this.events = events;
+        this.function = function;
     }
 
     @Override
@@ -85,8 +87,8 @@
 
         /* fixierungsauswahl - auto oder manuell */
         // AUTO: 0, 3
-        final Data q1 = super.getSimpleTextInput("q1", String.valueOf(this.qSectorStart));
-        final Data q2 = super.getSimpleTextInput("q2", String.valueOf(this.qSectorEnd));
+        final Data q1 = super.getSimpleTextInput("q1", this.qSectorStart);
+        final Data q2 = super.getSimpleTextInput("q2", this.qSectorEnd);
         final Data fixChoice = super.getSimpleTextInput("fix_choice", this.fixationChoice);
 
         final IntDataItem[] arr = new IntDataItem[this.events.length];
@@ -113,7 +115,7 @@
 
         /* calc_choice */
         final Data preprocessingData = super.getSimpleTextInput("preprocessing", "false");
-        final Data functionData = super.getSimpleTextInput("function", "log");
+        final Data functionData = super.getSimpleTextInput("function", this.function);
         final Data calcChoice = super.getSimpleTextInput("calc_choice", this.calcChoice);
         super.feedAndGoData(new Data[] { preprocessingData, functionData, calcChoice });
 

http://dive4elements.wald.intevation.org