Commit: 1.1

Author: BlankSpot08

src/processing/ProcessingTest.java

@@ -1,6 +1,8 @@
 package processing;
 
 import processing.core.PApplet;
+import processing.graphics.Button;
+import processing.graphics.TextBox;
 import processing.tree.BinarySearchTree;
 
 public class ProcessingTest extends PApplet {
@@ -10,30 +12,79 @@ public static void main(String... args) {
         PApplet.runSketch(processingArgs, processingTest);
     }
 
-    BinarySearchTree<Integer> binarySearchTree = new BinarySearchTree<>();
+    PApplet pApplet = this;
 
-    Button enterButton = new Button(this);
-    Button resetButton = new Button(this);
-    Button quitButton = new Button(this);
-    TextBox textBox = new TextBox(this);
+    BinarySearchTree<Integer> tree = new BinarySearchTree<>(pApplet);
+
+    Button enterButton = new Button(pApplet) {
+
+        @Override
+        public void setOnAction() {
+            if (textBox.getText().length() != 0) {
+                tree.add(Integer.valueOf(textBox.getText()));
+
+                textBox.setText("");
+                textBox.render();
+
+                System.out.println("AWIT");
+            }
+        }
+    };
+
+    Button resetButton = new Button(pApplet) {
+
+        @Override
+        public void setOnAction() {
+            BinarySearchTree<Integer> newTree = new BinarySearchTree<>(pApplet);
+
+            background(210);
+
+            tree = newTree;
+            textBox.setText("");
+        }
+
+    };
+    Button quitButton = new Button(pApplet) {
+
+        @Override
+        public void setOnAction() {
+            exit();
+        }
+
+    };
+
+    TextBox textBox = new TextBox(pApplet) {
+
+        @Override
+        public void setOnPressedKeyAction(char key, int keyCode) {
+
+            if (textBox.keyPressed(key, keyCode)) {
+                tree.add(Integer.valueOf(textBox.getText()));
+
+                textBox.setText("");
+                textBox.render();
+            }
+
+        }
+    };
 
     public void settings() {
         size(1000,800);
     }
 
     public void setup() {
         background(210);
+        textSize(14);
 
-        textBox.setId("InputGetterId");
         textBox.setWidth(245);
         textBox.setHeight(20);
         textBox.setX((width / 2) - (textBox.getWidth() / 2));
         textBox.setY(height - textBox.getHeight());
         textBox.setPadding(0, 0, 40, 0);
         textBox.setBackgroundColor(255, 255, 255);
+        textBox.setDisableLetters(true);
 
         enterButton.setText("Insert");
-        enterButton.setId("enterId");
         enterButton.setWidth(75);
         enterButton.setHeight(20);
         enterButton.setX((width / 2) - (textBox.getWidth() / 2));
@@ -42,7 +93,6 @@ public void setup() {
         enterButton.setBackgroundColor(255, 255, 255);
 
         resetButton.setText("Reset");
-        resetButton.setId("resetId");
         resetButton.setWidth(75);
         resetButton.setHeight(20);
         resetButton.setX((width / 2) - (textBox.getWidth() / 2) + enterButton.getWidth());
@@ -51,7 +101,6 @@ public void setup() {
         resetButton.setBackgroundColor(255, 255, 255);
 
         quitButton.setText("Quit");
-        quitButton.setId("quitId");
         quitButton.setWidth(75);
         quitButton.setHeight(20);
         quitButton.setX((width / 2) - (textBox.getWidth() / 2) + enterButton.getWidth() + resetButton.getWidth());
@@ -63,9 +112,18 @@ public void setup() {
         enterButton.render();
         resetButton.render();
         quitButton.render();
+//        createTitle();
     }
 
     public void draw() {
+//        tree.add(2);
+//        tree.add(3);
+//        tree.add(1);
+//        tree.add(6);
+//        tree.add(10);
+//        tree.add(5);
+//        tree.add(7);
+//        tree.add(4);
     }
 
     void InintLayout() {
@@ -75,10 +133,15 @@ void InintLayout() {
     public void mousePressed() {
         textBox.pressed(mouseX, mouseY);
 
+        enterButton.pressed(mouseX, mouseY);
+
+        quitButton.pressed(mouseX, mouseY);
+
+        resetButton.pressed(mouseX, mouseY);
     }
 
     public void keyPressed() {
-        textBox.keyPressed(key, keyCode);
+        textBox.setOnPressedKeyAction(key, keyCode);
     }
 
     public void mouseMoved() {
@@ -88,5 +151,14 @@ public void mouseMoved() {
         resetButton.cursorTouched();
         quitButton.cursorTouched();
         textBox.cursorTouched();
+
+        createTitle();
+    }
+
+    public void createTitle() {
+        String title = "Binary Search Tree";
+        textSize(40);
+        text(title, (width / 2) - title.length() , 20);
+        textSize(14);
     }
 }

src/processing/Button.java src/processing/graphics/Button.javasrc/processing/Button.java renamed to src/processing/graphics/Button.java

@@ -1,32 +1,29 @@
-package processing;
+package processing.graphics;
 
 import processing.core.PVector;
 import processing.core.PApplet;
 
-public class Button extends PApplet {
+public class Button extends Functions {
     public Button(PApplet pApplet)  {
-        this.text = text;
+        this.text = "";
         this.width = 10;
         this.height = 10;
-        this.backgroundColor = color(255, 255, 255);
-        this.backgroundSelected = color(150);
-        this.borderColor = color(0, 0, 0);
+        this.backgroundColor = pApplet.color(255, 255, 255);
+        this.backgroundSelected = pApplet.color(150);
+        this.borderColor = pApplet.color(0, 0, 0);
         this.pos = new PVector(0, 0);
         this.pApplet = pApplet;
     }
 
     private PApplet pApplet;
     private PVector pos;
     private String text;
-    private String id;
     private float width;
     private float height;
     private int backgroundColor;
     private int borderColor;
     private int backgroundSelected;
-
-    boolean pressed;
-    boolean clicked;
+    private boolean selected;
 
     public void setText(String text) {
         this.text = text;
@@ -36,14 +33,6 @@ public String getText() {
         return this.text;
     }
 
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getId() {
-        return this.id;
-    }
-
     public void setWidth(float width) {
         this.width = width;
     }
@@ -82,11 +71,11 @@ public float getY() {
     }
 
     public void setBackgroundColor(int r, int g, int b) {
-        backgroundColor = color(r, g, b);
+        backgroundColor = pApplet.color(r, g, b);
     }
 
     public void setBorderColor(int r, int g, int b) {
-        borderColor = color(r, g, b);
+        borderColor = pApplet.color(r, g, b);
     }
 
     public void render() {
@@ -102,8 +91,8 @@ public void render() {
 
         pApplet.rect(pos.x, pos.y, width, height);
 
-        pApplet.textAlign(CENTER, CENTER);
         pApplet.fill(0);
+        pApplet.textAlign(pApplet.CENTER, pApplet.CENTER);
         pApplet.text(text, pos.x + (width / 2), pos.y + (height / 2));
 
     }
@@ -129,10 +118,19 @@ private boolean hovering() {
     }
 
     private void mouseOver() {
-        pApplet.cursor(HAND);
+        pApplet.cursor(pApplet.HAND);
+    }
+
+    private boolean overBox(float x, float y) {
+        return x >= pos.x && x <= (pos.x + this.width)
+                && y >= pos.y && y <= (pos.y + this.height);
     }
 
-    public void setOnClickedAction() {
+    public void pressed(float x, float y) {
+        selected = overBox(x, y);
 
-    };
+        if (selected) {
+            setOnAction();
+        }
+    }
 }