FGFS-4.1/gr-air-modes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Real-time RSSI update and graceful flowgraph closure on exit.

Browse Source
This commit is contained in:
Nick Foster 2012-07-16 22:43:02 -07:00
parent 3163fca47a
commit b26012f5ad
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/modes_gui
View File

@ -76,7 +76,6 @@ class mainwindow(QtGui.QMainWindow):
self.updates = []
self.output_handler = None
self.kmlgen = None #necessary bc we stop its thread in shutdown
self.dbinput = None
self.dbname = "air_modes.db"
self.num_reports = 0
self.last_report = 0
@ -114,7 +113,7 @@ class mainwindow(QtGui.QMainWindow):
self.ui.list_aircraft.selectionModel().currentRowChanged.connect(self.dashboard_mapper.setCurrentModelIndex)
self.ui.list_aircraft.selectionModel().currentRowChanged.connect(self.update_heading_widget)
self.ui.list_aircraft.selectionModel().currentRowChanged.connect(self.update_bearing_widget)
self.datamodel.dataChanged.connect(self.compass_widgets_dataChanged)
self.datamodel.dataChanged.connect(self.unmapped_widgets_dataChanged)
self.ui.list_aircraft.selectionModel().currentRowChanged.connect(self.update_rssi_widget)
############ widget update functions for non-mapped widgets ############
@ -128,13 +127,15 @@ class mainwindow(QtGui.QMainWindow):
bearing = index.model().data(index.model().index(index.row(), self.datamodel._colnames.index("bearing"))).toDouble()[0]
self.ui.compass_bearing.setValue(bearing)
def compass_widgets_dataChanged(self, startIndex, endIndex):
def unmapped_widgets_dataChanged(self, startIndex, endIndex):
index = self.ui.list_aircraft.selectionModel().currentIndex()
if index.row() in range(startIndex.row(), endIndex.row()+1): #the current aircraft was affected
if self.datamodel._colnames.index("heading") in range(startIndex.column(), endIndex.column()+1):
self.update_heading_widget(index)
if self.datamodel._colnames.index("bearing") in range(startIndex.column(), endIndex.column()+1):
self.update_bearing_widget(index)
if self.datamodel._colnames.index("rssi") in range(startIndex.column(), endIndex.column()+1):
self.update_rssi_widget(index)
def update_rssi_widget(self, index):
if index.model() is not None:
@ -221,9 +222,6 @@ class mainwindow(QtGui.QMainWindow):
#self.kmlgen.join()
#self.kmlgen = None
if self.dbinput is not None: self.dbinput.close()
self.dbinput = None
self.num_reports = 0
self.ui.line_reports.setText("0")
@ -291,6 +289,21 @@ class mainwindow(QtGui.QMainWindow):
self.ui.button_start.setText("Stop")
def on_quit(self):
if self.runner is not None:
self.output_handler.done = True
self.output_handler = None
self.outputs = []
self.updates = []
self.fg.stop()
self.runner = None
self.fg = None
if self.kmlgen is not None:
self.kmlgen.done = True
#TODO FIXME need a way to kill kmlgen safely without delay
#self.kmlgen.join()
#self.kmlgen = None
def output_live_data(self, msg):
msgstr = self.livedata.parse(msg)
if msgstr is not None:
@ -398,10 +411,10 @@ class adsb_rx_block (gr.top_block):
self.connect(self.avg, (self.preamble, 1))
self.connect(self.preamble, self.slicer)
if __name__ == '__main__':
app = QtGui.QApplication(sys.argv)
window = mainwindow()
app.lastWindowClosed.connect(window.on_quit)
window.setWindowTitle("Mode S/ADS-B receiver")
window.show()
sys.exit(app.exec_())