Layout changes and sound tweaks

This commit is contained in:
2021-07-18 07:15:30 -04:00
parent 2eb0390076
commit 2bf7673b13
3 changed files with 208 additions and 193 deletions

View File

@ -26,6 +26,7 @@ from MainWindow import Ui_MainWindow
def play_sound(file):
wave_obj = sa.WaveObject.from_wave_file(file)
play_obj = wave_obj.play()
play_obj.wait_done()
##############################################################################
# gps stuff
@ -83,8 +84,6 @@ class VirtualCones():
self.num_cones = 0
self.current_cone = 0
self.distance = 0.0
self.buzz_no = 0
self.max_buzz = 1
def clr_cones(self):
self.cones = []
@ -126,7 +125,6 @@ class VirtualCones():
# end of list?
if self.current_cone >= self.num_cones:
self.current_cone = 0
self.buzz_no = 0
# check first node for reset
if self.current_cone:
@ -159,13 +157,9 @@ class VirtualCones():
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:
play_sound("alert.wav")
self.buzz_no = self.buzz_no + 1
play_sound("alert.wav")
self.current_cone = cone_next
trig = 1
else:
self.buzz_no = 0
return (self.current_cone, self.distance, trig)
@ -210,7 +204,7 @@ class ConesWindow(MainWindow):
def __init__(self, *args, obj=None, **kwargs):
super(ConesWindow, self).__init__(*args, **kwargs)
self.setWindowTitle("NTCNA GPS Virtual Cones V2.0")
self.setWindowTitle("NTCNA GPS Virtual Cones V2.2")
self.vlist1 = VirtualCones()
self.vlist2 = VirtualCones()
@ -223,6 +217,7 @@ class ConesWindow(MainWindow):
# button connections
self.openFiles.clicked.connect(self.read_dialog)
self.exitButton.clicked.connect(self.exit_button)
self.testSound.clicked.connect(self.test_sound)
self.resetList1.clicked.connect(self.reset_list1)
self.addPoint1.clicked.connect(self.add_point1)
@ -286,6 +281,9 @@ class ConesWindow(MainWindow):
self.num_points = 0
self.my_thread = DataThread()
def test_sound(self):
play_sound('alert.wav')
def read_dialog(self):
filedialog = QFileDialog(self)
filedialog.setDirectory(QDir.currentPath())
@ -331,7 +329,7 @@ class ConesWindow(MainWindow):
self.show()
except Exception as e:
print(e)
sys.exit(1)
continue
def start_thread(self):
if not self.my_thread.isRunning():