[Rails-commits] 18xx/rails/ui/swing MapPanel.java, 1.12, 1.13 ImageLoader.java, 1.13, 1.14

[Erik V. <ev...@us...>]

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5921/rails/ui/swing

Modified Files:
	MapPanel.java ImageLoader.java 
Log Message:
Adapted code for correct working with new set of SVG tiles.
Removed support for GIF tiles.

Index: ImageLoader.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ImageLoader.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ImageLoader.java	15 Dec 2009 18:56:11 -0000	1.13
--- ImageLoader.java	18 Dec 2009 20:04:32 -0000	1.14
***************
*** 3,10 ****
  
  import java.awt.image.BufferedImage;
- import java.io.InputStream;
  import java.util.*;
  
- import javax.imageio.ImageIO;
  import javax.xml.parsers.DocumentBuilder;
  import javax.xml.parsers.DocumentBuilderFactory;
--- 3,8 ----
***************
*** 28,42 ****
      private static Map<Integer, Document> svgMap;
      private static double[] zoomFactors = new double[21];
  
!     private static int svgWidth = 60;
!     private static int svgHeight = 55;
      private static String svgTileDir = "tiles/svg";
!     private static String gifTileDir = "tiles/images";
      private static String tileRootDir = Config.get("tile.root_directory");
!     private static String preference = Config.get("tile.format_preference");
      private static List<String> directories = new ArrayList<String>();
  
      static {
!         GUIHex.setScale(preference.equalsIgnoreCase("svg") ? 1.0 : 0.33);
      }
  
--- 26,45 ----
      private static Map<Integer, Document> svgMap;
      private static double[] zoomFactors = new double[21];
+     //private static Map<Integer, String> tileTypes = new HashMap<Integer, String>(64);
  
!     //private static int svgWidth = 60;
!     //private static int svgHeight = 55;
!     private static double svgWidth = 75;
!     private static double svgHeight = svgWidth * 0.5 * Math.sqrt(3.0);
      private static String svgTileDir = "tiles/svg";
!     //private static String gifTileDir = "tiles/images";
      private static String tileRootDir = Config.get("tile.root_directory");
!     //private static String preference = Config.get("tile.format_preference");
      private static List<String> directories = new ArrayList<String>();
  
      static {
!         //GUIHex.setScale(preference.equalsIgnoreCase("svg") ? 1.0 : 0.33);
!         //GUIHex.setScale(preference.equalsIgnoreCase("svg") ? 1.0 : 0.163);
!         GUIHex.setScale(1.0);
      }
  
***************
*** 71,77 ****
--- 74,82 ----
      }
  
+     /*
      private BufferedImage loadTile(int tileID, double zoomFactor) {
          BufferedImage image = null;
  
+         //String tileType;
          if (preference.equalsIgnoreCase("gif")) {
  
***************
*** 81,84 ****
--- 86,92 ----
                  log.warn("Attempting to load SVG version of tile " + tileID);
                  image = getSVGTile(tileID, zoomFactor);
+                 //tileType = "svg";
+             } else {
+             	tileType = "gif";
              }
  
***************
*** 90,97 ****
                  log.warn("Attempting to load GIF version of tile " + tileID);
                  image = getGIFTile(tileID);
              }
          }
          return image;
!     }
  
      private BufferedImage getSVGTile(int tileID, double zoomFactor) {
--- 98,109 ----
                  log.warn("Attempting to load GIF version of tile " + tileID);
                  image = getGIFTile(tileID);
+                 tileType = "gif";
+             } else {
+             	tileType = "svg";
              }
          }
+         //tileTypes.put(tileID, tileType);
          return image;
!     }*/
  
      private BufferedImage getSVGTile(int tileID, double zoomFactor) {
***************
*** 135,140 ****
          	}
              BufferedImageTranscoder t = new BufferedImageTranscoder();
!             t.addTranscodingHint(ImageTranscoder.KEY_WIDTH, new Float(svgWidth * zoomFactor));
!             t.addTranscodingHint(ImageTranscoder.KEY_HEIGHT, new Float(svgHeight * zoomFactor));
              TranscoderInput input = new TranscoderInput(svgMap.get(tileID));
              t.transcode(input, null);
--- 147,152 ----
          	}
              BufferedImageTranscoder t = new BufferedImageTranscoder();
!             t.addTranscodingHint(ImageTranscoder.KEY_MAX_WIDTH, new Float(svgWidth * zoomFactor));
!             t.addTranscodingHint(ImageTranscoder.KEY_MAX_HEIGHT, new Float(svgHeight * zoomFactor));
              TranscoderInput input = new TranscoderInput(svgMap.get(tileID));
              t.transcode(input, null);
***************
*** 150,153 ****
--- 162,166 ----
      }
  
+     /*
      private BufferedImage getGIFTile(int tileID) {
          String fn = "tile" + Integer.toString(tileID) + ".gif";
***************
*** 168,171 ****
--- 181,185 ----
          return image;
      }
+     */
  
      public BufferedImage getTile(int tileID, int zoomStep) {
***************
*** 178,182 ****
      	}
      	if (!tileMap.get(tileID).containsKey(zoomStep)) {
!         	BufferedImage image = loadTile(tileID, getZoomFactor(zoomStep));
          	tileMap.get(tileID).put(zoomStep, image);
          }
--- 192,196 ----
      	}
      	if (!tileMap.get(tileID).containsKey(zoomStep)) {
!         	BufferedImage image = getSVGTile(tileID, getZoomFactor(zoomStep));
          	tileMap.get(tileID).put(zoomStep, image);
          }
***************
*** 195,201 ****
      }
  
      public ImageLoader() {
          directories.add(tileRootDir + svgTileDir);
!         directories.add(tileRootDir + gifTileDir);
          directories.add(tileRootDir);
      }
--- 209,219 ----
      }
  
+     //public String getTileType (int tileID) {
+     //	return tileTypes.get(tileID);
+     //}
+ 
      public ImageLoader() {
          directories.add(tileRootDir + svgTileDir);
!         //directories.add(tileRootDir + gifTileDir);
          directories.add(tileRootDir);
      }

Index: MapPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/MapPanel.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MapPanel.java	15 Dec 2009 18:56:11 -0000	1.12
--- MapPanel.java	18 Dec 2009 20:04:31 -0000	1.13
***************
*** 31,35 ****
      public MapPanel(GameUIManager gameUIManager) {
          this.gameUIManager = gameUIManager;
!         Scale.set(15);
          setLayout(new BorderLayout());
  
--- 31,36 ----
      public MapPanel(GameUIManager gameUIManager) {
          this.gameUIManager = gameUIManager;
!         //Scale.set(15);
!         Scale.set(16);
          setLayout(new BorderLayout());