# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1340269973 0
# Node ID 7d69e570e79b3c8fbc2abb1f53b615e59c7eb7a0
# Parent  6d96443ed6e6d95bf632a4b13b06d18c8c5de36f
FixA: Set discharge sectors 0 and 3 as default in UI.

flys-client/trunk@4736 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 6d96443ed6e6 -r 7d69e570e79b flys-client/ChangeLog
--- a/flys-client/ChangeLog	Thu Jun 21 08:38:18 2012 +0000
+++ b/flys-client/ChangeLog	Thu Jun 21 09:12:53 2012 +0000
@@ -1,3 +1,11 @@
+2012-06-21	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java:
+	  Removed example comment about JSON filter.
+
+	* src/main/java/de/intevation/flys/client/client/ui/fixation/FixGaugeSelectPanel.java:
+	  Set discharge sectors 0 and 3 as default in UI.
+
 2012-06-21	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/webapp/WEB-INF/stylesheets/fixoverview2html.xsl:
diff -r 6d96443ed6e6 -r 7d69e570e79b flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixGaugeSelectPanel.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixGaugeSelectPanel.java	Thu Jun 21 08:38:18 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixGaugeSelectPanel.java	Thu Jun 21 09:12:53 2012 +0000
@@ -46,12 +46,10 @@
     public FixGaugeSelectPanel() {
         htmlOverview = "";
         mapValues = new LinkedHashMap();
-        mapValues.put("0", "[0, (MNQ + MQ)/2)");
-        mapValues.put("1", "[(MNQ + MQ)/2, (MQ + MHQ)/2)");
-        mapValues.put("2", "[(MQ + MHQ)/2, HQ5)");
+        mapValues.put("0", "[0, (MNQ+MQ)/2)");
+        mapValues.put("1", "[(MNQ+MQ)/2, (MQ+MHQ)/2)");
+        mapValues.put("2", "[(MQ+MHQ)/2, HQ5)");
         mapValues.put("3", "[HQ5, \u221e)");
-
-
     }
 
     public Canvas createWidget(DataList data) {
@@ -68,9 +66,11 @@
         from.setShowTitle(false);
         to.setShowTitle(false);
         from.setValueMap(mapValues);
-        from.setWidth(60);
+        from.setDefaultValues("0");
+        from.setWidth(160);
         to.setValueMap(mapValues);
-        to.setWidth(60);
+        to.setDefaultValues("3");
+        to.setWidth(160);
 
         DynamicForm form = new DynamicForm();
         StaticTextItem separator = new StaticTextItem("separator");
diff -r 6d96443ed6e6 -r 7d69e570e79b flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java	Thu Jun 21 08:38:18 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java	Thu Jun 21 09:12:53 2012 +0000
@@ -133,10 +133,7 @@
 
         String river = artifact.getArtifactDescription().getRiver();
         createCallback();
-/*
-Filter example.
-{"fixings":  "river": { "name": "Elbe"}, "range": {"from": 1, "to": 200}, "filter": {"and": { "column": {"cid": 1}, "column": {"cid": 2} } }}
-*/
+
         String callBack = "fixationCallback(this.checked, this.name)";
         FixAnalysisArtifact art = (FixAnalysisArtifact) this.artifact;