Skip to content

Commit 0c19831

Browse files
hpuhrhpuhr
authored
Merge pull request #213 from hpuhr/devel
Devel
2 parents 1f3c772 + 809ed50 commit 0c19831

Some content is hidden

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

52 files changed

+4915
-369
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 "6")
11-
SET(CPACK_PACKAGE_VERSION_PATCH "2")
11+
SET(CPACK_PACKAGE_VERSION_PATCH "3")
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.6.2",
2+
"version":"0.6.3",
33
"log_properties_file":"log4cpp.properties",
44
"log_filename":"log.txt",
55
"main_configuration_file":"client.json",

‎conf/default/db_object_tracker.json‎

Lines changed: 525 additions & 0 deletions
Large diffs are not rendered by default.

‎conf/default/db_schema_scdb_extended.json‎

Lines changed: 326 additions & 1 deletion
Large diffs are not rendered by default.

‎conf/default/filter.json‎

Lines changed: 202 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,52 @@
11
{
22
"parameters": {
3-
"db_id": "/home/sk/data/demo/20190506.db"
3+
"db_id": "/home/sk/data/malta/final_tests/20200125_ops_1215_1315.db",
4+
"use_filters": false
45
},
56
"sub_configs": {
7+
"ADSBQualityFilter": {
8+
"ADSBQualityFilter0": {
9+
"parameters": {
10+
"active": false,
11+
"changed": true,
12+
"max_nacp": 5,
13+
"max_nic": 5,
14+
"max_nucp": 4,
15+
"max_sil_v1": 2,
16+
"max_sil_v2": 4,
17+
"min_nacp": 5,
18+
"min_nic": 5,
19+
"min_nucp": 4,
20+
"min_sil_v1": 2,
21+
"min_sil_v2": 4,
22+
"name": "ADSB Quality",
23+
"op_and_": true,
24+
"use_max_nacp": false,
25+
"use_max_nic": false,
26+
"use_max_nucp": false,
27+
"use_max_sil_v1": false,
28+
"use_max_sil_v2": false,
29+
"use_min_nacp": true,
30+
"use_min_nic": true,
31+
"use_min_nucp": true,
32+
"use_min_sil_v1": true,
33+
"use_min_sil_v2": true,
34+
"use_v0": true,
35+
"use_v1": true,
36+
"use_v2": true,
37+
"visible": false
38+
},
39+
"sub_configs": {
40+
"ADSBQualityFilterWidget": {
41+
"ADSBQualityFilter0Widget0": {
42+
"parameters": {
43+
"visible": false
44+
}
45+
}
46+
}
47+
}
48+
}
49+
},
650
"DBFilter": {
751
"Barometric Altitude": {
852
"parameters": {
@@ -21,7 +65,7 @@
2165
"op_and": true,
2266
"operator": "<=",
2367
"reset_value": "MAX",
24-
"value": "409500",
68+
"value": "55500",
2569
"variable_dbo_name": "Meta",
2670
"variable_name": "modec_code_ft"
2771
}
@@ -161,7 +205,7 @@
161205
"op_and": true,
162206
"operator": "<=",
163207
"reset_value": "MAX",
164-
"value": "40.1566858016",
208+
"value": "40.1449280977249",
165209
"variable_dbo_name": "Meta",
166210
"variable_name": "pos_lat_deg"
167211
}
@@ -173,7 +217,7 @@
173217
"op_and": true,
174218
"operator": ">=",
175219
"reset_value": "MIN",
176-
"value": "31.65770083512",
220+
"value": "31.8964326381683",
177221
"variable_dbo_name": "Meta",
178222
"variable_name": "pos_lat_deg"
179223
}
@@ -185,7 +229,7 @@
185229
"op_and": true,
186230
"operator": "<=",
187231
"reset_value": "MAX",
188-
"value": "27.07018078455",
232+
"value": "27.5581097602844",
189233
"variable_dbo_name": "Meta",
190234
"variable_name": "pos_long_deg"
191235
}
@@ -197,7 +241,7 @@
197241
"op_and": true,
198242
"operator": ">=",
199243
"reset_value": "MIN",
200-
"value": "9.21563259161",
244+
"value": "9.17568147182465",
201245
"variable_dbo_name": "Meta",
202246
"variable_name": "pos_long_deg"
203247
}
@@ -212,6 +256,38 @@
212256
}
213257
}
214258
},
259+
"Radar Detection Type": {
260+
"parameters": {
261+
"active": false,
262+
"changed": true,
263+
"name": "Radar Detection Type",
264+
"op_and_": true,
265+
"visible": false
266+
},
267+
"sub_configs": {
268+
"DBFilterCondition": {
269+
"Radar Detection TypeCondition0": {
270+
"parameters": {
271+
"absolute_value": false,
272+
"display_instance_id": false,
273+
"op_and": true,
274+
"operator": "IN",
275+
"reset_value": "1",
276+
"value": "1",
277+
"variable_dbo_name": "Radar",
278+
"variable_name": "detection_type"
279+
}
280+
}
281+
},
282+
"DBFilterWidget": {
283+
"Radar Detection TypeWidget0": {
284+
"parameters": {
285+
"visible": false
286+
}
287+
}
288+
}
289+
}
290+
},
215291
"Target Address": {
216292
"parameters": {
217293
"active": false,
@@ -261,7 +337,7 @@
261337
"op_and": true,
262338
"operator": "<=",
263339
"reset_value": "MAX",
264-
"value": "23:58:59.539",
340+
"value": "13:15:09.297",
265341
"variable_dbo_name": "Meta",
266342
"variable_name": "tod"
267343
}
@@ -273,7 +349,7 @@
273349
"op_and": true,
274350
"operator": ">=",
275351
"reset_value": "MIN",
276-
"value": "00:01:12.695",
352+
"value": "12:14:58.398",
277353
"variable_dbo_name": "Meta",
278354
"variable_name": "tod"
279355
}
@@ -352,6 +428,38 @@
352428
}
353429
}
354430
},
431+
"Tracker LU SRC": {
432+
"parameters": {
433+
"active": false,
434+
"changed": true,
435+
"name": "Tracker LU SRC",
436+
"op_and_": true,
437+
"visible": false
438+
},
439+
"sub_configs": {
440+
"DBFilterCondition": {
441+
"Tracker LU SRCCondition0": {
442+
"parameters": {
443+
"absolute_value": false,
444+
"display_instance_id": false,
445+
"op_and": true,
446+
"operator": "IN",
447+
"reset_value": "0",
448+
"value": "0",
449+
"variable_dbo_name": "Tracker",
450+
"variable_name": "track_lu_ds_id"
451+
}
452+
}
453+
},
454+
"DBFilterWidget": {
455+
"Tracker LU SRCWidget0": {
456+
"parameters": {
457+
"visible": false
458+
}
459+
}
460+
}
461+
}
462+
},
355463
"Tracker Multiple Sources": {
356464
"parameters": {
357465
"active": false,
@@ -383,6 +491,38 @@
383491
}
384492
}
385493
}
494+
},
495+
"Tracker Track Confirmed": {
496+
"parameters": {
497+
"active": false,
498+
"changed": true,
499+
"name": "Tracker Track Confirmed",
500+
"op_and_": true,
501+
"visible": false
502+
},
503+
"sub_configs": {
504+
"DBFilterCondition": {
505+
"Tracker Track ConfirmedCondition0": {
506+
"parameters": {
507+
"absolute_value": false,
508+
"display_instance_id": false,
509+
"op_and": true,
510+
"operator": "=",
511+
"reset_value": "Y",
512+
"value": "Y",
513+
"variable_dbo_name": "Tracker",
514+
"variable_name": "track_confirmed"
515+
}
516+
}
517+
},
518+
"DBFilterWidget": {
519+
"Tracker Track ConfirmedWidget0": {
520+
"parameters": {
521+
"visible": false
522+
}
523+
}
524+
}
525+
}
386526
}
387527
},
388528
"DBOSpecificValuesDBFilter": {
@@ -399,7 +539,31 @@
399539
},
400540
"sub_configs": {
401541
"DBFilterCondition": {
402-
"ARTAS track_num": {
542+
"ARTAS_NEW track_num": {
543+
"parameters": {
544+
"absolute_value": false,
545+
"display_instance_id": true,
546+
"op_and": false,
547+
"operator": "IN",
548+
"reset_value": "4227",
549+
"value": "4227",
550+
"variable_dbo_name": "Tracker",
551+
"variable_name": "track_num"
552+
}
553+
},
554+
"ARTAS_OPS track_num": {
555+
"parameters": {
556+
"absolute_value": false,
557+
"display_instance_id": true,
558+
"op_and": false,
559+
"operator": "IN",
560+
"reset_value": "4227",
561+
"value": "4227",
562+
"variable_dbo_name": "Tracker",
563+
"variable_name": "track_num"
564+
}
565+
},
566+
"MRTS track_num": {
403567
"parameters": {
404568
"absolute_value": false,
405569
"display_instance_id": true,
@@ -430,7 +594,10 @@
430594
"30721": true,
431595
"30722": true,
432596
"30723": true,
433-
"30724": true
597+
"30724": true,
598+
"513": true,
599+
"514": true,
600+
"8715": true
434601
},
435602
"changed": false,
436603
"dbo_name": "Radar",
@@ -454,7 +621,9 @@
454621
"active_sources": {
455622
"13040": true,
456623
"13041": true,
457-
"30769": true
624+
"30769": true,
625+
"30770": true,
626+
"30772": true
458627
},
459628
"changed": true,
460629
"dbo_name": "Tracker",
@@ -472,6 +641,27 @@
472641
}
473642
}
474643
}
644+
},
645+
"UTNFilter": {
646+
"UTNFilter0": {
647+
"parameters": {
648+
"active": false,
649+
"changed": false,
650+
"name": "UTNs",
651+
"op_and_": true,
652+
"utns_str": "",
653+
"visible": false
654+
},
655+
"sub_configs": {
656+
"UTNFilterWidget": {
657+
"UTNFilter0Widget0": {
658+
"parameters": {
659+
"visible": false
660+
}
661+
}
662+
}
663+
}
664+
}
475665
}
476666
}
477-
}
667+
}

0 commit comments

Comments
 (0)