[Patchanim-commit] SF.net SVN: patchanim:[257] trunk/patchanim/src/com/mebigfatguy/patchanim

[<dbr...@us...>]

Revision: 257
          http://patchanim.svn.sourceforge.net/patchanim/?rev=257&view=rev
Author:   dbrosius
Date:     2008-12-25 18:52:27 +0000 (Thu, 25 Dec 2008)

Log Message:
-----------
add reset grid menu item

Modified Paths:
--------------
    trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java
    trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java
    trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java
    trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties
    trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java
    trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java

Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java
===================================================================
--- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java	2008-12-25 18:40:04 UTC (rev 256)
+++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JColorControlPatchPanel.java	2008-12-25 18:52:27 UTC (rev 257)
@@ -196,7 +196,7 @@
 		
 		if ((xDeltaSq + yDeltaSq) > MINDRAGDISTANCESQ) {
 			c.setX(inputX);
-			c.sety(inputY);
+			c.setY(inputY);
 			return true;
 		}
 		

Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java
===================================================================
--- trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java	2008-12-25 18:40:04 UTC (rev 256)
+++ trunk/patchanim/src/com/mebigfatguy/patchanim/gui/JPatchSamplePanel.java	2008-12-25 18:52:27 UTC (rev 257)
@@ -61,13 +61,13 @@
 	private static final long serialVersionUID = 8057501623261814175L;
 	
 	private static final int SAMPLE_SIZE = 200;
-	private PatchColor color;
+	private final PatchColor color;
 	private Color rgb;
 	private OutOfBoundsColor oob;
 	private transient BufferedImage image;
 	private PatchDecorator decorator;
 	private transient Thread redrawThread = null;
-	private Object redrawLock = new Object();
+	private final Object redrawLock = new Object();
 	private boolean redrawing = false;
 	private boolean dragging = false;
 	
@@ -385,6 +385,18 @@
 		}
 		
 		menu.add(copy);
+		
+		JMenuItem resetGrid = new JMenuItem(rb.getString(PatchAnimBundle.RESETGRID));
+		resetGrid.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				PatchPanelMediator mediator = PatchPanelMediator.getMediator();
+				PatchCoords coords = mediator.getActivePatch().getPatch(color);
+				coords.resetSpatialCoordinates();
+				redraw();
+			}
+		});
+		menu.add(resetGrid);
+		
 		menu.show(JPatchSamplePanel.this, me.getX(), me.getY());
 	}
 	
@@ -500,11 +512,11 @@
 				Coordinate c = coords.getCoordinate(i, j);
 				switch (direction) {
 					case Outward:
-						color = (double)(int)((255.0 * Math.abs(i - midOrder) * Math.abs(j - midOrder)) / midOrderSq);
+						color = (int)((255.0 * Math.abs(i - midOrder) * Math.abs(j - midOrder)) / midOrderSq);
 					break;
 						
 					case Inward:
-						color = (double)(int)(255.0 - (255.0 * (Math.abs(i - midOrder) * Math.abs(j - midOrder))) / midOrderSq);
+						color = (int)(255.0 - (255.0 * (Math.abs(i - midOrder) * Math.abs(j - midOrder))) / midOrderSq);
 					break;
 				}
 				

Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java
===================================================================
--- trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java	2008-12-25 18:40:04 UTC (rev 256)
+++ trunk/patchanim/src/com/mebigfatguy/patchanim/main/PatchAnimBundle.java	2008-12-25 18:52:27 UTC (rev 257)
@@ -106,6 +106,7 @@
 	public static final String REDPATCH = "patchanim.redpatch";
 	public static final String GREENPATCH = "patchanim.greenpatch";
 	public static final String BLUEPATCH = "patchanim.bluepatch";
+	public static final String RESETGRID = "patchanim.resetgrid";
 	public static final String ASKSAVE = "patchanim.asksave";
 	public static final String LOADFAILED = "patchanim.err.loadfailed";	
 	public static final String SAVEFAILED = "patchanim.err.savefailed";

Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties
===================================================================
--- trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties	2008-12-25 18:40:04 UTC (rev 256)
+++ trunk/patchanim/src/com/mebigfatguy/patchanim/resources.properties	2008-12-25 18:52:27 UTC (rev 257)
@@ -101,6 +101,7 @@
 patchanim.redpatch = Red Patch
 patchanim.greenpatch = Green Patch
 patchanim.bluepatch = Blue Patch
+patchanim.resetgrid = Reset Grid
 patchanim.asksave = Do you want to save your changes?
 patchanim.err.savefailed = Failed saving Patch Animation File
 patchanim.err.loadfailed = Failed loading Patch Animation File

Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java
===================================================================
--- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java	2008-12-25 18:40:04 UTC (rev 256)
+++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/Coordinate.java	2008-12-25 18:52:27 UTC (rev 257)
@@ -53,7 +53,7 @@
 		return y;
 	}
 	
-	public void sety(double yPos) {
+	public void setY(double yPos) {
 		y = yPos;
 	}
 	

Modified: trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java
===================================================================
--- trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java	2008-12-25 18:40:04 UTC (rev 256)
+++ trunk/patchanim/src/com/mebigfatguy/patchanim/surface/PatchCoords.java	2008-12-25 18:52:27 UTC (rev 257)
@@ -125,7 +125,17 @@
 	public void setCoordinate(int i, int j, Coordinate coordinate) {
 		coords[i][j] = coordinate;
 	}
+	
+	public void resetSpatialCoordinates() {
+		for (int u = 0; u < order; u++) {
+			for (int v = 0; v < order; v++) {
+				coords[u][v].setX((u * 100.0) / (order - 1));
+				coords[u][v].setY((v * 100.0) / (order - 1));
+			}
+		}
 
+	}
+
 	@Override
 	public String toString() {
 		return Arrays.toString(coords);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.