dive4elements/gnv-client: gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java comparison

comparison gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java @ 340:07a64cfafdf1

Added gap detection in horizontal and vertical profile charts. Distinguish between meshes and other data sources. gnv-artifacts/trunk@406 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Ingo Weinzierl <ingo.weinzierl@intevation.de>
date	Wed, 09 Dec 2009 10:22:20 +0000
parents	e964a3d8f7bc
children	2413273f1c13

comparison

equal deleted inserted replaced

-:02c71ea5c9c8
+:07a64cfafdf1
 */
 public class VerticalProfileChart
 extends      AbstractXYLineChart
 {
 private static Logger log = Logger.getLogger(VerticalProfileChart.class);
+protected final double PERCENTAGE     = 5.0;
+protected final double GAP_MAX_LEVEL  = Math.sqrt(2.0);
+protected final int    GAP_MAX_VALUES = 60;
 public VerticalProfileChart(
 ChartLabels labels,
 ChartTheme  theme,
 Iterator iter       = resultSet.iterator();
 Result   row        = null;
 String   seriesName = null;
 XYSeries series     = null;
-int idx = 0;
+int idx           = 0;
+int startPos      = 0;
+int endPos        = 0;
+double startValue = 0;
+double endValue   = 0;
+Result[] results =
+(Result[]) resultSet.toArray(new Result[resultSet.size()]);
 while (iter.hasNext()) {
 row = (Result) iter.next();
 // add current data to plot and prepare for next one
 !row.getString("GROUP3").equals(breakPoint3)
 ) {
 log.debug("prepare data/plot for next dataset");
 if(series != null) {
+gapDetection(results, series, startPos, endPos);
 addSeries(series, seriesName, idx);
+startPos = endPos +1;
 }
 // prepare variables for next plot
 breakPoint1 = row.getString("GROUP1");
 breakPoint2 = row.getString("GROUP2");
 log.debug("next dataset is '" + seriesName + "'");
 series = new XYSeries(seriesName);
 }
 addValue(row, series);
-}
+endPos++;
+}
+if (results.length == 0)
+return;
+gapDetection(results, series, startPos, endPos);
 addSeries(series, seriesName, idx);
 addDatasets();
 }
+protected void gapDetection(
+Result[] results,
+Series   series,
+int      startPos,
+int      endPos
+) {
+double startValue = results[startPos].getDouble("XORDINATE");
+double endValue   = results[endPos-1].getDouble("XORDINATE");
+if (results[0].getInteger("DATAID") == 2)
+addGapsOnGrid(results, series, startPos, endPos);
+else
+addGaps(results, series, startValue, endValue, startPos, endPos);
+}
 protected void addValue(Result row, Series series) {
-// TODO look for gaps between two values
 ((XYSeries) series).add(
 row.getDouble("XORDINATE"),
 row.getDouble("YORDINATE")
 );
 }
 return findValueTitle(parameters, breakPoint1) +
 " " +
 findValueTitle(measurements, breakPoint2) +
 "m";
 }
+protected void addGapsOnGrid(
+Result[] results,
+Series   series,
+int      startPos,
+int      endPos
+) {
+String axis = getDependendAxisName(
+results[startPos],
+results[startPos+1]
+);
+double range        = 0;
+int    last         = 0;
+int    current      = 0;
+for (int i = startPos+1; i < endPos; i++) {
+last    = results[i-1].getInteger(axis);
+current = results[i].getInteger(axis);
+boolean detected = gridDetection(last, current);
+if (detected) {
+double xOld = results[i-1].getDouble("XORDINATE");
+double xNow = results[i].getDouble("XORDINATE");
+log.debug("Gap detected on grid between "+ xOld +" and "+ xNow);
+((XYSeries) series).add(xOld+0.0001, null);
+}
+}
+}
+protected void addGaps(
+Result[] results,
+Series   series,
+double   startValue,
+double   endValue,
+int      startPos,
+int      endPos
+) {
+double last    = 0;
+double current = 0;
+int    num     = results.length;
+for (int i = startPos+1; i < endPos; i++) {
+boolean detected = false;
+last    = results[i-1].getDouble("YORDINATE");
+current = results[i].getDouble("YORDINATE");
+// gap detection for more than GAP_MAX_VALUES values
+if (num > GAP_MAX_VALUES)
+detected = simpleDetection(startValue, endValue, last, current);
+// gap detection for less than GAP_MAX_VALUES values
+else
+detected = specialDetection(
+startValue,
+endValue,
+last,
+current,
+num
+);
+if (detected) {
+log.info("Gap between " + last + " and " + current);
+((XYSeries) series).add((last+current)/2, null);
+}
+}
+}
+protected boolean simpleDetection(
+double start,
+double end,
+double last,
+double current
+) {
+double delta      = Math.abs(end - start);
+double smallDelta = Math.abs(current - last);
+return (smallDelta > delta / 100 * PERCENTAGE);
+}
+protected boolean specialDetection(
+double start,
+double end,
+double last,
+double current,
+int    count
+) {
+double delta      = Math.abs(end - start);
+double smallDelta = Math.abs(current - last);
+return (smallDelta > (3.0 / (count - 1) * delta));
+}
+protected boolean gridDetection(double last, double current) {
+return (Math.abs(current - last) > GAP_MAX_LEVEL);
+}
+protected String getDependendAxisName(Result first, Result second) {
+if (first.getInteger("IPOSITION") == second.getInteger("IPOSITION"))
+return "JPOSITION";
+return "IPOSITION";
+}
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :

Mercurial > dive4elements > gnv-client

comparison gnv-artifacts/src/main/java/de/intevation/gnv/chart/VerticalProfileChart.java @ 340:07a64cfafdf1