Commit Graph

1953 Commits

Author SHA1 Message Date
Klaus Basan
1b9878fdd3 refs #395, some functions renamed in network provider/context
Goal: consistent function names in own and remote aircraft provider
2015-05-12 20:46:50 +01:00
Klaus Basan
05be0ecb37 Formatting application context 2015-05-12 20:46:49 +01:00
Klaus Basan
3ecf37dda4 refs #395, changed own aircraft provider to thread safe member functions
(similar to remote aircraft provider)
* removed references
* made own aircraft context thread safe (reg. own aircrat data)
* removed the read only versions of the provider
* adjusted consuming methods
* renamed some functions ("ownAircraft...") to avoid ambiguity (with remote aircraft)
2015-05-12 20:46:48 +01:00
Klaus Basan
7200f2e29c GUI formatting 2015-05-12 20:46:47 +01:00
Klaus Basan
085edc82cb refs #395, post merge and rebase adjustments plus further testing fixes:
* adjusted iterim position updates
* removed deadlocks (thread safe values in airspace monitor)
* resolved some merge issues
* some smaller fixes in airspace monitor (style, finders)
2015-05-12 20:46:46 +01:00
Klaus Basan
6debd33b4f refs #395, turned remote aircraft provider interface into thread safe interfaces
* references gone, situations, parts, aircraft now as threadsafe copy
* read only interface gone (no longer references, so no longer needed)
2015-05-12 20:46:45 +01:00
Klaus Basan
24094eaf61 refs #395, airspace analyzer
* using providers for analyzer
2015-05-12 20:46:44 +01:00
Klaus Basan
79e2a7b805 refs #395, improved synchronization of booked and online stations
* moved sync functionality into CAtcStation
* consolidated function names
2015-05-12 20:46:43 +01:00
Klaus Basan
f7158f17f9 Renamed aircrafts -> aircraft 2015-05-12 20:46:42 +01:00
Klaus Basan
3300b1ad9b refs #395, added isInRange to ATC stations
* use null as default values for some members to detect those are not yet set
* used simplified bool formatter for views
2015-05-12 20:46:41 +01:00
Klaus Basan
a3b147d59a Doxygen 2015-05-12 20:46:40 +01:00
Klaus Basan
98812d3733 refs #395, shifted airspace watchdog into analyzer
* analyzer will run in background and perform several airspace calculations
* watchdog now acts directly on network signals, no need to add/remove callsigns
2015-05-12 20:46:39 +01:00
Klaus Basan
48188dd28d refs #395, moved thread safe aircraft parts / situations (from interpolator) to airspace
* access via provider, access now possible also beyond the scope of interpolator
* will be used in (to be written airpace analyzer)
* renamed some member functions as required
* fixed some asserts / Doxygen comments
* adjusted unit tests
* added vtolAircraft flag for interpolator, not fully used everywhere

remarks: update signals for parts / situation still only needed in XP driver
2015-05-12 20:46:38 +01:00
Klaus Basan
32e65669a3 GUI improvements: naming and better user experience during shutdown 2015-05-12 20:46:37 +01:00
Klaus Basan
7b1beaf02d Introduced hint for callsign to specify callsign type (aircraft? ATC?) by context.
Background: Pilots can login in with virtually any callsign like XXX_OBS, resulting in wrong interpretations (as OBS here is no ATC station).
2015-05-12 20:46:36 +01:00
Klaus Basan
acec379151 refs #395, renamed to updateFastPositionEnabled (consistency with other member functions) 2015-05-12 20:46:35 +01:00
Mathew Sutcliffe
ecc4c787a1 refs #413 Fixed parameter type mismatch between signal of XBus::CService and CXBusServiceProxy.
This fixes a regression introduced because QList and CSequence now have different dbus signatures.
2015-05-12 20:46:34 +01:00
Mathew Sutcliffe
f7eecdafe0 refs #413, #416 Workaround GCC 4.7 bug.
(cherry picked from commit 5b1a25489a545bddd66978a6b9a819742c5925d2)
2015-05-12 20:46:33 +01:00
Mathew Sutcliffe
b6f8654312 refs #413 Doxygen fixes.
(cherry picked from commit da107e6c5a90744c02bb61bc6be6ec026081b409)
2015-05-12 20:46:32 +01:00
Mathew Sutcliffe
27ce1eb914 Added toJson/convertFromJson support for CVariant containing QDateTime, QDate, QTime.
(cherry picked from commit af7f032daf4e5031a881bfb5025734d38817ed97)
2015-05-12 20:46:31 +01:00
Mathew Sutcliffe
f631f51210 refs #413, #416 Using Mixin::Index in more classes so that index "myself" yields correct derived type.
(cherry picked from commit 2b7f7eb6b692a3464863ece86b30ea0b7efc2a1d)
2015-05-12 20:46:30 +01:00
Mathew Sutcliffe
dfe42e1ce7 refs #413, #416 Implemented base_type fallthrough in Mixin::Index so it can be used by more classes.
(cherry picked from commit d97775a232b007061cbfa85b451b0be569127696)
2015-05-12 20:46:29 +01:00
Mathew Sutcliffe
84800c190a refs #413, #403 Removed default constructors of CAvionicsBase and CPhysicalQuantity, not needed.
Conflicts:
	src/blackmisc/aviation/avionicsbase.h
2015-05-12 20:46:21 +01:00
Mathew Sutcliffe
2f66785c63 refs #413 Doxygen. 2015-05-12 20:38:00 +01:00
Mathew Sutcliffe
5a91d761c2 refs #413 Breaking circular dependencies by moving mixin classes from valueobject.h to the files where they fit best:
* DBus mixins moved to dbus.h
* Json mixins moved to json.h
* Icon mixin moved to icon.h
* Comparison mixins moved to compare.h
* Hash and string mixins moved to blackmiscfreefunctions.h
* Index mixin moved to propertyindexvariantmap.h
* MetaType mixins moved to variant.h
* registerMetaValueType moved to variant.h
* valueobject_private.h renamed to variant_private.h
2015-05-12 20:37:59 +01:00
Mathew Sutcliffe
9cdacf8d86 refs #413 To signal when contained object doesn't support an operation, throw exception in CValueObjectMetaInfo and catch in CVariant. 2015-05-12 20:37:58 +01:00
Mathew Sutcliffe
38cfebc55c refs #413 Fixed TupleHelper::hash() using the wrong overload of qHash() found by ADL. 2015-05-12 20:37:57 +01:00
Mathew Sutcliffe
9867b4a6df refs #413 Extend Private::CValueObjectMetaInfo with more fallback helpers, and extend CVariant with toIcon method. 2015-05-12 20:37:56 +01:00
Mathew Sutcliffe
097522cfa5 refs #413 Moved traits BaseOf and MetaBaseOf into dedicated header. 2015-05-12 20:37:55 +01:00
Mathew Sutcliffe
530ba11747 refs #413 Removed TemplateIsBaseOf, no longer needed. 2015-05-12 20:37:54 +01:00
Mathew Sutcliffe
36d116b4e9 refs #413 Removed one overload of CRange::findBy and one of CSequence::applyIf; they were never used and they caused a circular dependency.
Templatized another overload of applyIf to break a circular dependency.
2015-05-12 20:37:53 +01:00
Mathew Sutcliffe
aeb95ebb30 refs #413 Removed all policy classes. 2015-05-12 20:37:52 +01:00
Mathew Sutcliffe
68ebcd7b8d refs #413 Macros to ease the task of disambiguating inherited members when using mixins in an inheritance hierarchy. 2015-05-12 20:37:51 +01:00
Mathew Sutcliffe
36a2e1a2bb refs #413 All value classes which had custom policies shall inherit from mixins instead. 2015-05-12 20:37:50 +01:00
Mathew Sutcliffe
9becc1c666 refs #413 CVariant and CPropertyIndexVariantMap equality operator templates support any metatype-registered class, not just CValueObject subclasses. 2015-05-12 20:37:49 +01:00
Mathew Sutcliffe
9f98943c1f refs #413 Stream operator template of CLogPattern supports any class with a toQString method, not just CValueObject subclasses. 2015-05-12 20:37:48 +01:00
Mathew Sutcliffe
6b40cde862 refs #413 Make all value class methods non-virtual.
toCVariant() and convertFromCVariant() are now deprecated,
use CVariant::from() and CVariant::to() instead.
2015-05-12 20:37:47 +01:00
Mathew Sutcliffe
fe08792bef refs #413 Decomposed icon-related functions of CValueObject into Mixin::Icon. 2015-05-12 20:37:46 +01:00
Mathew Sutcliffe
75f46068e1 refs #413 Decomposed property indexing functions of CValueObject into Mixin::Index. 2015-05-12 20:37:45 +01:00
Mathew Sutcliffe
9b58959f9e refs #413 Decomposed stringification operations of CValueObject into Mixin::String. 2015-05-12 20:37:44 +01:00
Mathew Sutcliffe
b64ae55a86 refs #413 Access control of convertToQString changed from protected to public. 2015-05-12 20:37:43 +01:00
Mathew Sutcliffe
97d83e5e41 refs #413 Decomposed comparison operations of CValueObject into mixins. 2015-05-12 20:37:42 +01:00
Mathew Sutcliffe
64e21b0a46 refs #413 Decomposed json-related functions of CValueObject into Mixin::JsonByTuple. 2015-05-12 20:37:41 +01:00
Mathew Sutcliffe
30cc7048ac refs #413 Decomposed dbus-related functions of CValueObject into Mixin::DBusByTuple. 2015-05-12 20:37:31 +01:00
Mathew Sutcliffe
2f55caf7c6 refs #413 Decomposed hash-related functions of CValueObject into Mixin::HashByTuple. 2015-05-12 20:36:04 +01:00
Mathew Sutcliffe
d9faa031d2 refs #413 Decomposed metatype-related functions of CValueObject into a dedicated class Mixin::MetaType,
bypassing the old Policy::MetaType classes. The ultimate intention is to decompose all the aspects of
CValueObject into separate mixins in this manner, and have derived classes inherit from the mixins directly.
Splitting the responsibilities of CValueObject into separate classes will reduce the coupling between different
cross-cutting concerns and allow us to untangle the web of interdependencies and greatly simplify things.
2015-05-12 20:36:03 +01:00
Mathew Sutcliffe
6fd3c78d33 refs #413 Removed some operators of CEarthAngle which were not used, not needed, and not working. 2015-05-12 20:36:02 +01:00
Mathew Sutcliffe
bfbfab5304 refs #413 Moved "maybe" functions into a dedicated class Private::MetaTypeHelper. 2015-05-12 20:36:01 +01:00
Mathew Sutcliffe
03707db182 refs #413 Moved iconByIndex method from CIconList to CIcon, to reduce coupling. 2015-05-12 20:36:00 +01:00
Mathew Sutcliffe
d476c9b709 Fixed copyright notices. 2015-05-12 20:36:00 +01:00