diff artifacts/doc/conf/artifacts/sinfo.xml @ 9057:2be202a8cb89

local merge
author gernotbelger
date Fri, 04 May 2018 14:50:13 +0200
parents 95643dffd006
children d3bef221b7d9
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/sinfo.xml	Fri May 04 13:36:01 2018 +0200
+++ b/artifacts/doc/conf/artifacts/sinfo.xml	Fri May 04 14:50:13 2018 +0200
@@ -226,21 +226,57 @@
     
     <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
       <from state="state.sinfo.distance_only"/>
-      <to state="state.sinfo.year"/>
+      <to state="state.sinfo.year_epoch"/>
       <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal"/>
     </transition>
     
-    <state id="state.sinfo.year" description="state.sinfo.year" state="org.dive4elements.river.artifacts.sinfo.collision.YearChoice" helpText="help.state.sinfo.year">
-      <data name="year" type="Boolean"/>
+    <state id="state.sinfo.year_epoch" description="state.sinfo.year_epoch" state="org.dive4elements.river.artifacts.sinfo.collision.YearChoice" helpText="help.state.sinfo.year">
+      <data name="ye_select" type="String"/>
     </state>
     
+    
+      <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+            <from state="state.sinfo.year_epoch"/>
+            <to state="state.sinfo.year_select"/>
+            <condition data="ye_select" value="state.sinfo.year" operator="equal"/>
+        </transition>
+
+        <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+            <from state="state.sinfo.year_epoch"/>
+            <to state="state.sinfo.epoch_select"/>
+            <condition data="ye_select" value="state.sinfo.epoch" operator="equal"/>
+        </transition>
+    
+    
+    <state id="state.sinfo.year_select" description="state.minfo.sediment.load.sq_interval"
+            state="org.dive4elements.river.artifacts.states.minfo.SedimentLoadSQTiSelect"
+            helpText="help.state.minfo.sediment.load.sq_interval">
+            <data name="sq_ti_id" type="Integer" />
+            <data name="sq_ti_date" type="String" />
+        </state>
+     
+    
+	<state id="state.sinfo.epoch_select" description="state.sinfo.year_epoch" state="org.dive4elements.river.artifacts.sinfo.collision.YearChoice" helpText="help.state.sinfo.year">
+      <data name="ye_select" type="String"/>
+    </state>
+	
+	
+	
+		<transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.sinfo.year_select"/>
+      <to state="state.sinfo.collision"/>
+      <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal"/>
+    </transition>
+	
+	<transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
+      <from state="state.sinfo.epoch_select"/>
+      <to state="state.sinfo.collision"/>
+      <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal"/>
+    </transition>
+    
 	
     
-    <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
-      <from state="state.sinfo.year"/>
-      <to state="state.sinfo.collision"/>
-      <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal"/>
-    </transition>
+    
     
     <state id="state.sinfo.collision" description="state.sinfo.collision" state="org.dive4elements.river.artifacts.sinfo.collision.CollisionState" helpText="help.state.sinfo.collision">
       <outputmodes>

http://dive4elements.wald.intevation.org