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

Renamed everything in python/ for consistent namespace

Browse Source
This commit is contained in:
Nick Foster
2012-07-16 20:59:37 -07:00
parent 5442cba206
commit 3163fca47a
16 changed files with 65 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/modes_gui
+8 -8
View File
@@ -25,9 +25,9 @@ from PyQt4.Qwt5 import Qwt
from gnuradio import gr, gru, optfir, eng_notation, blks2
import gnuradio.gr.gr_threading as _threading
import air_modes
from air_modes.modes_exceptions import *
from air_modes.exceptions import *
from air_modes.modes_rx_ui import Ui_MainWindow
from air_modes.modes_gui_model import *
from air_modes.gui_model import *
import sqlite3
class mainwindow(QtGui.QMainWindow):
@@ -254,32 +254,32 @@ class mainwindow(QtGui.QMainWindow):
#output options to populate outputs, updates
if self.ui.check_kml.checkState():
#we spawn a thread to run every 30 seconds (or whatever) to generate KML
self.kmlgen = air_modes.modes_kml(self.ui.line_kmlfilename.text(), self.dbname, my_position) #create a KML generating thread
self.kmlgen = air_modes.output_kml(self.ui.line_kmlfilename.text(), self.dbname, my_position) #create a KML generating thread
if self.ui.check_sbs1.checkState():
sbs1port = int(self.ui.line_sbs1port.text())
sbs1out = air_modes.modes_output_sbs1(my_position, sbs1port)
sbs1out = air_modes.output_sbs1(my_position, sbs1port)
self.outputs.append(sbs1out.output)
self.updates.append(sbs1out.add_pending_conns)
if self.ui.check_fgfs.checkState():
fghost = "127.0.0.1" #TODO FIXME
fgport = self.ui.line_fgfsport.currentText()
fgout = air_modes.modes_flightgear(my_position, fghost, int(fgport))
fgout = air_modes.output_flightgear(my_position, fghost, int(fgport))
self.outputs.append(fgout.output)
if self.ui.check_raw.checkState():
rawport = air_modes.modes_raw_server(int(self.ui.line_raw.text()))
rawport = air_modes.raw_server(int(self.ui.line_raw.text()))
self.outputs.append(rawport.output)
self.updates.append(rawport.add_pending_conns)
self.livedata = air_modes.modes_output_print(my_position)
self.livedata = air_modes.output_print(my_position)
#add output for live data box
#TODO: this doesn't handle large volumes of data well; i get segfaults.
#self.outputs.append(self.output_live_data)
#create SQL database for KML and dashboard displays
self.dbwriter = air_modes.modes_output_sql(my_position, self.dbname)
self.dbwriter = air_modes.output_sql(my_position, self.dbname)
self.outputs.append(self.dbwriter.output) #now the db will update itself
#output to update reports/sec widget
apps/modes_rx
+7 -7
View File
@@ -29,7 +29,7 @@ from string import split, join
import air_modes
import gnuradio.gr.gr_threading as _threading
import csv
from air_modes.modes_exceptions import *
from air_modes.exceptions import *
class top_block_runner(_threading.Thread):
def __init__(self, tb):
@@ -184,7 +184,7 @@ if __name__ == '__main__':
updates = [] #registry of plugin update functions
if options.raw is True:
rawport = air_modes.modes_raw_server(9988) #port
rawport = air_modes.raw_server(9988) #port
outputs.append(rawport.output)
outputs.append(printraw)
updates.append(rawport.add_pending_conns)
@@ -192,21 +192,21 @@ if __name__ == '__main__':
if options.kml is not None:
#we spawn a thread to run every 30 seconds (or whatever) to generate KML
dbname = 'adsb.db'
sqldb = air_modes.modes_output_sql(my_position, dbname) #input into the db
kmlgen = air_modes.modes_kml(options.kml, dbname, my_position) #create a KML generating thread to read from the db
sqldb = air_modes.output_sql(my_position, dbname) #input into the db
kmlgen = air_modes.output_kml(options.kml, dbname, my_position) #create a KML generating thread to read from the db
outputs.append(sqldb.output)
if options.sbs1 is True:
sbs1port = air_modes.modes_output_sbs1(my_position, 30003)
sbs1port = air_modes.output_sbs1(my_position, 30003)
outputs.append(sbs1port.output)
updates.append(sbs1port.add_pending_conns)
if options.no_print is not True:
outputs.append(air_modes.modes_output_print(my_position).output)
outputs.append(air_modes.output_print(my_position).output)
if options.multiplayer is not None:
[fghost, fgport] = options.multiplayer.split(':')
fgout = air_modes.modes_flightgear(my_position, fghost, int(fgport))
fgout = air_modes.output_flightgear(my_position, fghost, int(fgport))
outputs.append(fgout.output)
fg = adsb_rx_block(options, args, queue)