[Xulu-commits] r52 - in branches/1.8-gt2-2.6/src: appl/parallel/data/xulugridfile appl/util edu/bonn/xulu edu/bonn/xulu/plugin/appl edu/bonn/xulu/plugin/io/grid

[scm-commit@wald.intevation.org]

Author: mojays
Date: 2009-09-04 14:56:44 +0200 (Fri, 04 Sep 2009)
New Revision: 52

Modified:
   branches/1.8-gt2-2.6/src/appl/parallel/data/xulugridfile/XuluGridFileConverter.java
   branches/1.8-gt2-2.6/src/appl/util/RasterUtil.java
   branches/1.8-gt2-2.6/src/edu/bonn/xulu/XuluModellingPlatform.java
   branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/appl/GTVisualisationColorMapPlugin.java
   branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/io/grid/WritableGridFactory.java
Log:
Geotools 2.6 migration. ArcGridRaster now taken from "gtmig" package in SCHMITZM.
ColorMap-type can be specified in GTVisualisationColorMapPlugin color map file.
NOW STABLE! 



Modified: branches/1.8-gt2-2.6/src/appl/parallel/data/xulugridfile/XuluGridFileConverter.java
===================================================================
--- branches/1.8-gt2-2.6/src/appl/parallel/data/xulugridfile/XuluGridFileConverter.java	2009-08-31 18:21:09 UTC (rev 51)
+++ branches/1.8-gt2-2.6/src/appl/parallel/data/xulugridfile/XuluGridFileConverter.java	2009-09-04 12:56:44 UTC (rev 52)
@@ -15,7 +15,7 @@
  *
  */
 package appl.parallel.data.xulugridfile;
-import org.geotools.gce.arcgrid.ArcGridRaster;
+import gtmig.org.geotools.gce.arcgrid.ArcGridRaster;
 import org.geotools.resources.NIOUtilities;
 
 import appl.util.RasterMetaData;

Modified: branches/1.8-gt2-2.6/src/appl/util/RasterUtil.java
===================================================================
--- branches/1.8-gt2-2.6/src/appl/util/RasterUtil.java	2009-08-31 18:21:09 UTC (rev 51)
+++ branches/1.8-gt2-2.6/src/appl/util/RasterUtil.java	2009-09-04 12:56:44 UTC (rev 52)
@@ -10,7 +10,7 @@
 import schmitzm.data.WritableGrid;
 import schmitzm.geotools.io.GeoImportUtil;
 
-import org.geotools.gce.arcgrid.ArcGridRaster;
+import gtmig.org.geotools.gce.arcgrid.ArcGridRaster;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 
 /** 

Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/XuluModellingPlatform.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/XuluModellingPlatform.java	2009-08-31 18:21:09 UTC (rev 51)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/XuluModellingPlatform.java	2009-09-04 12:56:44 UTC (rev 52)
@@ -239,7 +239,7 @@
     String defaultCRS = XuluConfig.getXuluConfig().getProperty("General.DefaultCRS");
     CoordinateReferenceSystem crs = defaultCRS != null ? GTUtil.createCRS(defaultCRS) : null;
     if ( crs != null )  {
-      GeoImportUtil.DEFAULT_CRS = crs;
+      GeoImportUtil.setDefaultCRS(crs);
       giveStatus(" done.\n",infoStream);
     } else {
       giveStatus(" failt!\n",infoStream);

Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/appl/GTVisualisationColorMapPlugin.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/appl/GTVisualisationColorMapPlugin.java	2009-08-31 18:21:09 UTC (rev 51)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/appl/GTVisualisationColorMapPlugin.java	2009-09-04 12:56:44 UTC (rev 52)
@@ -189,6 +189,14 @@
         continue;
       }
 
+      // Beim Tag TYPE wird die Art der ColorMap festgelegt
+      if ( line.trim().toLowerCase().matches("type\\s*=.*") ) {
+        String[] line_parts = line.toLowerCase().split("type\\s*\\=\\s*");
+        int colorMapType = StylingUtil.getColorMapType(line_parts[1] );
+        colorMap.setType(colorMapType);
+        continue;
+      }
+
       // Ansonsten Zeile als ColorMapEntry interpretieren:
       //     <Quantity> <Color> [<Label>]
       if ( colorMap == null )

Modified: branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/io/grid/WritableGridFactory.java
===================================================================
--- branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/io/grid/WritableGridFactory.java	2009-08-31 18:21:09 UTC (rev 51)
+++ branches/1.8-gt2-2.6/src/edu/bonn/xulu/plugin/io/grid/WritableGridFactory.java	2009-09-04 12:56:44 UTC (rev 52)
@@ -118,7 +118,7 @@
    */
   public WritableGrid newInstance(boolean dialog, int type, int wCells, int hCells, double xCoord, double yCoord, double wReal, double hReal, CoordinateReferenceSystem crs) {
     if ( crs == null )
-      crs = GeoImportUtil.DEFAULT_CRS;
+      crs = GeoImportUtil.getDefaultCRS();
 
     // Sample-Angaben ohne Dialog uebernehmen
     if ( !dialog )