Temp commit. Not yet working.

apps/modes_gui

@@ -279,7 +279,7 @@ class mainwindow(QtGui.QMainWindow):
                 my_position = None
 
             self._cpr_dec = air_modes.cpr_decoder(my_position)
-            self.datamodelout = dashboard_output(self._cpr_dec, self.datamodel, self._publisher)
+#            self.datamodelout = dashboard_output(self._cpr_dec, self.datamodel, self._publisher)
 
             self.lock = threading.Lock() #grab a lock to ensure sql and kml don't step on each other
 
@@ -313,7 +313,6 @@ class mainwindow(QtGui.QMainWindow):
                                                    self.live_data_changed_signal.emit)
 
             #create SQL database for KML and dashboard displays
-<<<<<<< HEAD
             self.dbwriter = air_modes.output_sql(self._cpr_dec, self.dbname, self.lock, self._publisher)
             self.jsonpgen = air_modes.output_jsonp(self._jsonfile.name, self.dbname, my_position, self.lock, timeout=1)
             htmlstring = air_modes.html_template(my_position, self._jsonfile.name)
@@ -326,11 +325,6 @@ class mainwindow(QtGui.QMainWindow):
             self.ui.mapView.setPage(page)
             self.ui.mapView.load( QtCore.QUrl( QtCore.QUrl.fromLocalFile("/tmp/mode_s.html") ) )
             self.ui.mapView.show()
-=======
-            self.dbwriter = air_modes.output_sql(my_position, self.dbname, self.lock)
-            self.dbwriter.subscribe("new_adsb", self.datamodel.update_all)
-            self._relay.subscribe("dl_data", self.dbwriter.insert) #now the db will update itself
->>>>>>> GUI model ripped up and replaced with QSqlQueryModel. Not working but committing before I kill the child in row 15.
 
             #output to update reports/sec widget
             self._relay.subscribe("dl_data", self.increment_reportspersec)