From 2bf7673b13e6a661f67c57f2a14790e2f1f26c07 Mon Sep 17 00:00:00 2001 From: Neal Probert Date: Sun, 18 Jul 2021 07:15:30 -0400 Subject: [PATCH] Layout changes and sound tweaks --- gps_vcones/MainWindow.py | 136 ++++++++++----------- gps_vcones/mainwindow.ui | 247 ++++++++++++++++++++------------------- gps_vcones/vcones_gui.py | 18 ++- 3 files changed, 208 insertions(+), 193 deletions(-) diff --git a/gps_vcones/MainWindow.py b/gps_vcones/MainWindow.py index 778689d..99dde23 100644 --- a/gps_vcones/MainWindow.py +++ b/gps_vcones/MainWindow.py @@ -17,233 +17,236 @@ class Ui_MainWindow(object): def setupUi(self, MainWindow): if not MainWindow.objectName(): MainWindow.setObjectName(u"MainWindow") - MainWindow.resize(1082, 445) + MainWindow.resize(700, 580) self.centralwidget = QWidget(MainWindow) self.centralwidget.setObjectName(u"centralwidget") self.label_2 = QLabel(self.centralwidget) self.label_2.setObjectName(u"label_2") - self.label_2.setGeometry(QRect(389, 60, 81, 16)) + self.label_2.setGeometry(QRect(349, 60, 81, 16)) self.listCones2 = QListWidget(self.centralwidget) self.listCones2.setObjectName(u"listCones2") - self.listCones2.setGeometry(QRect(180, 110, 180, 220)) + self.listCones2.setGeometry(QRect(240, 110, 180, 181)) self.label = QLabel(self.centralwidget) self.label.setObjectName(u"label") - self.label.setGeometry(QRect(389, 40, 81, 16)) + self.label.setGeometry(QRect(349, 40, 81, 16)) self.label_3 = QLabel(self.centralwidget) self.label_3.setObjectName(u"label_3") - self.label_3.setGeometry(QRect(579, 40, 61, 16)) + self.label_3.setGeometry(QRect(539, 40, 61, 16)) self.txtLongitude = QLabel(self.centralwidget) self.txtLongitude.setObjectName(u"txtLongitude") - self.txtLongitude.setGeometry(QRect(470, 60, 91, 20)) + self.txtLongitude.setGeometry(QRect(430, 60, 91, 20)) self.txtLongitude.setFrameShape(QFrame.Panel) self.txtLongitude.setFrameShadow(QFrame.Sunken) self.txtDist4 = QLabel(self.centralwidget) self.txtDist4.setObjectName(u"txtDist4") - self.txtDist4.setGeometry(QRect(660, 90, 51, 20)) + self.txtDist4.setGeometry(QRect(140, 300, 51, 20)) self.txtDist4.setFrameShape(QFrame.Panel) self.txtDist4.setFrameShadow(QFrame.Sunken) self.txtDist2 = QLabel(self.centralwidget) self.txtDist2.setObjectName(u"txtDist2") - self.txtDist2.setGeometry(QRect(300, 90, 51, 20)) + self.txtDist2.setGeometry(QRect(370, 90, 51, 20)) self.txtDist2.setFrameShape(QFrame.Panel) self.txtDist2.setFrameShadow(QFrame.Sunken) self.txtSpeed = QLabel(self.centralwidget) self.txtSpeed.setObjectName(u"txtSpeed") - self.txtSpeed.setGeometry(QRect(650, 40, 81, 18)) + self.txtSpeed.setGeometry(QRect(610, 40, 81, 18)) self.txtSpeed.setFrameShape(QFrame.Panel) self.txtSpeed.setFrameShadow(QFrame.Sunken) self.txtDist1 = QLabel(self.centralwidget) self.txtDist1.setObjectName(u"txtDist1") - self.txtDist1.setGeometry(QRect(120, 90, 51, 20)) + self.txtDist1.setGeometry(QRect(140, 90, 51, 20)) self.txtDist1.setFrameShape(QFrame.Panel) self.txtDist1.setFrameShadow(QFrame.Sunken) self.lblList2 = QLabel(self.centralwidget) self.lblList2.setObjectName(u"lblList2") - self.lblList2.setGeometry(QRect(180, 90, 141, 16)) + self.lblList2.setGeometry(QRect(240, 90, 141, 16)) self.lblList1 = QLabel(self.centralwidget) self.lblList1.setObjectName(u"lblList1") - self.lblList1.setGeometry(QRect(0, 90, 141, 16)) + self.lblList1.setGeometry(QRect(10, 90, 141, 16)) self.txtLatitude = QLabel(self.centralwidget) self.txtLatitude.setObjectName(u"txtLatitude") - self.txtLatitude.setGeometry(QRect(470, 40, 91, 20)) + self.txtLatitude.setGeometry(QRect(430, 40, 91, 20)) self.txtLatitude.setFrameShape(QFrame.Panel) self.txtLatitude.setFrameShadow(QFrame.Sunken) self.label_4 = QLabel(self.centralwidget) self.label_4.setObjectName(u"label_4") - self.label_4.setGeometry(QRect(579, 60, 61, 16)) + self.label_4.setGeometry(QRect(539, 60, 61, 16)) self.listCones4 = QListWidget(self.centralwidget) self.listCones4.setObjectName(u"listCones4") - self.listCones4.setGeometry(QRect(540, 110, 180, 220)) + self.listCones4.setGeometry(QRect(10, 320, 180, 181)) self.label_5 = QLabel(self.centralwidget) self.label_5.setObjectName(u"label_5") - self.label_5.setGeometry(QRect(20, 10, 281, 16)) + self.label_5.setGeometry(QRect(20, 10, 261, 16)) font = QFont() font.setPointSize(14) self.label_5.setFont(font) self.exitButton = QPushButton(self.centralwidget) self.exitButton.setObjectName(u"exitButton") - self.exitButton.setGeometry(QRect(990, 10, 84, 32)) + self.exitButton.setGeometry(QRect(610, 510, 84, 32)) self.lblList4 = QLabel(self.centralwidget) self.lblList4.setObjectName(u"lblList4") - self.lblList4.setGeometry(QRect(540, 90, 141, 16)) + self.lblList4.setGeometry(QRect(10, 300, 141, 16)) self.listCones3 = QListWidget(self.centralwidget) self.listCones3.setObjectName(u"listCones3") - self.listCones3.setGeometry(QRect(360, 110, 180, 220)) + self.listCones3.setGeometry(QRect(470, 110, 180, 181)) self.listCones1 = QListWidget(self.centralwidget) self.listCones1.setObjectName(u"listCones1") - self.listCones1.setGeometry(QRect(0, 110, 180, 220)) + self.listCones1.setGeometry(QRect(10, 110, 180, 181)) self.txtDist3 = QLabel(self.centralwidget) self.txtDist3.setObjectName(u"txtDist3") - self.txtDist3.setGeometry(QRect(480, 90, 51, 20)) + self.txtDist3.setGeometry(QRect(600, 90, 51, 20)) self.txtDist3.setFrameShape(QFrame.Panel) self.txtDist3.setFrameShadow(QFrame.Sunken) self.txtHeading = QLabel(self.centralwidget) self.txtHeading.setObjectName(u"txtHeading") - self.txtHeading.setGeometry(QRect(650, 60, 81, 18)) + self.txtHeading.setGeometry(QRect(610, 60, 81, 18)) self.txtHeading.setFrameShape(QFrame.Panel) self.txtHeading.setFrameShadow(QFrame.Sunken) self.lblList3 = QLabel(self.centralwidget) self.lblList3.setObjectName(u"lblList3") - self.lblList3.setGeometry(QRect(360, 90, 141, 16)) + self.lblList3.setGeometry(QRect(470, 90, 141, 16)) self.openFiles = QPushButton(self.centralwidget) self.openFiles.setObjectName(u"openFiles") self.openFiles.setGeometry(QRect(40, 40, 111, 32)) self.txtTime = QLabel(self.centralwidget) self.txtTime.setObjectName(u"txtTime") - self.txtTime.setGeometry(QRect(470, 10, 261, 20)) + self.txtTime.setGeometry(QRect(430, 10, 261, 20)) self.txtTime.setFrameShape(QFrame.Panel) self.txtTime.setFrameShadow(QFrame.Sunken) self.label_7 = QLabel(self.centralwidget) self.label_7.setObjectName(u"label_7") - self.label_7.setGeometry(QRect(390, 10, 49, 16)) + self.label_7.setGeometry(QRect(350, 10, 49, 16)) self.logEnabled = QCheckBox(self.centralwidget) self.logEnabled.setObjectName(u"logEnabled") - self.logEnabled.setGeometry(QRect(170, 50, 131, 20)) + self.logEnabled.setGeometry(QRect(210, 60, 131, 20)) self.addPoint1 = QPushButton(self.centralwidget) self.addPoint1.setObjectName(u"addPoint1") - self.addPoint1.setGeometry(QRect(40, 330, 41, 32)) + self.addPoint1.setGeometry(QRect(190, 150, 41, 32)) self.delPoint1 = QPushButton(self.centralwidget) self.delPoint1.setObjectName(u"delPoint1") - self.delPoint1.setGeometry(QRect(80, 340, 41, 32)) + self.delPoint1.setGeometry(QRect(190, 210, 41, 32)) self.addPoint2 = QPushButton(self.centralwidget) self.addPoint2.setObjectName(u"addPoint2") - self.addPoint2.setGeometry(QRect(220, 330, 41, 32)) + self.addPoint2.setGeometry(QRect(420, 150, 41, 32)) self.delPoint2 = QPushButton(self.centralwidget) self.delPoint2.setObjectName(u"delPoint2") - self.delPoint2.setGeometry(QRect(260, 340, 41, 32)) + self.delPoint2.setGeometry(QRect(420, 210, 41, 32)) self.addPoint3 = QPushButton(self.centralwidget) self.addPoint3.setObjectName(u"addPoint3") - self.addPoint3.setGeometry(QRect(400, 330, 41, 32)) + self.addPoint3.setGeometry(QRect(650, 150, 41, 32)) self.delPoint3 = QPushButton(self.centralwidget) self.delPoint3.setObjectName(u"delPoint3") - self.delPoint3.setGeometry(QRect(440, 340, 41, 32)) + self.delPoint3.setGeometry(QRect(650, 210, 41, 32)) self.addPoint4 = QPushButton(self.centralwidget) self.addPoint4.setObjectName(u"addPoint4") - self.addPoint4.setGeometry(QRect(580, 330, 41, 32)) + self.addPoint4.setGeometry(QRect(190, 360, 41, 32)) self.delPoint4 = QPushButton(self.centralwidget) self.delPoint4.setObjectName(u"delPoint4") - self.delPoint4.setGeometry(QRect(620, 340, 41, 32)) + self.delPoint4.setGeometry(QRect(190, 420, 41, 32)) self.saveList1 = QPushButton(self.centralwidget) self.saveList1.setObjectName(u"saveList1") - self.saveList1.setGeometry(QRect(130, 340, 41, 32)) + self.saveList1.setGeometry(QRect(190, 260, 41, 32)) self.saveList2 = QPushButton(self.centralwidget) self.saveList2.setObjectName(u"saveList2") - self.saveList2.setGeometry(QRect(310, 340, 41, 32)) + self.saveList2.setGeometry(QRect(420, 260, 41, 32)) self.saveList3 = QPushButton(self.centralwidget) self.saveList3.setObjectName(u"saveList3") - self.saveList3.setGeometry(QRect(490, 340, 41, 32)) + self.saveList3.setGeometry(QRect(650, 260, 41, 32)) self.saveList4 = QPushButton(self.centralwidget) self.saveList4.setObjectName(u"saveList4") - self.saveList4.setGeometry(QRect(670, 340, 41, 32)) + self.saveList4.setGeometry(QRect(190, 470, 41, 32)) self.resetList1 = QPushButton(self.centralwidget) self.resetList1.setObjectName(u"resetList1") - self.resetList1.setGeometry(QRect(0, 340, 41, 32)) + self.resetList1.setGeometry(QRect(190, 110, 41, 32)) self.resetList2 = QPushButton(self.centralwidget) self.resetList2.setObjectName(u"resetList2") - self.resetList2.setGeometry(QRect(180, 340, 41, 32)) + self.resetList2.setGeometry(QRect(420, 110, 41, 32)) self.resetList3 = QPushButton(self.centralwidget) self.resetList3.setObjectName(u"resetList3") - self.resetList3.setGeometry(QRect(360, 340, 41, 32)) + self.resetList3.setGeometry(QRect(650, 110, 41, 32)) self.resetList4 = QPushButton(self.centralwidget) self.resetList4.setObjectName(u"resetList4") - self.resetList4.setGeometry(QRect(540, 340, 41, 32)) + self.resetList4.setGeometry(QRect(190, 320, 41, 32)) self.saveConfig = QPushButton(self.centralwidget) self.saveConfig.setObjectName(u"saveConfig") - self.saveConfig.setGeometry(QRect(880, 10, 84, 32)) + self.saveConfig.setGeometry(QRect(290, 510, 84, 32)) self.insPoint1 = QPushButton(self.centralwidget) self.insPoint1.setObjectName(u"insPoint1") - self.insPoint1.setGeometry(QRect(40, 360, 41, 32)) + self.insPoint1.setGeometry(QRect(190, 180, 41, 32)) self.insPoint2 = QPushButton(self.centralwidget) self.insPoint2.setObjectName(u"insPoint2") - self.insPoint2.setGeometry(QRect(220, 360, 41, 32)) + self.insPoint2.setGeometry(QRect(420, 180, 41, 32)) self.insPoint3 = QPushButton(self.centralwidget) self.insPoint3.setObjectName(u"insPoint3") - self.insPoint3.setGeometry(QRect(400, 360, 41, 32)) + self.insPoint3.setGeometry(QRect(650, 180, 41, 32)) self.insPoint4 = QPushButton(self.centralwidget) self.insPoint4.setObjectName(u"insPoint4") - self.insPoint4.setGeometry(QRect(580, 360, 41, 32)) + self.insPoint4.setGeometry(QRect(190, 390, 41, 32)) self.txtRange = QLineEdit(self.centralwidget) self.txtRange.setObjectName(u"txtRange") - self.txtRange.setGeometry(QRect(310, 10, 41, 30)) + self.txtRange.setGeometry(QRect(280, 20, 41, 30)) self.label_6 = QLabel(self.centralwidget) self.label_6.setObjectName(u"label_6") - self.label_6.setGeometry(QRect(250, 20, 61, 16)) + self.label_6.setGeometry(QRect(230, 30, 61, 16)) self.listCones5 = QListWidget(self.centralwidget) self.listCones5.setObjectName(u"listCones5") - self.listCones5.setGeometry(QRect(720, 110, 180, 220)) + self.listCones5.setGeometry(QRect(240, 320, 180, 181)) self.listCones6 = QListWidget(self.centralwidget) self.listCones6.setObjectName(u"listCones6") - self.listCones6.setGeometry(QRect(900, 110, 180, 220)) + self.listCones6.setGeometry(QRect(470, 320, 180, 181)) self.delPoint5 = QPushButton(self.centralwidget) self.delPoint5.setObjectName(u"delPoint5") - self.delPoint5.setGeometry(QRect(800, 340, 41, 32)) + self.delPoint5.setGeometry(QRect(420, 420, 41, 32)) self.saveList5 = QPushButton(self.centralwidget) self.saveList5.setObjectName(u"saveList5") - self.saveList5.setGeometry(QRect(850, 340, 41, 32)) + self.saveList5.setGeometry(QRect(420, 470, 41, 32)) self.addPoint5 = QPushButton(self.centralwidget) self.addPoint5.setObjectName(u"addPoint5") - self.addPoint5.setGeometry(QRect(760, 330, 41, 32)) + self.addPoint5.setGeometry(QRect(420, 360, 41, 32)) self.insPoint5 = QPushButton(self.centralwidget) self.insPoint5.setObjectName(u"insPoint5") - self.insPoint5.setGeometry(QRect(760, 360, 41, 32)) + self.insPoint5.setGeometry(QRect(420, 390, 41, 32)) self.resetList5 = QPushButton(self.centralwidget) self.resetList5.setObjectName(u"resetList5") - self.resetList5.setGeometry(QRect(720, 340, 41, 32)) + self.resetList5.setGeometry(QRect(420, 320, 41, 32)) self.delPoint6 = QPushButton(self.centralwidget) self.delPoint6.setObjectName(u"delPoint6") - self.delPoint6.setGeometry(QRect(980, 340, 41, 32)) + self.delPoint6.setGeometry(QRect(650, 420, 41, 32)) self.saveList6 = QPushButton(self.centralwidget) self.saveList6.setObjectName(u"saveList6") - self.saveList6.setGeometry(QRect(1030, 340, 41, 32)) + self.saveList6.setGeometry(QRect(650, 470, 41, 32)) self.addPoint6 = QPushButton(self.centralwidget) self.addPoint6.setObjectName(u"addPoint6") - self.addPoint6.setGeometry(QRect(940, 330, 41, 32)) + self.addPoint6.setGeometry(QRect(650, 360, 41, 32)) self.insPoint6 = QPushButton(self.centralwidget) self.insPoint6.setObjectName(u"insPoint6") - self.insPoint6.setGeometry(QRect(940, 360, 41, 32)) + self.insPoint6.setGeometry(QRect(650, 390, 41, 32)) self.resetList6 = QPushButton(self.centralwidget) self.resetList6.setObjectName(u"resetList6") - self.resetList6.setGeometry(QRect(900, 340, 41, 32)) + self.resetList6.setGeometry(QRect(650, 320, 41, 32)) self.txtDist5 = QLabel(self.centralwidget) self.txtDist5.setObjectName(u"txtDist5") - self.txtDist5.setGeometry(QRect(840, 90, 51, 20)) + self.txtDist5.setGeometry(QRect(360, 300, 51, 20)) self.txtDist5.setFrameShape(QFrame.Panel) self.txtDist5.setFrameShadow(QFrame.Sunken) self.txtDist6 = QLabel(self.centralwidget) self.txtDist6.setObjectName(u"txtDist6") - self.txtDist6.setGeometry(QRect(1020, 90, 51, 20)) + self.txtDist6.setGeometry(QRect(590, 300, 51, 20)) self.txtDist6.setFrameShape(QFrame.Panel) self.txtDist6.setFrameShadow(QFrame.Sunken) self.lblList5 = QLabel(self.centralwidget) self.lblList5.setObjectName(u"lblList5") - self.lblList5.setGeometry(QRect(720, 90, 141, 16)) + self.lblList5.setGeometry(QRect(240, 300, 141, 16)) self.lblList6 = QLabel(self.centralwidget) self.lblList6.setObjectName(u"lblList6") - self.lblList6.setGeometry(QRect(900, 90, 141, 16)) + self.lblList6.setGeometry(QRect(470, 300, 141, 16)) + self.testSound = QPushButton(self.centralwidget) + self.testSound.setObjectName(u"testSound") + self.testSound.setGeometry(QRect(10, 510, 71, 32)) MainWindow.setCentralWidget(self.centralwidget) self.menubar = QMenuBar(MainWindow) self.menubar.setObjectName(u"menubar") - self.menubar.setGeometry(QRect(0, 0, 1082, 28)) + self.menubar.setGeometry(QRect(0, 0, 700, 28)) MainWindow.setMenuBar(self.menubar) self.statusbar = QStatusBar(MainWindow) self.statusbar.setObjectName(u"statusbar") @@ -315,5 +318,6 @@ class Ui_MainWindow(object): self.txtDist6.setText(QCoreApplication.translate("MainWindow", u"0", None)) self.lblList5.setText("") self.lblList6.setText("") + self.testSound.setText(QCoreApplication.translate("MainWindow", u"Test Sound", None)) # retranslateUi diff --git a/gps_vcones/mainwindow.ui b/gps_vcones/mainwindow.ui index 68fa363..4e6638d 100644 --- a/gps_vcones/mainwindow.ui +++ b/gps_vcones/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 1082 - 445 + 700 + 580 @@ -17,7 +17,7 @@ - 389 + 349 60 81 16 @@ -30,17 +30,17 @@ - 180 + 240 110 180 - 220 + 181 - 389 + 349 40 81 16 @@ -53,7 +53,7 @@ - 579 + 539 40 61 16 @@ -66,7 +66,7 @@ - 470 + 430 60 91 20 @@ -85,8 +85,8 @@ - 660 - 90 + 140 + 300 51 20 @@ -104,7 +104,7 @@ - 300 + 370 90 51 20 @@ -123,7 +123,7 @@ - 650 + 610 40 81 18 @@ -142,7 +142,7 @@ - 120 + 140 90 51 20 @@ -161,7 +161,7 @@ - 180 + 240 90 141 16 @@ -174,7 +174,7 @@ - 0 + 10 90 141 16 @@ -187,7 +187,7 @@ - 470 + 430 40 91 20 @@ -206,7 +206,7 @@ - 579 + 539 60 61 16 @@ -219,10 +219,10 @@ - 540 - 110 + 10 + 320 180 - 220 + 181 @@ -231,7 +231,7 @@ 20 10 - 281 + 261 16 @@ -247,8 +247,8 @@ - 990 - 10 + 610 + 510 84 32 @@ -260,8 +260,8 @@ - 540 - 90 + 10 + 300 141 16 @@ -273,27 +273,27 @@ - 360 + 470 110 180 - 220 + 181 - 0 + 10 110 180 - 220 + 181 - 480 + 600 90 51 20 @@ -312,7 +312,7 @@ - 650 + 610 60 81 18 @@ -331,7 +331,7 @@ - 360 + 470 90 141 16 @@ -357,7 +357,7 @@ - 470 + 430 10 261 20 @@ -376,7 +376,7 @@ - 390 + 350 10 49 16 @@ -389,8 +389,8 @@ - 170 - 50 + 210 + 60 131 20 @@ -402,8 +402,8 @@ - 40 - 330 + 190 + 150 41 32 @@ -415,8 +415,8 @@ - 80 - 340 + 190 + 210 41 32 @@ -428,8 +428,8 @@ - 220 - 330 + 420 + 150 41 32 @@ -441,8 +441,8 @@ - 260 - 340 + 420 + 210 41 32 @@ -454,8 +454,8 @@ - 400 - 330 + 650 + 150 41 32 @@ -467,8 +467,8 @@ - 440 - 340 + 650 + 210 41 32 @@ -480,8 +480,8 @@ - 580 - 330 + 190 + 360 41 32 @@ -493,8 +493,8 @@ - 620 - 340 + 190 + 420 41 32 @@ -506,8 +506,8 @@ - 130 - 340 + 190 + 260 41 32 @@ -519,8 +519,8 @@ - 310 - 340 + 420 + 260 41 32 @@ -532,8 +532,8 @@ - 490 - 340 + 650 + 260 41 32 @@ -545,8 +545,8 @@ - 670 - 340 + 190 + 470 41 32 @@ -558,8 +558,8 @@ - 0 - 340 + 190 + 110 41 32 @@ -571,8 +571,8 @@ - 180 - 340 + 420 + 110 41 32 @@ -584,8 +584,8 @@ - 360 - 340 + 650 + 110 41 32 @@ -597,8 +597,8 @@ - 540 - 340 + 190 + 320 41 32 @@ -610,8 +610,8 @@ - 880 - 10 + 290 + 510 84 32 @@ -623,8 +623,8 @@ - 40 - 360 + 190 + 180 41 32 @@ -636,8 +636,8 @@ - 220 - 360 + 420 + 180 41 32 @@ -649,8 +649,8 @@ - 400 - 360 + 650 + 180 41 32 @@ -662,8 +662,8 @@ - 580 - 360 + 190 + 390 41 32 @@ -675,8 +675,8 @@ - 310 - 10 + 280 + 20 41 30 @@ -688,8 +688,8 @@ - 250 - 20 + 230 + 30 61 16 @@ -701,28 +701,28 @@ - 720 - 110 + 240 + 320 180 - 220 + 181 - 900 - 110 + 470 + 320 180 - 220 + 181 - 800 - 340 + 420 + 420 41 32 @@ -734,8 +734,8 @@ - 850 - 340 + 420 + 470 41 32 @@ -747,8 +747,8 @@ - 760 - 330 + 420 + 360 41 32 @@ -760,8 +760,8 @@ - 760 - 360 + 420 + 390 41 32 @@ -773,8 +773,8 @@ - 720 - 340 + 420 + 320 41 32 @@ -786,8 +786,8 @@ - 980 - 340 + 650 + 420 41 32 @@ -799,8 +799,8 @@ - 1030 - 340 + 650 + 470 41 32 @@ -812,8 +812,8 @@ - 940 - 330 + 650 + 360 41 32 @@ -825,8 +825,8 @@ - 940 - 360 + 650 + 390 41 32 @@ -838,8 +838,8 @@ - 900 - 340 + 650 + 320 41 32 @@ -851,8 +851,8 @@ - 840 - 90 + 360 + 300 51 20 @@ -870,8 +870,8 @@ - 1020 - 90 + 590 + 300 51 20 @@ -889,8 +889,8 @@ - 720 - 90 + 240 + 300 141 16 @@ -902,8 +902,8 @@ - 900 - 90 + 470 + 300 141 16 @@ -912,13 +912,26 @@ + + + + 10 + 510 + 71 + 32 + + + + Test Sound + + 0 0 - 1082 + 700 28 diff --git a/gps_vcones/vcones_gui.py b/gps_vcones/vcones_gui.py index bbef30d..7772352 100755 --- a/gps_vcones/vcones_gui.py +++ b/gps_vcones/vcones_gui.py @@ -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():