[PATCH] bundu.bezugswst workflow reviewed

Wald Commits scm-commit at wald.intevation.org
Thu Aug 2 15:06:28 CEST 2018


# HG changeset patch
# User gernotbelger
# Date 1533215182 -7200
# Node ID 3d006afee054a8a573b2dc134d6fa0bf3baae892
# Parent  ba1e2e8f05d1b9bbd86d4801f2cadcbded27b6f8
bundu.bezugswst workflow reviewed

diff -r ba1e2e8f05d1 -r 3d006afee054 artifacts/doc/conf/artifacts/bundu.xml
--- a/artifacts/doc/conf/artifacts/bundu.xml	Thu Aug 02 15:02:27 2018 +0200
+++ b/artifacts/doc/conf/artifacts/bundu.xml	Thu Aug 02 15:06:22 2018 +0200
@@ -309,33 +309,40 @@
 
 
     <!-- Bezugswasserstände bezugswst -->
+    <!-- clone, otherwise conditions won't work -->
+    <state id="state.bundu.wst.location" description="state.bundu.wst.location" helpText="help.state.bundu.location" state="org.dive4elements.river.artifacts.states.fixation.LocationSelect">
+      <data name="ld_from" type="Double" />
+      <data name="ld_to" type="Double" />
+      <data name="ld_step" type="Double" />
+    </state>
+
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.bundu.calculation.mode" />
-      <to state="state.bundu.location" />
+      <to state="state.bundu.wst.location" />
       <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.location" />
-      <to state="state.bundu.yearselect" />
+      <from state="state.bundu.wst.location" />
+      <to state="state.bundu.wst.yearselect" />
       <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
     </transition>
 
 
-    <state id="state.bundu.yearselect" helpText="state.bundu.yearselect" description="state.bundu.yearselect" state="org.dive4elements.river.artifacts.bundu.bezugswst.FixationPeriod">
+    <state id="state.bundu.wst.yearselect" helpText="help.state.bundu.wst.yearselect" description="state.bundu.wst.yearselect" state="org.dive4elements.river.artifacts.bundu.bezugswst.FixationPeriod">
       <data name="singleyear" type="String" />
       <data name="events_temp" type="String" /> <!-- String. -->
     </state>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.yearselect" />
-      <to state="state.bundu.fixationchoice" />
+      <from state="state.bundu.wst.yearselect" />
+      <to state="state.bundu.wst.fixationchoice" />
       <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
     </transition>
 
-    <state id="state.bundu.fixationchoice" helpText="state.bundu.fixationchoice" description="state.bundu.fixationchoice" state="org.dive4elements.river.artifacts.bundu.bezugswst.FixationChoice">
+    <state id="state.bundu.wst.fixationchoice" helpText="help.state.bundu.wst.fixationchoice" description="state.bundu.wst.fixationchoice" state="org.dive4elements.river.artifacts.bundu.bezugswst.FixationChoice">
       <data name="fix_choice" type="String" />
       <data name="q1" type="Integer" />
       <data name="q2" type="Integer" /> <!-- necessary, because they will be set automatically -->
@@ -348,30 +355,36 @@
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.fixationchoice" />
+      <from state="state.bundu.wst.fixationchoice" />
       <to state="state.bundu.wst.fix.load.year_length" />
-      <condition data="fix_choice" value="state.bundu.fix.auto" operator="equal" />
+      <condition data="fix_choice" value="state.bundu.wst.fix.auto" operator="equal" />
     </transition>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.fixationchoice" />
-      <to state="state.bundu.gaugerange" />
-      <condition data="fix_choice" value="state.bundu.fix.manual" operator="equal" />
+      <from state="state.bundu.wst.fixationchoice" />
+      <to state="state.bundu.wst.gaugerange" />
+      <condition data="fix_choice" value="state.bundu.wst.fix.manual" operator="equal" />
     </transition>
 
-
-
+    <state id="state.bundu.wst.gaugerange" description="state.bundu.wst.gaugerange" helpText="help.state.bundu.gaugerange" state="org.dive4elements.river.artifacts.states.fixation.GaugeRange">
+      <data name="q1" type="Integer" />
+      <data name="q2" type="Integer" />
+    </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.gaugerange" />
-      <to state="state.bundu.eventselect" />
+      <from state="state.bundu.wst.gaugerange" />
+      <to state="state.bundu.wst.eventselect" />
       <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
     </transition>
 
+    <!-- clone; conditions... -->
+    <state id="state.bundu.wst.eventselect" description="state.bundu.wst.eventselect" helpText="help.state.bundu.eventselect" state="org.dive4elements.river.artifacts.states.fixation.EventSelect">
+      <data name="events" type="intarray" />
+    </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.eventselect" />
+      <from state="state.bundu.wst.eventselect" />
       <to state="state.bundu.wst.fix.load.year_length" />
       <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
     </transition>
@@ -409,14 +422,14 @@
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.bundu.wst.load.calc_choice" />
       <to state="state.bundu.wst.load.function" />
-      <condition data="calc_choice" value="state.bundu.calc.manual" operator="equal" />
+      <condition data="calc_choice" value="state.bundu.wst.calc.manual" operator="equal" />
     </transition>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.bundu.wst.load.calc_choice" />
       <to state="state.bundu.wst.load.preprocessing" />
-      <condition data="calc_choice" value="state.bundu.calc.auto" operator="equal" />
+      <condition data="calc_choice" value="state.bundu.wst.calc.auto" operator="equal" />
     </transition>
 
     <state id="state.bundu.wst.load.function" helpText="state.bundu.wst.load.function" description="state.bundu.wst.load.function" state="org.dive4elements.river.artifacts.states.fixation.FunctionSelect">
@@ -446,7 +459,7 @@
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.bundu.wst.load.missing_volume" />
-      <to state="state.bundu.load.distance_only_part" />
+      <to state="state.bundu.wst.load.distance_only_part" />
       <condition data="missing_volume" value="true" operator="equal" />
     </transition>
 
@@ -456,14 +469,14 @@
       <condition data="missing_volume" value="false" operator="equal" />
     </transition>
 
-    <state id="state.bundu.load.distance_only_part" description="state.bundu.load.distance_only_part" state="org.dive4elements.river.artifacts.bundu.bezugswst.DistanceOnlyPartMissVolumeSelect" helpText="help.state.bundu.distance_only">
+    <state id="state.bundu.wst.load.distance_only_part" description="state.bundu.wst.load.distance_only_part" state="org.dive4elements.river.artifacts.bundu.bezugswst.DistanceOnlyPartMissVolumeSelect" helpText="help.state.bundu.distance_only">
       <data name="ld_from_part" type="Double" />
       <data name="ld_to_part" type="Double" />
     </state>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.bundu.load.distance_only_part" />
+      <from state="state.bundu.wst.load.distance_only_part" />
       <to state="state.bundu.wst.soundings" />
       <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
     </transition>
@@ -477,20 +490,20 @@
       <to state="state.bundu.wst" />
       <condition data="calculation_mode" value="bundu_bezugswst" operator="equal" />
     </transition>
- 
+
 
 
     <state id="state.bundu.wst" helpText="state.bundu.wst" description="state.bundu.wst" state="org.dive4elements.river.artifacts.bundu.bezugswst.BezugswstState">
       <outputmodes>
-    
+
         <outputmode name="bundu_wst_export" description="output.fix_waterlevel_export" mine-type="text/plain" type="export">
           <facets>
-            <facet name="csv" description="facet.waterlevel_export.csv" /> 
+            <facet name="csv" description="facet.waterlevel_export.csv" />
             <facet name="pdf" description="facet.waterlevel_export.pdf" />
           </facets>
         </outputmode>
-          
-      
+
+
       </outputmodes>
     </state>
 
diff -r ba1e2e8f05d1 -r 3d006afee054 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduAccess.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduAccess.java	Thu Aug 02 15:02:27 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BunduAccess.java	Thu Aug 02 15:06:22 2018 +0200
@@ -29,7 +29,7 @@
 
     public boolean isAutoSelect() {
         final String fixChoice = this.artifact.getDataAsString("fix_choice");
-        if (fixChoice != null && fixChoice.equals("state.bundu.fix.auto")) {
+        if (fixChoice != null && fixChoice.equals("state.bundu.wst.fix.auto")) {
             return true;
         }
         return false;
diff -r ba1e2e8f05d1 -r 3d006afee054 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/CalcChoice.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/CalcChoice.java	Thu Aug 02 15:02:27 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/CalcChoice.java	Thu Aug 02 15:06:22 2018 +0200
@@ -33,8 +33,8 @@
     @Override
     protected LinkedHashMap<String, String> makeEntries(final CallMeta meta, final Artifact artifact) {
         final LinkedHashMap<String, String> entries = new LinkedHashMap<>();
-        entries.put("state.bundu.calc.auto", null);
-        entries.put("state.bundu.calc.manual", null);
+        entries.put("state.bundu.wst.calc.auto", null);
+        entries.put("state.bundu.wst.calc.manual", null);
         return entries;
     }
 
diff -r ba1e2e8f05d1 -r 3d006afee054 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/FixationChoice.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/FixationChoice.java	Thu Aug 02 15:02:27 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/FixationChoice.java	Thu Aug 02 15:06:22 2018 +0200
@@ -34,8 +34,8 @@
     @Override
     protected LinkedHashMap<String, String> makeEntries(final CallMeta meta, final Artifact artifact) {
         final LinkedHashMap<String, String> entries = new LinkedHashMap<>();
-        entries.put("state.bundu.fix.auto", null);
-        entries.put("state.bundu.fix.manual", null);
+        entries.put("state.bundu.wst.fix.auto", null);
+        entries.put("state.bundu.wst.fix.manual", null);
         return entries;
     }
 
diff -r ba1e2e8f05d1 -r 3d006afee054 artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties	Thu Aug 02 15:02:27 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties	Thu Aug 02 15:06:22 2018 +0200
@@ -1095,7 +1095,7 @@
 scenarioType.option3 = Historische Betrachtung 
 help.state.uinfo.scenario_type=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.scenario_type
 
-state.bundu.load.distance_only_part= Teilabschnitt
+state.bundu.wst.load.distance_only_part = Fehltiefenermittlung
 state.uinfo.distance_only_part.historical= Teilabschnitt
 state.uinfo.distance_only_part.from_regional= Teilabschnitt
 state.uinfo.distance_only_part = Teilabschnitt
@@ -1213,32 +1213,40 @@
 state.bundu.analysis.preprocessing = Outliers
 state.bundu.preprocess=use outlier test
 state.bundu.vollmer.function=Function
-state.bundu.vollmer.preprocessing = Outliers
-state.bundu.vollmer.qs = Input for W/Q data
-state.bundu.yearselect = Bezugsjahr
-state.bundu.fix.auto = Automatische Auswahl 
-state.bundu.fix.manual = Manuelle Auswahl
-state.bundu.fixationchoice = Fixierungen
-state.bundu.calc.auto = Automatische Auswahl
-state.bundu.calc.manual = Manuelle Auswahl
+state.bundu.vollmer.preprocessing = Ausrei\u00dfer
+state.bundu.vollmer.qs = Eingabe f\u00fcr W/Q Daten
+state.bundu.wst.gaugerange = Gaugerange
+state.bundu.wst.eventselect = Event selection
+state.bundu.wst.location = Distance
+state.bundu.wst.yearselect = Bezugsjahr
+state.bundu.wst.fix.auto = Automatische Auswahl 
+state.bundu.wst.fix.manual = Manuelle Auswahl
+state.bundu.wst.fixationchoice = Fixierungen
+state.bundu.wst.calc.auto = Automatische Auswahl
+state.bundu.wst.calc.manual = Manuelle Auswahl
 state.bundu.wst.function = Auswahl der Ausgleichsfunktion
 state.bundu.wst.missing_volume.select = Ermittlung von Fehlvolumina durchf\u00fchren
 
-help.state.bundu.river=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.river
-help.state.bundu.calculation.mode=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.calculation.mode
-help.state.bundu.location=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.location
-help.state.bundu.period=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.period
-help.state.bundu.gaugerange=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.gaugerange
-help.state.bundu.eventselect=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.eventselect
-help.state.bundu.analysis.referenceperiod=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.referenceperiod
-help.state.bundu.analysis.analysisperiods=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.analysisperiods
-help.state.bundu.analysis.function=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.function
-help.state.bundu.analysis.preprocessing=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.preprocessing
-help.state.bundu.analysis.compute=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.compute
-help.state.bundu.vollmer.function=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.function
-help.state.bundu.vollmer.preprocessing=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.preprocessing
-help.state.bundu.vollmer.qs=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.qs
-help.state.bundu.vollmer.compute=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.compute
+help.state.bundu.river=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.river
+help.state.bundu.calculation.mode=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.calculation.mode
+help.state.bundu.location=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.location
+help.state.bundu.period=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.period
+help.state.bundu.gaugerange=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.gaugerange
+help.state.bundu.eventselect=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.eventselect
+help.state.bundu.analysis.referenceperiod=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.referenceperiod
+help.state.bundu.analysis.analysisperiods=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.analysisperiods
+help.state.bundu.analysis.function=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.function
+help.state.bundu.analysis.preprocessing=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.preprocessing
+help.state.bundu.analysis.compute=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.compute
+help.state.bundu.vollmer.function=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.function
+help.state.bundu.vollmer.preprocessing=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.preprocessing
+help.state.bundu.vollmer.qs=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.qs
+help.state.bundu.vollmer.compute=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.compute
+
+help.state.bundu.wst.yearselect = ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.yearselect
+help.state.bundu.wst.fixationchoice = ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.fixationchoice
+help.state.bundu.wst.fix.load.year_length =  ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.year_length
+help.state.bundu.wst.function =  ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.function
 
 state.bundu.wst.fix.load.year_length = L\u00e4nge der Abflusszeitreihe 
 state.bundu.wst.fix.year_length = L\u00e4nge der Abflusszeitreihe (Ausgehend vom Bezugsjahr in die Vergangenheit)
diff -r ba1e2e8f05d1 -r 3d006afee054 artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties	Thu Aug 02 15:02:27 2018 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Thu Aug 02 15:06:22 2018 +0200
@@ -1095,7 +1095,7 @@
 scenarioType.option3 = Historische Betrachtung 
 help.state.uinfo.scenario_type=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.scenario_type
 
-state.bundu.load.distance_only_part= Berechnungsstrecke Fehltiefen
+state.bundu.wst.load.distance_only_part= Berechnungsstrecke Fehltiefen
 state.uinfo.distance_only_part.historical= Teilabschnitt
 state.uinfo.distance_only_part.from_regional= Teilabschnitt 
 state.uinfo.distance_only_part = Teilabschnitt
@@ -1215,30 +1215,38 @@
 state.bundu.vollmer.function= Ausgleichsfunktion
 state.bundu.vollmer.preprocessing = Ausrei\u00dfer
 state.bundu.vollmer.qs = Eingabe f\u00fcr W/Q Daten
-state.bundu.yearselect = Bezugsjahr
-state.bundu.fix.auto = Automatische Auswahl 
-state.bundu.fix.manual = Manuelle Auswahl
-state.bundu.fixationchoice = Fixierungen
-state.bundu.calc.auto = Automatische Auswahl
-state.bundu.calc.manual = Manuelle Auswahl
+state.bundu.wst.gaugerange = Abflussklassen
+state.bundu.wst.eventselect = Ereignisauswahl
+state.bundu.wst.location = Strecke
+state.bundu.wst.yearselect = Bezugsjahr
+state.bundu.wst.fix.auto = Automatische Auswahl 
+state.bundu.wst.fix.manual = Manuelle Auswahl
+state.bundu.wst.fixationchoice = Fixierungen
+state.bundu.wst.calc.auto = Automatische Auswahl
+state.bundu.wst.calc.manual = Manuelle Auswahl
 state.bundu.wst.function = Auswahl der Ausgleichsfunktion
 state.bundu.wst.missing_volume.select = Ermittlung von Fehlvolumina durchf\u00fchren
 
-help.state.bundu.river=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.river
-help.state.bundu.calculation.mode=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.calculation.mode
-help.state.bundu.location=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.location
-help.state.bundu.period=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.period
-help.state.bundu.gaugerange=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.gaugerange
-help.state.bundu.eventselect=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.eventselect
-help.state.bundu.analysis.referenceperiod=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.referenceperiod
-help.state.bundu.analysis.analysisperiods=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.analysisperiods
-help.state.bundu.analysis.function=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.function
-help.state.bundu.analysis.preprocessing=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.preprocessing
-help.state.bundu.analysis.compute=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.analysis.compute
-help.state.bundu.vollmer.function=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.function
-help.state.bundu.vollmer.preprocessing=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.preprocessing
-help.state.bundu.vollmer.qs=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.qs
-help.state.bundu.vollmer.compute=${help.url}/OnlineHilfe/bunduierungsanalyse#help.state.bundu.vollmer.compute
+help.state.bundu.river=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.river
+help.state.bundu.calculation.mode=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.calculation.mode
+help.state.bundu.location=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.location
+help.state.bundu.period=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.period
+help.state.bundu.gaugerange=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.gaugerange
+help.state.bundu.eventselect=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.eventselect
+help.state.bundu.analysis.referenceperiod=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.referenceperiod
+help.state.bundu.analysis.analysisperiods=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.analysisperiods
+help.state.bundu.analysis.function=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.function
+help.state.bundu.analysis.preprocessing=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.preprocessing
+help.state.bundu.analysis.compute=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.analysis.compute
+help.state.bundu.vollmer.function=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.function
+help.state.bundu.vollmer.preprocessing=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.preprocessing
+help.state.bundu.vollmer.qs=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.qs
+help.state.bundu.vollmer.compute=${help.url}/OnlineHilfe/bundu_fixierungsanalyse#help.state.bundu.vollmer.compute
+
+help.state.bundu.wst.yearselect = ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.yearselect
+help.state.bundu.wst.fixationchoice = ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.fixationchoice
+help.state.bundu.wst.fix.load.year_length =  ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.year_length
+help.state.bundu.wst.function =  ${help.url}/OnlineHilfe/bundu_bezugswst#help.state.bundu.bezugswst.function
 
 state.bundu.wst.fix.load.year_length = L\u00e4nge der Abflusszeitreihe 
 state.bundu.wst.fix.year_length = L\u00e4nge der Abflusszeitreihe (Ausgehend vom Bezugsjahr in die Vergangenheit)
diff -r ba1e2e8f05d1 -r 3d006afee054 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/CustomFixationChoiceRadioPanel.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/CustomFixationChoiceRadioPanel.java	Thu Aug 02 15:02:27 2018 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/bundu/CustomFixationChoiceRadioPanel.java	Thu Aug 02 15:06:22 2018 +0200
@@ -95,7 +95,7 @@
     }
 
     @Override
-    protected Data[] getData() { // TODO: wild √ľberschreiben :-(
+    protected Data[] getData() {
         final String value = this.form.getValueAsString("selection");
         final List<Data> data = new ArrayList<Data>();
 
@@ -109,7 +109,7 @@
         final DataItem item = new DefaultDataItem("fix_choice", "fix_choice", value);
         data.add(new DefaultData("fix_choice", null, null, new DataItem[] { item }));
 
-        if (value.equals("state.bundu.fix.auto")) {
+        if (value.equals("state.bundu.wst.fix.auto")) {
             // set gauges: (do not appear in create old, but need to be set for calculation purpose
             final LinkedHashMap<String, String> map = FixGaugeSelectPanel.getMapValues(this.MSG);
             final String mnq = this.MSG.gauge_mnq();


More information about the Dive4Elements-commits mailing list