Fractal dimension output with sensible popup

sjpollard · Nov 19, 2018 · fd63d7f · fd63d7f
1 parent 52052e1
commit fd63d7f
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 78 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/src/mandelbrot/DimensionFrame.java b/src/mandelbrot/DimensionFrame.java
@@ -95,6 +95,12 @@ public void updateGridlines() {
             logOfNoBoxes[iteration - 1] = Math.log(boxes);
             logOfSideLengths[iteration - 1] = Math.log(1.0 / argandDiagram.currentLength);
         }
+        else if (!argandDiagram.start)  {
+
+            String output = "Box counting dimension: " + new RegressionCalculator(logOfSideLengths, logOfNoBoxes).calculateGradient();
+            JOptionPane.showMessageDialog(this, output, "Fractal dimension", JOptionPane.PLAIN_MESSAGE);
+
+        }
         argandDiagram.repaint();
 
     }

diff --git a/src/mandelbrot/GridArgandDiagram.java b/src/mandelbrot/GridArgandDiagram.java
@@ -67,18 +67,16 @@ public void paintComponent(Graphics g) {
     /**Draws gridlines across the screen for the DimensionFrame to count from*/
     public void drawGridlines(Graphics g) {
 
-        if (start) {
-            g.setColor(colours.getInverse());
-            for (int x = 0; x < this.getWidth(); x += currentLength - 1) {
+        g.setColor(colours.getInverse());
+        for (int x = 0; x < this.getWidth(); x += currentLength - 1) {
 
-                g.drawLine(x, 0, x, this.getHeight());
+            g.drawLine(x, 0, x, this.getHeight());
 
-            }
-            for (int y = 0; y < this.getHeight(); y += currentLength - 1) {
+        }
+        for (int y = 0; y < this.getHeight(); y += currentLength - 1) {
 
-                g.drawLine(0, y, this.getWidth(), y);
+            g.drawLine(0, y, this.getWidth(), y);
 
-            }
         }
 
     }
@@ -102,8 +100,6 @@ public void drawBoxes(Graphics g) {
     public void mouseClicked(MouseEvent mouseEvent) {
 
         dimensionFrame.updateGridlines();
-        RegressionCalculator dimensionRegression = new RegressionCalculator(dimensionFrame.logOfSideLengths, dimensionFrame.logOfNoBoxes);
-        System.out.println(dimensionRegression.calculateGradient());
 
     }