Added insert buttons and range field
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, 445)
|
||||
MainWindow.resize(772, 451)
|
||||
self.centralwidget = QWidget(MainWindow)
|
||||
self.centralwidget.setObjectName(u"centralwidget")
|
||||
self.label_2 = QLabel(self.centralwidget)
|
||||
@ -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(690, 90, 70, 18))
|
||||
self.txtDist4.setGeometry(QRect(709, 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(310, 90, 70, 18))
|
||||
self.txtDist2.setGeometry(QRect(329, 90, 51, 20))
|
||||
self.txtDist2.setFrameShape(QFrame.Panel)
|
||||
self.txtDist2.setFrameShadow(QFrame.Sunken)
|
||||
self.txtSpeed = QLabel(self.centralwidget)
|
||||
@ -54,7 +54,7 @@ class Ui_MainWindow(object):
|
||||
self.txtSpeed.setFrameShadow(QFrame.Sunken)
|
||||
self.txtDist1 = QLabel(self.centralwidget)
|
||||
self.txtDist1.setObjectName(u"txtDist1")
|
||||
self.txtDist1.setGeometry(QRect(120, 90, 70, 18))
|
||||
self.txtDist1.setGeometry(QRect(139, 90, 51, 20))
|
||||
self.txtDist1.setFrameShape(QFrame.Panel)
|
||||
self.txtDist1.setFrameShadow(QFrame.Sunken)
|
||||
self.lblList2 = QLabel(self.centralwidget)
|
||||
@ -94,7 +94,7 @@ class Ui_MainWindow(object):
|
||||
self.listCones1.setGeometry(QRect(10, 110, 180, 220))
|
||||
self.txtDist3 = QLabel(self.centralwidget)
|
||||
self.txtDist3.setObjectName(u"txtDist3")
|
||||
self.txtDist3.setGeometry(QRect(500, 90, 70, 18))
|
||||
self.txtDist3.setGeometry(QRect(519, 90, 51, 20))
|
||||
self.txtDist3.setFrameShape(QFrame.Panel)
|
||||
self.txtDist3.setFrameShadow(QFrame.Sunken)
|
||||
self.txtHeading = QLabel(self.centralwidget)
|
||||
@ -110,7 +110,7 @@ class Ui_MainWindow(object):
|
||||
self.openFiles.setGeometry(QRect(40, 40, 111, 32))
|
||||
self.txtTime = QLabel(self.centralwidget)
|
||||
self.txtTime.setObjectName(u"txtTime")
|
||||
self.txtTime.setGeometry(QRect(460, 10, 241, 20))
|
||||
self.txtTime.setGeometry(QRect(470, 10, 261, 20))
|
||||
self.txtTime.setFrameShape(QFrame.Panel)
|
||||
self.txtTime.setFrameShadow(QFrame.Sunken)
|
||||
self.label_7 = QLabel(self.centralwidget)
|
||||
@ -118,28 +118,28 @@ class Ui_MainWindow(object):
|
||||
self.label_7.setGeometry(QRect(390, 10, 49, 16))
|
||||
self.logEnabled = QCheckBox(self.centralwidget)
|
||||
self.logEnabled.setObjectName(u"logEnabled")
|
||||
self.logEnabled.setGeometry(QRect(170, 50, 181, 20))
|
||||
self.logEnabled.setGeometry(QRect(170, 50, 131, 20))
|
||||
self.addPoint1 = QPushButton(self.centralwidget)
|
||||
self.addPoint1.setObjectName(u"addPoint1")
|
||||
self.addPoint1.setGeometry(QRect(60, 340, 41, 32))
|
||||
self.addPoint1.setGeometry(QRect(60, 330, 41, 32))
|
||||
self.delPoint1 = QPushButton(self.centralwidget)
|
||||
self.delPoint1.setObjectName(u"delPoint1")
|
||||
self.delPoint1.setGeometry(QRect(100, 340, 41, 32))
|
||||
self.addPoint2 = QPushButton(self.centralwidget)
|
||||
self.addPoint2.setObjectName(u"addPoint2")
|
||||
self.addPoint2.setGeometry(QRect(250, 340, 41, 32))
|
||||
self.addPoint2.setGeometry(QRect(250, 330, 41, 32))
|
||||
self.delPoint2 = QPushButton(self.centralwidget)
|
||||
self.delPoint2.setObjectName(u"delPoint2")
|
||||
self.delPoint2.setGeometry(QRect(290, 340, 41, 32))
|
||||
self.addPoint3 = QPushButton(self.centralwidget)
|
||||
self.addPoint3.setObjectName(u"addPoint3")
|
||||
self.addPoint3.setGeometry(QRect(440, 340, 41, 32))
|
||||
self.addPoint3.setGeometry(QRect(440, 330, 41, 32))
|
||||
self.delPoint3 = QPushButton(self.centralwidget)
|
||||
self.delPoint3.setObjectName(u"delPoint3")
|
||||
self.delPoint3.setGeometry(QRect(480, 340, 41, 32))
|
||||
self.addPoint4 = QPushButton(self.centralwidget)
|
||||
self.addPoint4.setObjectName(u"addPoint4")
|
||||
self.addPoint4.setGeometry(QRect(630, 340, 41, 32))
|
||||
self.addPoint4.setGeometry(QRect(630, 330, 41, 32))
|
||||
self.delPoint4 = QPushButton(self.centralwidget)
|
||||
self.delPoint4.setObjectName(u"delPoint4")
|
||||
self.delPoint4.setGeometry(QRect(670, 340, 41, 32))
|
||||
@ -170,6 +170,24 @@ class Ui_MainWindow(object):
|
||||
self.saveConfig = QPushButton(self.centralwidget)
|
||||
self.saveConfig.setObjectName(u"saveConfig")
|
||||
self.saveConfig.setGeometry(QRect(340, 380, 84, 32))
|
||||
self.insPoint1 = QPushButton(self.centralwidget)
|
||||
self.insPoint1.setObjectName(u"insPoint1")
|
||||
self.insPoint1.setGeometry(QRect(60, 360, 41, 32))
|
||||
self.insPoint2 = QPushButton(self.centralwidget)
|
||||
self.insPoint2.setObjectName(u"insPoint2")
|
||||
self.insPoint2.setGeometry(QRect(250, 360, 41, 32))
|
||||
self.insPoint3 = QPushButton(self.centralwidget)
|
||||
self.insPoint3.setObjectName(u"insPoint3")
|
||||
self.insPoint3.setGeometry(QRect(440, 360, 41, 32))
|
||||
self.insPoint4 = QPushButton(self.centralwidget)
|
||||
self.insPoint4.setObjectName(u"insPoint4")
|
||||
self.insPoint4.setGeometry(QRect(630, 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))
|
||||
MainWindow.setCentralWidget(self.centralwidget)
|
||||
self.menubar = QMenuBar(MainWindow)
|
||||
self.menubar.setObjectName(u"menubar")
|
||||
@ -185,7 +203,7 @@ class Ui_MainWindow(object):
|
||||
# setupUi
|
||||
|
||||
def retranslateUi(self, MainWindow):
|
||||
MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"TOSCo Virtual Cones V1.0", None))
|
||||
MainWindow.setWindowTitle(QCoreApplication.translate("MainWindow", u"NTCNA GPS Virtual Cones V1.0", None))
|
||||
self.label_2.setText(QCoreApplication.translate("MainWindow", u"Longitude:", None))
|
||||
self.label.setText(QCoreApplication.translate("MainWindow", u"Latitude:", None))
|
||||
self.label_3.setText(QCoreApplication.translate("MainWindow", u"Speed:", None))
|
||||
@ -198,7 +216,7 @@ class Ui_MainWindow(object):
|
||||
self.lblList1.setText(QCoreApplication.translate("MainWindow", u"TextLabel", None))
|
||||
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"TOSCo Virtual Cones", None))
|
||||
self.label_5.setText(QCoreApplication.translate("MainWindow", u"NTCNA GPS Virtual Cones", None))
|
||||
self.exitButton.setText(QCoreApplication.translate("MainWindow", u"Exit", None))
|
||||
self.lblList4.setText(QCoreApplication.translate("MainWindow", u"TextLabel", None))
|
||||
self.txtDist3.setText(QCoreApplication.translate("MainWindow", u"0", None))
|
||||
@ -225,5 +243,11 @@ class Ui_MainWindow(object):
|
||||
self.resetList3.setText(QCoreApplication.translate("MainWindow", u"Reset", None))
|
||||
self.resetList4.setText(QCoreApplication.translate("MainWindow", u"Reset", None))
|
||||
self.saveConfig.setText(QCoreApplication.translate("MainWindow", u"SaveConfig", None))
|
||||
self.insPoint1.setText(QCoreApplication.translate("MainWindow", u"Ins", None))
|
||||
self.insPoint2.setText(QCoreApplication.translate("MainWindow", u"Ins", None))
|
||||
self.insPoint3.setText(QCoreApplication.translate("MainWindow", u"Ins", None))
|
||||
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))
|
||||
# retranslateUi
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>772</width>
|
||||
<height>445</height>
|
||||
<height>451</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@ -85,10 +85,10 @@
|
||||
<widget class="QLabel" name="txtDist4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>690</x>
|
||||
<x>709</x>
|
||||
<y>90</y>
|
||||
<width>70</width>
|
||||
<height>18</height>
|
||||
<width>51</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
@ -104,10 +104,10 @@
|
||||
<widget class="QLabel" name="txtDist2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>310</x>
|
||||
<x>329</x>
|
||||
<y>90</y>
|
||||
<width>70</width>
|
||||
<height>18</height>
|
||||
<width>51</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
@ -142,10 +142,10 @@
|
||||
<widget class="QLabel" name="txtDist1">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>120</x>
|
||||
<x>139</x>
|
||||
<y>90</y>
|
||||
<width>70</width>
|
||||
<height>18</height>
|
||||
<width>51</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
@ -293,10 +293,10 @@
|
||||
<widget class="QLabel" name="txtDist3">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>500</x>
|
||||
<x>519</x>
|
||||
<y>90</y>
|
||||
<width>70</width>
|
||||
<height>18</height>
|
||||
<width>51</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
@ -357,9 +357,9 @@
|
||||
<widget class="QLabel" name="txtTime">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>460</x>
|
||||
<x>470</x>
|
||||
<y>10</y>
|
||||
<width>241</width>
|
||||
<width>261</width>
|
||||
<height>20</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
||||
@ -232,12 +232,16 @@ class ConesWindow(MainWindow):
|
||||
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.addPoint2.clicked.connect(self.add_point2)
|
||||
self.delPoint2.clicked.connect(self.del_point2)
|
||||
self.insPoint2.clicked.connect(self.ins_point2)
|
||||
self.addPoint3.clicked.connect(self.add_point3)
|
||||
self.delPoint3.clicked.connect(self.del_point3)
|
||||
self.insPoint3.clicked.connect(self.ins_point3)
|
||||
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)
|
||||
@ -359,7 +363,10 @@ class ConesWindow(MainWindow):
|
||||
(cone, dist, trig) = self.vlists[i].check_list(lat, lon, heading, speed)
|
||||
if trig:
|
||||
self.lists[i].setCurrentRow(cone)
|
||||
self.dists[i].setText("%6.2f" % (dist))
|
||||
if dist < 10000.0:
|
||||
self.dists[i].setText("%6.1f" % (dist))
|
||||
else
|
||||
self.dists[i].setText("OOR")
|
||||
|
||||
if self.logEnabled.isChecked():
|
||||
point = gpxpy.gpx.GPXTrackPoint(lat, lon, elevation=elev)
|
||||
@ -391,10 +398,10 @@ class ConesWindow(MainWindow):
|
||||
item = self.lists[list].item(i)
|
||||
txt = item.text()
|
||||
lat, lon = txt.split(", ")
|
||||
self.vlists[list].add_cone(lat, lon, 3.0)
|
||||
self.vlists[list].add_cone(lat, lon, float(self.txtRange.text()))
|
||||
|
||||
def add_point(self, list):
|
||||
self.lists[list].insertItem(self.lists[list].currentRow()+1, "%11.7f, %11.7f" % (self.latitude, self.longitude))
|
||||
def add_point(self, list, add):
|
||||
self.lists[list].insertItem(self.lists[list].currentRow()+add, "%11.7f, %11.7f" % (self.latitude, self.longitude))
|
||||
self.saves[list].show()
|
||||
self.update_list(list)
|
||||
|
||||
@ -418,38 +425,50 @@ class ConesWindow(MainWindow):
|
||||
self.saves[list].hide()
|
||||
|
||||
def add_point1(self):
|
||||
self.add_point(0)
|
||||
self.add_point(0, 1)
|
||||
|
||||
def del_point1(self):
|
||||
self.del_point(0)
|
||||
|
||||
def ins_point1(self):
|
||||
self.add_point(0, 0)
|
||||
|
||||
def save_list1(self):
|
||||
self.save_list(0)
|
||||
|
||||
def add_point2(self):
|
||||
self.add_point(1)
|
||||
self.add_point(1, 1)
|
||||
|
||||
def del_point2(self):
|
||||
self.del_point(1)
|
||||
|
||||
def ins_point2(self):
|
||||
self.add_point(1, 0)
|
||||
|
||||
def save_list2(self):
|
||||
self.save_list(1)
|
||||
|
||||
def add_point3(self):
|
||||
self.add_point(2)
|
||||
self.add_point(2, 1)
|
||||
|
||||
def del_point3(self):
|
||||
self.del_point(2)
|
||||
|
||||
def ins_point3(self):
|
||||
self.add_point(2, 0)
|
||||
|
||||
def save_list3(self):
|
||||
self.save_list(2)
|
||||
|
||||
def add_point4(self):
|
||||
self.add_point(3)
|
||||
self.add_point(3, 1)
|
||||
|
||||
def del_point4(self):
|
||||
self.del_point(3)
|
||||
|
||||
def ins_point4(self):
|
||||
self.add_point(3, 0)
|
||||
|
||||
def save_list4(self):
|
||||
self.save_list(3)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user