Renamed and tweaked

This commit is contained in:
2021-06-18 10:55:55 -04:00
parent 81648e5ae1
commit 793d875ad2
4 changed files with 8 additions and 19 deletions

View File

@ -203,7 +203,7 @@ class Ui_MainWindow(object):
# setupUi # setupUi
def retranslateUi(self, MainWindow): def retranslateUi(self, MainWindow):
MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"NTCNA GPS Virtual Cones V1.0", None)) MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"GPS Virtual Cones", None))
self.label_2.setText(QCoreApplication.translate("MainWindow", u"Longitude:", None)) self.label_2.setText(QCoreApplication.translate("MainWindow", u"Longitude:", None))
self.label.setText(QCoreApplication.translate("MainWindow", u"Latitude:", None)) self.label.setText(QCoreApplication.translate("MainWindow", u"Latitude:", None))
self.label_3.setText(QCoreApplication.translate("MainWindow", u"Speed:", None)) self.label_3.setText(QCoreApplication.translate("MainWindow", u"Speed:", None))

View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>NTCNA GPS Virtual Cones V1.0</string> <string>GPS Virtual Cones</string>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">

View File

@ -16,15 +16,9 @@ from sys import platform
# audio stuff # audio stuff
############################################################################## ##############################################################################
sound_args = ""
def play_sound(file): def play_sound(file):
if platform == "win32" or platform == "win64" or platform == "cygwin": wave_obj = sa.WaveObject.from_wave_file(file)
cmd = "wmplayer " + '"' + file + '"' play_obj = wave_obj.play()
else:
cmd = "aplay -N " + sound_args + " " + file + " &"
# print(cmd)
os.system(cmd)
############################################################################## ##############################################################################
# buzzer stuff # buzzer stuff

View File

@ -7,6 +7,7 @@ from math import *
from gps import * from gps import *
from datetime import datetime from datetime import datetime
from time import time, strftime from time import time, strftime
import simpleaudio as sa
import gpxpy import gpxpy
import csv import csv
@ -22,15 +23,9 @@ from MainWindow import Ui_MainWindow
# audio stuff # audio stuff
############################################################################## ##############################################################################
sound_args = ""
def play_sound(file): def play_sound(file):
if platform == "win32" or platform == "win64" or platform == "cygwin": wave_obj = sa.WaveObject.from_wave_file(file)
cmd = "wmplayer " + '"' + file + '"' play_obj = wave_obj.play()
else:
cmd = "aplay -N " + sound_args + " " + file + " &"
# print(cmd)
system(cmd)
############################################################################## ##############################################################################
# gps stuff # gps stuff
@ -215,7 +210,7 @@ class ConesWindow(MainWindow):
def __init__(self, *args, obj=None, **kwargs): def __init__(self, *args, obj=None, **kwargs):
super(ConesWindow, self).__init__(*args, **kwargs) super(ConesWindow, self).__init__(*args, **kwargs)
self.setWindowTitle("NTCNA GPS Virtual Cones V1.6") self.setWindowTitle("NTCNA GPS Virtual Cones V2.0")
self.vlist1 = VirtualCones() self.vlist1 = VirtualCones()
self.vlist2 = VirtualCones() self.vlist2 = VirtualCones()