[PATCH] links online-hilfe uinfo

Wald Commits scm-commit at wald.intevation.org
Mon Aug 6 16:07:09 CEST 2018 

# HG changeset patch
# User gernotbelger
# Date 1533564423 -7200
# Node ID 04d6f998debbe556db24ff17b1761d2c23a0c8e7
# Parent  97aa4f6416346887433e5e6c89a67cc434ce33ce
links online-hilfe uinfo

diff -r 97aa4f641634 -r 04d6f998debb artifacts/doc/conf/artifacts/uinfo.xml
--- a/artifacts/doc/conf/artifacts/uinfo.xml	Mon Aug 06 14:07:25 2018 +0200
+++ b/artifacts/doc/conf/artifacts/uinfo.xml	Mon Aug 06 16:07:03 2018 +0200
@@ -20,31 +20,29 @@
       <data name="ld_to" type="Double" />
     </state>
 
-    <state id="state.uinfo.inundationduration.distance_only" description="state.uinfo.inundationduration.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlyInundationDurSelect" helpText="help.state.uinfo.distance_only">
+ <state id="state.uinfo.salix.distance_only" description="state.uinfo.salix.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlySelect" helpText="help.state.uinfo.salix.distance_only">
+      <data name="ld_from" type="Double" />
+      <data name="ld_to" type="Double" />
+    </state>
+    <state id="state.uinfo.inundationduration.distance_only" description="state.uinfo.inundationduration.distance_only" state="org.dive4elements.river.artifacts.states.DistanceOnlyInundationDurSelect" helpText="help.state.uinfo.inundation_duration.location">
       <data name="ld_from" type="Double" />
       <data name="ld_to" type="Double" />
     </state>
 
-    <state id="state.uinfo.distance" description="state.uinfo.distance" state="org.dive4elements.river.artifacts.states.DistanceSelect" helpText="help.state.uinfo.distance_only">
-      <data name="ld_from" type="Double" />
-      <data name="ld_to" type="Double" />
-      <data name="ld_step" type="Double" />
-    </state>
-
-
+ 
 
     <!-- Calculation Mode: Salix Linie -->
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.uinfo.calculation_mode" />
-      <to state="state.uinfo.distance_only" />
+      <to state="state.uinfo.salix.distance_only" />
       <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
     </transition>
 
 
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.uinfo.distance_only" />
+      <from state="state.uinfo.salix.distance_only" />
       <to state="state.uinfo.use_scenario" />
       <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
     </transition>
@@ -66,7 +64,7 @@
       <condition data="use_scenario" value="false" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.scenario_type" description="state.uinfo.scenario_type" state="org.dive4elements.river.artifacts.uinfo.salix.ScenarioTypeState" helpText="help.state.uinfo.scenario_type">
+    <state id="state.uinfo.scenario_type" description="state.uinfo.scenario_type" state="org.dive4elements.river.artifacts.uinfo.salix.ScenarioTypeState" helpText="help.state.uinfo.salix.scenario_type">
       <data name="scenario_selection" type="String" />
     </state>
 
@@ -94,10 +92,10 @@
       <condition data="scenario_selection" value="scenarioType.option3" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.year_epoch" description="state.uinfo.year_epoch" state="org.dive4elements.river.artifacts.uinfo.salix.YearChoice" helpText="help.state.uinfo.year">
+    <state id="state.uinfo.year_epoch" description="state.uinfo.year_epoch" state="org.dive4elements.river.artifacts.uinfo.salix.YearChoice" helpText="help.state.uinfo.salix.historical">
       <data name="ye_select" type="String" />
     </state>
-    <state id="state.uinfo.salix.supraregional" description="state.uinfo.salix.supraregional" state="org.dive4elements.river.artifacts.uinfo.salix.SupraRegionalTableState" helpText="help.state.uinfo.salix">
+    <state id="state.uinfo.salix.supraregional" description="state.uinfo.salix.supraregional" state="org.dive4elements.river.artifacts.uinfo.salix.SupraRegionalTableState" helpText="help.state.uinfo.salix.supraregional">
       <data name="supraregional_table" type="String" />
     </state>
 
@@ -113,11 +111,11 @@
       <condition data="ye_select" value="state.uinfo.epoch" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.load.year_with_soundings" description="state.uinfo.load.year_with_soundings" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleYearSelectState" helpText="help.state.uinfo.load.year">
+    <state id="state.uinfo.load.year_with_soundings" description="state.uinfo.load.year_with_soundings" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleYearSelectState" helpText="help.state.uinfo.salix.historical">
       <data name="singleyear" type="String" />
     </state>
 
-    <state id="state.uinfo.load.epoch" description="state.uinfo.load.epoch" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleEpochSelectState" helpText="help.state.uinfo.load.epoch">
+    <state id="state.uinfo.load.epoch" description="state.uinfo.load.epoch" state="org.dive4elements.river.artifacts.uinfo.salix.LoadSingleEpochSelectState" helpText="help.state.uinfo.salix.historical">
       <data name="singleepoch" type="Integer" />
     </state>
 
@@ -132,7 +130,7 @@
       <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.distance_only_part.historical" description="state.uinfo.distance_only_part.historical" state="org.dive4elements.river.artifacts.uinfo.salix.DistanceOnlyPartHistoricalSelect" helpText="help.state.uinfo.distance_only">
+    <state id="state.uinfo.distance_only_part.historical" description="state.uinfo.distance_only_part.historical" state="org.dive4elements.river.artifacts.uinfo.salix.DistanceOnlyPartHistoricalSelect" helpText="help.state.uinfo.salix.historical">
       <data name="ld_from_part" type="Double" />
       <data name="ld_to_part" type="Double" />
        <data name="bedheights_for_part" type="Double" />
@@ -144,11 +142,11 @@
       <condition data="calculation_mode" value="uinfo_salix_line" operator="equal" />
     </transition>
 
-    <state id="state.uinfo.inundation.load.scenario.regional" description="state.uinfo.inundation.load.scenario.regional" state="org.dive4elements.river.artifacts.uinfo.salix.LoadScenarioSelectLimit5" helpText="help.state.uinfo.use_scenario">
+    <state id="state.uinfo.inundation.load.scenario.regional" description="state.uinfo.inundation.load.scenario.regional" state="org.dive4elements.river.artifacts.uinfo.salix.LoadScenarioSelectLimit5" helpText="help.state.uinfo.salix.regional">
       <data name="sedimentheight" type="String" /> <!-- mittelwasserlage in cm! -->
     </state>
 
-    <state id="state.uinfo.distance_only_part.from_regional" description="state.uinfo.distance_only_part.from_regional" state="org.dive4elements.river.artifacts.states.DistanceOnlyPartSelect" helpText="help.state.uinfo.distance_only">
+    <state id="state.uinfo.distance_only_part.from_regional" description="state.uinfo.distance_only_part.from_regional" state="org.dive4elements.river.artifacts.states.DistanceOnlyPartSelect" helpText="help.state.uinfo.salix.regional">
       <data name="ld_from_part" type="Double" />
       <data name="ld_to_part" type="Double" />
     </state>
@@ -167,7 +165,7 @@
     </transition>
 
 
-    <state id="state.uinfo.salix_line" description="state.uinfo.salix_line" state="org.dive4elements.river.artifacts.uinfo.salix.SalixLineState" helpText="help.state.uinfo.salix_line">
+    <state id="state.uinfo.salix_line" description="state.uinfo.salix_line" state="org.dive4elements.river.artifacts.uinfo.salix.SalixLineState" helpText="help.state.uinfo.river">
       <outputmodes>
         <outputmode name="uinfo_salix_line" description="output.uinfo_salix_line" mime-type="image/png" type="chart">
           <facets>
@@ -230,12 +228,12 @@
     </transition>
 
 
-    <state id="state.uinfo.year_totalepoch" description="state.uinfo.year_totalepoch" state="org.dive4elements.river.artifacts.uinfo.inundationduration.YearChoice" helpText="help.state.uinfo.year">
+    <state id="state.uinfo.year_totalepoch" description="state.uinfo.year_totalepoch" state="org.dive4elements.river.artifacts.uinfo.inundationduration.YearChoice" helpText="help.state.uinfo.salix.historical">
       <data name="ye_select" type="String" />
     </state>
 
 
-    <state id="state.uinfo.load.year" description="state.uinfo.load.year" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadSingleYearSelectState" helpText="help.state.uinfo.load.year">
+    <state id="state.uinfo.load.year" description="state.uinfo.load.year" state="org.dive4elements.river.artifacts.uinfo.inundationduration.LoadSingleYearSelectState" helpText="help.state.uinfo.salix.historical">
       <data name="singleyear" type="String" />
     </state>
 
diff -r 97aa4f641634 -r 04d6f998debb artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties	Mon Aug 06 14:07:25 2018 +0200
+++ b/artifacts/src/main/resources/messages.properties	Mon Aug 06 16:07:03 2018 +0200
@@ -1092,6 +1092,15 @@
 scenarioType.option2 = \u00dcberregional wirkende Eingriffe
 scenarioType.option3 = Historische Betrachtung 
 help.state.uinfo.scenario_type=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.scenario_type
+help.state.uinfo.salix.distance_only = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.distance_only
+help.state.uinfo.salix.use_scenario${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.use_scenario
+help.state.uinfo.salix.scenario_type = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.scenario_type
+help.state.uinfo.salix.supraregional = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.supraregional
+help.state.uinfo.salix.regional = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.regional
+help.state.uinfo.salix.historical = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.historical
+help.state.uinfo.inundation_duration = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation_duration
+help.state.uinfo.inundation_duration.location = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation_duration.location
+help.state.uinfo.vegetation_zones = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.vegetation_zones
 
 state.bundu.wst.load.distance_only_part = Fehltiefenermittlung
 state.uinfo.distance_only_part.historical= Teilabschnitt
@@ -1099,6 +1108,7 @@
 state.uinfo.distance_only_part = Teilabschnitt
 help.state.uinfo.distance_only_part = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.distance_only_part 
 
+state.uinfo.salix.distance_only = Wahl der Berechnungsstrecke
 state.uinfo.distance_only = Choose calculation range [km]
 state.uinfo.inundationduration.distance_only = Wahl des Darstellungsbereichs
 help.state.uinfo.distance_only = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.distance_only
diff -r 97aa4f641634 -r 04d6f998debb artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties	Mon Aug 06 14:07:25 2018 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Mon Aug 06 16:07:03 2018 +0200
@@ -1085,13 +1085,22 @@
 help.state.uinfo.use_scenario=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.use_scenario
 help.state.uinfo.river=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.river
 help.state.uinfo.calculation_mode=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.calculation_mode
-
+help.state.uinfo.salix.suprarregional 
 state.uinfo.scenario_type = Szenariotyp
 state.uinfo.load.scenario_type=Auswahl des Szenariotyps
 scenarioType.option1 = Regional wirkende Eingriffe
 scenarioType.option2 = \u00dcberregional wirkende Eingriffe
 scenarioType.option3 = Historische Betrachtung 
 help.state.uinfo.scenario_type=${help.url}/OnlineHilfe/UINFO#help.state.uinfo.scenario_type
+help.state.uinfo.salix.distance_only = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.distance_only
+help.state.uinfo.salix.use_scenario = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.use_scenario
+help.state.uinfo.salix.scenario_type = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.scenario_type
+help.state.uinfo.salix.supraregional = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.supraregional
+help.state.uinfo.salix.regional = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.regional
+help.state.uinfo.salix.historical = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.salix.historical
+help.state.uinfo.inundation_duration = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation_duration
+help.state.uinfo.inundation_duration.location = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.inundation_duration.location
+help.state.uinfo.vegetation_zones = ${help.url}/OnlineHilfe/UINFO#help.state.uinfo.vegetation_zones
 
 state.bundu.wst.load.distance_only_part= Berechnungsstrecke Fehltiefen
 state.uinfo.distance_only_part.historical= Teilabschnitt
@@ -1099,6 +1108,7 @@
 state.uinfo.distance_only_part = Teilabschnitt
 help.state.uinfo.distance_only_part = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.distance_only_part 
 
+state.uinfo.salix.distance_only = Wahl der Berechnungsstrecke
 state.uinfo.distance_only = Wahl der Berechnungsstrecke
 state.uinfo.inundationduration.distance_only = Wahl des Darstellungsbereichs
 help.state.uinfo.distance_only = ${help.url}/OnlineHilfe/SINFO#help.state.sinfo.distance_only

More information about the Dive4Elements-commits mailing list