flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-14 16:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #875, DBus fixes

Browse Source 
* wrong signal connection signature -> assert
* missing SELCAL in simulated aircraft
This commit is contained in:
Klaus Basan
2017-02-05 23:54:47 +01:00
committed by Mathew Sutcliffe
parent c1482dca36
commit 2f4c86fac4
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/context/contextsimulatorproxy.cpp
View File

@@ -51,7 +51,7 @@ namespace BlackCore
"modelMatchingCompleted", this, SIGNAL(modelMatchingCompleted(BlackMisc::Simulation::CSimulatedAircraft))); "modelMatchingCompleted", this, SIGNAL(modelMatchingCompleted(BlackMisc::Simulation::CSimulatedAircraft)));
Q_ASSERT(s); Q_ASSERT(s);
s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(), s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(),
"renderRestrictionsChanged", this, SIGNAL(renderRestrictionsChanged(bool, bool, int, BlackMisc::PhysicalQuantities::CLength, BlackMisc::PhysicalQuantities::CLength))); "renderRestrictionsChanged", this, SIGNAL(renderRestrictionsChanged(bool, bool, int, BlackMisc::PhysicalQuantities::CLength)));
Q_ASSERT(s); Q_ASSERT(s);
s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(), s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(),
"simulatorPluginChanged", this, SIGNAL(simulatorPluginChanged(BlackMisc::Simulation::CSimulatorPluginInfo))); "simulatorPluginChanged", this, SIGNAL(simulatorPluginChanged(BlackMisc::Simulation::CSimulatorPluginInfo)));
@@ -63,7 +63,7 @@ namespace BlackCore
"weatherGridReceived", this, SIGNAL(weatherGridReceived(BlackMisc::Weather::CWeatherGrid, BlackMisc::CIdentifier))); "weatherGridReceived", this, SIGNAL(weatherGridReceived(BlackMisc::Weather::CWeatherGrid, BlackMisc::CIdentifier)));
Q_ASSERT(s); Q_ASSERT(s);
s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(), s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(),
"addingRemoteModelFailed", this, SIGNAL(addingRemoteModelFailed(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::CStatusMessage &))); "addingRemoteModelFailed", this, SIGNAL(addingRemoteModelFailed(BlackMisc::Simulation::CSimulatedAircraft, BlackMisc::CStatusMessage)));
Q_ASSERT(s); Q_ASSERT(s);
Q_UNUSED(s); Q_UNUSED(s);
this->relayBaseClassSignals(serviceName, connection, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName()); this->relayBaseClassSignals(serviceName, connection, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName());

8
src/blackmisc/simulation/simulatedaircraft.h
View File

@@ -437,14 +437,16 @@ namespace BlackMisc
BLACK_METAMEMBER(com2system), BLACK_METAMEMBER(com2system),
BLACK_METAMEMBER(transponder), BLACK_METAMEMBER(transponder),
BLACK_METAMEMBER(parts), BLACK_METAMEMBER(parts),
BLACK_METAMEMBER(relativeDistance), BLACK_METAMEMBER(selcal),
BLACK_METAMEMBER(relativeBearing),
BLACK_METAMEMBER(model), BLACK_METAMEMBER(model),
BLACK_METAMEMBER(networkModel), BLACK_METAMEMBER(networkModel),
BLACK_METAMEMBER(enabled), BLACK_METAMEMBER(enabled),
BLACK_METAMEMBER(rendered), BLACK_METAMEMBER(rendered),
BLACK_METAMEMBER(partsSynchronized), BLACK_METAMEMBER(partsSynchronized),
BLACK_METAMEMBER(fastPositionUpdates) BLACK_METAMEMBER(fastPositionUpdates),
// ICoordinateWithRelativePosition
BLACK_METAMEMBER(relativeDistance),
BLACK_METAMEMBER(relativeBearing)
); );
}; };
} // namespace } // namespace