1 files changed, 50 insertions, 3 deletions
diff --git a/Week11 Mandelbrot/src/fractals/MainWindow.java b/Week11 Mandelbrot/src/fractals/MainWindow.java
index 7e72b30..44e1791 100644
--- a/Week11 Mandelbrot/src/fractals/MainWindow.java
+++ b/Week11 Mandelbrot/src/fractals/MainWindow.java
@@ -2,13 +2,17 @@ package fractals;
 
 
 
+import com.camilstaps.mandelbrot.MandelbrotController;
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
 import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import javax.swing.JButton;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
+import javax.swing.JTextField;
 
 /**
  * 
@@ -20,12 +24,20 @@ import javax.swing.JPanel;
  * creates a window to which a GridView panel is added
  * 
  */
-public class MainWindow  {
+public class MainWindow implements MandelbrotController.MandelbrotProvider {
     // the size of the window
     public static final int WIDTH = 500, HEIGHT = 500;
     
     // The grip panel
-    private GridView grid;
+    private final GridView grid;
+    
+    private final JTextField field_centerX = new JTextField("0");
+    private final JTextField field_centerY = new JTextField("0");
+    private final JTextField field_scale = new JTextField("100");
+    private final JTextField field_repetitions = new JTextField("100");
+    private final JButton button_redraw = new JButton("Redraw");
+    
+    private final MandelbrotController mandelbrotController;
     
     public MainWindow () {
     	JFrame mainFrame = new JFrame ("Mandelbrot");
@@ -41,8 +53,23 @@ public class MainWindow  {
         grid = new GridView(WIDTH - insets.left - insets.right, HEIGHT - insets.top - insets.bottom);
         mainFrame.add(grid, BorderLayout.CENTER);
         
+         mandelbrotController = new MandelbrotController(this, grid);
+        
         JPanel panel = new JPanel(new FlowLayout());
-        panel.add(new JButton("test"));
+        button_redraw.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent ae) {
+                if (ae.getActionCommand().equals("Redraw")) {
+                    mandelbrotController.redraw();
+                }
+            }
+        });
+        panel.add(field_centerX);
+        panel.add(field_centerY);
+        panel.add(field_scale);
+        panel.add(field_repetitions);
+        panel.add(button_redraw);
+        
         mainFrame.add(panel, BorderLayout.PAGE_END);
         
         mainFrame.pack();
@@ -55,5 +82,25 @@ public class MainWindow  {
     public Grid getGrid () {
     	return grid;
     }
+
+    @Override
+    public double getCenterX() {
+        return Double.parseDouble(field_centerX.getText());
+    }
+
+    @Override
+    public double getCenterY() {
+        return Double.parseDouble(field_centerY.getText());
+    }
+
+    @Override
+    public double getScale() {
+        return Double.parseDouble(field_scale.getText());
+    }
+
+    @Override
+    public int getRepetitions() {
+        return Integer.parseInt(field_repetitions.getText());
+    }
     
 }