Merge branch 'master' of https://github.uconn.edu/compgeogroup/compge…

…oproject Merging things
compgeogroup · Dec 7, 2015 · 3ef6e19 · 3ef6e19
2 parents cedb66d + 0bbc673
commit 3ef6e19
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/main/Point.pde b/main/Point.pde
@@ -60,6 +60,7 @@ public class Point {
 
   public void deleteEdges() {
     while(ref != null) {
+      System.out.println("REMOVING EDGE " + ref.getOrigin() + " " + ref.gettwin().getOrigin());
       ref.Remove();
     }
 

diff --git a/main/main.pde b/main/main.pde
@@ -89,7 +89,8 @@ public void setup() {
   (new Face(h12, list)).printFace();
 }
 void draw() {
-   drawgraph.drawGraph(list.getPoints());
+  background(255,255,255,0);
+  drawgraph.drawGraph(list.getPoints());
 }
 void keyPressed() {
   switch (key) {
@@ -99,14 +100,17 @@ void keyPressed() {
     case 'r':
       mode = 1;
       break;
+    case 'h':
+      mode = 2;
+      break;
     case 'p':
-      mode = 2;  
+      mode = 3;  
       break;
     case 'b':
-      mode = 3;
+      mode = 4;
       break;
     case 'g':
-      mode = 4;
+      mode = 5;
       break;
   }
 
@@ -158,11 +162,13 @@ public void insertMode(float x, float y) {
 }
 
 public void removePointMode(float x, float y) {
-  boolean removePoint= false;
+  System.out.println("entered remove point");
+  boolean removePoint = false;
   Point removeThis = null;
   for(Point p: list.getPoints()) {
-    if((p.getX() - 10 < x) && (p.getX() + + 10 > x)) {
+    if((p.getX() - 10 < x) && (p.getX() + 10 > x)) {
         if((p.getY() - 10 < y) && (p.getY() + 10 > y)) {
+          System.out.println("point found");
           removeThis = p;
           removePoint = true;
         }