ProbeStar/Pynomicon
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
Neal Probert
2021-06-21 07:58:37 -04:00
parent 793d875ad2
commit c67a9f7d19
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gps_vcones/vcones_gui.py
View File

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