diff options
author | Camil Staps | 2015-04-29 22:37:13 +0200 |
---|---|---|
committer | Camil Staps | 2015-04-29 22:37:13 +0200 |
commit | 57cc1163708260f3e4f5b56cc1de2ad2ee625018 (patch) | |
tree | c865e7c5ad8db5bf4e3846395e55046a9bc2263f /Week11 Mandelbrot/src/com/camilstaps/mandelbrot/ZoomFrame.java | |
parent | Bugfix drawing zoom rectangle (diff) |
cleanup
Diffstat (limited to 'Week11 Mandelbrot/src/com/camilstaps/mandelbrot/ZoomFrame.java')
-rw-r--r-- | Week11 Mandelbrot/src/com/camilstaps/mandelbrot/ZoomFrame.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Week11 Mandelbrot/src/com/camilstaps/mandelbrot/ZoomFrame.java b/Week11 Mandelbrot/src/com/camilstaps/mandelbrot/ZoomFrame.java index b7b5a68..1dfa2a7 100644 --- a/Week11 Mandelbrot/src/com/camilstaps/mandelbrot/ZoomFrame.java +++ b/Week11 Mandelbrot/src/com/camilstaps/mandelbrot/ZoomFrame.java @@ -17,7 +17,7 @@ import javax.swing.JFrame; */ public class ZoomFrame extends JFrame implements MouseListener, MouseMotionListener { - private MandelbrotController mandelbrotController; + private MandelbrotView mandelbrotView; private MandelbrotTextFields mandelbrotTextFields; private Graphics graphics; @@ -31,8 +31,8 @@ public class ZoomFrame extends JFrame implements MouseListener, MouseMotionListe addMouseMotionListener(this); } - public void setMandelbrotController(MandelbrotController mc) { - mandelbrotController = mc; + public void setMandelbrotView(MandelbrotView mv) { + mandelbrotView = mv; } public void setMandelbrotTextFields(MandelbrotTextFields mtf) { @@ -52,11 +52,11 @@ public class ZoomFrame extends JFrame implements MouseListener, MouseMotionListe @Override public void mouseReleased(MouseEvent me) { if (me.getX() == start_x && me.getY() == start_y) { - if (mandelbrotController == null || mandelbrotTextFields == null) + if (mandelbrotView == null || mandelbrotTextFields == null) return; - mandelbrotTextFields.setCenterX(mandelbrotController.getX(me.getX())); - mandelbrotTextFields.setCenterY(mandelbrotController.getY(me.getY())); + mandelbrotTextFields.setCenterX(mandelbrotView.getX(me.getX())); + mandelbrotTextFields.setCenterY(mandelbrotView.getY(me.getY())); if ((me.getModifiers() & InputEvent.SHIFT_MASK) != 0) { mandelbrotTextFields.setScale(mandelbrotTextFields.getScale() / 2); @@ -64,12 +64,12 @@ public class ZoomFrame extends JFrame implements MouseListener, MouseMotionListe mandelbrotTextFields.setScale(mandelbrotTextFields.getScale() * 2); } } else { - double center_x = (mandelbrotController.getX(me.getX()) - - mandelbrotController.getX(start_x)) / 2 - + mandelbrotController.getX(start_x); - double center_y = (mandelbrotController.getY(me.getY()) - - mandelbrotController.getY(start_y)) / 2 - + mandelbrotController.getY(start_y); + double center_x = (mandelbrotView.getX(me.getX()) + - mandelbrotView.getX(start_x)) / 2 + + mandelbrotView.getX(start_x); + double center_y = (mandelbrotView.getY(me.getY()) + - mandelbrotView.getY(start_y)) / 2 + + mandelbrotView.getY(start_y); mandelbrotTextFields.setCenterX(center_x); mandelbrotTextFields.setCenterY(center_y); @@ -85,7 +85,7 @@ public class ZoomFrame extends JFrame implements MouseListener, MouseMotionListe mandelbrotTextFields.setScale(scale); } - mandelbrotController.redraw(); + mandelbrotView.redraw(); dragging = false; } @@ -137,7 +137,7 @@ public class ZoomFrame extends JFrame implements MouseListener, MouseMotionListe public void setCenterY(double y); public double getScale(); public void setScale(double scale); - public void setRepetitions(double repetitions); + public void setRepetitions(int repetitions); } } |