Update of /cvsroot/rails/18xx/rails/ui/swing/hexmap
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25886/rails/ui/swing/hexmap
Modified Files:
EWHexMap.java NSHexMap.java
Log Message:
Added coordinate grid
Index: NSHexMap.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/NSHexMap.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NSHexMap.java 2 Nov 2009 23:30:36 -0000 1.9
--- NSHexMap.java 8 Dec 2009 19:31:49 -0000 1.10
***************
*** 2,6 ****
package rails.ui.swing.hexmap;
! import java.awt.Dimension;
import java.util.ArrayList;
--- 2,6 ----
package rails.ui.swing.hexmap;
! import java.awt.*;
import java.util.ArrayList;
***************
*** 54,56 ****
--- 54,95 ----
* GUIHex.SQRT3 * scale));
}
+
+ @Override
+ public void paint(Graphics g) {
+
+ super.paint(g);
+ Graphics2D g2 = (Graphics2D) g;
+ String label;
+
+ boolean lettersGoHorizontal = mapManager.lettersGoHorizontal();
+ int xOffset = mapManager.letterAHasEvenNumbers() ? 1 : 0;
+ int xLeft = cx + 10;
+ int xRight = (cx + 5 + 3 * scale * hexArray.length);
+ int yTop = 20;
+ int yBottom = (int)(cy + 20 + 2 * hexArray[0].length * GUIHex.SQRT3 * scale);
+
+ for (int i = 1; i < hexArray.length; i++) {
+ label = lettersGoHorizontal
+ ? String.valueOf((char)('@'+i))
+ : String.valueOf(i);
+ g2.drawString(label,
+ (cx - 30 -3*label.length() + 3 * scale * (i + xOffset)),
+ yTop);
+ g2.drawString(label,
+ (cx - 30 -3*label.length() + 3 * scale * (i + xOffset)),
+ yBottom);
+ }
+
+ for (int j = 1; j < 2 * hexArray[0].length; j++) {
+ label = lettersGoHorizontal
+ ? String.valueOf(j)
+ : String.valueOf((char)('@'+j));
+ g2.drawString(label,
+ xLeft,
+ (int)(cy + 56 + j * GUIHex.SQRT3 * scale));
+ g2.drawString(label,
+ xRight,
+ (int)(cy + 56 + j * GUIHex.SQRT3 * scale));
+ }
+ }
}
Index: EWHexMap.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/hexmap/EWHexMap.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EWHexMap.java 2 Nov 2009 23:30:36 -0000 1.10
--- EWHexMap.java 8 Dec 2009 19:31:49 -0000 1.11
***************
*** 2,6 ****
package rails.ui.swing.hexmap;
! import java.awt.Dimension;
import java.util.ArrayList;
--- 2,6 ----
package rails.ui.swing.hexmap;
! import java.awt.*;
import java.util.ArrayList;
***************
*** 52,54 ****
--- 52,96 ----
(int) Math.round((hexArray[0].length + 1) * 1.5 * scale));
}
+
+ @Override
+ public void paint(Graphics g) {
+
+ super.paint(g);
+ Graphics2D g2 = (Graphics2D) g;
+ String label;
+
+ boolean lettersGoHorizontal = mapManager.lettersGoHorizontal();
+ int xOffset = mapManager.letterAHasEvenNumbers() ? 1 : 0;
+ int xLeft = cx + 10;
+ int xRight = (int)(cx + 5 + scale * (GUIHex.SQRT3/2 * 2*hexArray.length));
+ int yTop = cy + 10;
+ int yBottom = (int)(cy - 10 + hexArray[0].length * 1.5 * scale);
+
+ for (int i = 1; i < 2*hexArray.length; i++) {
+ label = lettersGoHorizontal
+ ? String.valueOf((char)('@'+i))
+ : String.valueOf(i);
+ g2.drawString(label,
+ (int) (cx + (26-3*label.length()) + scale * (GUIHex.SQRT3/2 * (i + xOffset))),
+ yTop);
+ g2.drawString(label,
+ (int) (cx + (26-3*label.length()) + scale * (GUIHex.SQRT3/2 * (i + xOffset))),
+ yBottom);
+ }
+
+ for (int j = 1; j < hexArray[0].length; j++) {
+ label = lettersGoHorizontal
+ ? String.valueOf(j)
+ : String.valueOf((char)('@'+j));
+ g2.drawString(label,
+ xLeft,
+ (int)(cy - 10 + j * 1.5 * scale));
+ g2.drawString(label,
+ xRight,
+ (int)(cy - 10 + j * 1.5 * scale));
+ }
+
+
+ }
+
}
|
