[Schmitzm-commits] r674 - in branches/2.0-RC2/src: schmitzm/jfree/feature/style skrueger/swing

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2010-02-04 17:28:15 +0100 (Thu, 04 Feb 2010)
New Revision: 674

Modified:
   branches/2.0-RC2/src/schmitzm/jfree/feature/style/FeatureChartUtil.java
   branches/2.0-RC2/src/skrueger/swing/HeapBar.java
Log:
Calculating Chart statistics on extra threads (not EDT)

Modified: branches/2.0-RC2/src/schmitzm/jfree/feature/style/FeatureChartUtil.java
===================================================================
--- branches/2.0-RC2/src/schmitzm/jfree/feature/style/FeatureChartUtil.java	2010-02-04 12:51:02 UTC (rev 673)
+++ branches/2.0-RC2/src/schmitzm/jfree/feature/style/FeatureChartUtil.java	2010-02-04 16:28:15 UTC (rev 674)
@@ -280,7 +280,6 @@
 			Number xValue = (Number) f.getAttribute(xAttrName);
 			
 			// Filter out NODATA values
-			System.out.println("X    " + xValue+" tested against "+chartStyle.getNoDataValues(0));
 			xValue = chartStyle.filterNoDataValue(0, xValue);
 			if (xValue == null)
 				continue;
@@ -290,7 +289,7 @@
 			for (int attrIdx = 1; attrIdx < attrCount; attrIdx++) {
 				String yAttrName = chartStyle.getAttributeName(attrIdx);
 				Number yValue = (Number) f.getAttribute(yAttrName);
-
+				
 				// Filter out NoDataValues
 				yValue = chartStyle.filterNoDataValue(attrIdx, yValue);
 				if (yValue == null)
@@ -314,7 +313,7 @@
 				// Mapping between FID and data index in series
 				mapping.setMapping(f.getID(), yAttrName, datasetIdx++);
 			}
-
+			
 		}
 		return dataset;
 	}
@@ -374,14 +373,14 @@
 								attribStats.put(attrName, stat);
 							}
 
-							Object rawValue = f.getAttribute(attrName);
-
 							// Filter out NoDataValues
-							rawValue = chartStyle.filterNoDataValue(attrIdx,
-									rawValue);
+							Object rawValue = chartStyle.filterNoDataValue(attrIdx, f.getAttribute(attrName));
 							if (rawValue == null)
 								continue;
 
+//							rawValue = ,
+//									rawValue);
+
 							final Double doubleValue = new Double(
 									((Number) rawValue).doubleValue());
 							stat.add(doubleValue);

Modified: branches/2.0-RC2/src/skrueger/swing/HeapBar.java
===================================================================
--- branches/2.0-RC2/src/skrueger/swing/HeapBar.java	2010-02-04 12:51:02 UTC (rev 673)
+++ branches/2.0-RC2/src/skrueger/swing/HeapBar.java	2010-02-04 16:28:15 UTC (rev 674)
@@ -30,7 +30,7 @@
 
 	public HeapBar() {
 		updateTimer = new Timer("check memory");
-		updateTimer.scheduleAtFixedRate(new UpdateMemoryBarTask(), 100, 1000);
+		updateTimer.scheduleAtFixedRate(new UpdateMemoryBarTask(), 1000, 5000);
 
 		setMinimum(0);
 		setMaximum(100);