Expanded to 6 lanes
This commit is contained in:
@ -17,7 +17,7 @@ class Ui_MainWindow(object):
|
||||
def setupUi(self, MainWindow):
|
||||
if not MainWindow.objectName():
|
||||
MainWindow.setObjectName(u"MainWindow")
|
||||
MainWindow.resize(772, 451)
|
||||
MainWindow.resize(1082, 445)
|
||||
self.centralwidget = QWidget(MainWindow)
|
||||
self.centralwidget.setObjectName(u"centralwidget")
|
||||
self.label_2 = QLabel(self.centralwidget)
|
||||
@ -25,7 +25,7 @@ class Ui_MainWindow(object):
|
||||
self.label_2.setGeometry(QRect(389, 60, 81, 16))
|
||||
self.listCones2 = QListWidget(self.centralwidget)
|
||||
self.listCones2.setObjectName(u"listCones2")
|
||||
self.listCones2.setGeometry(QRect(200, 110, 180, 220))
|
||||
self.listCones2.setGeometry(QRect(180, 110, 180, 220))
|
||||
self.label = QLabel(self.centralwidget)
|
||||
self.label.setObjectName(u"label")
|
||||
self.label.setGeometry(QRect(389, 40, 81, 16))
|
||||
@ -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(709, 90, 51, 20))
|
||||
self.txtDist4.setGeometry(QRect(660, 90, 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(329, 90, 51, 20))
|
||||
self.txtDist2.setGeometry(QRect(300, 90, 51, 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(139, 90, 51, 20))
|
||||
self.txtDist1.setGeometry(QRect(120, 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(200, 90, 141, 16))
|
||||
self.lblList2.setGeometry(QRect(180, 90, 141, 16))
|
||||
self.lblList1 = QLabel(self.centralwidget)
|
||||
self.lblList1.setObjectName(u"lblList1")
|
||||
self.lblList1.setGeometry(QRect(10, 90, 141, 16))
|
||||
self.lblList1.setGeometry(QRect(0, 90, 141, 16))
|
||||
self.txtLatitude = QLabel(self.centralwidget)
|
||||
self.txtLatitude.setObjectName(u"txtLatitude")
|
||||
self.txtLatitude.setGeometry(QRect(470, 40, 91, 20))
|
||||
@ -73,7 +73,7 @@ class Ui_MainWindow(object):
|
||||
self.label_4.setGeometry(QRect(579, 60, 61, 16))
|
||||
self.listCones4 = QListWidget(self.centralwidget)
|
||||
self.listCones4.setObjectName(u"listCones4")
|
||||
self.listCones4.setGeometry(QRect(580, 110, 180, 220))
|
||||
self.listCones4.setGeometry(QRect(540, 110, 180, 220))
|
||||
self.label_5 = QLabel(self.centralwidget)
|
||||
self.label_5.setObjectName(u"label_5")
|
||||
self.label_5.setGeometry(QRect(20, 10, 281, 16))
|
||||
@ -82,19 +82,19 @@ class Ui_MainWindow(object):
|
||||
self.label_5.setFont(font)
|
||||
self.exitButton = QPushButton(self.centralwidget)
|
||||
self.exitButton.setObjectName(u"exitButton")
|
||||
self.exitButton.setGeometry(QRect(680, 380, 84, 32))
|
||||
self.exitButton.setGeometry(QRect(990, 10, 84, 32))
|
||||
self.lblList4 = QLabel(self.centralwidget)
|
||||
self.lblList4.setObjectName(u"lblList4")
|
||||
self.lblList4.setGeometry(QRect(580, 90, 141, 16))
|
||||
self.lblList4.setGeometry(QRect(540, 90, 141, 16))
|
||||
self.listCones3 = QListWidget(self.centralwidget)
|
||||
self.listCones3.setObjectName(u"listCones3")
|
||||
self.listCones3.setGeometry(QRect(390, 110, 180, 220))
|
||||
self.listCones3.setGeometry(QRect(360, 110, 180, 220))
|
||||
self.listCones1 = QListWidget(self.centralwidget)
|
||||
self.listCones1.setObjectName(u"listCones1")
|
||||
self.listCones1.setGeometry(QRect(10, 110, 180, 220))
|
||||
self.listCones1.setGeometry(QRect(0, 110, 180, 220))
|
||||
self.txtDist3 = QLabel(self.centralwidget)
|
||||
self.txtDist3.setObjectName(u"txtDist3")
|
||||
self.txtDist3.setGeometry(QRect(519, 90, 51, 20))
|
||||
self.txtDist3.setGeometry(QRect(480, 90, 51, 20))
|
||||
self.txtDist3.setFrameShape(QFrame.Panel)
|
||||
self.txtDist3.setFrameShadow(QFrame.Sunken)
|
||||
self.txtHeading = QLabel(self.centralwidget)
|
||||
@ -104,7 +104,7 @@ class Ui_MainWindow(object):
|
||||
self.txtHeading.setFrameShadow(QFrame.Sunken)
|
||||
self.lblList3 = QLabel(self.centralwidget)
|
||||
self.lblList3.setObjectName(u"lblList3")
|
||||
self.lblList3.setGeometry(QRect(390, 90, 141, 16))
|
||||
self.lblList3.setGeometry(QRect(360, 90, 141, 16))
|
||||
self.openFiles = QPushButton(self.centralwidget)
|
||||
self.openFiles.setObjectName(u"openFiles")
|
||||
self.openFiles.setGeometry(QRect(40, 40, 111, 32))
|
||||
@ -121,77 +121,129 @@ class Ui_MainWindow(object):
|
||||
self.logEnabled.setGeometry(QRect(170, 50, 131, 20))
|
||||
self.addPoint1 = QPushButton(self.centralwidget)
|
||||
self.addPoint1.setObjectName(u"addPoint1")
|
||||
self.addPoint1.setGeometry(QRect(60, 330, 41, 32))
|
||||
self.addPoint1.setGeometry(QRect(40, 330, 41, 32))
|
||||
self.delPoint1 = QPushButton(self.centralwidget)
|
||||
self.delPoint1.setObjectName(u"delPoint1")
|
||||
self.delPoint1.setGeometry(QRect(100, 340, 41, 32))
|
||||
self.delPoint1.setGeometry(QRect(80, 340, 41, 32))
|
||||
self.addPoint2 = QPushButton(self.centralwidget)
|
||||
self.addPoint2.setObjectName(u"addPoint2")
|
||||
self.addPoint2.setGeometry(QRect(250, 330, 41, 32))
|
||||
self.addPoint2.setGeometry(QRect(220, 330, 41, 32))
|
||||
self.delPoint2 = QPushButton(self.centralwidget)
|
||||
self.delPoint2.setObjectName(u"delPoint2")
|
||||
self.delPoint2.setGeometry(QRect(290, 340, 41, 32))
|
||||
self.delPoint2.setGeometry(QRect(260, 340, 41, 32))
|
||||
self.addPoint3 = QPushButton(self.centralwidget)
|
||||
self.addPoint3.setObjectName(u"addPoint3")
|
||||
self.addPoint3.setGeometry(QRect(440, 330, 41, 32))
|
||||
self.addPoint3.setGeometry(QRect(400, 330, 41, 32))
|
||||
self.delPoint3 = QPushButton(self.centralwidget)
|
||||
self.delPoint3.setObjectName(u"delPoint3")
|
||||
self.delPoint3.setGeometry(QRect(480, 340, 41, 32))
|
||||
self.delPoint3.setGeometry(QRect(440, 340, 41, 32))
|
||||
self.addPoint4 = QPushButton(self.centralwidget)
|
||||
self.addPoint4.setObjectName(u"addPoint4")
|
||||
self.addPoint4.setGeometry(QRect(630, 330, 41, 32))
|
||||
self.addPoint4.setGeometry(QRect(580, 330, 41, 32))
|
||||
self.delPoint4 = QPushButton(self.centralwidget)
|
||||
self.delPoint4.setObjectName(u"delPoint4")
|
||||
self.delPoint4.setGeometry(QRect(670, 340, 41, 32))
|
||||
self.delPoint4.setGeometry(QRect(620, 340, 41, 32))
|
||||
self.saveList1 = QPushButton(self.centralwidget)
|
||||
self.saveList1.setObjectName(u"saveList1")
|
||||
self.saveList1.setGeometry(QRect(150, 340, 41, 32))
|
||||
self.saveList1.setGeometry(QRect(130, 340, 41, 32))
|
||||
self.saveList2 = QPushButton(self.centralwidget)
|
||||
self.saveList2.setObjectName(u"saveList2")
|
||||
self.saveList2.setGeometry(QRect(340, 340, 41, 32))
|
||||
self.saveList2.setGeometry(QRect(310, 340, 41, 32))
|
||||
self.saveList3 = QPushButton(self.centralwidget)
|
||||
self.saveList3.setObjectName(u"saveList3")
|
||||
self.saveList3.setGeometry(QRect(530, 340, 41, 32))
|
||||
self.saveList3.setGeometry(QRect(490, 340, 41, 32))
|
||||
self.saveList4 = QPushButton(self.centralwidget)
|
||||
self.saveList4.setObjectName(u"saveList4")
|
||||
self.saveList4.setGeometry(QRect(720, 340, 41, 32))
|
||||
self.saveList4.setGeometry(QRect(670, 340, 41, 32))
|
||||
self.resetList1 = QPushButton(self.centralwidget)
|
||||
self.resetList1.setObjectName(u"resetList1")
|
||||
self.resetList1.setGeometry(QRect(10, 340, 41, 32))
|
||||
self.resetList1.setGeometry(QRect(0, 340, 41, 32))
|
||||
self.resetList2 = QPushButton(self.centralwidget)
|
||||
self.resetList2.setObjectName(u"resetList2")
|
||||
self.resetList2.setGeometry(QRect(200, 340, 41, 32))
|
||||
self.resetList2.setGeometry(QRect(180, 340, 41, 32))
|
||||
self.resetList3 = QPushButton(self.centralwidget)
|
||||
self.resetList3.setObjectName(u"resetList3")
|
||||
self.resetList3.setGeometry(QRect(390, 340, 41, 32))
|
||||
self.resetList3.setGeometry(QRect(360, 340, 41, 32))
|
||||
self.resetList4 = QPushButton(self.centralwidget)
|
||||
self.resetList4.setObjectName(u"resetList4")
|
||||
self.resetList4.setGeometry(QRect(580, 340, 41, 32))
|
||||
self.resetList4.setGeometry(QRect(540, 340, 41, 32))
|
||||
self.saveConfig = QPushButton(self.centralwidget)
|
||||
self.saveConfig.setObjectName(u"saveConfig")
|
||||
self.saveConfig.setGeometry(QRect(340, 380, 84, 32))
|
||||
self.saveConfig.setGeometry(QRect(880, 10, 84, 32))
|
||||
self.insPoint1 = QPushButton(self.centralwidget)
|
||||
self.insPoint1.setObjectName(u"insPoint1")
|
||||
self.insPoint1.setGeometry(QRect(60, 360, 41, 32))
|
||||
self.insPoint1.setGeometry(QRect(40, 360, 41, 32))
|
||||
self.insPoint2 = QPushButton(self.centralwidget)
|
||||
self.insPoint2.setObjectName(u"insPoint2")
|
||||
self.insPoint2.setGeometry(QRect(250, 360, 41, 32))
|
||||
self.insPoint2.setGeometry(QRect(220, 360, 41, 32))
|
||||
self.insPoint3 = QPushButton(self.centralwidget)
|
||||
self.insPoint3.setObjectName(u"insPoint3")
|
||||
self.insPoint3.setGeometry(QRect(440, 360, 41, 32))
|
||||
self.insPoint3.setGeometry(QRect(400, 360, 41, 32))
|
||||
self.insPoint4 = QPushButton(self.centralwidget)
|
||||
self.insPoint4.setObjectName(u"insPoint4")
|
||||
self.insPoint4.setGeometry(QRect(630, 360, 41, 32))
|
||||
self.insPoint4.setGeometry(QRect(580, 360, 41, 32))
|
||||
self.txtRange = QLineEdit(self.centralwidget)
|
||||
self.txtRange.setObjectName(u"txtRange")
|
||||
self.txtRange.setGeometry(QRect(310, 10, 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.listCones5 = QListWidget(self.centralwidget)
|
||||
self.listCones5.setObjectName(u"listCones5")
|
||||
self.listCones5.setGeometry(QRect(720, 110, 180, 220))
|
||||
self.listCones6 = QListWidget(self.centralwidget)
|
||||
self.listCones6.setObjectName(u"listCones6")
|
||||
self.listCones6.setGeometry(QRect(900, 110, 180, 220))
|
||||
self.delPoint5 = QPushButton(self.centralwidget)
|
||||
self.delPoint5.setObjectName(u"delPoint5")
|
||||
self.delPoint5.setGeometry(QRect(800, 340, 41, 32))
|
||||
self.saveList5 = QPushButton(self.centralwidget)
|
||||
self.saveList5.setObjectName(u"saveList5")
|
||||
self.saveList5.setGeometry(QRect(850, 340, 41, 32))
|
||||
self.addPoint5 = QPushButton(self.centralwidget)
|
||||
self.addPoint5.setObjectName(u"addPoint5")
|
||||
self.addPoint5.setGeometry(QRect(760, 330, 41, 32))
|
||||
self.insPoint5 = QPushButton(self.centralwidget)
|
||||
self.insPoint5.setObjectName(u"insPoint5")
|
||||
self.insPoint5.setGeometry(QRect(760, 360, 41, 32))
|
||||
self.resetList5 = QPushButton(self.centralwidget)
|
||||
self.resetList5.setObjectName(u"resetList5")
|
||||
self.resetList5.setGeometry(QRect(720, 340, 41, 32))
|
||||
self.delPoint6 = QPushButton(self.centralwidget)
|
||||
self.delPoint6.setObjectName(u"delPoint6")
|
||||
self.delPoint6.setGeometry(QRect(980, 340, 41, 32))
|
||||
self.saveList6 = QPushButton(self.centralwidget)
|
||||
self.saveList6.setObjectName(u"saveList6")
|
||||
self.saveList6.setGeometry(QRect(1030, 340, 41, 32))
|
||||
self.addPoint6 = QPushButton(self.centralwidget)
|
||||
self.addPoint6.setObjectName(u"addPoint6")
|
||||
self.addPoint6.setGeometry(QRect(940, 330, 41, 32))
|
||||
self.insPoint6 = QPushButton(self.centralwidget)
|
||||
self.insPoint6.setObjectName(u"insPoint6")
|
||||
self.insPoint6.setGeometry(QRect(940, 360, 41, 32))
|
||||
self.resetList6 = QPushButton(self.centralwidget)
|
||||
self.resetList6.setObjectName(u"resetList6")
|
||||
self.resetList6.setGeometry(QRect(900, 340, 41, 32))
|
||||
self.txtDist5 = QLabel(self.centralwidget)
|
||||
self.txtDist5.setObjectName(u"txtDist5")
|
||||
self.txtDist5.setGeometry(QRect(840, 90, 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.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.lblList6 = QLabel(self.centralwidget)
|
||||
self.lblList6.setObjectName(u"lblList6")
|
||||
self.lblList6.setGeometry(QRect(900, 90, 141, 16))
|
||||
MainWindow.setCentralWidget(self.centralwidget)
|
||||
self.menubar = QMenuBar(MainWindow)
|
||||
self.menubar.setObjectName(u"menubar")
|
||||
self.menubar.setGeometry(QRect(0, 0, 772, 28))
|
||||
self.menubar.setGeometry(QRect(0, 0, 1082, 28))
|
||||
MainWindow.setMenuBar(self.menubar)
|
||||
self.statusbar = QStatusBar(MainWindow)
|
||||
self.statusbar.setObjectName(u"statusbar")
|
||||
@ -249,5 +301,19 @@ class Ui_MainWindow(object):
|
||||
self.insPoint4.setText(QCoreApplication.translate("MainWindow", u"Ins", None))
|
||||
self.txtRange.setText(QCoreApplication.translate("MainWindow", u"3.0", None))
|
||||
self.label_6.setText(QCoreApplication.translate("MainWindow", u"Range:", None))
|
||||
self.delPoint5.setText(QCoreApplication.translate("MainWindow", u"Del", None))
|
||||
self.saveList5.setText(QCoreApplication.translate("MainWindow", u"Save", None))
|
||||
self.addPoint5.setText(QCoreApplication.translate("MainWindow", u"Add", None))
|
||||
self.insPoint5.setText(QCoreApplication.translate("MainWindow", u"Ins", None))
|
||||
self.resetList5.setText(QCoreApplication.translate("MainWindow", u"Reset", None))
|
||||
self.delPoint6.setText(QCoreApplication.translate("MainWindow", u"Del", None))
|
||||
self.saveList6.setText(QCoreApplication.translate("MainWindow", u"Save", None))
|
||||
self.addPoint6.setText(QCoreApplication.translate("MainWindow", u"Add", None))
|
||||
self.insPoint6.setText(QCoreApplication.translate("MainWindow", u"Ins", None))
|
||||
self.resetList6.setText(QCoreApplication.translate("MainWindow", u"Reset", None))
|
||||
self.txtDist5.setText(QCoreApplication.translate("MainWindow", u"0", None))
|
||||
self.txtDist6.setText(QCoreApplication.translate("MainWindow", u"0", None))
|
||||
self.lblList5.setText("")
|
||||
self.lblList6.setText("")
|
||||
# retranslateUi
|
||||
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>772</width>
|
||||
<height>451</height>
|
||||
<width>1082</width>
|
||||
<height>445</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@ -30,7 +30,7 @@
|
||||
<widget class="QListWidget" name="listCones2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>200</x>
|
||||
<x>180</x>
|
||||
<y>110</y>
|
||||
<width>180</width>
|
||||
<height>220</height>
|
||||
@ -85,7 +85,7 @@
|
||||
<widget class="QLabel" name="txtDist4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>709</x>
|
||||
<x>660</x>
|
||||
<y>90</y>
|
||||
<width>51</width>
|
||||
<height>20</height>
|
||||
@ -104,7 +104,7 @@
|
||||
<widget class="QLabel" name="txtDist2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>329</x>
|
||||
<x>300</x>
|
||||
<y>90</y>
|
||||
<width>51</width>
|
||||
<height>20</height>
|
||||
@ -142,7 +142,7 @@
|
||||
<widget class="QLabel" name="txtDist1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>139</x>
|
||||
<x>120</x>
|
||||
<y>90</y>
|
||||
<width>51</width>
|
||||
<height>20</height>
|
||||
@ -161,7 +161,7 @@
|
||||
<widget class="QLabel" name="lblList2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>200</x>
|
||||
<x>180</x>
|
||||
<y>90</y>
|
||||
<width>141</width>
|
||||
<height>16</height>
|
||||
@ -174,7 +174,7 @@
|
||||
<widget class="QLabel" name="lblList1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<x>0</x>
|
||||
<y>90</y>
|
||||
<width>141</width>
|
||||
<height>16</height>
|
||||
@ -219,7 +219,7 @@
|
||||
<widget class="QListWidget" name="listCones4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>580</x>
|
||||
<x>540</x>
|
||||
<y>110</y>
|
||||
<width>180</width>
|
||||
<height>220</height>
|
||||
@ -247,8 +247,8 @@
|
||||
<widget class="QPushButton" name="exitButton">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>680</x>
|
||||
<y>380</y>
|
||||
<x>990</x>
|
||||
<y>10</y>
|
||||
<width>84</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
@ -260,7 +260,7 @@
|
||||
<widget class="QLabel" name="lblList4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>580</x>
|
||||
<x>540</x>
|
||||
<y>90</y>
|
||||
<width>141</width>
|
||||
<height>16</height>
|
||||
@ -273,7 +273,7 @@
|
||||
<widget class="QListWidget" name="listCones3">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>390</x>
|
||||
<x>360</x>
|
||||
<y>110</y>
|
||||
<width>180</width>
|
||||
<height>220</height>
|
||||
@ -283,7 +283,7 @@
|
||||
<widget class="QListWidget" name="listCones1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<x>0</x>
|
||||
<y>110</y>
|
||||
<width>180</width>
|
||||
<height>220</height>
|
||||
@ -293,7 +293,7 @@
|
||||
<widget class="QLabel" name="txtDist3">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>519</x>
|
||||
<x>480</x>
|
||||
<y>90</y>
|
||||
<width>51</width>
|
||||
<height>20</height>
|
||||
@ -331,7 +331,7 @@
|
||||
<widget class="QLabel" name="lblList3">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>390</x>
|
||||
<x>360</x>
|
||||
<y>90</y>
|
||||
<width>141</width>
|
||||
<height>16</height>
|
||||
@ -402,7 +402,7 @@
|
||||
<widget class="QPushButton" name="addPoint1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>60</x>
|
||||
<x>40</x>
|
||||
<y>330</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -415,7 +415,7 @@
|
||||
<widget class="QPushButton" name="delPoint1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>100</x>
|
||||
<x>80</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -428,7 +428,7 @@
|
||||
<widget class="QPushButton" name="addPoint2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<x>220</x>
|
||||
<y>330</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -441,7 +441,7 @@
|
||||
<widget class="QPushButton" name="delPoint2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>290</x>
|
||||
<x>260</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -454,7 +454,7 @@
|
||||
<widget class="QPushButton" name="addPoint3">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>440</x>
|
||||
<x>400</x>
|
||||
<y>330</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -467,7 +467,7 @@
|
||||
<widget class="QPushButton" name="delPoint3">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>480</x>
|
||||
<x>440</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -480,7 +480,7 @@
|
||||
<widget class="QPushButton" name="addPoint4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>630</x>
|
||||
<x>580</x>
|
||||
<y>330</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -493,7 +493,7 @@
|
||||
<widget class="QPushButton" name="delPoint4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>670</x>
|
||||
<x>620</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -506,7 +506,7 @@
|
||||
<widget class="QPushButton" name="saveList1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>150</x>
|
||||
<x>130</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -519,7 +519,7 @@
|
||||
<widget class="QPushButton" name="saveList2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>340</x>
|
||||
<x>310</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -532,7 +532,7 @@
|
||||
<widget class="QPushButton" name="saveList3">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>530</x>
|
||||
<x>490</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -545,7 +545,7 @@
|
||||
<widget class="QPushButton" name="saveList4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>720</x>
|
||||
<x>670</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -558,7 +558,7 @@
|
||||
<widget class="QPushButton" name="resetList1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<x>0</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -571,7 +571,7 @@
|
||||
<widget class="QPushButton" name="resetList2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>200</x>
|
||||
<x>180</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -584,7 +584,7 @@
|
||||
<widget class="QPushButton" name="resetList3">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>390</x>
|
||||
<x>360</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -597,7 +597,7 @@
|
||||
<widget class="QPushButton" name="resetList4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>580</x>
|
||||
<x>540</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -610,8 +610,8 @@
|
||||
<widget class="QPushButton" name="saveConfig">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>340</x>
|
||||
<y>380</y>
|
||||
<x>880</x>
|
||||
<y>10</y>
|
||||
<width>84</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
@ -623,7 +623,7 @@
|
||||
<widget class="QPushButton" name="insPoint1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>60</x>
|
||||
<x>40</x>
|
||||
<y>360</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -636,7 +636,7 @@
|
||||
<widget class="QPushButton" name="insPoint2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>250</x>
|
||||
<x>220</x>
|
||||
<y>360</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -649,7 +649,7 @@
|
||||
<widget class="QPushButton" name="insPoint3">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>440</x>
|
||||
<x>400</x>
|
||||
<y>360</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -662,7 +662,7 @@
|
||||
<widget class="QPushButton" name="insPoint4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>630</x>
|
||||
<x>580</x>
|
||||
<y>360</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
@ -698,13 +698,227 @@
|
||||
<string>Range:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QListWidget" name="listCones5">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>720</x>
|
||||
<y>110</y>
|
||||
<width>180</width>
|
||||
<height>220</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QListWidget" name="listCones6">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>900</x>
|
||||
<y>110</y>
|
||||
<width>180</width>
|
||||
<height>220</height>
|
||||
</rect>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="delPoint5">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>800</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Del</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="saveList5">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>850</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Save</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="addPoint5">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>760</x>
|
||||
<y>330</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Add</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="insPoint5">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>760</x>
|
||||
<y>360</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Ins</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="resetList5">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>720</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Reset</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="delPoint6">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>980</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Del</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="saveList6">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>1030</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Save</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="addPoint6">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>940</x>
|
||||
<y>330</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Add</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="insPoint6">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>940</x>
|
||||
<y>360</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Ins</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="resetList6">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>900</x>
|
||||
<y>340</y>
|
||||
<width>41</width>
|
||||
<height>32</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Reset</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="txtDist5">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>840</x>
|
||||
<y>90</y>
|
||||
<width>51</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Panel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>0</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="txtDist6">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>1020</x>
|
||||
<y>90</y>
|
||||
<width>51</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Panel</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>0</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="lblList5">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>720</x>
|
||||
<y>90</y>
|
||||
<width>141</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="lblList6">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>900</x>
|
||||
<y>90</y>
|
||||
<width>141</width>
|
||||
<height>16</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QMenuBar" name="menubar">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>772</width>
|
||||
<width>1082</width>
|
||||
<height>28</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
||||
@ -216,40 +216,57 @@ class ConesWindow(MainWindow):
|
||||
self.vlist2 = VirtualCones()
|
||||
self.vlist3 = VirtualCones()
|
||||
self.vlist4 = VirtualCones()
|
||||
self.vlists = [self.vlist1, self.vlist2, self.vlist3, self.vlist4]
|
||||
self.vlist5 = VirtualCones()
|
||||
self.vlist6 = VirtualCones()
|
||||
self.vlists = [self.vlist1, self.vlist2, self.vlist3, self.vlist4, self.vlist5, self.vlist6]
|
||||
|
||||
# button connections
|
||||
self.openFiles.clicked.connect(self.read_dialog)
|
||||
self.exitButton.clicked.connect(self.exit_button)
|
||||
|
||||
self.resetList1.clicked.connect(self.reset_list1)
|
||||
self.resetList2.clicked.connect(self.reset_list2)
|
||||
self.resetList3.clicked.connect(self.reset_list3)
|
||||
self.resetList4.clicked.connect(self.reset_list4)
|
||||
self.addPoint1.clicked.connect(self.add_point1)
|
||||
self.delPoint1.clicked.connect(self.del_point1)
|
||||
self.insPoint1.clicked.connect(self.ins_point1)
|
||||
self.saveList1.clicked.connect(self.save_list1)
|
||||
|
||||
self.resetList2.clicked.connect(self.reset_list2)
|
||||
self.addPoint2.clicked.connect(self.add_point2)
|
||||
self.delPoint2.clicked.connect(self.del_point2)
|
||||
self.insPoint2.clicked.connect(self.ins_point2)
|
||||
self.saveList2.clicked.connect(self.save_list2)
|
||||
|
||||
self.resetList3.clicked.connect(self.reset_list3)
|
||||
self.addPoint3.clicked.connect(self.add_point3)
|
||||
self.delPoint3.clicked.connect(self.del_point3)
|
||||
self.insPoint3.clicked.connect(self.ins_point3)
|
||||
self.saveList3.clicked.connect(self.save_list3)
|
||||
|
||||
self.resetList4.clicked.connect(self.reset_list4)
|
||||
self.addPoint4.clicked.connect(self.add_point4)
|
||||
self.delPoint4.clicked.connect(self.del_point4)
|
||||
self.insPoint4.clicked.connect(self.ins_point4)
|
||||
self.saveList1.clicked.connect(self.save_list1)
|
||||
self.saveList2.clicked.connect(self.save_list2)
|
||||
self.saveList3.clicked.connect(self.save_list3)
|
||||
self.saveList4.clicked.connect(self.save_list4)
|
||||
self.saveConfig.clicked.connect(self.save_config)
|
||||
|
||||
self.resetList5.clicked.connect(self.reset_list5)
|
||||
self.addPoint5.clicked.connect(self.add_point5)
|
||||
self.delPoint5.clicked.connect(self.del_point5)
|
||||
self.insPoint5.clicked.connect(self.ins_point5)
|
||||
self.saveList5.clicked.connect(self.save_list5)
|
||||
|
||||
self.resetList6.clicked.connect(self.reset_list6)
|
||||
self.addPoint6.clicked.connect(self.add_point6)
|
||||
self.delPoint6.clicked.connect(self.del_point6)
|
||||
self.insPoint6.clicked.connect(self.ins_point6)
|
||||
self.saveList6.clicked.connect(self.save_list6)
|
||||
|
||||
# makes life easier, avoid redundant code
|
||||
self.labels = [self.lblList1, self.lblList2, self.lblList3, self.lblList4]
|
||||
self.lists = [self.listCones1, self.listCones2, self.listCones3, self.listCones4]
|
||||
self.dists = [self.txtDist1, self.txtDist2, self.txtDist3, self.txtDist4]
|
||||
self.saves = [self.saveList1, self.saveList2, self.saveList3, self.saveList4]
|
||||
self.labels = [self.lblList1, self.lblList2, self.lblList3, self.lblList4, self.lblList5, self.lblList6]
|
||||
self.lists = [self.listCones1, self.listCones2, self.listCones3, self.listCones4, self.listCones5, self.listCones6]
|
||||
self.dists = [self.txtDist1, self.txtDist2, self.txtDist3, self.txtDist4, self.txtDist5, self.txtDist6]
|
||||
self.saves = [self.saveList1, self.saveList2, self.saveList3, self.saveList4, self.saveList5, self.saveList6]
|
||||
|
||||
for i in range(0, 4):
|
||||
for i in range(0, 6):
|
||||
self.labels[i].setText("")
|
||||
self.saves[i].hide()
|
||||
|
||||
@ -277,7 +294,7 @@ class ConesWindow(MainWindow):
|
||||
filedialog.setFileMode(QFileDialog.ExistingFiles)
|
||||
selected = filedialog.exec()
|
||||
if selected:
|
||||
self.load_cones( filedialog.selectedFiles()[0:4] )
|
||||
self.load_cones( filedialog.selectedFiles()[0:6] )
|
||||
|
||||
def write_dialog(self):
|
||||
filedialog = QFileDialog(self)
|
||||
@ -293,7 +310,7 @@ class ConesWindow(MainWindow):
|
||||
# slurp in files for each list
|
||||
def load_cones(self, args):
|
||||
count = 0
|
||||
for i in range(0, 4):
|
||||
for i in range(0, 6):
|
||||
self.labels[i].setText("")
|
||||
self.lists[i].clear()
|
||||
self.saves[i].hide()
|
||||
@ -359,7 +376,7 @@ class ConesWindow(MainWindow):
|
||||
else:
|
||||
rng = float(rng)
|
||||
|
||||
for i in range(0, 4):
|
||||
for i in range(0, 6):
|
||||
if self.lists[i].count() == 0:
|
||||
continue
|
||||
(cone, dist, trig) = self.vlists[i].check_list(lat, lon, heading, speed, rng)
|
||||
@ -393,6 +410,14 @@ class ConesWindow(MainWindow):
|
||||
def reset_list4(self):
|
||||
self.listCones4.current_cone = 0
|
||||
self.lists[3].setCurrentRow(0)
|
||||
|
||||
def reset_list5(self):
|
||||
self.listCones5.current_cone = 0
|
||||
self.lists[4].setCurrentRow(0)
|
||||
|
||||
def reset_list6(self):
|
||||
self.listCones6.current_cone = 0
|
||||
self.lists[5].setCurrentRow(0)
|
||||
|
||||
def update_list(self, list):
|
||||
self.vlists[list].clr_cones()
|
||||
@ -473,6 +498,30 @@ class ConesWindow(MainWindow):
|
||||
|
||||
def save_list4(self):
|
||||
self.save_list(3)
|
||||
|
||||
def add_point5(self):
|
||||
self.add_point(4, 1)
|
||||
|
||||
def del_point5(self):
|
||||
self.del_point(4)
|
||||
|
||||
def ins_point5(self):
|
||||
self.add_point(4, 0)
|
||||
|
||||
def save_list5(self):
|
||||
self.save_list(4)
|
||||
|
||||
def add_point6(self):
|
||||
self.add_point(5, 1)
|
||||
|
||||
def del_point6(self):
|
||||
self.del_point(5)
|
||||
|
||||
def ins_point6(self):
|
||||
self.add_point(5, 0)
|
||||
|
||||
def save_list6(self):
|
||||
self.save_list(5)
|
||||
|
||||
def save_config(self):
|
||||
with open('config.yaml', 'w') as f:
|
||||
@ -480,7 +529,7 @@ class ConesWindow(MainWindow):
|
||||
if gpsd_host != "localhost":
|
||||
config['gpsd_host'] = gpsd_host
|
||||
config['lists'] = []
|
||||
for i in range(0, 4):
|
||||
for i in range(0, 6):
|
||||
if self.labels[i].text() != "":
|
||||
self.save_list(i)
|
||||
config['lists'].append( self.labels[i].text() )
|
||||
|
||||
Reference in New Issue
Block a user