Merge pull request #2 from crazycat9942/wip

1.0.3

Author: crazycat9942

README.md

@@ -6,13 +6,15 @@
   - Input the functions of the vector field such that the x component is in the "P" box and the y component is in the "Q" box. For example, P = y and Q = 0 would make the x component of the vectors proportional to the y value.  
   - The default colors of the vectors get brighter with increasing magnitude and vice versa. The hue (whether it's red, green, blue, yellow, etc.) is determined by the direction the arrow is pointing.  
   - The P and Q boxes can accept equations that depend on t (time), x (left to right of the screen), and y (down and up on the screen)  
-  - You can zoom in and out of the vector field with a mouse scroll wheel or zooming in on a trackpad. You can also move the center of the vector field by dragging.  
+  - You can zoom in and out of the vector field with a mouse scroll wheel or zooming in on a trackpad. You can also move the center of the vector field by dragging.
+  - Add a test point using the button in the menu to see the path a point would take forward and backward in time if directed by the vector field
 
 **Creating a complex equation:**  
   - To increase the detail (at the expense of performance) of the complex equation use the slider in the menu  
   - Complex equations can be made by putting any function of z (e.g. z<sup>2</sup>) into the "P" box.  
   - Complex equations take in 2 inputs (the x and y coordinate of a pixel on screen converted to real (x) and imaginary (y) values) and spit out 2 outputs.  
-  - The outputs of the complex equation have an argument (direction) and modulus (magnitude). Similar to the vector fields, the argument controls the hue and the modulus controls the brightness.  
+  - The outputs of the complex equation have an argument (direction) and modulus (magnitude). Similar to the vector fields, the argument controls the hue and the modulus controls the brightness.
+  - Create contour integrals (integrals of complex functions) with the buttons in the menu for either a freeform, closed freeform, or circular contour. The value of the contour integral is shown in the upper left corner of the screen.
 
 **Mandelbrot set info:**  
   - This is an extra thing I put in because it looks pretty. To view the set type "zm" into the "P" box. To increase the number of max iterations slide the slider for the mandelbrot set in the menu.  

src/Arrow.java

@@ -24,6 +24,8 @@ public class Arrow
     double DQDX;
     double DQDY;
     double DQDT;
+    int endX;
+    int endY;
     public Arrow(double initX, double initY, Panel panelInit)
     {
         panel = panelInit;
@@ -59,8 +61,8 @@ public void update(Graphics g, Panel panel)
         curl = panel.getCurl(coordX, coordY);
         angle = tempPoint.getY();
         panel.vector_to_rgb(this);
-        int endX = (int)(screenX + 2*length*Math.cos(angle));
-        int endY = (int)(screenY + 2*length*Math.sin(angle));
+        endX = (int)(screenX + 2*length*Math.cos(angle));
+        endY = (int)(screenY + 2*length*Math.sin(angle));
         /*int leftX = endX - (int)(length*Math.sin(angle));
         int leftY = endY + (int)(length*Math.cos(angle));
         int rightX = endX + (int)(length*Math.sin(angle));

src/Main.java

@@ -75,6 +75,7 @@ class Panel extends JPanel {
     boolean zoomChanged = true;
     boolean panChanged = true;
     double mandelbrotDetail;
+    boolean userPressed = false;
     Panel()
     {
         parser = new JEP();
@@ -136,16 +137,25 @@ public void mouseWheelMoved(MouseWheelEvent e) {
         });
         this.addMouseListener(new MouseAdapter()
         {
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                super.mouseReleased(e);
+                userPressed = false;
+            }
+
             public void mousePressed(MouseEvent m)
             {
-                lastPoint = m.getPoint();
+                if(!menu.contourFreeformActive && !menu.contourFreeformClosedActive) {
+                    lastPoint = m.getPoint();
+                }
+                userPressed = true;
             }
         });
         this.addMouseMotionListener(new MouseAdapter()
         {//panning
             public void mouseDragged(MouseEvent m)//when mouse dragged
             {
-                if (lastPoint != null)//if lastpoint is defined
+                if (lastPoint != null && !menu.contourFreeformActive && !menu.contourFreeformClosedActive)//if lastpoint is defined
                 {
                     panChanged = true;
                     lastCenter = new Point2D.Double(centerX, centerY);
@@ -367,36 +377,54 @@ public void run() {
         }
         else
         {
+            if (!zoomChanged && !panChanged && tempImage != null) {
+                g.drawImage(tempImage, 0, 0, null);
+            }
+            else
+            {
             parser.addVariable("t", time);
-            double[][][] colorData = new double[numIStep][numJStep][5];
             colors = new int[1600][900];
+            Complex m;
+            double argument;
+            double modulus;
+            Complex R;
+            Color tempColor;
             for(int i = 0; i < numIStep; i++) {
                 for (int j = 0; j < numJStep; j++) {
-                    Complex m = new Complex(screenToCoordsX(i * iStep), screenToCoordsY(j * jStep));
+                    m = new Complex(screenToCoordsX(i * iStep), screenToCoordsY(j * jStep));
                     parser.addComplexVariable("z", m.re(), m.im());
                     parser.parseExpression(menu.P.getText());
-                    Complex R = parser.getComplexValue();
+                    R = parser.getComplexValue();
                     //System.out.println(R);
-                    double argument = Math.toDegrees(Math.atan2(R.im(), R.re()));
+                    argument = Math.toDegrees(Math.atan2(R.im(), R.re()));
                     if (argument < 0f) {
                         argument = argument + 360f;
                     }
-                    double modulus = Math.sqrt(Math.pow(R.re(), 2) + Math.pow(R.im(), 2));
+                    modulus = Math.sqrt(Math.pow(R.re(), 2) + Math.pow(R.im(), 2));
                     modulus = (float) Math.pow((1f - Math.exp(-0.02f * modulus)), 0.3);
-                    Color tempColor = hslToRGB((float) argument, (float) modulus, (float) modulus);
-                    colorData[i][j] = new double[]{tempColor.getRed(), tempColor.getGreen(), tempColor.getBlue(), m.re(), m.im()};
+                    tempColor = hslToRGB((float) argument, (float) modulus, (float) modulus);
+                    int rgbval = tempColor.getRGB();
+                    for(int k = i*iStep; k < (i+1)*iStep; k++)
+                    {
+                        for(int l = j*jStep; l < (j+1)*jStep; l++)
+                        {
+                            colors[k][l] = rgbval;
+                        }
+                    }
                     /*for(int k = i*iStep; k < (i + 1)*iStep; k++)
                     {
                         for(int l = j*jStep; l < (j + 1)*jStep; l++)
                         {
                             colors[(k * iStep) - 1][(l * jStep)] = tempColor.getRGB();
                         }
                     }*/
-                    g.setColor(tempColor);
-                    g.fillRect(i*iStep, j*jStep, (i + 1) * iStep, (j + 1) * jStep);
+                    //g.setColor(tempColor);
+                    //g.fillRect(i * iStep, j * jStep, (i + 1) * iStep, (j + 1) * jStep);
+                }
                 }
             }
-            //tempImage = createImage(colors);
+            tempImage = createImage(colors);
+            g.drawImage(tempImage, 0, 0, null);
             //g.drawImage(tempImage, 0, 0, null);
             /*for(int i = 0; i < numIStep; i++)
             {
@@ -860,11 +888,27 @@ public Color mandelbrotColor(Complex z)
                 double g = color1[1] + (n - Math.floor(n)) * (color2[1] - color1[1]);
                 double b = color1[2] + (n - Math.floor(n)) * (color2[2] - color1[2]);*/
         //double n = 0.99;
-        double h = (Math.log(i + 20) * 100) % 360;
+        double h = (Math.log(i + 15) * 100) % 360;
         //double c_ = 100;
         //double l = 100;
         //return hslToRGB((float)Math.pow(((double)i/maxIter)*360, 1.5) % 360f, 0.5f, ((float)(i/maxIter)));
-        return HCLToRGB(h, 100, 1.5);
+        return HCLToRGB(h, 100, 2);
+    }
+    public int mandelbrotDiverge(Complex z) {//gives number of iterations before the mandelbrot thing diverges (goes past 2 in magnitude)
+        int i = 0;
+        double xsqr = 0;
+        double ysqr = 0;
+        double x = z.re();
+        double y = z.im();
+        int maxIter = (int) mandelbrotDetail;
+        while (i < maxIter && xsqr + ysqr < 4)
+        {
+            xsqr = z.re() * z.re();
+            ysqr = z.im() * z.im();
+            z = new Complex(xsqr - ysqr + x, 2 * z.re() * z.im() + y);
+            i++;
+        }
+        return i;
     }
     public Complex mandelbrot(Complex z)
     {
@@ -915,8 +959,8 @@ protected void paintComponent(Graphics gInit) {
         else
         {
             userMouse = MouseInfo.getPointerInfo().getLocation();
-            menu.update(g);
             colorComplex();
+            menu.update(g);
         }
         axes.update(g);
         /*if(!Double.isNaN(forceAtMouse.getX()))
@@ -944,8 +988,8 @@ public void actionPerformed(ActionEvent e) {
             }
         });
         timer.setRepeats(true);
-        // Aprox. 60 FPS
-        timer.setDelay(17);
+        // Aprox. 60 FPS at 17
+        timer.setDelay(1);
         timer.start();
     }
     @Override