Skip to content

Commit 77733f2

Browse files
hpuhrhpuhr
authored
Merge pull request #268 from hpuhr/devel
Devel
2 parents 226e697 + 7179877 commit 77733f2

File tree

770 files changed

+58557
-20920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

770 files changed

+58557
-20920
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set ( CMAKE_BUILD_TYPE RelWithDebInfo ) #Debug RelWithDebInfo Release
88
project( COMPASS )
99
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
1010
SET(CPACK_PACKAGE_VERSION_MINOR "7")
11-
SET(CPACK_PACKAGE_VERSION_PATCH "1")
11+
SET(CPACK_PACKAGE_VERSION_PATCH "4")
1212

1313
message(" System: ${CMAKE_SYSTEM}")
1414
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

‎conf/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version":"0.7.1",
2+
"version":"0.7.4",
33
"log_properties_file":"log4cpp.properties",
44
"log_filename":"log.txt",
55
"main_configuration_file":"client.json",

‎conf/default/db_content.json‎

Lines changed: 143 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
{
22
"parameters": {
3+
"limit_max": 1000000,
4+
"limit_min": 0,
5+
"max_live_data_age_cache": 5,
6+
"max_live_data_age_db": 60,
7+
"order_variable_dbcontent_name": "Meta",
8+
"order_variable_name": "Timestamp",
39
"use_filters": false,
4-
"use_limit": false
10+
"use_limit": false,
11+
"use_order": true,
12+
"use_order_ascending": true
513
},
614
"sub_config_files": [
715
{
@@ -44,14 +52,14 @@
4452
"DBContentLabelGenerator": {
4553
"DBContentLabelGenerator0": {
4654
"parameters": {
47-
"auto_label": true,
55+
"auto_label": false,
4856
"declutter_labels": true,
4957
"filter_mode3a_active": false,
5058
"filter_mode3a_values": "7000,7777",
5159
"filter_modec_max_active": false,
52-
"filter_modec_max_value": 400.0,
60+
"filter_modec_max_value": 500.0,
5361
"filter_modec_min_active": false,
54-
"filter_modec_min_value": 100.0,
62+
"filter_modec_min_value": 347.0,
5563
"filter_modec_null_wanted": false,
5664
"filter_primary_only_activ": false,
5765
"filter_ta_active": false,
@@ -115,6 +123,7 @@
115123
"4": "Mode C Code LM",
116124
"5": "DS ID",
117125
"6": "Ground Speed",
126+
"7": "Wake Turbulence Category FPL",
118127
"8": "Timestamp"
119128
},
120129
"RefTraj": {
@@ -130,6 +139,7 @@
130139
},
131140
"label_directions": {
132141
"0": 3,
142+
"10": 3,
133143
"12241": 1,
134144
"12639": 3,
135145
"12750": 2,
@@ -138,7 +148,7 @@
138148
"12760": 2,
139149
"12761": 2,
140150
"12762": 3,
141-
"12763": 0,
151+
"12763": 1,
142152
"12770": 3,
143153
"12798": 3,
144154
"12820": 1,
@@ -153,9 +163,18 @@
153163
"12830": 2,
154164
"12831": 3,
155165
"12990": 1,
166+
"20": 1,
156167
"25005": 3,
157168
"25006": 3,
158169
"265": 3,
170+
"26527": 3,
171+
"26538": 3,
172+
"26542": 1,
173+
"26551": 3,
174+
"26582": 3,
175+
"26692": 3,
176+
"26693": 3,
177+
"30601": 3,
159178
"30602": 3,
160179
"30603": 0,
161180
"30604": 1,
@@ -169,7 +188,27 @@
169188
"6495": 3,
170189
"8681": 3
171190
},
191+
"label_ds_ids": {
192+
"0": true,
193+
"12820": true,
194+
"12821": true,
195+
"12822": true,
196+
"12823": true,
197+
"12824": true,
198+
"12825": true,
199+
"12826": true,
200+
"12827": true,
201+
"12828": true,
202+
"12830": true,
203+
"12831": true,
204+
"12990": true,
205+
"26582": true,
206+
"26692": false,
207+
"26693": false
208+
},
172209
"label_lines": {
210+
"0": 0,
211+
"10": 0,
173212
"12241": 0,
174213
"12639": 0,
175214
"12750": 0,
@@ -193,15 +232,60 @@
193232
"12830": 0,
194233
"12831": 0,
195234
"12990": 0,
235+
"20": 0,
196236
"25005": 0,
197237
"25006": 0,
198-
"37494": 0
238+
"265": 0,
239+
"26527": 0,
240+
"26538": 0,
241+
"26542": 0,
242+
"26551": 0,
243+
"26582": 2,
244+
"26692": 0,
245+
"26693": 0,
246+
"30601": 0,
247+
"30602": 0,
248+
"30603": 0,
249+
"30604": 0,
250+
"30649": 0,
251+
"30650": 0,
252+
"37494": 0,
253+
"511": 0,
254+
"512": 0,
255+
"547": 0,
256+
"6427": 0,
257+
"6495": 0,
258+
"8681": 0
199259
},
200-
"label_opacity": 0.8399999737739563,
260+
"label_opacity": 0.8500000238418579,
201261
"max_declutter_labels": 100
202262
}
203263
}
204264
},
265+
"DBContentTargetModel": {
266+
"DBContentTargetModel0": {
267+
"parameters": {
268+
"filter_mode_a_code_blacklist": false,
269+
"filter_mode_a_code_values": "7000,7777",
270+
"filter_mode_a_codes": false,
271+
"filter_target_address_values": "",
272+
"filter_target_addresses": false,
273+
"filter_target_addresses_blacklist": false,
274+
"remove_mode_c_min_value": 3000.0,
275+
"remove_mode_c_values": true,
276+
"remove_modeac_onlys": false,
277+
"remove_not_detected_dbo_values": {
278+
"CAT001": false,
279+
"CAT021": true
280+
},
281+
"remove_not_detected_dbos": false,
282+
"remove_psr_only_targets": true,
283+
"remove_short_targets": false,
284+
"remove_short_targets_min_duration": 60.0,
285+
"remove_short_targets_min_updates": 10
286+
}
287+
}
288+
},
205289
"MetaVariable": {
206290
"MetaVariableARTAS Hash0": {
207291
"parameters": {
@@ -332,57 +416,6 @@
332416
}
333417
}
334418
},
335-
"MetaVariableAssociations0": {
336-
"parameters": {
337-
"name": "Associations"
338-
},
339-
"sub_configs": {
340-
"VariableDefinition": {
341-
"VariableDefinitionCAT001Associations0": {
342-
"parameters": {
343-
"dbcontent_name": "CAT001",
344-
"variable_name": "Associations"
345-
}
346-
},
347-
"VariableDefinitionCAT010Associations0": {
348-
"parameters": {
349-
"dbcontent_name": "CAT010",
350-
"variable_name": "Associations"
351-
}
352-
},
353-
"VariableDefinitionCAT020Associations0": {
354-
"parameters": {
355-
"dbcontent_name": "CAT020",
356-
"variable_name": "Associations"
357-
}
358-
},
359-
"VariableDefinitionCAT021Associations0": {
360-
"parameters": {
361-
"dbcontent_name": "CAT021",
362-
"variable_name": "Associations"
363-
}
364-
},
365-
"VariableDefinitionCAT048Associations0": {
366-
"parameters": {
367-
"dbcontent_name": "CAT048",
368-
"variable_name": "Associations"
369-
}
370-
},
371-
"VariableDefinitionCAT062Associations0": {
372-
"parameters": {
373-
"dbcontent_name": "CAT062",
374-
"variable_name": "Associations"
375-
}
376-
},
377-
"VariableDefinitionRefTrajAssociations0": {
378-
"parameters": {
379-
"dbcontent_name": "RefTraj",
380-
"variable_name": "Associations"
381-
}
382-
}
383-
}
384-
}
385-
},
386419
"MetaVariableAzimuth0": {
387420
"parameters": {
388421
"name": "Azimuth"
@@ -2060,6 +2093,57 @@
20602093
}
20612094
}
20622095
},
2096+
"MetaVariableUTN0": {
2097+
"parameters": {
2098+
"name": "UTN"
2099+
},
2100+
"sub_configs": {
2101+
"VariableDefinition": {
2102+
"VariableDefinitionCAT001UTN0": {
2103+
"parameters": {
2104+
"dbcontent_name": "CAT001",
2105+
"variable_name": "UTN"
2106+
}
2107+
},
2108+
"VariableDefinitionCAT010UTN0": {
2109+
"parameters": {
2110+
"dbcontent_name": "CAT010",
2111+
"variable_name": "UTN"
2112+
}
2113+
},
2114+
"VariableDefinitionCAT020UTN0": {
2115+
"parameters": {
2116+
"dbcontent_name": "CAT020",
2117+
"variable_name": "UTN"
2118+
}
2119+
},
2120+
"VariableDefinitionCAT021UTN0": {
2121+
"parameters": {
2122+
"dbcontent_name": "CAT021",
2123+
"variable_name": "UTN"
2124+
}
2125+
},
2126+
"VariableDefinitionCAT048UTNs0": {
2127+
"parameters": {
2128+
"dbcontent_name": "CAT048",
2129+
"variable_name": "UTN"
2130+
}
2131+
},
2132+
"VariableDefinitionCAT062UTN0": {
2133+
"parameters": {
2134+
"dbcontent_name": "CAT062",
2135+
"variable_name": "UTN"
2136+
}
2137+
},
2138+
"VariableDefinitionRefTrajUTN0": {
2139+
"parameters": {
2140+
"dbcontent_name": "RefTraj",
2141+
"variable_name": "UTN"
2142+
}
2143+
}
2144+
}
2145+
}
2146+
},
20632147
"MetaVariableVx0": {
20642148
"parameters": {
20652149
"name": "Vx"
@@ -2419,4 +2503,4 @@
24192503
}
24202504
}
24212505
}
2422-
}
2506+
}

0 commit comments

Comments
 (0)