[PATCH] sinfo onlinehilfe

[Wald Commits]

# HG changeset patch
# User gernotbelger
# Date 1533657596 -7200
# Node ID 0dd1d592714f95edc189cf1e979c053abeb9012f
# Parent  8ae7137b67d7b6efa2b51b54966a5584d081dbe9
sinfo onlinehilfe

diff -r 8ae7137b67d7 -r 0dd1d592714f artifacts/doc/conf/artifacts/sinfo.xml
--- a/artifacts/doc/conf/artifacts/sinfo.xml	Tue Aug 07 14:06:49 2018 +0200
+++ b/artifacts/doc/conf/artifacts/sinfo.xml	Tue Aug 07 17:59:56 2018 +0200
@@ -245,7 +245,7 @@
       <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal" />
     </transition>
 
-    <state id="state.sinfo.year_epoch" description="state.sinfo.year_epoch" state="org.dive4elements.river.artifacts.sinfo.collision.YearChoice" helpText="help.state.sinfo.year">
+    <state id="state.sinfo.year_epoch" description="state.sinfo.year_epoch" state="org.dive4elements.river.artifacts.sinfo.collision.YearChoice" helpText="help.state.sinfo.collisions.year_epoch_choice">
       <data name="ye_select" type="String" /> 
     </state>
 
@@ -262,11 +262,11 @@
       <condition data="ye_select" value="state.sinfo.epoch" operator="equal" />
     </transition>
 
-    <state id="state.sinfo.load.year" description="state.sinfo.load.year" state="org.dive4elements.river.artifacts.sinfo.collision.LoadMultipleYearSelectState" helpText="help.state.sinfo.load.year">
+    <state id="state.sinfo.load.year" description="state.sinfo.load.year" state="org.dive4elements.river.artifacts.sinfo.collision.LoadMultipleYearSelectState" helpText="help.state.sinfo.collisions.years">
       <data name="years" type="String" /> 
     </state>
 
-    <state id="state.sinfo.load.epoch" description="state.sinfo.load.epoch" state="org.dive4elements.river.artifacts.sinfo.collision.LoadMultipleEpochSelectState" helpText="help.state.sinfo.load.epoch">
+    <state id="state.sinfo.load.epoch" description="state.sinfo.load.epoch" state="org.dive4elements.river.artifacts.sinfo.collision.LoadMultipleEpochSelectState" helpText="help.state.sinfo.collisions.epochs">
       <data name="epochs" type="String" />
     </state>
 
@@ -339,7 +339,7 @@
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.wspl" />
-      <to state="state.sinfo.wq" />
+      <to state="state.sinfo.inundation_duration.wq" />
       <condition data="wspl" value="true" operator="equal" />
     </transition>
 
@@ -350,7 +350,7 @@
     </transition>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.sinfo.wq" />
+      <from state="state.sinfo.inundation_duration.wq" />
       <to state="state.sinfo.flood_duration" />
       <condition data="calculation_mode" value="sinfo_calc_flood_duration" operator="equal" />
     </transition>
@@ -428,6 +428,16 @@
       <data name="wq_step" type="Double" />
       <data name="wq_single" type="Double[]" />
     </state>
+    
+     <state id="state.sinfo.inundation_duration.wq" description="state.sinfo.inundation_duration.wq" state="org.dive4elements.river.artifacts.states.WQSelect" helpText="help.state.sinfo.inundation_duration.wq">
+      <data name="wq_isq" type="Boolean" />
+      <data name="wq_isfree" type="Boolean" />
+      <data name="wq_isrange" type="Boolean" />
+      <data name="wq_from" type="Double" />
+      <data name="wq_to" type="Double" />
+      <data name="wq_step" type="Double" />
+      <data name="wq_single" type="Double[]" />
+    </state>
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.wq" />
diff -r 8ae7137b67d7 -r 0dd1d592714f artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties	Tue Aug 07 14:06:49 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties	Tue Aug 07 17:59:56 2018 +0200
@@ -810,9 +810,6 @@
 state.sinfo.infrastructures_inundation = \u00dcberflutungsdauern Infrastrukturen BWaStr (Ergebnis)
 help.state.sinfo.infrastructures_inundation = ${help.url}/OnlineHilfe/SINFO#help.state.infrastructures_inundation
 
-state.sinfo.grounding =Grundber\u00fchrungen (Ergebnis)
-help.state.sinfo.grounding =help.state.sinfo.flowdepthdevlopment_current_select = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.grounding
-
 help.state.sinfo=${help.url}/OnlineHilfe/SINFO
 help.state.sinfo.river=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.river
 help.state.sinfo.calculation_mode=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.calculation_mode
@@ -853,23 +850,26 @@
 
 state.sinfo.flowdepthdevlopment_historical_select = Historisches Differenzenpaar
 help.state.sinfo.flowdepthdevlopment_historical_select = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.flowdepthdevlopment_historical_select
+help.state.sinfo.collisions.year_epoch_choice = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.collisions.year_epoch_choice
+help.state.sinfo.collisions.epochs = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.collisions.epochs
 
 state.sinfo.riverside = Auswahl der Uferseite
 state.sinfo.riverside.option1 = Linke Uferseite
 state.sinfo.riverside.option2 = Rechte Uferseite
 state.sinfo.riverside.option3 = Beide Uferseiten
-help.state.sinfo.wspl= ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.riverside
+help.state.sinfo.riverside= ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.riverside
 
 state.bundu.wst.qs = Eingabe f\u00fcr UD/Q Daten
 state.sinfo.wqinput = Eingabe f\u00fcr W/Q Daten
 state.sinfo.wqinput.option = wqinput-option
 help.state.sinfo.wqinput = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.wqinput
+help.state.sinfo.inundation_duration.wq = ${help.url}/OnlineHilfe/SINFO#state.sinfo.inundation_duration.wq
+state.sinfo.inundation_duration.wq = Input for W/Q data
 
 state.sinfo.wspl = Wasserspiegellagen
 state.sinfo.wspl.option = Wasserspiegellagen zus\u00e4tzlich darstellen?
 state.sinfo.wspl.active = Ja
 state.sinfo.wspl.inactive = Nein
-state.sinfo.grounding.year = Jahr/Zeitraum 
 
 sinfo.export.flow_depth.csv.meta.header.result = ## {0} - {1} - {2}
 sinfo.export.flow_depth.csv.meta.header.result.label = Calculation Output
diff -r 8ae7137b67d7 -r 0dd1d592714f artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties	Tue Aug 07 14:06:49 2018 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Tue Aug 07 17:59:56 2018 +0200
@@ -810,9 +810,6 @@
 state.sinfo.infrastructures_inundation = \u00dcberflutungsdauern Infrastrukturen BWaStr (Ergebnis)
 help.state.sinfo.infrastructures_inundation = ${help.url}/OnlineHilfe/SINFO#help.state.infrastructures_inundation
 
-state.sinfo.grounding =Grundber\u00fchrungen (Ergebnis)
-help.state.sinfo.grounding =help.state.sinfo.flowdepthdevlopment_current_select = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.grounding
-
 help.state.sinfo=${help.url}/OnlineHilfe/SINFO
 help.state.sinfo.river=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.river
 help.state.sinfo.calculation_mode=${help.url}/OnlineHilfe/SINFO#help.state.sinfo.calculation_mode
@@ -853,23 +850,26 @@
 
 state.sinfo.flowdepthdevlopment_historical_select = Historisches Differenzenpaar
 help.state.sinfo.flowdepthdevlopment_historical_select = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.flowdepthdevlopment_historical_select
+help.state.sinfo.collisions.year_epoch_choice = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.collisions.year_epoch_choice
+help.state.sinfo.collisions.epochs = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.collisions.epochs
 
 state.sinfo.riverside = Auswahl der Uferseite
 state.sinfo.riverside.option1 = Linke Uferseite
 state.sinfo.riverside.option2 = Rechte Uferseite
 state.sinfo.riverside.option3 = Beide Uferseiten
-help.state.sinfo.wspl= ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.riverside
+help.state.sinfo.riverside= ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.riverside
 
 state.bundu.wst.qs = Eingabe f\u00fcr UD/Q Daten
 state.sinfo.wqinput = Eingabe f\u00fcr W/Q Daten
 state.sinfo.wqinput.option = wqinput-option
 help.state.sinfo.wqinput = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.wqinput
+help.state.sinfo.inundation_duration.wq = ${help.url}/OnlineHilfe/SINFO#state.sinfo.inundation_duration.wq
+state.sinfo.inundation_duration.wq = Eingabe f\u00fcr W/Q Daten
 
 state.sinfo.wspl = Wasserspiegellagen
 state.sinfo.wspl.option = Wasserspiegellagen zus\u00e4tzlich darstellen?
 state.sinfo.wspl.active = Ja
 state.sinfo.wspl.inactive = Nein
-state.sinfo.grounding.year = Jahr/Zeitraum
 
 sinfo.export.flow_depth.csv.meta.header.result = ##{0} - {1} - {2}
 sinfo.export.flow_depth.csv.meta.header.result.label = Ergebnisausgabe