Mercurial > dive4elements > gnv-client
comparison gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileVectorChart.java @ 1085:ec512e7992c6
Improved data initialization and axis range calculation in vertical profiles (scalar and vector).
gnv-artifacts/trunk@1187 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Wed, 09 Jun 2010 17:11:54 +0000 |
parents | 9bb1979aabbe |
children | f953c9a559d8 |
comparison
equal
deleted
inserted
replaced
1084:81ac8d2f6cb7 | 1085:ec512e7992c6 |
---|---|
46 | 46 |
47 @Override | 47 @Override |
48 protected void initData() { | 48 protected void initData() { |
49 logger.debug("init data for verticalprofile chart with vector data."); | 49 logger.debug("init data for verticalprofile chart with vector data."); |
50 | 50 |
51 int items = resultSet.size(); | |
52 logger.debug("Found " + items + " items for this chart."); | |
53 | |
51 Iterator iter = resultSet.iterator(); | 54 Iterator iter = resultSet.iterator(); |
52 Result row = null; | 55 Result row = null; |
53 String seriesName = null; | 56 String seriesName = null; |
54 XYSeries series = null; | 57 XYSeries series = null; |
55 | 58 |
80 | 83 |
81 if (!row.getString(idxSeries).equals(seriesName)) { | 84 if (!row.getString(idxSeries).equals(seriesName)) { |
82 logger.debug("prepare data/plot for next dataset."); | 85 logger.debug("prepare data/plot for next dataset."); |
83 | 86 |
84 if (series != null) { | 87 if (series != null) { |
85 gapDetection(results, series, startPos, endPos); | 88 if (startPos >= 0 && endPos < items) { |
89 gapDetection(results, series, startPos, endPos); | |
90 } | |
91 | |
86 addSeries(series, seriesName, idx); | 92 addSeries(series, seriesName, idx); |
87 | 93 |
88 startPos = endPos + 1; | 94 startPos = endPos + 1; |
89 } | 95 } |
90 | 96 |
106 } | 112 } |
107 | 113 |
108 if (results.length == 0) | 114 if (results.length == 0) |
109 return; | 115 return; |
110 | 116 |
111 gapDetection(results, series, startPos, endPos); | 117 if (startPos >= 0 && endPos < items) { |
118 gapDetection(results, series, startPos, endPos); | |
119 } | |
112 addSeries(series, seriesName, idx); | 120 addSeries(series, seriesName, idx); |
113 | 121 |
114 addDatasets(); | 122 addDatasets(); |
115 } | 123 } |
116 | 124 |
134 sc.getSeriesCount(), | 142 sc.getSeriesCount(), |
135 linesVisible, | 143 linesVisible, |
136 shapesVisible | 144 shapesVisible |
137 ); | 145 ); |
138 } | 146 } |
147 | |
148 prepareRangeAxis(null, -1); | |
139 } | 149 } |
140 } | 150 } |
141 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : | 151 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : |