Cleanups

gps_vcones/vcones_gui.py

@@ -118,7 +118,7 @@ class VirtualCones():
         file.write("%11.7f, %11.7f, %4.1f\n" % (self.cones[i][0], self.cones[i][1], self.cones[i][2]))
       file.close()
 
-  def check_list(self, lat, lon, heading, speed):
+  def check_list(self, lat, lon, heading, speed, rng):
     trig = 0
     if self.num_cones == 0:
       return (0, 999.0, 0)
@@ -136,7 +136,7 @@ class VirtualCones():
       cone_lon = row[1]
       cone_dist = row[2]
       dist = roydistance(lat, lon, cone_lat, cone_lon)
-      if dist < cone_dist:
+      if dist < rng:
         self.current_cone = 0
       
     # node from csv (each line is lat, long, distance, next code#)
@@ -156,7 +156,7 @@ class VirtualCones():
     self.distance = roydistance(lat, lon, cone_lat, cone_lon)
                     
     # check distance trigger
-    if self.distance < cone_dist:
+    if self.distance < rng:
 #      out = "Waypoint %s:%d reached: %f, %f, %f, %d" % (self.filename, self.current_cone, lat, lon,  heading, speed)
 #      print(out)
       if self.buzz_no < self.max_buzz:
@@ -352,15 +352,21 @@ class ConesWindow(MainWindow):
       self.txtHeading.setText("%7.2f" % (heading))
       self.txtSpeed.setText("%7.2f" % (speed))
 
+      rng = self.txtRange.text()
+      if rng == "":
+        rng = 3.0
+      else:
+        rng = float(rng)
+
       for i in range(0, 4):
         if self.lists[i].count() == 0:
           continue
-        (cone, dist, trig) = self.vlists[i].check_list(lat, lon, heading, speed)
+        (cone, dist, trig) = self.vlists[i].check_list(lat, lon, heading, speed, rng)
         if trig:
           self.lists[i].setCurrentRow(cone)
         if dist < 10000.0:
           self.dists[i].setText("%6.1f" % (dist))
-        else
+        else:
           self.dists[i].setText("OOR")
       
       if self.logEnabled.isChecked():