[Schmitzm-commits] r707 - in trunk: . src/schmitzm/geotools/styling src/schmitzm/jfree/feature/style src/skrueger/i8n src/skrueger/swing
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Mon Feb 15 12:07:37 CET 2010
Author: alfonx
Date: 2010-02-15 12:07:30 +0100 (Mon, 15 Feb 2010)
New Revision: 707
Modified:
trunk/build.xml
trunk/src/schmitzm/geotools/styling/StylingUtil.java
trunk/src/schmitzm/jfree/feature/style/FeatureBasicChartStyle.java
trunk/src/schmitzm/jfree/feature/style/FeatureChartStyle.java
trunk/src/schmitzm/jfree/feature/style/FeatureScatterChartStyle.java
trunk/src/skrueger/i8n/SwitchLanguageDialog.java
trunk/src/skrueger/swing/CancellableDialogAdapter.java
Log:
* Atlas charts do no longer show units if normalization is enabled
* Improvements in AtlasStyler towards labeling classes, NODATA values and MigLayout
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2010-02-15 09:08:12 UTC (rev 706)
+++ trunk/build.xml 2010-02-15 11:07:30 UTC (rev 707)
@@ -97,9 +97,8 @@
</target>
<!-- ############## Create a JAR from "classes" and ZIP it ############## -->
-<!-- <target name="jar" depends="nativeToAscii"-->
- <target name="jar">
- <!-- Create the JAR -->
+ <target name="jar" depends="nativeToAscii">
+<!-- <target name="jar"> -->
<delete failonerror="false" file="${FILE.JAR}"/>
<jar destfile="${FILE.JAR}" index="false" level="8" duplicate="preserve">
<fileset dir="${DIR.CLASSES}">
Modified: trunk/src/schmitzm/geotools/styling/StylingUtil.java
===================================================================
--- trunk/src/schmitzm/geotools/styling/StylingUtil.java 2010-02-15 09:08:12 UTC (rev 706)
+++ trunk/src/schmitzm/geotools/styling/StylingUtil.java 2010-02-15 11:07:30 UTC (rev 707)
@@ -2596,8 +2596,8 @@
prop2 = attributeNames[0];
}
- LOGGER.debug("Thie second for \n" + filterExpression + "\n is "
- + prop2);
+// LOGGER.debug("The second property for \n" + filterExpression + "\n is "
+// + prop2);
return FilterUtil.FILTER_FAC2.property(prop2);
}
Modified: trunk/src/schmitzm/jfree/feature/style/FeatureBasicChartStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/feature/style/FeatureBasicChartStyle.java 2010-02-15 09:08:12 UTC (rev 706)
+++ trunk/src/schmitzm/jfree/feature/style/FeatureBasicChartStyle.java 2010-02-15 11:07:30 UTC (rev 707)
@@ -36,6 +36,8 @@
import org.jfree.data.category.CategoryDataset;
import org.jfree.data.general.Dataset;
import org.jfree.data.xy.XYDataset;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
import schmitzm.jfree.chart.style.BasicChartStyle;
import schmitzm.jfree.chart.style.ChartStyle;
@@ -283,4 +285,18 @@
Dataset dataset = FeatureChartUtil.createDataset(fc,this);
return applyToDataset(dataset);
}
+
+ /**
+ * Updates the unitVisible parameter for all axes at once.
+ *
+ * @param visible
+ * <code>true</code> if unit string shall be displayed in the
+ * chart.
+ */
+ @Override
+ public void setUnitVisible(boolean visible) {
+ dummyFeatureChartStyle.setUnitVisible(visible);
+ }
+
+
}
Modified: trunk/src/schmitzm/jfree/feature/style/FeatureChartStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/feature/style/FeatureChartStyle.java 2010-02-15 09:08:12 UTC (rev 706)
+++ trunk/src/schmitzm/jfree/feature/style/FeatureChartStyle.java 2010-02-15 11:07:30 UTC (rev 707)
@@ -43,6 +43,7 @@
import org.opengis.feature.simple.SimpleFeatureType;
import schmitzm.jfree.chart.style.AbstractChartStyle;
+import schmitzm.jfree.chart.style.ChartAxisStyle;
import schmitzm.jfree.chart.style.ChartStyle;
import schmitzm.lang.LangUtil;
@@ -193,6 +194,15 @@
* @return {@code null} if the given value is one of the "No data" values
*/
public <T> T filterNoDataValue(int idx, T value);
+
+ /**
+ * Updates the unitVisible parameter for all axes at once.
+ *
+ * @param visible
+ * <code>true</code> if unit string shall be displayed in the
+ * chart.
+ */
+ public void setUnitVisible(boolean visible);
/**
* This class defines a dummy implementation of {@link FeatureChartStyle} just
@@ -558,6 +568,21 @@
throw new UnsupportedOperationException("FeatureChartStyle.Dummy does not implement applyToFeatureCollection(..)");
}
+ /**
+ * Updates the unitVisible parameter for all axes at once.
+ *
+ * @param visible
+ * <code>true</code> if unit string shall be displayed in the
+ * chart.
+ */
+ @Override
+ public void setUnitVisible(boolean visible) {
+ // TODO MArtin! Funktioniert so leider nicht. Warum ist hier getAxisCount() immer 0 ????
+ for (int axisIndex = 0; axisIndex < getAxisCount(); axisIndex++) {
+ getAxisStyle(axisIndex).setUnitVisible(visible);
+ }
+ }
+
}
}
Modified: trunk/src/schmitzm/jfree/feature/style/FeatureScatterChartStyle.java
===================================================================
--- trunk/src/schmitzm/jfree/feature/style/FeatureScatterChartStyle.java 2010-02-15 09:08:12 UTC (rev 706)
+++ trunk/src/schmitzm/jfree/feature/style/FeatureScatterChartStyle.java 2010-02-15 11:07:30 UTC (rev 707)
@@ -298,4 +298,16 @@
Dataset dataset = FeatureChartUtil.createDataset(fc,this);
return applyToDataset(dataset);
}
+
+ /**
+ * Updates the unitVisible parameter for all axes at once.
+ *
+ * @param visible
+ * <code>true</code> if unit string shall be displayed in the
+ * chart.
+ */
+ @Override
+ public void setUnitVisible(boolean visible) {
+ dummyFeatureChartStyle.setUnitVisible(visible);
+ }
}
Modified: trunk/src/skrueger/i8n/SwitchLanguageDialog.java
===================================================================
--- trunk/src/skrueger/i8n/SwitchLanguageDialog.java 2010-02-15 09:08:12 UTC (rev 706)
+++ trunk/src/skrueger/i8n/SwitchLanguageDialog.java 2010-02-15 11:07:30 UTC (rev 707)
@@ -62,7 +62,7 @@
public class SwitchLanguageDialog extends JDialog {
protected Logger LOGGER = Logger.getLogger(SwitchLanguageDialog.class);
- private static final long serialVersionUID = 1L;
+
private JPanel jContentPane = null;
Modified: trunk/src/skrueger/swing/CancellableDialogAdapter.java
===================================================================
--- trunk/src/skrueger/swing/CancellableDialogAdapter.java 2010-02-15 09:08:12 UTC (rev 706)
+++ trunk/src/skrueger/swing/CancellableDialogAdapter.java 2010-02-15 11:07:30 UTC (rev 707)
@@ -33,6 +33,7 @@
protected boolean cancelled = false;
private OkButton okButton;
+
private CancelButton cancelButton;
public CancellableDialogAdapter(Component parentWindow) {
More information about the Schmitzm-commits
mailing list