Formatting, tweaks

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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