Change config file name

gps_vcones/MainWindow.py

@@ -39,12 +39,12 @@ class Ui_MainWindow(object):
         self.txtLongitude.setFrameShadow(QFrame.Sunken)
         self.txtDist4 = QLabel(self.centralwidget)
         self.txtDist4.setObjectName(u"txtDist4")
-        self.txtDist4.setGeometry(QRect(140, 300, 51, 20))
+        self.txtDist4.setGeometry(QRect(190, 320, 41, 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(370, 90, 51, 20))
+        self.txtDist2.setGeometry(QRect(420, 110, 41, 20))
         self.txtDist2.setFrameShape(QFrame.Panel)
         self.txtDist2.setFrameShadow(QFrame.Sunken)
         self.txtSpeed = QLabel(self.centralwidget)
@@ -54,15 +54,15 @@ class Ui_MainWindow(object):
         self.txtSpeed.setFrameShadow(QFrame.Sunken)
         self.txtDist1 = QLabel(self.centralwidget)
         self.txtDist1.setObjectName(u"txtDist1")
-        self.txtDist1.setGeometry(QRect(140, 90, 51, 20))
+        self.txtDist1.setGeometry(QRect(190, 110, 41, 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(240, 90, 141, 16))
+        self.lblList2.setGeometry(QRect(240, 90, 181, 16))
         self.lblList1 = QLabel(self.centralwidget)
         self.lblList1.setObjectName(u"lblList1")
-        self.lblList1.setGeometry(QRect(10, 90, 141, 16))
+        self.lblList1.setGeometry(QRect(10, 90, 181, 16))
         self.txtLatitude = QLabel(self.centralwidget)
         self.txtLatitude.setObjectName(u"txtLatitude")
         self.txtLatitude.setGeometry(QRect(430, 40, 91, 20))
@@ -94,7 +94,7 @@ class Ui_MainWindow(object):
         self.listCones1.setGeometry(QRect(10, 110, 180, 181))
         self.txtDist3 = QLabel(self.centralwidget)
         self.txtDist3.setObjectName(u"txtDist3")
-        self.txtDist3.setGeometry(QRect(600, 90, 51, 20))
+        self.txtDist3.setGeometry(QRect(650, 110, 41, 20))
         self.txtDist3.setFrameShape(QFrame.Panel)
         self.txtDist3.setFrameShadow(QFrame.Sunken)
         self.txtHeading = QLabel(self.centralwidget)
@@ -121,28 +121,28 @@ class Ui_MainWindow(object):
         self.logEnabled.setGeometry(QRect(210, 60, 131, 20))
         self.addPoint1 = QPushButton(self.centralwidget)
         self.addPoint1.setObjectName(u"addPoint1")
-        self.addPoint1.setGeometry(QRect(190, 150, 41, 32))
+        self.addPoint1.setGeometry(QRect(190, 170, 41, 32))
         self.delPoint1 = QPushButton(self.centralwidget)
         self.delPoint1.setObjectName(u"delPoint1")
-        self.delPoint1.setGeometry(QRect(190, 210, 41, 32))
+        self.delPoint1.setGeometry(QRect(190, 230, 41, 32))
         self.addPoint2 = QPushButton(self.centralwidget)
         self.addPoint2.setObjectName(u"addPoint2")
-        self.addPoint2.setGeometry(QRect(420, 150, 41, 32))
+        self.addPoint2.setGeometry(QRect(420, 170, 41, 32))
         self.delPoint2 = QPushButton(self.centralwidget)
         self.delPoint2.setObjectName(u"delPoint2")
-        self.delPoint2.setGeometry(QRect(420, 210, 41, 32))
+        self.delPoint2.setGeometry(QRect(420, 230, 41, 32))
         self.addPoint3 = QPushButton(self.centralwidget)
         self.addPoint3.setObjectName(u"addPoint3")
-        self.addPoint3.setGeometry(QRect(650, 150, 41, 32))
+        self.addPoint3.setGeometry(QRect(650, 170, 41, 32))
         self.delPoint3 = QPushButton(self.centralwidget)
         self.delPoint3.setObjectName(u"delPoint3")
-        self.delPoint3.setGeometry(QRect(650, 210, 41, 32))
+        self.delPoint3.setGeometry(QRect(650, 230, 41, 32))
         self.addPoint4 = QPushButton(self.centralwidget)
         self.addPoint4.setObjectName(u"addPoint4")
-        self.addPoint4.setGeometry(QRect(190, 360, 41, 32))
+        self.addPoint4.setGeometry(QRect(190, 380, 41, 32))
         self.delPoint4 = QPushButton(self.centralwidget)
         self.delPoint4.setObjectName(u"delPoint4")
-        self.delPoint4.setGeometry(QRect(190, 420, 41, 32))
+        self.delPoint4.setGeometry(QRect(190, 440, 41, 32))
         self.saveList1 = QPushButton(self.centralwidget)
         self.saveList1.setObjectName(u"saveList1")
         self.saveList1.setGeometry(QRect(190, 260, 41, 32))
@@ -157,31 +157,31 @@ class Ui_MainWindow(object):
         self.saveList4.setGeometry(QRect(190, 470, 41, 32))
         self.resetList1 = QPushButton(self.centralwidget)
         self.resetList1.setObjectName(u"resetList1")
-        self.resetList1.setGeometry(QRect(190, 110, 41, 32))
+        self.resetList1.setGeometry(QRect(190, 140, 41, 32))
         self.resetList2 = QPushButton(self.centralwidget)
         self.resetList2.setObjectName(u"resetList2")
-        self.resetList2.setGeometry(QRect(420, 110, 41, 32))
+        self.resetList2.setGeometry(QRect(420, 140, 41, 32))
         self.resetList3 = QPushButton(self.centralwidget)
         self.resetList3.setObjectName(u"resetList3")
-        self.resetList3.setGeometry(QRect(650, 110, 41, 32))
+        self.resetList3.setGeometry(QRect(650, 140, 41, 32))
         self.resetList4 = QPushButton(self.centralwidget)
         self.resetList4.setObjectName(u"resetList4")
-        self.resetList4.setGeometry(QRect(190, 320, 41, 32))
+        self.resetList4.setGeometry(QRect(190, 350, 41, 32))
         self.saveConfig = QPushButton(self.centralwidget)
         self.saveConfig.setObjectName(u"saveConfig")
         self.saveConfig.setGeometry(QRect(290, 510, 84, 32))
         self.insPoint1 = QPushButton(self.centralwidget)
         self.insPoint1.setObjectName(u"insPoint1")
-        self.insPoint1.setGeometry(QRect(190, 180, 41, 32))
+        self.insPoint1.setGeometry(QRect(190, 200, 41, 32))
         self.insPoint2 = QPushButton(self.centralwidget)
         self.insPoint2.setObjectName(u"insPoint2")
-        self.insPoint2.setGeometry(QRect(420, 180, 41, 32))
+        self.insPoint2.setGeometry(QRect(420, 200, 41, 32))
         self.insPoint3 = QPushButton(self.centralwidget)
         self.insPoint3.setObjectName(u"insPoint3")
-        self.insPoint3.setGeometry(QRect(650, 180, 41, 32))
+        self.insPoint3.setGeometry(QRect(650, 200, 41, 32))
         self.insPoint4 = QPushButton(self.centralwidget)
         self.insPoint4.setObjectName(u"insPoint4")
-        self.insPoint4.setGeometry(QRect(190, 390, 41, 32))
+        self.insPoint4.setGeometry(QRect(190, 410, 41, 32))
         self.txtRange = QLineEdit(self.centralwidget)
         self.txtRange.setObjectName(u"txtRange")
         self.txtRange.setGeometry(QRect(280, 20, 41, 30))
@@ -196,42 +196,42 @@ class Ui_MainWindow(object):
         self.listCones6.setGeometry(QRect(470, 320, 180, 181))
         self.delPoint5 = QPushButton(self.centralwidget)
         self.delPoint5.setObjectName(u"delPoint5")
-        self.delPoint5.setGeometry(QRect(420, 420, 41, 32))
+        self.delPoint5.setGeometry(QRect(420, 440, 41, 32))
         self.saveList5 = QPushButton(self.centralwidget)
         self.saveList5.setObjectName(u"saveList5")
         self.saveList5.setGeometry(QRect(420, 470, 41, 32))
         self.addPoint5 = QPushButton(self.centralwidget)
         self.addPoint5.setObjectName(u"addPoint5")
-        self.addPoint5.setGeometry(QRect(420, 360, 41, 32))
+        self.addPoint5.setGeometry(QRect(420, 380, 41, 32))
         self.insPoint5 = QPushButton(self.centralwidget)
         self.insPoint5.setObjectName(u"insPoint5")
-        self.insPoint5.setGeometry(QRect(420, 390, 41, 32))
+        self.insPoint5.setGeometry(QRect(420, 410, 41, 32))
         self.resetList5 = QPushButton(self.centralwidget)
         self.resetList5.setObjectName(u"resetList5")
-        self.resetList5.setGeometry(QRect(420, 320, 41, 32))
+        self.resetList5.setGeometry(QRect(420, 350, 41, 32))
         self.delPoint6 = QPushButton(self.centralwidget)
         self.delPoint6.setObjectName(u"delPoint6")
-        self.delPoint6.setGeometry(QRect(650, 420, 41, 32))
+        self.delPoint6.setGeometry(QRect(650, 440, 41, 32))
         self.saveList6 = QPushButton(self.centralwidget)
         self.saveList6.setObjectName(u"saveList6")
         self.saveList6.setGeometry(QRect(650, 470, 41, 32))
         self.addPoint6 = QPushButton(self.centralwidget)
         self.addPoint6.setObjectName(u"addPoint6")
-        self.addPoint6.setGeometry(QRect(650, 360, 41, 32))
+        self.addPoint6.setGeometry(QRect(650, 380, 41, 32))
         self.insPoint6 = QPushButton(self.centralwidget)
         self.insPoint6.setObjectName(u"insPoint6")
-        self.insPoint6.setGeometry(QRect(650, 390, 41, 32))
+        self.insPoint6.setGeometry(QRect(650, 410, 41, 32))
         self.resetList6 = QPushButton(self.centralwidget)
         self.resetList6.setObjectName(u"resetList6")
-        self.resetList6.setGeometry(QRect(650, 320, 41, 32))
+        self.resetList6.setGeometry(QRect(650, 350, 41, 32))
         self.txtDist5 = QLabel(self.centralwidget)
         self.txtDist5.setObjectName(u"txtDist5")
-        self.txtDist5.setGeometry(QRect(360, 300, 51, 20))
+        self.txtDist5.setGeometry(QRect(420, 320, 41, 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(590, 300, 51, 20))
+        self.txtDist6.setGeometry(QRect(650, 320, 41, 20))
         self.txtDist6.setFrameShape(QFrame.Panel)
         self.txtDist6.setFrameShadow(QFrame.Sunken)
         self.lblList5 = QLabel(self.centralwidget)
@@ -271,7 +271,7 @@ class Ui_MainWindow(object):
         self.lblList1.setText("")
         self.txtLatitude.setText(QCoreApplication.translate("MainWindow", u"0", None))
         self.label_4.setText(QCoreApplication.translate("MainWindow", u"Heading:", None))
-        self.label_5.setText(QCoreApplication.translate("MainWindow", u"NTCNA GPS Virtual Cones", None))
+        self.label_5.setText(QCoreApplication.translate("MainWindow", u"NTCNA GPS Virtual Cones V1.0", None))
         self.exitButton.setText(QCoreApplication.translate("MainWindow", u"Exit", None))
         self.lblList4.setText("")
         self.txtDist3.setText(QCoreApplication.translate("MainWindow", u"0", None))

gps_vcones/mainwindow.ui

@@ -85,9 +85,9 @@
    <widget class="QLabel" name="txtDist4">
     <property name="geometry">
      <rect>
-      <x>140</x>
+      <x>190</x>
-      <y>300</y>
+      <y>320</y>
-      <width>51</width>
+      <width>41</width>
       <height>20</height>
      </rect>
     </property>
@@ -104,9 +104,9 @@
    <widget class="QLabel" name="txtDist2">
     <property name="geometry">
      <rect>
-      <x>370</x>
+      <x>420</x>
-      <y>90</y>
+      <y>110</y>
-      <width>51</width>
+      <width>41</width>
       <height>20</height>
      </rect>
     </property>
@@ -142,9 +142,9 @@
    <widget class="QLabel" name="txtDist1">
     <property name="geometry">
      <rect>
-      <x>140</x>
+      <x>190</x>
-      <y>90</y>
+      <y>110</y>
-      <width>51</width>
+      <width>41</width>
       <height>20</height>
      </rect>
     </property>
@@ -163,7 +163,7 @@
      <rect>
       <x>240</x>
       <y>90</y>
-      <width>141</width>
+      <width>181</width>
       <height>16</height>
      </rect>
     </property>
@@ -176,7 +176,7 @@
      <rect>
       <x>10</x>
       <y>90</y>
-      <width>141</width>
+      <width>181</width>
       <height>16</height>
      </rect>
     </property>
@@ -241,7 +241,7 @@
      </font>
     </property>
     <property name="text">
-     <string>NTCNA GPS Virtual Cones</string>
+     <string>NTCNA GPS Virtual Cones V1.0</string>
     </property>
    </widget>
    <widget class="QPushButton" name="exitButton">
@@ -293,9 +293,9 @@
    <widget class="QLabel" name="txtDist3">
     <property name="geometry">
      <rect>
-      <x>600</x>
+      <x>650</x>
-      <y>90</y>
+      <y>110</y>
-      <width>51</width>
+      <width>41</width>
       <height>20</height>
      </rect>
     </property>
@@ -403,7 +403,7 @@
     <property name="geometry">
      <rect>
       <x>190</x>
-      <y>150</y>
+      <y>170</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -416,7 +416,7 @@
     <property name="geometry">
      <rect>
       <x>190</x>
-      <y>210</y>
+      <y>230</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -429,7 +429,7 @@
     <property name="geometry">
      <rect>
       <x>420</x>
-      <y>150</y>
+      <y>170</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -442,7 +442,7 @@
     <property name="geometry">
      <rect>
       <x>420</x>
-      <y>210</y>
+      <y>230</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -455,7 +455,7 @@
     <property name="geometry">
      <rect>
       <x>650</x>
-      <y>150</y>
+      <y>170</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -468,7 +468,7 @@
     <property name="geometry">
      <rect>
       <x>650</x>
-      <y>210</y>
+      <y>230</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -481,7 +481,7 @@
     <property name="geometry">
      <rect>
       <x>190</x>
-      <y>360</y>
+      <y>380</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -494,7 +494,7 @@
     <property name="geometry">
      <rect>
       <x>190</x>
-      <y>420</y>
+      <y>440</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -559,7 +559,7 @@
     <property name="geometry">
      <rect>
       <x>190</x>
-      <y>110</y>
+      <y>140</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -572,7 +572,7 @@
     <property name="geometry">
      <rect>
       <x>420</x>
-      <y>110</y>
+      <y>140</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -585,7 +585,7 @@
     <property name="geometry">
      <rect>
       <x>650</x>
-      <y>110</y>
+      <y>140</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -598,7 +598,7 @@
     <property name="geometry">
      <rect>
       <x>190</x>
-      <y>320</y>
+      <y>350</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -624,7 +624,7 @@
     <property name="geometry">
      <rect>
       <x>190</x>
-      <y>180</y>
+      <y>200</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -637,7 +637,7 @@
     <property name="geometry">
      <rect>
       <x>420</x>
-      <y>180</y>
+      <y>200</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -650,7 +650,7 @@
     <property name="geometry">
      <rect>
       <x>650</x>
-      <y>180</y>
+      <y>200</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -663,7 +663,7 @@
     <property name="geometry">
      <rect>
       <x>190</x>
-      <y>390</y>
+      <y>410</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -722,7 +722,7 @@
     <property name="geometry">
      <rect>
       <x>420</x>
-      <y>420</y>
+      <y>440</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -748,7 +748,7 @@
     <property name="geometry">
      <rect>
       <x>420</x>
-      <y>360</y>
+      <y>380</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -761,7 +761,7 @@
     <property name="geometry">
      <rect>
       <x>420</x>
-      <y>390</y>
+      <y>410</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -774,7 +774,7 @@
     <property name="geometry">
      <rect>
       <x>420</x>
-      <y>320</y>
+      <y>350</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -787,7 +787,7 @@
     <property name="geometry">
      <rect>
       <x>650</x>
-      <y>420</y>
+      <y>440</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -813,7 +813,7 @@
     <property name="geometry">
      <rect>
       <x>650</x>
-      <y>360</y>
+      <y>380</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -826,7 +826,7 @@
     <property name="geometry">
      <rect>
       <x>650</x>
-      <y>390</y>
+      <y>410</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -839,7 +839,7 @@
     <property name="geometry">
      <rect>
       <x>650</x>
-      <y>320</y>
+      <y>350</y>
       <width>41</width>
       <height>32</height>
      </rect>
@@ -851,9 +851,9 @@
    <widget class="QLabel" name="txtDist5">
     <property name="geometry">
      <rect>
-      <x>360</x>
+      <x>420</x>
-      <y>300</y>
+      <y>320</y>
-      <width>51</width>
+      <width>41</width>
       <height>20</height>
      </rect>
     </property>
@@ -870,9 +870,9 @@
    <widget class="QLabel" name="txtDist6">
     <property name="geometry">
      <rect>
-      <x>590</x>
+      <x>650</x>
-      <y>300</y>
+      <y>320</y>
-      <width>51</width>
+      <width>41</width>
       <height>20</height>
      </rect>
     </property>

gps_vcones/vcones_gui.py

@@ -19,6 +19,8 @@ from PySide2.QtCore import QObject, Slot, Signal, QThread, QDir
 
 from MainWindow import Ui_MainWindow
 
+config_file = "vcones.yaml"
+
 ##############################################################################
 # audio stuff
 ##############################################################################
@@ -218,6 +220,7 @@ class ConesWindow(MainWindow):
     self.openFiles.clicked.connect(self.read_dialog)
     self.exitButton.clicked.connect(self.exit_button)
     self.testSound.clicked.connect(self.test_sound)
+    self.saveConfig.clicked.connect(self.save_config)
 
     self.resetList1.clicked.connect(self.reset_list1)
     self.addPoint1.clicked.connect(self.add_point1)
@@ -522,7 +525,7 @@ class ConesWindow(MainWindow):
     self.save_list(5)
   
   def save_config(self):
-    with open('config.yaml', 'w') as f:
+    with open(config_file, 'w') as f:
       config = {}
       if gpsd_host != "localhost":
         config['gpsd_host'] = gpsd_host
@@ -557,8 +560,8 @@ if __name__ == '__main__':
   window.show()
 
   config = []
-  if path.isfile('config.yaml'):
+  if path.isfile(config_file):
-    with open('config.yaml') as f:
+    with open(config_file) as f:
       config = yaml.load(f, Loader=yaml.FullLoader)
       if 'gpsd_host' in config:
         gpsd_host = config['gpsd_host']