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

Layout and porting the SQL fix over from master.

Browse Source
This commit is contained in:
Nick Foster
2012-07-18 17:11:19 -07:00
parent f8ac334dde
commit 004500a5d7
2 changed files with 128 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/sql.py
+1
View File
@@ -55,6 +55,7 @@ class output_sql(air_modes.parse):
);""" );"""
c.execute(query) c.execute(query)
c.close() c.close()
self.db.commit()
#we close the db conn now to reopen it in the output() thread context. #we close the db conn now to reopen it in the output() thread context.
self.db.close() self.db.close()
self.db = None self.db = None
res/modes_rx.ui
+127 -128
View File
@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>686</width> <width>686</width>
<height>449</height> <height>418</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -35,8 +35,8 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>20</y> <y>20</y>
<width>221</width> <width>236</width>
<height>191</height> <height>193</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">
@@ -45,8 +45,8 @@
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>11</x>
<y>60</y> <y>66</y>
<width>66</width> <width>66</width>
<height>17</height> <height>17</height>
</rect> </rect>
@@ -58,8 +58,8 @@
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>11</x>
<y>30</y> <y>36</y>
<width>66</width> <width>66</width>
<height>17</height> <height>17</height>
</rect> </rect>
@@ -82,7 +82,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>90</y> <y>95</y>
<width>66</width> <width>66</width>
<height>17</height> <height>17</height>
</rect> </rect>
@@ -114,8 +114,8 @@
<widget class="QLabel" name="label_19"> <widget class="QLabel" name="label_19">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>160</x> <x>164</x>
<y>90</y> <y>96</y>
<width>31</width> <width>31</width>
<height>17</height> <height>17</height>
</rect> </rect>
@@ -127,8 +127,8 @@
<widget class="QLabel" name="label_27"> <widget class="QLabel" name="label_27">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>180</x> <x>184</x>
<y>60</y> <y>66</y>
<width>41</width> <width>41</width>
<height>17</height> <height>17</height>
</rect> </rect>
@@ -140,8 +140,8 @@
<widget class="QStackedWidget" name="stack_source"> <widget class="QStackedWidget" name="stack_source">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>-1</x>
<y>120</y> <y>117</y>
<width>221</width> <width>221</width>
<height>71</height> <height>71</height>
</rect> </rect>
@@ -214,8 +214,8 @@
<widget class="QLineEdit" name="line_inputfile"> <widget class="QLineEdit" name="line_inputfile">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>90</x> <x>91</x>
<y>10</y> <y>2</y>
<width>113</width> <width>113</width>
<height>27</height> <height>27</height>
</rect> </rect>
@@ -224,8 +224,8 @@
<widget class="QLabel" name="label_13"> <widget class="QLabel" name="label_13">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>11</x>
<y>10</y> <y>7</y>
<width>66</width> <width>66</width>
<height>17</height> <height>17</height>
</rect> </rect>
@@ -234,6 +234,10 @@
<string>Filename</string> <string>Filename</string>
</property> </property>
</widget> </widget>
<zorder>line_inputfile</zorder>
<zorder>label_13</zorder>
<zorder>combo_rate</zorder>
<zorder>label_27</zorder>
</widget> </widget>
</widget> </widget>
</widget> </widget>
@@ -252,8 +256,8 @@
<widget class="QCheckBox" name="check_kml"> <widget class="QCheckBox" name="check_kml">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>19</x>
<y>120</y> <y>124</y>
<width>61</width> <width>61</width>
<height>22</height> <height>22</height>
</rect> </rect>
@@ -262,37 +266,11 @@
<string>KML</string> <string>KML</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_6">
<property name="geometry">
<rect>
<x>130</x>
<y>30</y>
<width>31</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Port</string>
</property>
</widget>
<widget class="QLabel" name="label_7">
<property name="geometry">
<rect>
<x>130</x>
<y>60</y>
<width>31</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Port</string>
</property>
</widget>
<widget class="QCheckBox" name="check_sbs1"> <widget class="QCheckBox" name="check_sbs1">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>19</x>
<y>30</y> <y>34</y>
<width>71</width> <width>71</width>
<height>22</height> <height>22</height>
</rect> </rect>
@@ -301,24 +279,11 @@
<string>SBS-1</string> <string>SBS-1</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_8">
<property name="geometry">
<rect>
<x>130</x>
<y>90</y>
<width>31</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Port</string>
</property>
</widget>
<widget class="QCheckBox" name="check_raw"> <widget class="QCheckBox" name="check_raw">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>19</x>
<y>60</y> <y>64</y>
<width>61</width> <width>61</width>
<height>22</height> <height>22</height>
</rect> </rect>
@@ -367,24 +332,11 @@
</rect> </rect>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_9">
<property name="geometry">
<rect>
<x>100</x>
<y>120</y>
<width>66</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Filename</string>
</property>
</widget>
<widget class="QCheckBox" name="check_fgfs"> <widget class="QCheckBox" name="check_fgfs">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>19</x>
<y>90</y> <y>94</y>
<width>101</width> <width>101</width>
<height>22</height> <height>22</height>
</rect> </rect>
@@ -393,6 +345,58 @@
<string>FlightGear</string> <string>FlightGear</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_7">
<property name="geometry">
<rect>
<x>128</x>
<y>66</y>
<width>31</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Port</string>
</property>
</widget>
<widget class="QLabel" name="label_8">
<property name="geometry">
<rect>
<x>128</x>
<y>96</y>
<width>31</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Port</string>
</property>
</widget>
<widget class="QLabel" name="label_6">
<property name="geometry">
<rect>
<x>128</x>
<y>36</y>
<width>31</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Port</string>
</property>
</widget>
<widget class="QLabel" name="label_9">
<property name="geometry">
<rect>
<x>98</x>
<y>126</y>
<width>66</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Filename</string>
</property>
</widget>
</widget> </widget>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="geometry"> <property name="geometry">
@@ -412,8 +416,8 @@
<widget class="QLabel" name="label_29"> <widget class="QLabel" name="label_29">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>16</x>
<y>60</y> <y>64</y>
<width>71</width> <width>71</width>
<height>20</height> <height>20</height>
</rect> </rect>
@@ -445,8 +449,8 @@
<widget class="QLabel" name="label_28"> <widget class="QLabel" name="label_28">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>30</x> <x>28</x>
<y>40</y> <y>34</y>
<width>61</width> <width>61</width>
<height>20</height> <height>20</height>
</rect> </rect>
@@ -464,10 +468,10 @@
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>190</x> <x>193</x>
<y>30</y> <y>35</y>
<width>21</width> <width>21</width>
<height>17</height> <height>18</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@@ -477,8 +481,8 @@
<widget class="QLabel" name="label_11"> <widget class="QLabel" name="label_11">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>480</x> <x>483</x>
<y>60</y> <y>66</y>
<width>21</width> <width>21</width>
<height>17</height> <height>17</height>
</rect> </rect>
@@ -490,8 +494,8 @@
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="label_12">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>480</x> <x>483</x>
<y>90</y> <y>96</y>
<width>21</width> <width>21</width>
<height>17</height> <height>17</height>
</rect> </rect>
@@ -545,8 +549,8 @@
<widget class="QLabel" name="label_17"> <widget class="QLabel" name="label_17">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>17</x>
<y>240</y> <y>243</y>
<width>101</width> <width>101</width>
<height>17</height> <height>17</height>
</rect> </rect>
@@ -558,7 +562,7 @@
<widget class="QLabel" name="label_20"> <widget class="QLabel" name="label_20">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>130</x> <x>120</x>
<y>10</y> <y>10</y>
<width>61</width> <width>61</width>
<height>20</height> <height>20</height>
@@ -571,8 +575,8 @@
<widget class="QLabel" name="label_21"> <widget class="QLabel" name="label_21">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>360</x> <x>365</x>
<y>60</y> <y>64</y>
<width>51</width> <width>51</width>
<height>20</height> <height>20</height>
</rect> </rect>
@@ -584,8 +588,8 @@
<widget class="QLabel" name="label_22"> <widget class="QLabel" name="label_22">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>350</x> <x>352</x>
<y>90</y> <y>93</y>
<width>61</width> <width>61</width>
<height>20</height> <height>20</height>
</rect> </rect>
@@ -598,7 +602,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>370</x> <x>370</x>
<y>150</y> <y>154</y>
<width>51</width> <width>51</width>
<height>20</height> <height>20</height>
</rect> </rect>
@@ -675,8 +679,8 @@
<widget class="QLabel" name="label_24"> <widget class="QLabel" name="label_24">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>370</x> <x>373</x>
<y>180</y> <y>184</y>
<width>51</width> <width>51</width>
<height>20</height> <height>20</height>
</rect> </rect>
@@ -714,8 +718,8 @@
<widget class="QLabel" name="label_25"> <widget class="QLabel" name="label_25">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>62</x>
<y>180</y> <y>183</y>
<width>61</width> <width>61</width>
<height>21</height> <height>21</height>
</rect> </rect>
@@ -727,8 +731,8 @@
<widget class="QLabel" name="label_26"> <widget class="QLabel" name="label_26">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>40</x> <x>50</x>
<y>210</y> <y>213</y>
<width>71</width> <width>71</width>
<height>21</height> <height>21</height>
</rect> </rect>
@@ -753,8 +757,8 @@
<widget class="QLabel" name="label_30"> <widget class="QLabel" name="label_30">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>480</x> <x>483</x>
<y>120</y> <y>125</y>
<width>31</width> <width>31</width>
<height>17</height> <height>17</height>
</rect> </rect>
@@ -766,8 +770,8 @@
<widget class="QLabel" name="label_31"> <widget class="QLabel" name="label_31">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>370</x> <x>368</x>
<y>120</y> <y>123</y>
<width>41</width> <width>41</width>
<height>20</height> <height>20</height>
</rect> </rect>
@@ -795,8 +799,8 @@
<widget class="QLabel" name="label_32"> <widget class="QLabel" name="label_32">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>370</x> <x>372</x>
<y>30</y> <y>34</y>
<width>51</width> <width>51</width>
<height>20</height> <height>20</height>
</rect> </rect>
@@ -862,8 +866,8 @@
<widget class="QLabel" name="label_14"> <widget class="QLabel" name="label_14">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>19</x>
<y>39</y> <y>36</y>
<width>101</width> <width>101</width>
<height>17</height> <height>17</height>
</rect> </rect>
@@ -886,10 +890,13 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="check_adsbonly"> <widget class="QCheckBox" name="check_adsbonly">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>4</x>
<y>340</y> <y>344</y>
<width>271</width> <width>271</width>
<height>22</height> <height>22</height>
</rect> </rect>
@@ -901,10 +908,10 @@
<widget class="QListView" name="list_aircraft"> <widget class="QListView" name="list_aircraft">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>15</x> <x>18</x>
<y>60</y> <y>59</y>
<width>101</width> <width>101</width>
<height>271</height> <height>272</height>
</rect> </rect>
</property> </property>
<property name="editTriggers"> <property name="editTriggers">
@@ -920,8 +927,8 @@
<widget class="QLineEdit" name="line_reports"> <widget class="QLineEdit" name="line_reports">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>630</x> <x>520</x>
<y>370</y> <y>341</y>
<width>41</width> <width>41</width>
<height>27</height> <height>27</height>
</rect> </rect>
@@ -930,8 +937,8 @@
<widget class="QLabel" name="label_33"> <widget class="QLabel" name="label_33">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>515</x> <x>407</x>
<y>370</y> <y>345</y>
<width>111</width> <width>111</width>
<height>20</height> <height>20</height>
</rect> </rect>
@@ -940,14 +947,6 @@
<string>Reports/second</string> <string>Reports/second</string>
</property> </property>
</widget> </widget>
<zorder>tab_dataview</zorder>
<zorder>label_14</zorder>
<zorder>button_start</zorder>
<zorder>check_adsbonly</zorder>
<zorder>list_aircraft</zorder>
<zorder>lineEdit</zorder>
<zorder>line_reports</zorder>
<zorder>label_33</zorder>
</widget> </widget>
<widget class="QMenuBar" name="menubar"> <widget class="QMenuBar" name="menubar">
<property name="geometry"> <property name="geometry">