Expanded to 6 lanes
This commit is contained in:
@ -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