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

Formatting, tweaks

Browse Source
This commit is contained in:
Klaus Basan
2014-07-06 17:07:48 +02:00
parent 4d3b3d213d
commit 76bc6f0efc
8 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context_simulator.h
View File

@@ -108,6 +108,6 @@ namespace BlackCore
IContextSimulator(CRuntimeConfig::ContextMode mode, CRuntime *runtime) : CContext(mode, runtime) {}
};
} // namespace BlackCore
} // namespace
#endif // guard

6
src/blackcore/simulator.h
View File

@@ -111,11 +111,7 @@ namespace BlackCore
//! ISimulatorVirtual destructor
virtual ~ISimulatorFactory() {}
/*!
* ISimulatorCreate a new instance
* \param parent
* \return
*/
//! Create a new instance
virtual ISimulator *create(QObject *parent = nullptr) = 0;
//! Simulator info

11
src/blackgui/aircraftlistmodel.h
View File

@@ -14,22 +14,17 @@
namespace BlackGui
{
/*!
* \brief Aircraft list model
* Aircraft list model
*/
class CAircraftListModel : public CListModelBase<BlackMisc::Aviation::CAircraft, BlackMisc::Aviation::CAircraftList>
{
public:
/*!
* \brief Constructor
* \param parent
*/
//! Constructor
explicit CAircraftListModel(QObject *parent = nullptr);
/*!
* \brief Destructor
*/
//! Destructor
virtual ~CAircraftListModel() {}
};

2
src/blackgui/aircraftview.h
View File

@@ -7,7 +7,7 @@
namespace BlackGui
{
/*!
* \brief Aircrafts view
* Aircrafts view
*/
class CAircraftView : public CViewBase<CAircraftListModel>
{

4
src/blackgui/airportlistmodel.h
View File

@@ -15,10 +15,10 @@ namespace BlackGui
public:
//! \brief Constructor
//! Constructor
explicit CAirportListModel(QObject *parent = nullptr);
//! \brief Destructor
//! Destructor
virtual ~CAirportListModel() {}
};
}

2
src/blackgui/listmodelbase.cpp
View File

@@ -7,6 +7,7 @@
#include "blackmisc/statusmessagelist.h"
#include "blackmisc/avatcstationlist.h"
#include "blackmisc/avaircraftlist.h"
#include "blackmisc/avairportlist.h"
#include "blackmisc/nwserverlist.h"
#include "blackmisc/nwuserlist.h"
#include "blackmisc/nwclientlist.h"
@@ -228,6 +229,7 @@ namespace BlackGui
template class CListModelBase<BlackMisc::CStatusMessage, BlackMisc::CStatusMessageList>;
template class CListModelBase<BlackMisc::Aviation::CAtcStation, BlackMisc::Aviation::CAtcStationList>;
template class CListModelBase<BlackMisc::Aviation::CAircraft, BlackMisc::Aviation::CAircraftList>;
template class CListModelBase<BlackMisc::Aviation::CAirport, BlackMisc::Aviation::CAirportList>;
template class CListModelBase<BlackMisc::Network::CServer, BlackMisc::Network::CServerList>;
template class CListModelBase<BlackMisc::Network::CUser, BlackMisc::Network::CUserList>;
template class CListModelBase<BlackMisc::Network::CClient, BlackMisc::Network::CClientList>;

2
src/blackgui/timerbasedcomponent.cpp
View File

@@ -19,7 +19,9 @@ namespace BlackGui
void CTimerBasedComponent::setUpdateInterval(int milliSeconds)
{
if (milliSeconds < 100)
{
this->m_timer->stop();
}
else
{
this->m_timer->setInterval(milliSeconds);

16
src/plugins/simulator/xplane/simulator_xplane.cpp
View File

@@ -239,7 +239,7 @@ namespace BlackSimPlugin
}
void CSimulatorXPlane::addRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign, const QString &type,
const BlackMisc::Aviation::CAircraftSituation &initialSituation)
const BlackMisc::Aviation::CAircraftSituation &initialSituation)
{
Q_UNUSED(initialSituation); // fixed gcc warning
if (! isConnected()) { return; }
@@ -249,18 +249,18 @@ namespace BlackSimPlugin
}
void CSimulatorXPlane::addAircraftSituation(const BlackMisc::Aviation::CCallsign &callsign,
const BlackMisc::Aviation::CAircraftSituation &situ)
const BlackMisc::Aviation::CAircraftSituation &situ)
{
if (! isConnected()) { return; }
if (! m_planes.contains(callsign.asString())) { addRemoteAircraft(callsign, "A320", situ); } // FIXME should not be needed here IMHO
using namespace BlackMisc::PhysicalQuantities;
m_traffic->setPlanePosition(callsign.asString(),
situ.latitude().value(CAngleUnit::deg()),
situ.longitude().value(CAngleUnit::deg()),
situ.getAltitude().value(CLengthUnit::ft()),
situ.getPitch().value(CAngleUnit::deg()),
situ.getBank().value(CAngleUnit::deg()),
situ.getHeading().value(CAngleUnit::deg()));
situ.latitude().value(CAngleUnit::deg()),
situ.longitude().value(CAngleUnit::deg()),
situ.getAltitude().value(CLengthUnit::ft()),
situ.getPitch().value(CAngleUnit::deg()),
situ.getBank().value(CAngleUnit::deg()),
situ.getHeading().value(CAngleUnit::deg()));
m_traffic->setPlaneSurfaces(callsign.asString(), true, 0, 0, 0, 0, 0, 0, 0, 0, 0, true, true, true, true, 0); // TODO landing gear, lights, control surfaces
m_traffic->setPlaneTransponder(callsign.asString(), 2000, true, false); // TODO transponder
}