flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 12:35:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of dev.vatsim-germany.org:vatpilotclient/client

Browse Source
This commit is contained in:
Klaus Basan
2014-03-12 02:28:50 +01:00
parent 60b7ffde19 805a751071
commit b1a5ada3a4
6 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/blackgui/mainwindow.cpp
View File

@@ -514,7 +514,7 @@ void MainWindow::updateSimulatorData()
else else
ui->le_SimulatorStatus->setText("Not connected"); ui->le_SimulatorStatus->setText("Not connected");
CAircraft ownAircraft = m_contextSimulator->ownAircraft(); CAircraft ownAircraft = m_contextSimulator->getOwnAircraft();
ui->le_SimulatorLatitude->setText(ownAircraft.getSituation().latitude().toFormattedQString()); ui->le_SimulatorLatitude->setText(ownAircraft.getSituation().latitude().toFormattedQString());
ui->le_SimulatorLongitude->setText(ownAircraft.getSituation().longitude().toFormattedQString()); ui->le_SimulatorLongitude->setText(ownAircraft.getSituation().longitude().toFormattedQString());
ui->le_SimulatorAltitude->setText(ownAircraft.getSituation().getAltitude().toFormattedQString()); ui->le_SimulatorAltitude->setText(ownAircraft.getSituation().getAltitude().toFormattedQString());

12
src/blackcore/context_simulator.h
View File

@@ -56,12 +56,6 @@ namespace BlackCore
*/ */
virtual bool usingLocalObjects() const = 0; virtual bool usingLocalObjects() const = 0;
/*!
* \brief Get user aircraft value object
* \return
*/
virtual BlackMisc::Aviation::CAircraft ownAircraft() const = 0;
signals: signals:
/*! /*!
* \brief Emitted when the simulator connection changes * \brief Emitted when the simulator connection changes
@@ -73,6 +67,12 @@ namespace BlackCore
//! Returns true when simulator is connected and available //! Returns true when simulator is connected and available
virtual bool isConnected() const = 0; virtual bool isConnected() const = 0;
/*!
* \brief Get user aircraft value object
* \return
*/
virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const = 0;
}; };
} // namespace BlackCore } // namespace BlackCore

2
src/blackcore/context_simulator_impl.cpp
View File

@@ -47,7 +47,7 @@ namespace BlackCore
return m_simulator->isConnected(); return m_simulator->isConnected();
} }
BlackMisc::Aviation::CAircraft CContextSimulator::ownAircraft() const BlackMisc::Aviation::CAircraft CContextSimulator::getOwnAircraft() const
{ {
return m_ownAircraft; return m_ownAircraft;
} }

5
src/blackcore/context_simulator_impl.h
View File

@@ -60,12 +60,13 @@ namespace BlackCore
//! \copydoc IContextSimulator::usingLocalObjects() //! \copydoc IContextSimulator::usingLocalObjects()
virtual bool usingLocalObjects() const override { return true; } virtual bool usingLocalObjects() const override { return true; }
virtual BlackMisc::Aviation::CAircraft ownAircraft() const override;
public slots: public slots:
//! \copydoc IContextSimulator::isConnected() //! \copydoc IContextSimulator::isConnected()
virtual bool isConnected() const override; virtual bool isConnected() const override;
//! \copydoc IContextSimulator::getOwnAircraft()
virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const override;
private slots: private slots:
//! \copydoc IContextSimulator::updateOwnAircraft() //! \copydoc IContextSimulator::updateOwnAircraft()
virtual void updateOwnAircraft(); virtual void updateOwnAircraft();

4
src/blackcore/context_simulator_proxy.cpp
View File

@@ -35,9 +35,9 @@ namespace BlackCore
return m_dBusInterface->callDBusRet<bool>(QLatin1Literal("isConnected")); return m_dBusInterface->callDBusRet<bool>(QLatin1Literal("isConnected"));
} }
BlackMisc::Aviation::CAircraft CContextSimulatorProxy::ownAircraft() const BlackMisc::Aviation::CAircraft CContextSimulatorProxy::getOwnAircraft() const
{ {
return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAircraft>(QLatin1Literal("ownAircraft")); return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAircraft>(QLatin1Literal("getOwnAircraft"));
} }
} // namespace BlackCore } // namespace BlackCore

6
src/blackcore/context_simulator_proxy.h
View File

@@ -33,8 +33,6 @@ namespace BlackCore
*/ */
virtual bool usingLocalObjects() const override { return false; } virtual bool usingLocalObjects() const override { return false; }
virtual BlackMisc::Aviation::CAircraft ownAircraft() const override;
private: private:
BlackMisc::CGenericDBusInterface *m_dBusInterface; BlackMisc::CGenericDBusInterface *m_dBusInterface;
@@ -59,8 +57,8 @@ namespace BlackCore
//! \copydoc IContextSimulator::isConnected() //! \copydoc IContextSimulator::isConnected()
virtual bool isConnected() const override; virtual bool isConnected() const override;
//virtual void ownAircraftUpdateReceived(BlackMisc::Aviation::CAircraft aircraft) override; //! \copydoc IContextSimulator::getOwnAircraft()
virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const override;
}; };
} // namespace BlackCore } // namespace BlackCore