Revision 36:f25de790ea0b, committed 2014-12-12

Comitter:

lsaristo

Date:

Fri Dec 12 08:46:22 2014 +0000

Parent:

35:a1c14c6d9282

Child:

38:69c7e86244e4

Commit message:

Fixed python gui program coordinate flattening

Changed in this revision

--- a/user-gui.py	Wed Dec 10 19:15:52 2014 +0000
+++ b/user-gui.py	Fri Dec 12 08:46:22 2014 +0000
@@ -179,11 +179,10 @@
             continue
 
         if prev and move_x == prev_x:
+            prev = move
             prev_y = move_y
             continue
-
-        if prev:
-            output_list.append(prev)
+        if prev: output_list.append(prev)
         prev = move
         prev_s = prev.split()
         prev_y = prev_s[1]
@@ -212,9 +211,9 @@
         
         if prev and move_y == prev_y:
             prev_x = move_x
+            prev = move
             continue
-        if prev:
-            output_list.append(prev)
+        if prev: output_list.append(prev)
         prev = move
         prev_s = prev.split()
         prev_y = prev_s[1]
@@ -225,6 +224,7 @@
     y0 = 0
     f_output_list = list()
     i = 0
+    to_app = ""
     while i < len(output_list)-1:
         line1 = output_list[i].split(' ')
         line2 = output_list[i+1].split(' ')
@@ -232,22 +232,23 @@
         x2 = int(line2[0])
         y1 = int(line1[1])
         y2 = int(line2[1])
-        if line1[2] == line2[2] and dist(x0,y0,x1,y1) <= 10\
-                and dist(x1,y1,x2,y2) <= 10:
-            x0 = x2
-            y0 = y2
-            i += 2
-            f_output_list.append("%d %d %s" % (x2,y2,line1[2]));
+        if line1[2] == line2[2] and dist(x0,y0,x1,y1) <= 20\
+                and dist(x1,y1,x2,y2) <= 20:
+            i += 1
+            to_app = "%d %d %s" % (x2,y2,line1[2])
         else:
             x0 = x1
             y0 = y1
-            f_output_list.append(output_list[i])
+            if to_app != "":
+                f_output_list.append(to_app)
+                to_app = ""
+            else:
+                f_output_list.append(output_list[i])
             i += 1
     f_output_list.append(output_list[len(output_list)-1])
-    print output_list
+    print "Raw Numbers: ", moves
     print "--------------------------------------------"
-    print f_output_list
-
+    print "Filtered: ", f_output_list
     return f_output_list
 
 def dist(x1,y1,x2,y2):