diff --git a/gps_vcones/MainWindow.py b/gps_vcones/MainWindow.py
index 0094e85..778689d 100644
--- a/gps_vcones/MainWindow.py
+++ b/gps_vcones/MainWindow.py
@@ -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
diff --git a/gps_vcones/mainwindow.ui b/gps_vcones/mainwindow.ui
index 4fdeb97..68fa363 100644
--- a/gps_vcones/mainwindow.ui
+++ b/gps_vcones/mainwindow.ui
@@ -6,8 +6,8 @@
0
0
- 772
- 451
+ 1082
+ 445
@@ -30,7 +30,7 @@
- 200
+ 180
110
180
220
@@ -85,7 +85,7 @@
- 709
+ 660
90
51
20
@@ -104,7 +104,7 @@
- 329
+ 300
90
51
20
@@ -142,7 +142,7 @@
- 139
+ 120
90
51
20
@@ -161,7 +161,7 @@
- 200
+ 180
90
141
16
@@ -174,7 +174,7 @@
- 10
+ 0
90
141
16
@@ -219,7 +219,7 @@
- 580
+ 540
110
180
220
@@ -247,8 +247,8 @@
- 680
- 380
+ 990
+ 10
84
32
@@ -260,7 +260,7 @@
- 580
+ 540
90
141
16
@@ -273,7 +273,7 @@
- 390
+ 360
110
180
220
@@ -283,7 +283,7 @@
- 10
+ 0
110
180
220
@@ -293,7 +293,7 @@
- 519
+ 480
90
51
20
@@ -331,7 +331,7 @@
- 390
+ 360
90
141
16
@@ -402,7 +402,7 @@
- 60
+ 40
330
41
32
@@ -415,7 +415,7 @@
- 100
+ 80
340
41
32
@@ -428,7 +428,7 @@
- 250
+ 220
330
41
32
@@ -441,7 +441,7 @@
- 290
+ 260
340
41
32
@@ -454,7 +454,7 @@
- 440
+ 400
330
41
32
@@ -467,7 +467,7 @@
- 480
+ 440
340
41
32
@@ -480,7 +480,7 @@
- 630
+ 580
330
41
32
@@ -493,7 +493,7 @@
- 670
+ 620
340
41
32
@@ -506,7 +506,7 @@
- 150
+ 130
340
41
32
@@ -519,7 +519,7 @@
- 340
+ 310
340
41
32
@@ -532,7 +532,7 @@
- 530
+ 490
340
41
32
@@ -545,7 +545,7 @@
- 720
+ 670
340
41
32
@@ -558,7 +558,7 @@
- 10
+ 0
340
41
32
@@ -571,7 +571,7 @@
- 200
+ 180
340
41
32
@@ -584,7 +584,7 @@
- 390
+ 360
340
41
32
@@ -597,7 +597,7 @@
- 580
+ 540
340
41
32
@@ -610,8 +610,8 @@
- 340
- 380
+ 880
+ 10
84
32
@@ -623,7 +623,7 @@
- 60
+ 40
360
41
32
@@ -636,7 +636,7 @@
- 250
+ 220
360
41
32
@@ -649,7 +649,7 @@
- 440
+ 400
360
41
32
@@ -662,7 +662,7 @@
- 630
+ 580
360
41
32
@@ -698,13 +698,227 @@
Range:
+
+
+
+ 720
+ 110
+ 180
+ 220
+
+
+
+
+
+
+ 900
+ 110
+ 180
+ 220
+
+
+
+
+
+
+ 800
+ 340
+ 41
+ 32
+
+
+
+ Del
+
+
+
+
+
+ 850
+ 340
+ 41
+ 32
+
+
+
+ Save
+
+
+
+
+
+ 760
+ 330
+ 41
+ 32
+
+
+
+ Add
+
+
+
+
+
+ 760
+ 360
+ 41
+ 32
+
+
+
+ Ins
+
+
+
+
+
+ 720
+ 340
+ 41
+ 32
+
+
+
+ Reset
+
+
+
+
+
+ 980
+ 340
+ 41
+ 32
+
+
+
+ Del
+
+
+
+
+
+ 1030
+ 340
+ 41
+ 32
+
+
+
+ Save
+
+
+
+
+
+ 940
+ 330
+ 41
+ 32
+
+
+
+ Add
+
+
+
+
+
+ 940
+ 360
+ 41
+ 32
+
+
+
+ Ins
+
+
+
+
+
+ 900
+ 340
+ 41
+ 32
+
+
+
+ Reset
+
+
+
+
+
+ 840
+ 90
+ 51
+ 20
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Sunken
+
+
+ 0
+
+
+
+
+
+ 1020
+ 90
+ 51
+ 20
+
+
+
+ QFrame::Panel
+
+
+ QFrame::Sunken
+
+
+ 0
+
+
+
+
+
+ 720
+ 90
+ 141
+ 16
+
+
+
+
+
+
+
+
+
+ 900
+ 90
+ 141
+ 16
+
+
+
+
+
+