knut/album
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
knut 2007-04-21 22:29:42 +00:00
parent bcc46597c9
commit 5c9d049819
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/album/editor/Editor.java
View file

@ -35,7 +35,7 @@ public class Editor
AffineTransform screenToCoord; AffineTransform screenToCoord;
AffineTransform coordToScreen; AffineTransform coordToScreen;
boolean dirty = true; boolean dirty = true;
// CropFrame mask;
public Editor(BufferedImage img) { public Editor(BufferedImage img) {
this.img = img; this.img = img;
@ -44,10 +44,10 @@ public class Editor
imgScale = 1d / Math.sqrt(w * w + h * h); imgScale = 1d / Math.sqrt(w * w + h * h);
roi = new Rect(); roi = new Rect();
roi.top = 0.5f; roi.top = 0.4f;
roi.bottom = -0.5f; roi.bottom = -0.4f;
roi.left = -0.5f; roi.left = -0.4f;
roi.right = 0.5f; roi.right = 0.4f;
rescale(imgScale * 680); rescale(imgScale * 680);
/* /*
@ -80,7 +80,7 @@ public class Editor
Dimension size = new Dimension(side, side); Dimension size = new Dimension(side, side);
dirty = true; dirty = true;
roi.cache = null; roi.cache = null;
System.out.println("Side: " + side); // System.out.println("Side: " + side);
setSize(size); setSize(size);
setPreferredSize(size); setPreferredSize(size);
setMinimumSize(size); setMinimumSize(size);
@ -94,7 +94,7 @@ public class Editor
super.paintComponent(g1); super.paintComponent(g1);
if (dirty) { if (dirty) {
System.out.println("Recalculating"); // System.out.println("Recalculating");
AffineTransform screenToCoord = new AffineTransform(); AffineTransform screenToCoord = new AffineTransform();
screenToCoord.translate(side/2d, side/2d); screenToCoord.translate(side/2d, side/2d);
screenToCoord.scale(side, -side); screenToCoord.scale(side, -side);
@ -414,7 +414,8 @@ public class Editor
left = coordTopLeft.x; left = coordTopLeft.x;
bottom = coordBottomRight.y; bottom = coordBottomRight.y;
right = coordBottomRight.x; right = coordBottomRight.x;
// System.out.println("rect: " + left + ", " + top + ", " + right + ", " + bottom); /*
System.out.println("rect: " + left + ", " + top + ", " + right + ", " + bottom);
Rectangle stored = calculateScreenRectangle(); Rectangle stored = calculateScreenRectangle();
Rectangle delta = new Rectangle(); Rectangle delta = new Rectangle();
delta.x = frame.x - stored.x; delta.x = frame.x - stored.x;
@ -422,6 +423,7 @@ public class Editor
delta.width = frame.width - stored.width; delta.width = frame.width - stored.width;
delta.height = frame.height - stored.height; delta.height = frame.height - stored.height;
System.out.println("delta: " + delta); System.out.println("delta: " + delta);
*/
cache = frame; cache = frame;
} }