From b9087497bcc26225a17580854eacfc1cc87a95c2 Mon Sep 17 00:00:00 2001
From: laa11004 <lynn.asselin@uconn.edu>
Date: Sun, 6 Dec 2015 20:31:29 -0500
Subject: [PATCH] just to synchronize better

---
 kdtest/Menu.pde     | 9 ++++-----
 kdtest/Selector.pde | 5 ++++-
 kdtest/Tests.pde    | 3 ++-
 kdtest/Tree.pde     | 1 +
 kdtest/kdtest.pde   | 2 ++
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/kdtest/Menu.pde b/kdtest/Menu.pde
index 1d53879..a47cfc3 100644
--- a/kdtest/Menu.pde
+++ b/kdtest/Menu.pde
@@ -16,8 +16,8 @@ class Menu{
   
   int onaButton(int x, int y){
     int i;
-    for( i = 0; i < 4; i++){
-      if(_buttonList.get(i).isInside(x,y)) { return 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
     }
     return 99;
   }
@@ -30,9 +30,8 @@ class Menu{
   }
   
   void mousePressed(){
-    int button = onaButton(mouseX,mouseY);
-    println("%d \n",button);
-    if( button != 99 ){ activate(button); } //99 is an arbitrary invalid _id value
+    int button = onaButton(mouseX,mouseY);  //which button is selected
+    if( button != 99 ){ activate(button); } //99 is an arbitrary invalid button _id
     else{ _selector.mousePressed(); }
   }
   
diff --git a/kdtest/Selector.pde b/kdtest/Selector.pde
index bd53f9d..699f4b1 100644
--- a/kdtest/Selector.pde
+++ b/kdtest/Selector.pde
@@ -43,7 +43,10 @@ class Selector{
         case 0: 
         Point p1 = cam.transform(new Point(_startX, _startY));
         Point p2 = cam.transform(new Point(_endX, _endY));
-        //pot._tree.query(new BoundingBox(p1._x, p1._y, p2._x, p2._y));
+        if(pot.getTree() != null){//prevents query of null/empty tree
+          ArrayList<Point> solution = pot.getTree().query(new BoundingBox(p1._x, p1._y, p2._x, p2._y));
+          println("size of list: %d", solution.size());
+        }
         break;
         case 1: //_tree.circleQuery(cam.transform(new Point(_a,_b)),
       }
diff --git a/kdtest/Tests.pde b/kdtest/Tests.pde
index 18423ec..ee1daed 100644
--- a/kdtest/Tests.pde
+++ b/kdtest/Tests.pde
@@ -23,9 +23,10 @@ boolean inBox(Point p, BoundingBox a)
 {
   return p._x >= a.x1 && p._x <= a.x2 && p._y >= a.y1 && p._y <= a.y2;
 }
+
 //random helper function I don't know where to put
 ArrayList<Point> merge(ArrayList<Point> a, ArrayList<Point> b) {
   for(Point p : b)
     a.add(p);
   return a;
-}
\ No newline at end of file
+}
diff --git a/kdtest/Tree.pde b/kdtest/Tree.pde
index 7b7486c..91ad6e7 100644
--- a/kdtest/Tree.pde
+++ b/kdtest/Tree.pde
@@ -170,6 +170,7 @@ class TreeContainer {
   }
   
   KdTree getTree(){ return _tree;}
+  
   void clearTree(){ _tree = null; }
    
    void draw(){ _tree.draw(); }
diff --git a/kdtest/kdtest.pde b/kdtest/kdtest.pde
index 5904869..76facce 100644
--- a/kdtest/kdtest.pde
+++ b/kdtest/kdtest.pde
@@ -4,6 +4,7 @@ Mode statusLine;
 //KdTree tree;
 TreeContainer pot;//or tree
 Menu menu;
+Point nearestNeighbor;
 
 ArrayList<Point> pointList;
 
@@ -25,6 +26,7 @@ void setup() {
   cam = new Camera();
   statusLine = new Mode();
   pot = new TreeContainer();
+  nearestNeighbor = null;
 
   pointList = new ArrayList<Point>();
   //tree = null;