From 11057903377d534703fa1af795bbd3f8840b3115 Mon Sep 17 00:00:00 2001
From: ThermalSpan <russell.bentley@Uconn.edu>
Date: Tue, 8 Dec 2015 04:51:10 -0500
Subject: [PATCH] Rebuilt Menu and Buttons so that Menu and Selector are no
 seperate, and buttons work as a toggle group, and they're prettier and more
 flexable.

---
 kdtest/Button.pde     |  97 +++++++++++++++++++++++++++++++
 kdtest/Camera.pde     |  51 +++++++++--------
 kdtest/Menu.pde       | 129 ++++++++++++++++++++++++------------------
 kdtest/Mode.pde       |  41 --------------
 kdtest/Properties.pde |   8 +++
 kdtest/Selector.pde   |  14 ++++-
 kdtest/kdtest.pde     | 109 ++++++++++++++---------------------
 7 files changed, 261 insertions(+), 188 deletions(-)
 create mode 100644 kdtest/Button.pde
 delete mode 100644 kdtest/Mode.pde

diff --git a/kdtest/Button.pde b/kdtest/Button.pde
new file mode 100644
index 0000000..18c4c1d
--- /dev/null
+++ b/kdtest/Button.pde
@@ -0,0 +1,97 @@
+class CirSHandler implements ButtonHandler{
+  void Selected() {
+    selector.setSelectMode(1);
+    useSelector = true;
+  }
+}
+
+class RectSHandler implements ButtonHandler{
+  void Selected() {
+    selector.setSelectMode(0);
+    useSelector = true;
+  }
+}
+class PanHandler implements ButtonHandler{
+  void Selected() {
+    cam.setMode(0);
+    useSelector = false;
+  }
+}
+
+class RotHandler implements ButtonHandler{
+  void Selected() {
+    cam.setMode(1);
+    useSelector = false;
+  }
+}
+
+class PlaceHandler implements ButtonHandler{
+  void Selected() {
+    selector.setSelectMode(3);
+    useSelector = true;
+  }
+}
+
+interface ButtonHandler {
+  void Selected ();
+}
+
+class Button {
+  int _x;
+  int _y;
+  int _w;
+  int _h;
+  int _r;
+  boolean _isSel;
+  String _label;
+  ArrayList<ButtonHandler> _handlerList;
+
+  Button (int x, int y, String label) {
+    _x = x;
+    _y = y;
+    _w = i_buttonWidth;
+    _h = i_buttonHeight;
+    _r = i_buttonRad;
+    _handlerList = new ArrayList<ButtonHandler> ();
+    _label = label;
+    _isSel = false;
+  }
+ 
+  boolean isMouseOver() {
+    return mouseX >= _x && mouseX <= _x + _w && mouseY >= _y && mouseY <= _y + _h;
+  }
+  
+  void Select() {
+    _isSel = true;
+    for(ButtonHandler h: _handlerList) {
+      h.Selected();
+    }
+  }
+
+  void unSelect() {
+    _isSel = false;
+  }
+
+  void draw () {
+      pushStyle();
+      stroke(c_buttonStr);
+      if(_isSel) {
+        fill(c_buttonSel);
+      } else {
+        fill(c_buttonDef);
+      }
+      rect(_x, _y, _w, _h, 0, _r, _r, 0);
+      if(_isSel) {
+        fill(c_WHITE);
+      } else {
+        fill(c_BLACK);
+      }
+      textSize(20);
+      text(_label, _x + 3, _y + _h - 10);
+      popStyle();
+  } 
+
+  void addHandler (ButtonHandler h) {
+    _handlerList.add(h);
+  }
+}
diff --git a/kdtest/Camera.pde b/kdtest/Camera.pde
index 029fd96..4a34711 100644
--- a/kdtest/Camera.pde
+++ b/kdtest/Camera.pde
@@ -10,6 +10,8 @@ class Camera {
   
   int   _initMX;
   int   _initMY;
+
+  int _mode;
   
   Camera() {
     _x = 0.0;
@@ -17,6 +19,10 @@ class Camera {
     _scale = 1.0;
     _angle = 4 * PI;
   }
+
+  void setMode(int mode) {
+    _mode = mode;
+  }
   
   void update() {
     translate(_x + width/2,_y + height/2);
@@ -36,30 +42,29 @@ class Camera {
   void mouseDragged() {
     float difX = (float)(mouseX - _initMX);
     float difY = (float)(mouseY - _initMY);
-        
-    switch(G_mode) {
-      case 1:
-        difX /= (float)(width);
-        difY /= (float)(height);
-        _scale = epsilon + abs((1 - 4*(difX + difY)) * _oldScale); 
-        _x = _oldX * _scale;
-        _y = _oldY * _scale; 
-        break;
-      case 2:
-        difX *= 1.0/_scale;
-        difY *= 1.0/_scale;
-//        _x = cos(_angle)*difX - sin(_angle)*difY + _oldX;
-//        _y = sin(_angle)*difX + cos(_angle)*difY + _oldY;  
-        _x = _oldX + difX;
-        _y = _oldY + difY;
-        break;
-      case 3:
-        float initAngle = atan((_initMY - height/2)/(epsilon + _initMX - width/2)); 
-        float newAngle = atan((mouseY - height/2)/(epsilon + mouseX - width/2)); 
-        float delta = newAngle - initAngle;
-        _angle = _oldAngle + delta;
-        break;
+       
+    if(mouseButton == RIGHT) {
+      difX /= (float)(width);
+      difY /= (float)(height);
+      _scale = epsilon + abs((1 - 4*(difX + difY)) * _oldScale); 
+      _x = _oldX * _scale;
+      _y = _oldY * _scale; 
+    } else {
+      switch(_mode) {
+        case 0:
+          difX *= 1.0/_scale;
+          difY *= 1.0/_scale;
+          _x = _oldX + difX;
+          _y = _oldY + difY;
+          break;
+        case 1:
+          float initAngle = atan((_initMY - height/2)/(epsilon + _initMX - width/2)); 
+          float newAngle = atan((mouseY - height/2)/(epsilon + mouseX - width/2)); 
+          float delta = newAngle - initAngle;
+          _angle = _oldAngle + delta;
+          break;
       }
+    }
   }
   
   void mouseReleased() {
diff --git a/kdtest/Menu.pde b/kdtest/Menu.pde
index a47cfc3..98d3235 100644
--- a/kdtest/Menu.pde
+++ b/kdtest/Menu.pde
@@ -1,72 +1,91 @@
 class Menu{
   ArrayList<Button> _buttonList;
-  Selector _selector; 
+
   Menu(){
-    _selector = new Selector();
     _buttonList = new ArrayList<Button>();
     makeButtons();
   }
   
-  void activate(int button){ _selector.setSelectMode(button); }
-  
-  void makeButtons(){
-   _buttonList.add(new Button(0,0,0)); //adds the first button
-   for( int i = 1; i < 4; i++){ _buttonList.add(new Button(0,i*25+1,i)); }
+  void draw(){
+    for(Button b: _buttonList) {
+      b.draw();
+    }
   }
   
-  int onaButton(int x, int y){
-    int i;
-    for( i = 0; i < 4; i++){ //loop checks if any button was clicked
-      if(_buttonList.get(i).isInside(x,y)) { return i; } //and returns the _id if one was in fact clicked
+  boolean mousePressed(){
+    boolean result = false;
+    for(Button b: _buttonList) {
+      boolean check = b.isMouseOver();
+      if(check) {
+        result = true;
+        for(Button b0: _buttonList) {
+          b0.unSelect();
+        }
+        b.Select();
+        break;
+      }
     }
-    return 99;
+    return result;
   }
 
-  void draw(){
-    pushStyle();
-    for(int i=0; i<4; i++){ _buttonList.get(i).draw(); }
-    popStyle();
-    _selector.draw();
+  void mouseDragged() { 
+    selector.stretchSelection(); 
   }
-  
-  void mousePressed(){
-    int button = onaButton(mouseX,mouseY);  //which button is selected
-    if( button != 99 ){ activate(button); } //99 is an arbitrary invalid button _id
-    else{ _selector.mousePressed(); }
+ 
+  void mouseReleased() { 
+    selector.resetSelection(); 
   }
-  
-  void mouseDragged(){ _selector.stretchSelection(); }
-  void mouseReleased(){ _selector.resetSelection(); }
-}
 
-class Button{
- int _x1, _y1, _x2, _y2, _id;
-  Button(int x,int y, int id){
-   _x1 = x;
-   _y1 = y;
-   _x2 = 60;
-   _y2 = 24;
-   _id = id;
-  } 
-  
-  boolean isInside(int x, int y){
-    if( x>=_x1 && x<=_x2 && y>_y1 && y<=_y1+_y2){ return true; }
-    else{ return false; }
+  void makeButtons() {
+    int y = 50;
+    Button cirS = new Button (0, y, "Circ Sel");
+    y += i_buttonHeight + 10;
+    _buttonList.add(cirS);
+    cirS.addHandler(new CirSHandler());
+   
+    Button rectS = new Button (0, y, "Rect Sel");
+    y += i_buttonHeight + 10;
+    _buttonList.add(rectS);
+    rectS.addHandler(new RectSHandler());
+    
+    Button pan = new Button (0, y, "Pan");
+    y += i_buttonHeight + 10;
+    _buttonList.add(pan);
+    pan.addHandler(new PanHandler());
+    
+    Button rot = new Button (0, y, "Rotate");
+    y += i_buttonHeight + 10;
+    _buttonList.add(rot);
+    rot.addHandler(new RotHandler());
+ 
+    Button place = new Button (0, y, "Place");
+    y += i_buttonHeight + 10;
+    _buttonList.add(place);
+    place.addHandler(new PlaceHandler());
+    place.Select();
   }
-  
-  void draw(){
-      rect(_x1,_y1,_x2,_y2,0,7,7,0);//basic button shape
-      switch(_id){
-       case 0: rect(_x1+_x2/2,_y1+5,10,10);//rect icon
-       break;
-       case 1: ellipseMode(CORNER);
-               //ellipse(0.0,26.0,60.0,25.0);//circle icon
-       break;
-       case 2: //ellipse(0.0,52.0,60.0,25.0);//NN icon
-       break;
-       case 3:
-       break;
-       default:
-     }
-   }
 }
+
+void drawHelpMenu() {
+    float hwidth = 400;
+    float hheight = 600;
+
+    pushStyle();
+    strokeWeight (i_helpStrokeWidth);
+    stroke(c_helpStroke);
+    fill(c_helpBackground);
+    rect(width/2 - hwidth/2, height/2 - hheight/2, hwidth, hheight, 50, 50, 50, 50);
+    textSize(40);
+    fill(c_helpText);
+    text("Help:", width/2 - 50, height/2 - hheight/2 + 50);
+    textSize (30);
+    float x = width/2 - 150;
+    float y = height/2 - hheight/2 + 100;
+    for (int i = 0; i < i_helpStrings; i++) {
+      text(s_helpStrings[i], x, y);
+      y += 35;
+    }
+    popStyle();
+}
+
+
diff --git a/kdtest/Mode.pde b/kdtest/Mode.pde
deleted file mode 100644
index 37a9fee..0000000
--- a/kdtest/Mode.pde
+++ /dev/null
@@ -1,41 +0,0 @@
-class Mode {
-  int _h = 30;
-  int _w = 60;
-  color c = color(256,256,256);
-
-  Mode () {
-
-  }
-
-  void draw() {
-    pushStyle();
-      fill(c_statusBackground);
-      rect(0, height - 35, width, 35);
-      fill(c_statusMode);
-      rect(-10,height -35, 140, 35, 10);
-      fill(c_statusBackground);
-      textSize(30);
-      String s = new String();
-      switch(G_mode) {
-        case 1:
-          s = "SCALE";
-          break;
-        case 2:
-          s = "PAN";
-          break;
-        case 3: 
-          s = "ROTATE";
-          break;
-        case 4:
-          s = "PLACE";
-          break;
-        case 5:
-          s = "SELECT";
-          break;
-      }
-      text(s, 5, height - 5);
-      fill(c_statusText);
-      text("Point Count: " + pointList.size(), 150, height - 5);
-    popStyle(); 
-  }
-}
diff --git a/kdtest/Properties.pde b/kdtest/Properties.pde
index 9d68e53..8a25565 100644
--- a/kdtest/Properties.pde
+++ b/kdtest/Properties.pde
@@ -12,6 +12,14 @@ color c_HILITE = color (251, 255, 20, 100);//selector filling
 color c_background = color (26, 26, 26);
 color c_gnoman = c_LIGHTBLUE;
 
+// Buttons
+color c_buttonStr = c_BLACK;
+color c_buttonDef = c_WHITE;
+color c_buttonSel = color (170, 50, 50);
+int   i_buttonWidth = 80;
+int   i_buttonHeight = 40;
+int   i_buttonRad = 7;
+
 // Menu Colors
 color c_modeText = c_BLACK;
 color c_modeBackground = color (200,200,200,200);
diff --git a/kdtest/Selector.pde b/kdtest/Selector.pde
index 699f4b1..fc324f7 100644
--- a/kdtest/Selector.pde
+++ b/kdtest/Selector.pde
@@ -35,8 +35,12 @@ class Selector{
             pointList.add(p);
             pot.insert(p);
   }
-}
-  
+  }
+ 
+  void mouseReleased() {
+    resetSelection();
+  }
+   
   void resetSelection(){//triggered on mouseReleased()
     if(_selecting){  //selecting with rect or circle
       switch(_select_mode){
@@ -63,7 +67,11 @@ class Selector{
     _a = 0;
     _b = 0;
   }
-  
+ 
+  void mouseDragged() {
+    stretchSelection();  
+  }
+
   void stretchSelection(){
     if(_selecting){
       _endX = mouseX-_startX;
diff --git a/kdtest/kdtest.pde b/kdtest/kdtest.pde
index c4118de..f2c8887 100644
--- a/kdtest/kdtest.pde
+++ b/kdtest/kdtest.pde
@@ -1,38 +1,35 @@
 Camera cam;
-Mode statusLine;
 TreeContainer pot;//or tree
 Menu menu;
+Selector selector;
 Point nearestNeighbor;
-
 ArrayList<Point> pointList;
-
-boolean drawCon, drawHelp, drawTreeRelations, drawTreeBoundaries, drawGnoman;
+boolean drawCon, drawHelp, drawTreeRelations, drawTreeBoundaries, drawGnoman, useSelector;
 float epsilon = 0.000001;
 int G_mode;
 // 1 = SCALE
 // 2 = PAN
 // 3 = ROTATE
 // 4 = PLACE [removed]
-// 5 = SELECT
+// 5 = CIRC SELECT
+// 6 = RECT SELECT
 
 void setup() {
   size(800,800);
   background(120);
   ellipseMode(CENTER);
-  menu = new Menu();
   cam = new Camera();
-  statusLine = new Mode();
   pot = new TreeContainer();
+  selector = new Selector();
   nearestNeighbor = null;
+  menu = new Menu();
   pointList = new ArrayList<Point>();
 
   drawCon = false;
-  drawHelp = true;
+  drawHelp = false;
   drawGnoman = true;
   drawTreeRelations = true;
   drawTreeBoundaries = true;
-
-  G_mode = 1;
 }
 
 void draw() {
@@ -54,43 +51,21 @@ void draw() {
       p.draw();
     }
   popMatrix();
-  
-  menu.draw();
-  
+
+  if(useSelector) {
+    selector.draw();
+  }
+
   if (drawHelp) {
     drawHelpMenu();
   } else {
-    statusLine.draw();
+    menu.draw();
   }
 
 }
 
 void keyPressed() {
   switch(key) {
-    case 't': 
-    case 'T':
-      drawCon = !drawCon;
-      break;
-    case 'f':
-    case 'F':
-      G_mode = 1;
-      break;
-    case 'd':
-    case 'D':
-      G_mode = 2;
-      break;
-    case 's':
-    case 'S':
-      G_mode = 3;
-      break;
-    case 'a':
-    case 'A':
-      G_mode = 4;
-      break;
-    case 'g':
-    case 'G':
-      G_mode = 5;
-      break;
     case 'c':
     case 'C':
       pointList.clear();
@@ -115,28 +90,6 @@ void keyPressed() {
   } 
 }
 
-void drawHelpMenu() {
-    float hwidth = 400;
-    float hheight = 600;
-
-    pushStyle();
-    strokeWeight (i_helpStrokeWidth);
-    stroke(c_helpStroke);
-    fill(c_helpBackground);
-    rect(width/2 - hwidth/2, height/2 - hheight/2, hwidth, hheight, 50, 50, 50, 50);
-    textSize(40);
-    fill(c_helpText);
-    text("Help:", width/2 - 50, height/2 - hheight/2 + 50);
-    textSize (30);
-    float x = width/2 - 150;
-    float y = height/2 - hheight/2 + 100;
-    for (int i = 0; i < i_helpStrings; i++) {
-      text(s_helpStrings[i], x, y);
-      y += 35;
-    }
-    popStyle();
-}
-
 void checkSelect() {}
 
 void GnomanDraw(int r) {
@@ -148,16 +101,40 @@ void GnomanDraw(int r) {
 }
 
 void mousePressed() {
-  if(mouseButton == LEFT){ menu.mousePressed(); }
-  if(mouseButton == RIGHT){ cam.mousePressed(); }
+  if(mouseButton == LEFT && !menu.mousePressed()) { 
+    if(useSelector) {
+      selector.mousePressed(); 
+    } else {
+      cam.mousePressed();
+    }
+  }
+  if(mouseButton == RIGHT) { 
+    cam.mousePressed();
+  }
 }
 
 void mouseDragged() {
-  if(mouseButton == LEFT){ menu.mouseDragged(); }
-  if(mouseButton == RIGHT){ cam.mouseDragged(); }
+  if(mouseButton == LEFT) { 
+    if(useSelector) {
+      selector.mouseDragged();
+    } else {
+      cam.mouseDragged();
+    }
+  }
+  if(mouseButton == RIGHT) { 
+    cam.mouseDragged(); 
+  }
 }
 
 void mouseReleased() {
-  if(mouseButton == LEFT){ menu.mouseReleased(); }
-  if(mouseButton == RIGHT){ cam.mouseReleased(); }
+  if(mouseButton == LEFT) { 
+    if(useSelector) {
+      menu.mouseReleased(); 
+    } else {
+      cam.mouseReleased();
+    }
+  }
+  if(mouseButton == RIGHT) { 
+    cam.mouseReleased(); 
+  }
 }