# HG changeset patch
# User Tim Englich <tim.englich@intevation.de>
# Date 1262944895 0
# Node ID 9c2767fcb388777708431207779499e0121bf3cf
# Parent  92d6cf44859834a0fff1de009c9523a237aafcc7
Added the possibility to enter a Polygon represented by an WKT into the Workflow of the HorizontalCrossSections

gnv-artifacts/trunk@513 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 92d6cf448598 -r 9c2767fcb388 gnv-artifacts/ChangeLog
--- a/gnv-artifacts/ChangeLog	Wed Jan 06 10:09:51 2010 +0000
+++ b/gnv-artifacts/ChangeLog	Fri Jan 08 10:01:35 2010 +0000
@@ -1,3 +1,15 @@
+2010-01-08  Tim Englich  <tim.englich@intevation.de>
+
+	* src/main/resources/lang/artifactMessages.properties: 
+	  Added Ressources for the GUI for visualizing the Inputstate for
+	  Polygons.
+	* doc/conf/products/horizontalcrosssection/conf_mesh.xml: 
+	  Added State for the possibility to enter a Polygon which should trim 
+	  the Data that will be visualized.
+	* src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java (getChart): 
+	  Integrated the access to the Polygon which should be used to trim the Data which 
+	  should be visualized.
+
 2010-01-05	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/gnv/math/QueriedXYDepth.java:
diff -r 92d6cf448598 -r 9c2767fcb388 gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml
--- a/gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml	Wed Jan 06 10:09:51 2010 +0000
+++ b/gnv-artifacts/doc/conf/products/horizontalcrosssection/conf_mesh.xml	Fri Jan 08 10:01:35 2010 +0000
@@ -55,7 +55,7 @@
         
         <transition transition="de.intevation.gnv.transition.DefaultTransition">
             <from state="horizontalcrosssection_mesh_without_geom"/>
-            <to state="horizontalcrosssection_meshpoint_depth"/>
+            <to state="verticalcrosssection_mesh_polygon"/>
         </transition>
         
         <state id="horizontalcrosssection_mesh" description="horizontalcrosssection_mesh" state="de.intevation.gnv.state.DefaultState">
@@ -72,6 +72,21 @@
         
         <transition transition="de.intevation.gnv.transition.DefaultTransition">
             <from state="horizontalcrosssection_mesh"/>
+            <to state="verticalcrosssection_mesh_polygon"/>
+        </transition>
+        
+        <state id="verticalcrosssection_mesh_polygon" description="verticalcrosssection_mesh_polygon" state="de.intevation.gnv.state.SingleInputState">
+           <dataname>mesh_polygon</dataname>
+           <data-multiselect>false</data-multiselect>
+           <inputvalues>
+                <inputvalue name="meshid" type="Integer" multiselect="false"/>
+                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                <inputvalue name="mesh_polygon" type="String" multiselect="false" usedinquery="0"/>
+           </inputvalues>
+        </state>
+        
+        <transition transition="de.intevation.gnv.transition.DefaultTransition">
+            <from state="verticalcrosssection_mesh_polygon"/>
             <to state="horizontalcrosssection_meshpoint_depth"/>
         </transition>
         
@@ -83,6 +98,7 @@
                  <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
                  <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                  <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/>
+                 <inputvalue name="mesh_polygon" type="String" multiselect="false" usedinquery="0"/>
             </inputvalues>
         </state>
         
@@ -100,6 +116,7 @@
                  <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="0"/>
                  <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                  <inputvalue name="parameterid" type="Integer" multiselect="false" usedinquery="0" />
+                 <inputvalue name="mesh_polygon" type="String" multiselect="false" usedinquery="0"/>
             </inputvalues>
         </state>
         
@@ -118,6 +135,7 @@
                <inputvalue name="parameterid" type="Integer" multiselect="false" usedinquery="1" />
                <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
                <inputvalue name="dateid" type="Date" multiselect="false" usedinquery="0" />
+               <inputvalue name="mesh_polygon" type="String" multiselect="false" usedinquery="0"/>
            </inputvalues>
         </state>
         
@@ -135,6 +153,7 @@
                 <inputvalue name="meshid" type="Integer" multiselect="false" usedinquery="1"/>
                 <inputvalue name="depthid" type="Integer" multiselect="false" usedinquery="1"/>
                 <inputvalue name="fisname" type="String" multiselect="false" usedinquery="0"/>
+                <inputvalue name="mesh_polygon" type="String" multiselect="false" usedinquery="0"/>
             </inputvalues>
             <value-names>
                 <value-name name="feature" value="meshid"></value-name>
diff -r 92d6cf448598 -r 9c2767fcb388 gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java	Wed Jan 06 10:09:51 2010 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/profile/horizontalcrosssection/HorizontalCrossSectionMeshOutputState.java	Fri Jan 08 10:01:35 2010 +0000
@@ -19,6 +19,7 @@
 import de.intevation.gnv.chart.Chart;
 import de.intevation.gnv.chart.ChartLabels;
 import de.intevation.gnv.geobackend.base.Result;
+import de.intevation.gnv.state.InputData;
 import de.intevation.gnv.state.exception.StateException;
 import de.intevation.gnv.state.timeseries.TimeSeriesOutputState;
 import de.intevation.gnv.statistics.Statistics;
@@ -92,6 +93,14 @@
             purifyChart(chart, uuid);
         }
         */
+        
+        InputData meshPolygon = inputData.get("mesh_polygon");
+        String meshPolygonWkt = null;
+        if (meshPolygon != null){
+            meshPolygonWkt = meshPolygon.getValue();
+            
+        }
+        log.debug("Used Polygon: "+meshPolygonWkt);
 
         return chart;
     }
diff -r 92d6cf448598 -r 9c2767fcb388 gnv-artifacts/src/main/resources/lang/artifactMessages.properties
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Wed Jan 06 10:09:51 2010 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages.properties	Fri Jan 08 10:01:35 2010 +0000
@@ -26,6 +26,7 @@
 featureid = Station
 mesh_coordinate = Geographic position (e.g. 56n30 6e20)
 mesh_linestring = Line (WKT)
+mesh_polygon = Area (WKT)
 mesh_point = Mesh Point
 measurementid = Measurement depth/height [m]
 depthrange = Measurementarea depth/height [m]
diff -r 92d6cf448598 -r 9c2767fcb388 gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Wed Jan 06 10:09:51 2010 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de.properties	Fri Jan 08 10:01:35 2010 +0000
@@ -26,6 +26,7 @@
 meshid= Datengitter
 mesh_coordinate = Geographische Position (z.B. 56n30 6e20)
 mesh_linestring = Linienzug als WKT
+mesh_polygon = Fläche als WKT
 mesh_point = Gitterzelle/Knotenpunkt
 measurementid = Messung Tiefe/Höhe [m]
 depthrange = Messbereich Tiefe/Höhe [m]
diff -r 92d6cf448598 -r 9c2767fcb388 gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Wed Jan 06 10:09:51 2010 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_de_DE.properties	Fri Jan 08 10:01:35 2010 +0000
@@ -26,6 +26,7 @@
 meshid= Datengitter
 mesh_coordinate = Geographische Position (z.B. 56n30 6e20)
 mesh_linestring = Linienzug als WKT
+mesh_polygon = Fläche als WKT
 mesh_point = Gitterzelle/Knotenpunkt
 measurementid = Messung Tiefe/Höhe [m]
 depthrange = Messbereich Tiefe/Höhe [m]
diff -r 92d6cf448598 -r 9c2767fcb388 gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties
--- a/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Wed Jan 06 10:09:51 2010 +0000
+++ b/gnv-artifacts/src/main/resources/lang/artifactMessages_en.properties	Fri Jan 08 10:01:35 2010 +0000
@@ -26,6 +26,7 @@
 featureid = Station
 mesh_coordinate = Geographic position (e.g. 56n30 6e20)
 mesh_linestring = Line (WKT)
+mesh_polygon = Area (WKT)
 mesh_point = Mesh Point
 measurementid = Measurement depth/height [m]
 depthrange = Measurementarea depth/height [m]