changeset 370:061355435075

Changed depending value for gap detection in verticalprofile charts on meshes. gnv-artifacts/trunk@447 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Thu, 17 Dec 2009 13:21:43 +0000 (2009-12-17)
parents 77cd3a2bc381
children bc00848f0350
files gnv-artifacts/ChangeLog gnv-artifacts/doc/conf/queries.properties gnv-artifacts/src/main/java/de/intevation/gnv/chart/HorizontalProfileChart.java gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java
diffstat 4 files changed, 18 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog	Thu Dec 17 11:42:21 2009 +0000
+++ b/gnv-artifacts/ChangeLog	Thu Dec 17 13:21:43 2009 +0000
@@ -1,3 +1,12 @@
+009-12-17  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	* doc/conf/queries.properties: Added K-position to sql statement for
+	  verticalprofile charts on meshes.
+
+	* src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java,
+	  src/main/java/de/intevation/gnv/chart/HorizontalProfileChart.java: Changed
+	  the depending axis for gap detection on meshes for verticalprofile charts.
+
 009-12-17  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	* src/main/java/de/intevation/gnv/artifacts/context/GNVArtifactContextFactory.java:
--- a/gnv-artifacts/doc/conf/queries.properties	Thu Dec 17 11:42:21 2009 +0000
+++ b/gnv-artifacts/doc/conf/queries.properties	Thu Dec 17 13:21:43 2009 +0000
@@ -412,6 +412,7 @@
 
 verticalprofile_mesh_chart_data=select ml.UPPERZLOCATION XORDINATE, \
            msv.DATAVALUE YORDINATE, \
+           mp.KPOSITION KPOSITION, \
            msv.PARAMETERID GROUP1, \
            msv.TIMEVALUE GROUP2, \
            1 GROUP3, \
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/HorizontalProfileChart.java	Thu Dec 17 11:42:21 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/HorizontalProfileChart.java	Thu Dec 17 13:21:43 2009 +0000
@@ -266,6 +266,13 @@
         return (smallDelta > (3.0 / (count - 1) * delta));
     }
 
+    @Override
+    protected String getDependendAxisName(Result first, Result second) {
+        if (first.getInteger("IPOSITION") == second.getInteger("IPOSITION"))
+            return "JPOSITION";
+
+        return "IPOSITION";
+    }
 
     private Point getPoint(Result result)
     throws ParseException
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java	Thu Dec 17 11:42:21 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java	Thu Dec 17 13:21:43 2009 +0000
@@ -323,10 +323,7 @@
 
 
     protected String getDependendAxisName(Result first, Result second) {
-        if (first.getInteger("IPOSITION") == second.getInteger("IPOSITION"))
-            return "JPOSITION";
-
-        return "IPOSITION";
+        return "KPOSITION";
     }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :

http://dive4elements.wald.intevation.org