refs #432, adjusted originators

This commit is contained in:
Klaus Basan
2015-05-28 00:32:17 +02:00
parent a62cf48e18
commit 6c06ff5d46
20 changed files with 96 additions and 138 deletions

View File

@@ -21,10 +21,11 @@ using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
Client::Client(QObject *parent)
: QObject(parent), COwnAircraftAware(COwnAircraftProviderDummy::instance()),
: QObject(parent),
COwnAircraftAware(COwnAircraftProviderDummy::instance()),
COriginatorAware("samples:cmdClient"),
m_net(new BlackCore::CNetworkVatlib(COwnAircraftProviderDummy::instance(), this))
{
connect(m_net, &INetwork::atcPositionUpdate, this, &Client::atcPositionUpdate);
connect(m_net, &INetwork::atcDisconnected, this, &Client::atcDisconnected);
connect(m_net, &INetwork::connectionStatusChanged, this, &Client::connectionStatusChanged);
@@ -339,7 +340,8 @@ void Client::setOwnAircraftCmd(QTextStream &args)
BlackMisc::Aviation::CComSystem("COM1", BlackMisc::PhysicalQuantities::CFrequency(com1, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz())),
BlackMisc::Aviation::CComSystem("COM2", BlackMisc::PhysicalQuantities::CFrequency(com2, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz())),
BlackMisc::Aviation::CTransponder(xpdrCode, xpdrMode),
COriginator("cmdClient"));
originator());
Q_UNUSED(aircraft);
}
void Client::setOwnAircraftPositionCmd(QTextStream &args)

View File

@@ -14,6 +14,7 @@
#include "blackcore/network.h"
#include "blackmisc/simulation/ownaircraftproviderdummy.h"
#include "blackmisc/originatoraware.h"
#include <QObject>
#include <QTextStream>
#include <QMap>
@@ -21,7 +22,8 @@
class Client :
public QObject,
public BlackMisc::Simulation::COwnAircraftAware
public BlackMisc::Simulation::COwnAircraftAware,
public BlackMisc::COriginatorAware
{
Q_OBJECT
@@ -29,9 +31,11 @@ public:
Client(QObject *parent = nullptr);
signals:
//! Terminated
void quit();
public slots:
//! Handle command
void command(QString line);
private: //commands