Mercurial > dive4elements > river
annotate flys-client/src/main/java/de/intevation/flys/client/client/ui/fixation/FixationPanel.java @ 3362:bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
flys-client/trunk@5049 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Raimund Renkert <raimund.renkert@intevation.de> |
---|---|
date | Thu, 19 Jul 2012 07:39:50 +0000 |
parents | f362e54b7e80 |
children | 8bedd1fcaeee |
rev | line source |
---|---|
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
1 package de.intevation.flys.client.client.ui.fixation; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
2 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
3 import java.util.HashMap; |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
4 import java.util.Date; |
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
5 |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
6 import com.google.gwt.core.client.GWT; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
7 import com.google.gwt.user.client.rpc.AsyncCallback; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
8 |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
9 import com.google.gwt.json.client.JSONObject; |
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
10 import com.google.gwt.json.client.JSONNumber; |
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
11 import com.google.gwt.json.client.JSONString; |
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
12 import com.google.gwt.i18n.client.DateTimeFormat; |
3362
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
13 import com.google.gwt.i18n.client.NumberFormat; |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
14 |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
15 import com.smartgwt.client.util.SC; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
16 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
17 import com.smartgwt.client.widgets.Canvas; |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
18 import com.smartgwt.client.widgets.Button; |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
19 import com.smartgwt.client.widgets.form.DynamicForm; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
20 import com.smartgwt.client.widgets.HTMLPane; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
21 import com.smartgwt.client.widgets.layout.VLayout; |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
22 import com.smartgwt.client.widgets.layout.HLayout; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
23 import com.smartgwt.client.widgets.form.fields.TextItem; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
24 import com.smartgwt.client.widgets.form.fields.events.ChangedHandler; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
25 import com.smartgwt.client.widgets.form.fields.events.ChangedEvent; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
26 import com.smartgwt.client.widgets.events.ClickHandler; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
27 import com.smartgwt.client.widgets.events.ClickEvent; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
28 import com.smartgwt.client.widgets.events.ResizedHandler; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
29 import com.smartgwt.client.widgets.events.ResizedEvent; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
30 import com.smartgwt.client.widgets.form.validator.IsFloatValidator; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
31 import com.smartgwt.client.types.Alignment; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
32 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
33 import com.smartgwt.client.widgets.tab.Tab; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
34 import com.smartgwt.client.widgets.tab.TabSet; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
35 import com.smartgwt.client.widgets.Img; |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
36 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
37 import de.intevation.flys.client.client.FLYSConstants; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
38 import de.intevation.flys.client.client.ui.AbstractUIProvider; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
39 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
40 import de.intevation.flys.client.client.Config; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
41 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
42 import de.intevation.flys.client.shared.model.Data; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
43 import de.intevation.flys.client.shared.model.DataList; |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
44 import de.intevation.flys.client.shared.model.FixFilter; |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
45 import de.intevation.flys.client.shared.model.FixingsOverviewInfo; |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
46 import de.intevation.flys.client.shared.model.FixAnalysisArtifact; |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
47 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
48 import de.intevation.flys.client.client.services.FixingsOverviewService; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
49 import de.intevation.flys.client.client.services.FixingsOverviewServiceAsync; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
50 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
51 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
52 /** |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
53 * This UIProvider creates helper panel for fixation analysis without input |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
54 * elements. |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
55 * |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
56 * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a> |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
57 */ |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
58 public abstract class FixationPanel |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
59 extends AbstractUIProvider |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
60 implements ResizedHandler |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
61 { |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
62 protected static HashMap<String, FixationPanel> instances = new HashMap<String, FixationPanel>(); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
63 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
64 /** The message class that provides i18n strings. */ |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
65 protected FLYSConstants MESSAGES = GWT.create(FLYSConstants.class); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
66 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
67 protected FixingsOverviewServiceAsync overviewService = |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
68 GWT.create(FixingsOverviewService.class); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
69 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
70 protected String htmlOverview; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
71 protected FixingsOverviewInfo fixInfo; |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
72 protected TabSet tabs; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
73 protected Tab events; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
74 protected Tab chart; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
75 protected VLayout chartContainer; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
76 protected Img chartImg; |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
77 protected TextItem kmText; |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
78 |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
79 public static final DateTimeFormat DTF = DateTimeFormat.getFormat("dd.MM.yyyy"); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
80 |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
81 |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
82 public FixationPanel() { |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
83 chartImg = new Img(); |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
84 htmlOverview = ""; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
85 } |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
86 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
87 protected String getArtifactUuid() { |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
88 return this.artifact.getUuid(); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
89 } |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
90 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
91 protected void init() { |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
92 } |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
93 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
94 public Data[] getData() { |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
95 return null; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
96 } |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
97 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
98 public Canvas create(DataList list) { |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
99 VLayout layout = new VLayout(); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
100 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
101 Canvas helper = createHelper(); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
102 this.helperContainer.addMember(helper); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
103 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
104 Canvas submit = getNextButton(); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
105 Canvas widget = createWidget(list); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
106 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
107 layout.addMember(widget); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
108 layout.addMember(submit); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
109 return layout; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
110 } |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
111 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
112 public Canvas createOld(DataList list) { |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
113 return new DynamicForm(); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
114 } |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
115 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
116 protected Canvas createHelper() { |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
117 Config config = Config.getInstance(); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
118 String locale = config.getLocale (); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
119 |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
120 tabs = new TabSet(); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
121 events = new Tab(MESSAGES.events()); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
122 chart = new Tab(MESSAGES.kmchart()); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
123 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
124 chartContainer = new VLayout(); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
125 Canvas scroll = createChartHelper(); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
126 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
127 VLayout layout = new VLayout(); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
128 layout.addResizedHandler(this); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
129 layout.addMember(chartContainer); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
130 layout.addMember(scroll); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
131 layout.setAlign(Alignment.CENTER); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
132 chart.setPane(layout); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
133 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
134 final HTMLPane eventPane = new HTMLPane(); |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
135 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
136 String river = artifact.getArtifactDescription().getRiver(); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
137 createCallback(); |
2914
7d69e570e79b
FixA: Set discharge sectors 0 and 3 as default in UI.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2901
diff
changeset
|
138 |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
139 String callBack = "fixationCallback(this.checked, this.name)"; |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
140 FixAnalysisArtifact art = (FixAnalysisArtifact) this.artifact; |
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
141 |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
142 overviewService.generateOverview( |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
143 locale, |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
144 artifact.getUuid(), |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
145 getOverviewFilter(art.getFilter()), |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
146 renderCheckboxes(), |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
147 callBack, |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
148 new AsyncCallback<FixingsOverviewInfo>() { |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
149 public void onFailure(Throwable caught) { |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
150 GWT.log("Could not receive overview."); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
151 SC.warn(caught.getMessage()); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
152 } |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
153 public void onSuccess(FixingsOverviewInfo info) { |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
154 GWT.log("Successfully loaded overview."); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
155 fixInfo = info; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
156 htmlOverview = info.getHTML(); |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
157 FixAnalysisArtifact art = (FixAnalysisArtifact)artifact; |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
158 FixFilter filter = art.getFilter(); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
159 filter.setRiver(info.getRiver()); |
3362
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
160 if (filter.getCurrentKm() == -Double.MAX_VALUE || |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
161 filter.getCurrentKm() == -1d) { |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
162 filter.setCurrentKm(info.getFrom()); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
163 filter.setToKm(info.getTo()); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
164 } |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
165 if (kmText != null) { |
3362
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
166 NumberFormat nf = NumberFormat.getDecimalFormat(); |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
167 try { |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
168 double d = Double.valueOf(filter.getCurrentKm()); |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
169 kmText.setValue(nf.format(d)); |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
170 } catch (NumberFormatException e) { |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
171 kmText.setValue(filter.getCurrentKm()); |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
172 } |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
173 } |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
174 eventPane.setContents(htmlOverview); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
175 updateChartTab(fixInfo.getFrom()); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
176 events.setPane(eventPane); |
2537
cc5969df0490
New methods in UI providers for fixings states and minor protocol changes.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2526
diff
changeset
|
177 success(); |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
178 } |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
179 }); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
180 |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
181 tabs.addTab(events); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
182 tabs.addTab(chart); |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
183 |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
184 return tabs; |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
185 } |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
186 |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
187 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
188 protected Canvas createChartHelper() { |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
189 DynamicForm form = new DynamicForm(); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
190 Button lower = new Button("<<"); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
191 lower.setWidth(30); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
192 Button upper = new Button(">>"); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
193 upper.setWidth(30); |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
194 kmText = new TextItem(); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
195 kmText.setWidth(60); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
196 kmText.setShowTitle(false); |
3362
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
197 |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
198 |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
199 form.setFields(kmText); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
200 form.setWidth(60); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
201 lower.addClickHandler(new ClickHandler() { |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
202 public void onClick(ClickEvent ce) { |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
203 FixFilter filter = updateChartTabLow(); |
3362
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
204 NumberFormat nf = NumberFormat.getDecimalFormat(); |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
205 try { |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
206 double d = Double.valueOf(filter.getCurrentKm()); |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
207 kmText.setValue(nf.format(d)); |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
208 } catch (NumberFormatException e) { |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
209 kmText.setValue(filter.getCurrentKm()); |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
210 } |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
211 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
212 }); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
213 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
214 upper.addClickHandler(new ClickHandler() { |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
215 public void onClick(ClickEvent ce) { |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
216 FixFilter filter = updateChartTabUp(); |
3362
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
217 NumberFormat nf = NumberFormat.getDecimalFormat(); |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
218 try { |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
219 double d = Double.valueOf(filter.getCurrentKm()); |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
220 kmText.setValue(nf.format(d)); |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
221 } catch (NumberFormatException e) { |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
222 kmText.setValue(filter.getCurrentKm()); |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
223 } |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
224 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
225 }); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
226 |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
227 kmText.addChangedHandler(new ChangedHandler() { |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
228 public void onChanged(ChangedEvent ce) { |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
229 //TODO: get current value. |
3362
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
230 if(ce.getItem().getValue() != null) { |
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
231 NumberFormat nf = NumberFormat.getDecimalFormat(); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
232 try { |
3362
bea50e45f0d3
FixA: Input fields for chart navigation now use the correct i18n number formats.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2963
diff
changeset
|
233 double d = nf.parse(ce.getItem().getValue().toString()); |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
234 updateChartTab(d); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
235 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
236 catch(NumberFormatException nfe) { |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
237 // Do nothing. |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
238 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
239 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
240 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
241 }); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
242 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
243 HLayout layout = new HLayout(); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
244 layout.setAlign(Alignment.CENTER); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
245 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
246 layout.addMember(lower); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
247 layout.addMember(form); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
248 layout.addMember(upper); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
249 return layout; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
250 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
251 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
252 protected void updateChartTab(double km) { |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
253 Config config = Config.getInstance(); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
254 String locale = config.getLocale (); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
255 |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
256 FixAnalysisArtifact art = (FixAnalysisArtifact) this.artifact; |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
257 |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
258 if (fixInfo != null) { |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
259 if (km < fixInfo.getFrom()) km = fixInfo.getFrom(); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
260 if (km > fixInfo.getTo()) km = fixInfo.getTo(); |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
261 } |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
262 |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
263 FixFilter filter = art.getFilter(); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
264 |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
265 if (km < filter.getFromKm()) km = filter.getFromKm(); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
266 if (km > filter.getToKm()) km = filter.getToKm(); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
267 |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
268 filter.setCurrentKm(km); |
2901
2fdeb239bbd2
Changed helper chart size in Fix analysis to avoid overlapping in maximized project window.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2899
diff
changeset
|
269 |
2fdeb239bbd2
Changed helper chart size in Fix analysis to avoid overlapping in maximized project window.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2899
diff
changeset
|
270 int hWidth = helperContainer.getWidth() - 12; |
2fdeb239bbd2
Changed helper chart size in Fix analysis to avoid overlapping in maximized project window.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2899
diff
changeset
|
271 int hHeight = helperContainer.getHeight() - 62; |
2fdeb239bbd2
Changed helper chart size in Fix analysis to avoid overlapping in maximized project window.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2899
diff
changeset
|
272 |
2922
71db63f67d31
FixA: Do not throw layout away if only the km chart needs reloading.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2917
diff
changeset
|
273 if ((int)(hHeight *4f/3) < hWidth) { |
71db63f67d31
FixA: Do not throw layout away if only the km chart needs reloading.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2917
diff
changeset
|
274 hWidth = (int)(hHeight * 4f/3); |
2901
2fdeb239bbd2
Changed helper chart size in Fix analysis to avoid overlapping in maximized project window.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2899
diff
changeset
|
275 } |
2fdeb239bbd2
Changed helper chart size in Fix analysis to avoid overlapping in maximized project window.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2899
diff
changeset
|
276 else { |
2922
71db63f67d31
FixA: Do not throw layout away if only the km chart needs reloading.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2917
diff
changeset
|
277 hHeight = (int)(hWidth *3f/4); |
2901
2fdeb239bbd2
Changed helper chart size in Fix analysis to avoid overlapping in maximized project window.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2899
diff
changeset
|
278 } |
2fdeb239bbd2
Changed helper chart size in Fix analysis to avoid overlapping in maximized project window.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2899
diff
changeset
|
279 |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
280 String imgUrl = GWT.getModuleBaseURL(); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
281 imgUrl += "fixings-km-chart"; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
282 imgUrl += "?locale=" + locale; |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
283 imgUrl += "&filter=" + getChartFilter(filter, hWidth, hHeight); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
284 |
2922
71db63f67d31
FixA: Do not throw layout away if only the km chart needs reloading.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2917
diff
changeset
|
285 if (chartContainer.hasMember(chartImg)) { |
71db63f67d31
FixA: Do not throw layout away if only the km chart needs reloading.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2917
diff
changeset
|
286 chartImg.setWidth(hWidth); |
71db63f67d31
FixA: Do not throw layout away if only the km chart needs reloading.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2917
diff
changeset
|
287 chartImg.setHeight(hHeight); |
71db63f67d31
FixA: Do not throw layout away if only the km chart needs reloading.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2917
diff
changeset
|
288 chartImg.setSrc(imgUrl); |
71db63f67d31
FixA: Do not throw layout away if only the km chart needs reloading.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2917
diff
changeset
|
289 } |
71db63f67d31
FixA: Do not throw layout away if only the km chart needs reloading.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2917
diff
changeset
|
290 else { |
71db63f67d31
FixA: Do not throw layout away if only the km chart needs reloading.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2917
diff
changeset
|
291 chartImg = new Img(imgUrl, hWidth, hHeight); |
71db63f67d31
FixA: Do not throw layout away if only the km chart needs reloading.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2917
diff
changeset
|
292 chartContainer.addMember(chartImg); |
71db63f67d31
FixA: Do not throw layout away if only the km chart needs reloading.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2917
diff
changeset
|
293 } |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
294 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
295 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
296 |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
297 protected FixFilter updateChartTabLow() { |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
298 FixAnalysisArtifact art = (FixAnalysisArtifact) this.artifact; |
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
299 |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
300 FixFilter filter = art.getFilter(); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
301 |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
302 double curr = filter.getCurrentKm(); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
303 if (curr > filter.getFromKm()) { |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
304 double newVal = (curr - 0.1) * 10; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
305 long round = Math.round(newVal); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
306 updateChartTab(((double)round) / 10); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
307 } |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
308 return filter; |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
309 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
310 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
311 |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
312 protected FixFilter updateChartTabUp() { |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
313 FixAnalysisArtifact art = (FixAnalysisArtifact) this.artifact; |
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
314 |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
315 FixFilter filter = art.getFilter(); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
316 |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
317 double curr = filter.getCurrentKm(); |
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
318 if (curr < filter.getToKm()) { |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
319 double newVal = (curr + 0.1) * 10; |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
320 long round = Math.round(newVal); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
321 updateChartTab(((double)round) / 10); |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
322 } |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
323 return filter; |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
324 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
325 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
326 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
327 public void onResized(ResizedEvent re) { |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
328 FixAnalysisArtifact art = (FixAnalysisArtifact) this.artifact; |
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
329 |
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
330 updateChartTab(art.getFilter().getCurrentKm()); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
331 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
332 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
333 |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
334 private native void createCallback() /*-{ |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
335 $wnd.fixationCallback = @de.intevation.flys.client.client.ui.fixation.FixationPanel::helperCallback(ZLjava/lang/String;); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
336 }-*/; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
337 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
338 private static void helperCallback(boolean checked, String name) { |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
339 String[] parts = name.split(":"); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
340 String uuid = parts[0]; |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
341 String cid = parts[1]; |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
342 |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
343 FixationPanel p = FixationPanel.getInstance(uuid); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
344 if (p != null) { |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
345 p.setValues(cid, checked); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
346 } |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
347 } |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
348 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
349 private static FixationPanel getInstance(String uuid) { |
2923
43e0f6d96206
FixA: Make the km chart helper panel more useful.
Sascha L. Teichmann <sascha.teichmann@intevation.de>
parents:
2922
diff
changeset
|
350 return instances.get(uuid); |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
351 } |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
352 |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
353 public abstract Canvas createWidget(DataList data); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
354 public abstract void setValues(String cid, boolean checked); |
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
355 public abstract boolean renderCheckboxes(); |
2537
cc5969df0490
New methods in UI providers for fixings states and minor protocol changes.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2526
diff
changeset
|
356 public abstract void success(); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
357 |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
358 |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
359 public static String getOverviewFilter(FixFilter filter) { |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
360 String river = filter.getRiver(); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
361 |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
362 if (river != null && river.length() > 0) { |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
363 JSONObject jfix = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
364 JSONObject jfilter = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
365 JSONObject jrName = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
366 JSONString jrValue = new JSONString(river); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
367 jrName.put("name", jrValue); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
368 jfilter.put("river", jrName); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
369 jfix.put("fixings", createFilter(filter, jfilter)); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
370 return jfix.toString(); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
371 } |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
372 return ""; |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
373 } |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
374 |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
375 public String getChartFilter(FixFilter filter, int width, int height) { |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
376 String river = filter.getRiver(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
377 double currentKm = filter.getCurrentKm(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
378 double fromKm = filter.getFromKm(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
379 double toKm = filter.getToKm(); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
380 |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
381 if (river != null && river.length() > 0 && |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
382 currentKm >= fromKm && currentKm <= toKm) |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
383 { |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
384 JSONObject jfix = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
385 JSONObject jfilter = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
386 JSONObject jrName = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
387 JSONString jrValue = new JSONString(river); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
388 JSONObject jkm = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
389 JSONNumber jkmValue = new JSONNumber(currentKm); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
390 JSONObject jextent = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
391 JSONNumber jwidth = new JSONNumber(width); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
392 JSONNumber jheight = new JSONNumber(height); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
393 |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
394 jkm.put("value", jkmValue); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
395 jrName.put("name", jrValue); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
396 jfilter.put("river", jrName); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
397 jfilter.put("km", jkm); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
398 jextent.put("width", jwidth); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
399 jextent.put("height", jheight); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
400 jfilter.put("extent", jextent); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
401 jfix.put("fixings", createFilter(filter, jfilter)); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
402 return jfix.toString(); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
403 } |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
404 return ""; |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
405 } |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
406 |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
407 protected static JSONObject createFilter(FixFilter filter, JSONObject root) { |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
408 double fromKm = filter.getFromKm(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
409 double toKm = filter.getToKm(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
410 boolean hasDate = filter.getFromDate() > 0 && filter.getToDate() > 0; |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
411 |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
412 if (fromKm >= 0 && toKm >= 0 && fromKm <= toKm) { |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
413 JSONObject range = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
414 JSONObject fromtokm = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
415 JSONNumber f = new JSONNumber(fromKm); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
416 JSONNumber t = new JSONNumber(toKm); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
417 fromtokm.put("from", f); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
418 fromtokm.put("to", t); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
419 root.put("range", fromtokm); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
420 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
421 |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
422 JSONObject and = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
423 if (hasDate) { |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
424 long fromDate = filter.getFromDate(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
425 long toDate = filter.getToDate(); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
426 |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
427 Date df = new Date(fromDate); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
428 Date dt = new Date(toDate); |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
429 |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
430 JSONObject daterange = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
431 JSONString f = new JSONString(DTF.format(df)); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
432 JSONString t = new JSONString(DTF.format(dt)); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
433 |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
434 daterange.put("from", f); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
435 daterange.put("to", t); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
436 and.put("date-range", daterange); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
437 } |
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
438 |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
439 int fromClass = filter.getFromClass(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
440 int toClass = filter.getToClass(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
441 |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
442 if (fromClass >= 0 && toClass >= 0 && fromClass <= toClass) { |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
443 JSONObject classrange = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
444 JSONNumber f = new JSONNumber(fromClass); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
445 JSONNumber t = new JSONNumber(toClass); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
446 |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
447 classrange.put("from", f); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
448 classrange.put("to", t); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
449 and.put("sector-range", classrange); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
450 } |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
451 |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
452 int[] events = filter.getEvents(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
453 |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
454 if (events.length > 0) { |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
455 StringBuilder cids = new StringBuilder(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
456 |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
457 for (int i = 0; i < events.length; i++) { |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
458 if (i > 0) cids.append(' '); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
459 cids.append(events[i]); |
2884
88bca9f735c0
Implemented filter for fix analysis helper widgets.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2539
diff
changeset
|
460 } |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
461 JSONObject columns = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
462 columns.put("cids", new JSONString(cids.toString())); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
463 and.put("columns", columns); |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
464 } |
2962
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
465 if (and.size() > 0) { |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
466 JSONObject jFilter = new JSONObject(); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
467 jFilter.put("and", and); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
468 root.put("filter", jFilter); |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
469 } |
f14d4c668ec5
Bugfix: #698 Fix-Analysis is working in Tomcat again.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2923
diff
changeset
|
470 return root; |
2517
8f528f5ae137
Added filter object class and scrollable chart to helper panel.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
2505
diff
changeset
|
471 } |
2505
87ac5c532523
First part of the UI for fixing analysis parameter.
Raimund Renkert <raimund.renkert@intevation.de>
parents:
diff
changeset
|
472 } |