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

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

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

Modified Files:
	ImageLoader.java 
Log Message:
Better positioning and sizing of tokens and home indicators

Index: ImageLoader.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ImageLoader.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ImageLoader.java	18 Dec 2009 20:04:32 -0000	1.14
--- ImageLoader.java	19 Dec 2009 16:48:32 -0000	1.15
***************
*** 26,44 ****
      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);
      }
--- 26,37 ----
***************
*** 74,130 ****
      }
  
-     /*
-     private BufferedImage loadTile(int tileID, double zoomFactor) {
-         BufferedImage image = null;
- 
-         //String tileType;
-         if (preference.equalsIgnoreCase("gif")) {
- 
-             image = getGIFTile(tileID);
-             if (image == null) {
-                 // If loading the GIF fails, try loading the SVG.
-                 log.warn("Attempting to load SVG version of tile " + tileID);
-                 image = getSVGTile(tileID, zoomFactor);
-                 //tileType = "svg";
-             } else {
-             	tileType = "gif";
-             }
- 
-         } else {
- 
-             image = getSVGTile(tileID, zoomFactor);
-             if (image == null) {
-                 // If loading the SVG fails, try loading the GIF.
-                 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) {
          String fn = "tile" + Integer.toString(tileID) + ".svg";
-         //log.debug("Loading SVG tile " + fn);
  
          BufferedImage image = null;
  
          try {
-         	/*
-             InputStream stream = ResourceLoader.getInputStream(fn, directories);
-             if (stream != null) {
-                 BufferedImageTranscoder t = new BufferedImageTranscoder();
-                 t.addTranscodingHint(ImageTranscoder.KEY_WIDTH, new Float(
-                         svgWidth));
-                 t.addTranscodingHint(ImageTranscoder.KEY_HEIGHT, new Float(
-                         svgHeight));
-                 TranscoderInput input = new TranscoderInput(stream);
-                 t.transcode(input, null);
-                 image = t.getImage();
-             }
-             */
          	// Experimental new version, that stacks the XML to allow zooming
          	if (svgMap == null) {
--- 67,76 ----
***************
*** 162,186 ****
      }
  
-     /*
-     private BufferedImage getGIFTile(int tileID) {
-         String fn = "tile" + Integer.toString(tileID) + ".gif";
-         //log.debug("Loading tile " + fn);
- 
-         BufferedImage image = null;
- 
-         try {
- 
-             InputStream str = ResourceLoader.getInputStream(fn, directories);
-             if (str != null) {
-                 image = ImageIO.read(str);
-             }
-         } catch (Exception e) {
-             log.error("Error loading file: " + fn + "\nLoad failed with " + e);
-             return null;
-         }
-         return image;
-     }
-     */
- 
      public BufferedImage getTile(int tileID, int zoomStep) {
  
--- 108,111 ----
***************
*** 209,219 ****
      }
  
-     //public String getTileType (int tileID) {
-     //	return tileTypes.get(tileID);
-     //}
- 
      public ImageLoader() {
          directories.add(tileRootDir + svgTileDir);
-         //directories.add(tileRootDir + gifTileDir);
          directories.add(tileRootDir);
      }
--- 134,139 ----