Translate table origin

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@98 72836036-5685-4462-b002-a69064685172

src/jrummikub/JRummikub.java

@@ -105,8 +105,7 @@ public class JRummikub {
 					}
 				});
 
-    view.getTablePanel().getClickEvent()
+		view.getTablePanel().getClickEvent().add(new IListener1<Position>() {
-        .add(new IListener1<Position>() {
 			@Override
 			public void handle(Position p) {
 				System.out.println("Table clicked at " + p);

src/jrummikub/view/impl/AbstractStonePanel.java

@@ -13,6 +13,7 @@ import jrummikub.model.Position;
 import jrummikub.model.Stone;
 import jrummikub.util.Event1;
 import jrummikub.util.Event2;
+import jrummikub.util.Pair;
 import jrummikub.view.IClickable;
 import jrummikub.view.IStonePanel;
 
@@ -60,8 +61,9 @@ abstract class AbstractStonePanel extends JPanel implements IStonePanel,
 			@Override
 			public void mouseClicked(MouseEvent e) {
 				Insets insets = getInsets();
-				Position pos = stonePainter.calculatePosition(e.getX() - insets.left,
+				Pair<Integer, Integer> trans = getTranslation();
-						e.getY() - insets.top);
+				Position pos = stonePainter.calculatePosition(e.getX() - insets.left
+						- trans.getFirst(), e.getY() - insets.top - trans.getSecond());
 				Stone stone = getStoneAt(pos);
 
 				if (stone == null) {
@@ -85,7 +87,9 @@ abstract class AbstractStonePanel extends JPanel implements IStonePanel,
 
 	/**
 	 * *Overwrite this method* to signal if special zone was clicked
-	 * @param pos the clicked position
+	 * 
+	 * @param pos
+	 *          the clicked position
 	 * 
 	 * @return special zone clicked
 	 */
@@ -116,6 +120,15 @@ abstract class AbstractStonePanel extends JPanel implements IStonePanel,
 		this.stones = stones;
 	}
 
+	/**
+	 * Returns the translation in pixels the stones in this panel are painted with
+	 * 
+	 * @return the translation
+	 */
+	protected Pair<Integer, Integer> getTranslation() {
+		return new Pair<Integer, Integer>(0, 0);
+	}
+
 	/**
 	 * Returns the list of stones and positions currently set
 	 * 

src/jrummikub/view/impl/TablePanel.java

@@ -8,6 +8,7 @@ import java.awt.RenderingHints;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
+import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 import java.util.Collection;
 import java.util.Collections;
@@ -21,6 +22,7 @@ import jrummikub.model.Position;
 import jrummikub.model.Stone;
 import jrummikub.model.StoneSet;
 import jrummikub.util.Event1;
+import jrummikub.util.Pair;
 import jrummikub.view.IStoneCollectionPanel;
 import jrummikub.view.ITablePanel;
 
@@ -34,6 +36,8 @@ class TablePanel extends AbstractStonePanel implements ITablePanel {
 
 	private final static float MIN_VISIBLE_WIDTH = 15;
 	private final static float MIN_VISIBLE_HEIGHT = 7.5f;
+	private final static float HORIZONTAL_MARGIN = 1.5f;
+	private final static float VERTICAL_MARGIN = 1;
 	private final static float CONNECTOR_WIDTH = 0.25f;
 	private final int COLLECTION_GAP = 5;
 
@@ -107,18 +111,7 @@ class TablePanel extends AbstractStonePanel implements ITablePanel {
 		repaint();
 	}
 
-	private void rescale() {
+	private Rectangle2D calculateTableExtent() {
-		Insets insets = getInsets();
-		int x = insets.left, y = insets.top, width = getWidth() - insets.left
-				- insets.right, height = getHeight() - insets.top - insets.bottom;
-
-		leftPlayerLabel.setBounds(x, y, width, height);
-		topPlayerLabel.setBounds(x, y, width, height);
-		rightPlayerLabel.setBounds(x, y, width, height);
-
-		stoneCollection.setLocation(x + width / 2 - stoneCollection.getWidth() / 2,
-				y + height - stoneCollection.getHeight() - COLLECTION_GAP);
-
 		float minx = -MIN_VISIBLE_WIDTH / 2, maxx = MIN_VISIBLE_WIDTH / 2;
 		float miny = -MIN_VISIBLE_HEIGHT / 2, maxy = MIN_VISIBLE_HEIGHT / 2;
 
@@ -139,8 +132,29 @@ class TablePanel extends AbstractStonePanel implements ITablePanel {
 				maxy = p.getY() + 1;
 		}
 
-		float widthScale = width / (maxx - minx) * StonePainter.WIDTH_SCALE;
+		return new Rectangle2D.Float(minx - HORIZONTAL_MARGIN, miny
-		float heightScale = height / (maxy - miny) * StonePainter.HEIGHT_SCALE;
+				- VERTICAL_MARGIN, maxx - minx + 2 * HORIZONTAL_MARGIN, maxy - miny + 2
+				* VERTICAL_MARGIN);
+	}
+
+	private void rescale() {
+		Insets insets = getInsets();
+		int x = insets.left, y = insets.top, width = getWidth() - insets.left
+				- insets.right, height = getHeight() - insets.top - insets.bottom;
+
+		leftPlayerLabel.setBounds(x, y, width, height);
+		topPlayerLabel.setBounds(x, y, width, height);
+		rightPlayerLabel.setBounds(x, y, width, height);
+
+		stoneCollection.setLocation(x + width / 2 - stoneCollection.getWidth() / 2,
+				y + height - stoneCollection.getHeight() - COLLECTION_GAP);
+
+		Rectangle2D extent = calculateTableExtent();
+
+		float widthScale = width / (float) extent.getWidth()
+				* StonePainter.WIDTH_SCALE;
+		float heightScale = height / (float) extent.getHeight()
+				* StonePainter.HEIGHT_SCALE;
 
 		getStonePainter().setScale(Math.min(widthScale, heightScale));
 
@@ -211,6 +225,19 @@ class TablePanel extends AbstractStonePanel implements ITablePanel {
 		return false;
 	}
 
+	@Override
+	protected Pair<Integer, Integer> getTranslation() {
+		Insets insets = getInsets();
+		int width = getWidth() - insets.left - insets.right, height = getHeight()
+				- insets.top - insets.bottom;
+		int stoneWidth = getStonePainter().getStoneWidth(), stoneHeight = getStonePainter()
+				.getStoneHeight();
+		Rectangle2D extent = calculateTableExtent();
+
+		return new Pair<Integer, Integer>((int) (width / 2 - extent.getCenterX()
+				* stoneWidth), (int) (height / 2 - extent.getCenterY() * stoneHeight));
+	}
+
 	private void paintStoneSet(Graphics2D g, StoneSet stoneSet, Position pos) {
 		float x = pos.getX();
 		int width = getStonePainter().getStoneWidth(), height = getStonePainter()
@@ -241,11 +268,18 @@ class TablePanel extends AbstractStonePanel implements ITablePanel {
 			}
 		}
 
+		AffineTransform oldTransform = g.getTransform();
+
+		Pair<Integer, Integer> translation = getTranslation();
+		g.translate(translation.getFirst(), translation.getSecond());
+
 		g.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
 				RenderingHints.VALUE_ANTIALIAS_ON);
 
 		for (Map.Entry<StoneSet, Position> entry : stoneSets.entrySet()) {
 			paintStoneSet(g, entry.getKey(), entry.getValue());
 		}
+
+		g.setTransform(oldTransform);
 	}
 }