Chapter 02 section 09 updated.

Author: liuyubobobo

02-Java-Swing-Basics/08-MVC-in-Algorithm-Visualization/src/AlgoVisualizer.java

@@ -1,5 +1,4 @@
 import java.awt.*;
-import java.util.Random;
 
 public class AlgoVisualizer {
 
@@ -42,12 +41,4 @@ private void run(){
         }
     }
 
-    public static void main(String[] args) {
-
-        int sceneWidth = 800;
-        int sceneHeight = 800;
-        int N = 10;
-
-        AlgoVisualizer vis = new AlgoVisualizer(sceneWidth, sceneHeight, N);
-    }
 }

02-Java-Swing-Basics/08-MVC-in-Algorithm-Visualization/src/Main.java

@@ -0,0 +1,11 @@
+public class Main {
+
+    public static void main(String[] args) {
+
+        int sceneWidth = 800;
+        int sceneHeight = 800;
+        int N = 10;
+
+        AlgoVisualizer vis = new AlgoVisualizer(sceneWidth, sceneHeight, N);
+    }
+}

02-Java-Swing-Basics/09-Keyboard-Event/src/AlgoFrame.java

@@ -10,7 +10,6 @@ public class AlgoFrame extends JFrame{
 
     private int canvasWidth;
     private int canvasHeight;
-    private JPanel canvas;
 
     public AlgoFrame(String title, int canvasWidth, int canvasHeight){
 
@@ -39,7 +38,7 @@ public AlgoFrame(String title){
 
     // data
     private Circle[] circles;
-    public void setCircles(Circle[] circles){
+    public void render(Circle[] circles){
         this.circles = circles;
         repaint();
     }

02-Java-Swing-Basics/09-Keyboard-Event/src/AlgoVisHelper.java

@@ -1,29 +1,28 @@
 import java.awt.*;
 import java.awt.geom.Ellipse2D;
-
 import java.lang.InterruptedException;
 
 public class AlgoVisHelper {
 
     private AlgoVisHelper(){}
 
-    static public void strokeCircle(Graphics2D g, int x, int y, int r){
+    public static void strokeCircle(Graphics2D g, int x, int y, int r){
 
         Ellipse2D circle = new Ellipse2D.Double(x-r, y-r, 2*r, 2*r);
         g.draw(circle);
     }
 
-    static public void fillCircle(Graphics2D g, int x, int y, int r){
+    public static void fillCircle(Graphics2D g, int x, int y, int r){
 
         Ellipse2D circle = new Ellipse2D.Double(x-r, y-r, 2*r, 2*r);
         g.fill(circle);
     }
 
-    static public void setColor(Graphics2D g, Color color){
+    public static void setColor(Graphics2D g, Color color){
         g.setColor(color);
     }
 
-    static public void setStrokeWidth(Graphics2D g, int w){
+    public static void setStrokeWidth(Graphics2D g, int w){
         int strokeWidth = w;
         g.setStroke(new BasicStroke(strokeWidth, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
     }

02-Java-Swing-Basics/09-Keyboard-Event/src/AlgoVisualizer.java

@@ -1,35 +1,40 @@
 import java.awt.*;
 import java.awt.event.*;
-import java.util.Random;
 
 public class AlgoVisualizer{
 
-    private int N;
     private Circle[] circles;
-    private static int R = 50;
     private AlgoFrame frame;
     private boolean isAnimated = true;
 
-    public AlgoVisualizer(int N, AlgoFrame frame){
-        this.N = N;
-        this.frame = frame;
+    public AlgoVisualizer(int sceneWidth, int sceneHeight, int N){
 
+        // 初始化数据
         circles = new Circle[N];
-
+        int R = 50;
         for(int i = 0 ; i < N ; i ++ ) {
-            int x = (int)(Math.random()*(frame.getCanvasWidth()-2*R)) + R;
-            int y = (int)(Math.random()*(frame.getCanvasHeight()-2*R)) + R;
+            int x = (int)(Math.random()*(sceneWidth-2*R)) + R;
+            int y = (int)(Math.random()*(sceneHeight-2*R)) + R;
             int vx = (int)(Math.random()*11) - 5;
             int vy = (int)(Math.random()*11) - 5;
             circles[i] = new Circle(x, y, R, vx, vy);
         }
+
+        // 初始化视图
+        EventQueue.invokeLater(() -> {
+            frame = new AlgoFrame("Welcome", sceneWidth, sceneHeight);
+            frame.addKeyListener(new AlgoKeyListener());
+            new Thread(() -> {
+                run();
+            }).start();
+        });
     }
 
     public void run(){
 
         while(true){
             // 绘制数据
-            frame.setCircles(circles);
+            frame.render(circles);
             AlgoVisHelper.pause(20);
 
             // 更新数据
@@ -39,15 +44,10 @@ public void run(){
         }
     }
 
-    public void addAlgoKeyListener(){
-        frame.addKeyListener(new AlgoKeyListener());
-    }
-
     private class AlgoKeyListener extends KeyAdapter{
 
         @Override
         public void keyReleased(KeyEvent event){
-            //System.out.println("Key released:" + event);
             if(event.getKeyChar() == ' ')
                 isAnimated = !isAnimated;
         }
@@ -57,16 +57,8 @@ public static void main(String[] args) {
 
         int sceneWidth = 800;
         int sceneHeight = 800;
+        int N = 10;
 
-        EventQueue.invokeLater(() -> {
-            AlgoFrame frame = new AlgoFrame("Welcome", sceneWidth,sceneHeight);
-
-            int N = 10;
-            AlgoVisualizer vis = new AlgoVisualizer(N, frame);
-            vis.addAlgoKeyListener();
-            new Thread(() -> {
-                vis.run();
-            }).start();
-        });
+        AlgoVisualizer vis = new AlgoVisualizer(sceneWidth, sceneHeight, N);
     }
 }