mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-05-06 02:16:04 +08:00
@@ -64,7 +64,7 @@ namespace BlackCore
|
|||||||
|
|
||||||
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::isRemoteAircraftSupportingParts
|
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::isRemoteAircraftSupportingParts
|
||||||
//! \ingroup remoteaircraftprovider
|
//! \ingroup remoteaircraftprovider
|
||||||
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const;
|
virtual bool isRemoteAircraftSupportingParts(const BlackMisc::Aviation::CCallsign &callsign) const override;
|
||||||
|
|
||||||
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftSupportingParts
|
//! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::remoteAircraftSupportingParts
|
||||||
//! \ingroup remoteaircraftprovider
|
//! \ingroup remoteaircraftprovider
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ namespace BlackCore
|
|||||||
}
|
}
|
||||||
|
|
||||||
//! \copydoc IContextOwnAircraft::setAudioVoiceRoomOverrideUrls
|
//! \copydoc IContextOwnAircraft::setAudioVoiceRoomOverrideUrls
|
||||||
virtual void setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url)
|
virtual void setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url) override
|
||||||
{
|
{
|
||||||
Q_UNUSED(voiceRoom1Url);
|
Q_UNUSED(voiceRoom1Url);
|
||||||
Q_UNUSED(voiceRoom2Url);
|
Q_UNUSED(voiceRoom2Url);
|
||||||
@@ -114,7 +114,7 @@ namespace BlackCore
|
|||||||
}
|
}
|
||||||
|
|
||||||
//! \copydoc IContextOwnAircraft::enableAutomaticVoiceRoomResolution
|
//! \copydoc IContextOwnAircraft::enableAutomaticVoiceRoomResolution
|
||||||
virtual void enableAutomaticVoiceRoomResolution(bool enable)
|
virtual void enableAutomaticVoiceRoomResolution(bool enable) override
|
||||||
{
|
{
|
||||||
Q_UNUSED(enable);
|
Q_UNUSED(enable);
|
||||||
logEmptyContextWarning(Q_FUNC_INFO);
|
logEmptyContextWarning(Q_FUNC_INFO);
|
||||||
|
|||||||
@@ -47,11 +47,11 @@ namespace BlackCore
|
|||||||
|
|
||||||
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftParts
|
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftParts
|
||||||
//! \ingroup ownaircraftprovider
|
//! \ingroup ownaircraftprovider
|
||||||
virtual BlackMisc::Aviation::CAircraftParts getOwnAircraftParts() const;
|
virtual BlackMisc::Aviation::CAircraftParts getOwnAircraftParts() const override;
|
||||||
|
|
||||||
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftModel
|
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftModel
|
||||||
//! \ingroup ownaircraftprovider
|
//! \ingroup ownaircraftprovider
|
||||||
virtual BlackMisc::Simulation::CAircraftModel getOwnAircraftModel() const;
|
virtual BlackMisc::Simulation::CAircraftModel getOwnAircraftModel() const override;
|
||||||
|
|
||||||
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getDistanceToOwnAircraft
|
//! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getDistanceToOwnAircraft
|
||||||
//! \ingroup ownaircraftprovider
|
//! \ingroup ownaircraftprovider
|
||||||
|
|||||||
@@ -60,10 +60,10 @@ namespace BlackCore
|
|||||||
virtual void setAudioOutputVolume(int outputVolume) override;
|
virtual void setAudioOutputVolume(int outputVolume) override;
|
||||||
|
|
||||||
//! \copydoc IContextOwnAircraft::setAudioVoiceRoomOverrideUrls
|
//! \copydoc IContextOwnAircraft::setAudioVoiceRoomOverrideUrls
|
||||||
virtual void setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url);
|
virtual void setAudioVoiceRoomOverrideUrls(const QString &voiceRoom1Url, const QString &voiceRoom2Url) override;
|
||||||
|
|
||||||
//! \copydoc IContextOwnAircraft::enableAutomaticVoiceRoomResolution
|
//! \copydoc IContextOwnAircraft::enableAutomaticVoiceRoomResolution
|
||||||
virtual void enableAutomaticVoiceRoomResolution(bool enable);
|
virtual void enableAutomaticVoiceRoomResolution(bool enable) override;
|
||||||
|
|
||||||
//! \copydoc IContextOwnAircraft::parseCommandLine
|
//! \copydoc IContextOwnAircraft::parseCommandLine
|
||||||
virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override;
|
virtual bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator) override;
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ namespace BlackCore
|
|||||||
}
|
}
|
||||||
|
|
||||||
//! \copydoc IContextSimulator::setMaxRenderedDistance
|
//! \copydoc IContextSimulator::setMaxRenderedDistance
|
||||||
virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance)
|
virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance) override
|
||||||
{
|
{
|
||||||
Q_UNUSED(distance);
|
Q_UNUSED(distance);
|
||||||
logEmptyContextWarning(Q_FUNC_INFO);
|
logEmptyContextWarning(Q_FUNC_INFO);
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ namespace BlackCore
|
|||||||
virtual void setMaxRenderedAircraft(int number) override;
|
virtual void setMaxRenderedAircraft(int number) override;
|
||||||
|
|
||||||
//! \copydoc IContextSimulator::setMaxRenderedDistance
|
//! \copydoc IContextSimulator::setMaxRenderedDistance
|
||||||
virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance);
|
virtual void setMaxRenderedDistance(const BlackMisc::PhysicalQuantities::CLength &distance) override;
|
||||||
|
|
||||||
//! \copydoc IContextSimulator::setMaxRenderedDistance
|
//! \copydoc IContextSimulator::setMaxRenderedDistance
|
||||||
virtual void deleteAllRenderingRestrictions() override;
|
virtual void deleteAllRenderingRestrictions() override;
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ namespace BlackCore
|
|||||||
|
|
||||||
CInputManager::CInputManager(QObject *parent) :
|
CInputManager::CInputManager(QObject *parent) :
|
||||||
QObject(parent),
|
QObject(parent),
|
||||||
m_keyboard(std::move(IKeyboard::create(this))),
|
m_keyboard(IKeyboard::create(this)),
|
||||||
m_joystick(std::move(IJoystick::create(this)))
|
m_joystick(IJoystick::create(this))
|
||||||
{
|
{
|
||||||
connect(m_keyboard.get(), &IKeyboard::keyCombinationChanged, this, &CInputManager::ps_processKeyCombinationChanged);
|
connect(m_keyboard.get(), &IKeyboard::keyCombinationChanged, this, &CInputManager::ps_processKeyCombinationChanged);
|
||||||
connect(m_joystick.get(), &IJoystick::buttonCombinationChanged, this, &CInputManager::ps_processButtonCombinationChanged);
|
connect(m_joystick.get(), &IJoystick::buttonCombinationChanged, this, &CInputManager::ps_processButtonCombinationChanged);
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ namespace BlackCore
|
|||||||
virtual const BlackMisc::Simulation::CSimulatorSetup &getSimulatorSetup() const override;
|
virtual const BlackMisc::Simulation::CSimulatorSetup &getSimulatorSetup() const override;
|
||||||
|
|
||||||
//! \copydoc ISimulator::unload
|
//! \copydoc ISimulator::unload
|
||||||
virtual void unload();
|
virtual void unload() override;
|
||||||
|
|
||||||
//! \copydoc IContextSimulator::deleteAllRenderingRestrictions
|
//! \copydoc IContextSimulator::deleteAllRenderingRestrictions
|
||||||
virtual void deleteAllRenderingRestrictions() override;
|
virtual void deleteAllRenderingRestrictions() override;
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ namespace BlackCore
|
|||||||
protected: // QObject overrides
|
protected: // QObject overrides
|
||||||
|
|
||||||
//! Process voice lib
|
//! Process voice lib
|
||||||
virtual void timerEvent(QTimerEvent *);
|
virtual void timerEvent(QTimerEvent *) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ namespace BlackGui
|
|||||||
|
|
||||||
void CDbAutoStashingComponent::ps_entitiesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count)
|
void CDbAutoStashingComponent::ps_entitiesRead(CEntityFlags::Entity entity, CEntityFlags::ReadState readState, int count)
|
||||||
{
|
{
|
||||||
if (!readState != CEntityFlags::ReadFinished) { return; }
|
if (readState != CEntityFlags::ReadFinished) { return; }
|
||||||
Q_UNUSED(count);
|
Q_UNUSED(count);
|
||||||
Q_UNUSED(entity);
|
Q_UNUSED(entity);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ namespace BlackGui
|
|||||||
void setInfoText(const QString &dropSiteText);
|
void setInfoText(const QString &dropSiteText);
|
||||||
|
|
||||||
//! Drop allowed
|
//! Drop allowed
|
||||||
void allowDrop(bool allowed);
|
void allowDrop(bool allowed) override;
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
//! Dropped value object
|
//! Dropped value object
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ namespace BlackGui
|
|||||||
void clear();
|
void clear();
|
||||||
|
|
||||||
//! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
|
//! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
|
||||||
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider);
|
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
//! Set value
|
//! Set value
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ namespace BlackGui
|
|||||||
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
|
virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
|
||||||
|
|
||||||
//! \copydoc Models::IModelFilterProvider::createModelFilter
|
//! \copydoc Models::IModelFilterProvider::createModelFilter
|
||||||
std::unique_ptr<BlackGui::Models::IModelFilter<BlackMisc::Aviation::CAircraftIcaoCodeList> > createModelFilter() const;
|
std::unique_ptr<BlackGui::Models::IModelFilter<BlackMisc::Aviation::CAircraftIcaoCodeList> > createModelFilter() const override;
|
||||||
|
|
||||||
//! Filter by ICAO object as default values
|
//! Filter by ICAO object as default values
|
||||||
void filter(const BlackMisc::Aviation::CAircraftIcaoCode &icao);
|
void filter(const BlackMisc::Aviation::CAircraftIcaoCode &icao);
|
||||||
@@ -56,7 +56,7 @@ namespace BlackGui
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
//! \copydoc CFilterWidget::clearForm
|
//! \copydoc CFilterWidget::clearForm
|
||||||
void clearForm();
|
void clearForm() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QScopedPointer<Ui::CAircraftIcaoFilterBar> ui;
|
QScopedPointer<Ui::CAircraftIcaoFilterBar> ui;
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ namespace BlackGui
|
|||||||
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
|
virtual void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
|
||||||
|
|
||||||
//! \copydoc QItemDelegate::updateEditorGeometry
|
//! \copydoc QItemDelegate::updateEditorGeometry
|
||||||
virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const;
|
virtual void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QString m_iconCheckedUrl;
|
QString m_iconCheckedUrl;
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ namespace BlackGui
|
|||||||
virtual bool isDropAllowed() const override;
|
virtual bool isDropAllowed() const override;
|
||||||
|
|
||||||
//! \copydoc Components::CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
|
//! \copydoc Components::CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
|
||||||
virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget);
|
virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget) override;
|
||||||
|
|
||||||
//! Resize mode
|
//! Resize mode
|
||||||
ResizeMode getResizeMode() const { return m_resizeMode; }
|
ResizeMode getResizeMode() const { return m_resizeMode; }
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ namespace BlackMisc
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
codes == this->findByIataCode(icaoPattern.getIataCode());
|
codes = this->findByIataCode(icaoPattern.getIataCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (codes.size() == 1) { return codes.front(); }
|
if (codes.size() == 1) { return codes.front(); }
|
||||||
|
|||||||
@@ -43,13 +43,13 @@ namespace BlackMisc
|
|||||||
{ }
|
{ }
|
||||||
|
|
||||||
//! Set active frequency
|
//! Set active frequency
|
||||||
void setFrequencyActiveMHz(double frequencyMHz)
|
void setFrequencyActiveMHz(double frequencyMHz) override
|
||||||
{
|
{
|
||||||
this->CModulator::setFrequencyActiveMHz(frequencyMHz);
|
this->CModulator::setFrequencyActiveMHz(frequencyMHz);
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Set standby frequency
|
//! Set standby frequency
|
||||||
void setFrequencyStandbyMHz(double frequencyMHz)
|
void setFrequencyStandbyMHz(double frequencyMHz) override
|
||||||
{
|
{
|
||||||
this->CModulator::setFrequencyStandbyMHz(frequencyMHz);
|
this->CModulator::setFrequencyStandbyMHz(frequencyMHz);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -188,7 +188,7 @@ namespace BlackMisc
|
|||||||
|
|
||||||
std::array<double, 3> CCoordinateGeodetic::normalVectorDouble() const
|
std::array<double, 3> CCoordinateGeodetic::normalVectorDouble() const
|
||||||
{
|
{
|
||||||
return { this->m_x, this->m_y, this->m_z };
|
return { { this->m_x, this->m_y, this->m_z } };
|
||||||
}
|
}
|
||||||
|
|
||||||
void CCoordinateGeodetic::setLatitude(const CLatitude &latitude)
|
void CCoordinateGeodetic::setLatitude(const CLatitude &latitude)
|
||||||
|
|||||||
@@ -169,10 +169,10 @@ namespace BlackMisc
|
|||||||
virtual const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const override { return this->m_geodeticHeight; }
|
virtual const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const override { return this->m_geodeticHeight; }
|
||||||
|
|
||||||
//! \copydoc ICoordinateGeodetic::normalVector
|
//! \copydoc ICoordinateGeodetic::normalVector
|
||||||
virtual QVector3D normalVector() const;
|
virtual QVector3D normalVector() const override;
|
||||||
|
|
||||||
//! \copydoc ICoordinateGeodetic::normalVectorDouble
|
//! \copydoc ICoordinateGeodetic::normalVectorDouble
|
||||||
virtual std::array<double, 3> normalVectorDouble() const;
|
virtual std::array<double, 3> normalVectorDouble() const override;
|
||||||
|
|
||||||
//! \copydoc BlackMisc::Mixin::Index::propertyByIndex
|
//! \copydoc BlackMisc::Mixin::Index::propertyByIndex
|
||||||
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
|
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
|
||||||
|
|||||||
@@ -315,7 +315,7 @@ namespace BlackMisc
|
|||||||
{
|
{
|
||||||
if (this->isNull()) return false;
|
if (this->isNull()) return false;
|
||||||
if (value == 0) return true;
|
if (value == 0) return true;
|
||||||
return abs(value) <= this->m_epsilon;
|
return std::abs(value) <= this->m_epsilon;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! Is unit null?
|
//! Is unit null?
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ namespace BlackMisc
|
|||||||
virtual BlackMisc::Aviation::CAircraftParts getOwnAircraftParts() const override;
|
virtual BlackMisc::Aviation::CAircraftParts getOwnAircraftParts() const override;
|
||||||
|
|
||||||
//! \copydoc IOwnAircraftProvider::getOwnAircraftModel
|
//! \copydoc IOwnAircraftProvider::getOwnAircraftModel
|
||||||
virtual BlackMisc::Simulation::CAircraftModel getOwnAircraftModel() const;
|
virtual BlackMisc::Simulation::CAircraftModel getOwnAircraftModel() const override;
|
||||||
|
|
||||||
//! \copydoc IOwnAircraftProvider::getDistanceToOwnAircraft
|
//! \copydoc IOwnAircraftProvider::getDistanceToOwnAircraft
|
||||||
virtual BlackMisc::PhysicalQuantities::CLength getDistanceToOwnAircraft(const BlackMisc::Geo::ICoordinateGeodetic &position) const override;
|
virtual BlackMisc::PhysicalQuantities::CLength getDistanceToOwnAircraft(const BlackMisc::Geo::ICoordinateGeodetic &position) const override;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ namespace BlackMisc
|
|||||||
m_payload(payload)
|
m_payload(payload)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
CStatusException::CStatusException(const CStatusException &other) : std::exception(other)
|
CStatusException::CStatusException(const CStatusException &other) : std::exception(other), m_payload(other.m_payload)
|
||||||
{
|
{
|
||||||
QReadLocker lock(&other.m_lock);
|
QReadLocker lock(&other.m_lock);
|
||||||
this->m_temp = other.m_temp;
|
this->m_temp = other.m_temp;
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ namespace BlackMisc
|
|||||||
void valuesSaveRequested(const BlackMisc::CValueCachePacket &values);
|
void valuesSaveRequested(const BlackMisc::CValueCachePacket &values);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct Element; // remove forward declaration when elementsStartingWith uses C++14 auto deduced return type
|
struct Element; // remove forward declaration (and uncomment the one below) when elementsStartingWith uses C++14 auto deduced return type
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
//! Returns a range referring to all elements which start with the given prefix.
|
//! Returns a range referring to all elements which start with the given prefix.
|
||||||
@@ -235,7 +235,7 @@ namespace BlackMisc
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
friend class Private::CValuePage;
|
friend class Private::CValuePage;
|
||||||
struct Element;
|
// struct Element; // to be uncommented when the forward declaration above elementsStartingWith is removed
|
||||||
using ElementPtr = QSharedPointer<Element>; // QMap doesn't support move-only types
|
using ElementPtr = QSharedPointer<Element>; // QMap doesn't support move-only types
|
||||||
|
|
||||||
QMap<QString, ElementPtr> m_elements;
|
QMap<QString, ElementPtr> m_elements;
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ namespace BlackMisc
|
|||||||
protected:
|
protected:
|
||||||
QString getRegExp() const override { return QStringLiteral("^(?<airport>\\w{4}) "); }
|
QString getRegExp() const override { return QStringLiteral("^(?<airport>\\w{4}) "); }
|
||||||
|
|
||||||
bool validateAndSet(const QRegularExpressionMatch &match, CMetar &metar) const
|
bool validateAndSet(const QRegularExpressionMatch &match, CMetar &metar) const override
|
||||||
{
|
{
|
||||||
QString airportAsString = match.captured("airport");
|
QString airportAsString = match.captured("airport");
|
||||||
Q_ASSERT(!airportAsString.isEmpty());
|
Q_ASSERT(!airportAsString.isEmpty());
|
||||||
@@ -475,7 +475,7 @@ namespace BlackMisc
|
|||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool isRepeatable() const { return true; }
|
virtual bool isRepeatable() const override { return true; }
|
||||||
|
|
||||||
// w'w' represents present weather, coded in accordance with WMO Code Table 4678.
|
// w'w' represents present weather, coded in accordance with WMO Code Table 4678.
|
||||||
// As many groups as necessary are included, with each group containing from 2 to 9 characters.
|
// As many groups as necessary are included, with each group containing from 2 to 9 characters.
|
||||||
@@ -550,7 +550,7 @@ namespace BlackMisc
|
|||||||
return hash;
|
return hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual bool isRepeatable() const { return true; }
|
virtual bool isRepeatable() const override { return true; }
|
||||||
|
|
||||||
QString getRegExp() const override
|
QString getRegExp() const override
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -158,8 +158,8 @@ namespace BlackSimPlugin
|
|||||||
m_xplaneData.strobeLightsOn, m_xplaneData.landingLightsOn, m_xplaneData.taxiLightsOn,
|
m_xplaneData.strobeLightsOn, m_xplaneData.landingLightsOn, m_xplaneData.taxiLightsOn,
|
||||||
m_xplaneData.beaconLightsOn, m_xplaneData.navLightsOn, false
|
m_xplaneData.beaconLightsOn, m_xplaneData.navLightsOn, false
|
||||||
},
|
},
|
||||||
{ m_xplaneData.gearReployRatio > 0 }, { static_cast<int>(m_xplaneData.flapsReployRatio * 100) },
|
m_xplaneData.gearReployRatio > 0, static_cast<int>(m_xplaneData.flapsReployRatio * 100) ,
|
||||||
{ m_xplaneData.speedBrakeRatio > 0.5 }, engines, { m_xplaneData.onGroundAll }
|
m_xplaneData.speedBrakeRatio > 0.5, engines, m_xplaneData.onGroundAll
|
||||||
};
|
};
|
||||||
updateOwnParts(parts);
|
updateOwnParts(parts);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ namespace BlackSimPlugin
|
|||||||
virtual void reloadInstalledModels() override;
|
virtual void reloadInstalledModels() override;
|
||||||
|
|
||||||
//! \copydoc BlackCore::ISimulator::getAirportsInRange
|
//! \copydoc BlackCore::ISimulator::getAirportsInRange
|
||||||
virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const;
|
virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const override;
|
||||||
|
|
||||||
//! \copydoc BlackCore::ISimulator::setTimeSynchronization
|
//! \copydoc BlackCore::ISimulator::setTimeSynchronization
|
||||||
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;
|
virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;
|
||||||
|
|||||||
@@ -29,13 +29,13 @@ namespace BlackWxPlugin
|
|||||||
{
|
{
|
||||||
const CWeatherDataGfs::Grib2ParameterTable CWeatherDataGfs::m_grib2ParameterTable
|
const CWeatherDataGfs::Grib2ParameterTable CWeatherDataGfs::m_grib2ParameterTable
|
||||||
{
|
{
|
||||||
{ {0, 0}, { TMP, "Temperature", "K" } },
|
{ { {0, 0} }, { TMP, "Temperature", "K" } },
|
||||||
{ {1, 1}, { RH, "Relative Humidity", "%" } },
|
{ { {1, 1} }, { RH, "Relative Humidity", "%" } },
|
||||||
{ {2, 2}, { UGRD, "U-Component of Wind", "m s-1" } },
|
{ { {2, 2} }, { UGRD, "U-Component of Wind", "m s-1" } },
|
||||||
{ {2, 3}, { VGRD, "V-Component of Wind", "m s-1" } },
|
{ { {2, 3} }, { VGRD, "V-Component of Wind", "m s-1" } },
|
||||||
{ {3, 0}, { PRES, "Pressure", "Pa" } },
|
{ { {3, 0} }, { PRES, "Pressure", "Pa" } },
|
||||||
{ {3, 1}, { PRMSL, "Pressure Reduced to MSL", "Pa" } },
|
{ { {3, 1} }, { PRMSL, "Pressure Reduced to MSL", "Pa" } },
|
||||||
{ {6, 1}, { TCDC, "Total Cloud Cover", "%" } },
|
{ { {6, 1} }, { TCDC, "Total Cloud Cover", "%" } },
|
||||||
};
|
};
|
||||||
|
|
||||||
double millibarToLevel(double millibar)
|
double millibarToLevel(double millibar)
|
||||||
@@ -137,7 +137,7 @@ namespace BlackWxPlugin
|
|||||||
"VGRD",
|
"VGRD",
|
||||||
};
|
};
|
||||||
|
|
||||||
static const std::array<int, 4> cycles = { 0, 6, 12, 18 };
|
static const std::array<int, 4> cycles = { { 0, 6, 12, 18 } };
|
||||||
const QDateTime now = QDateTime::currentDateTimeUtc();
|
const QDateTime now = QDateTime::currentDateTimeUtc();
|
||||||
|
|
||||||
// GFS data is published after 4 yours.
|
// GFS data is published after 4 yours.
|
||||||
@@ -443,7 +443,7 @@ namespace BlackWxPlugin
|
|||||||
g2int parameterNumber = gfld->ipdtmpl[1];
|
g2int parameterNumber = gfld->ipdtmpl[1];
|
||||||
g2int valueFirstFixedSurface = gfld->ipdtmpl[11];
|
g2int valueFirstFixedSurface = gfld->ipdtmpl[11];
|
||||||
|
|
||||||
std::array<g2int, 2> key { parameterCategory, parameterNumber };
|
std::array<g2int, 2> key { { parameterCategory, parameterNumber } };
|
||||||
// Make sure the key exists
|
// Make sure the key exists
|
||||||
if (!m_grib2ParameterTable.contains(key))
|
if (!m_grib2ParameterTable.contains(key))
|
||||||
{
|
{
|
||||||
@@ -488,7 +488,7 @@ namespace BlackWxPlugin
|
|||||||
g2int parameterNumber = gfld->ipdtmpl[1];
|
g2int parameterNumber = gfld->ipdtmpl[1];
|
||||||
g2int typeFirstFixedSurface = gfld->ipdtmpl[9];
|
g2int typeFirstFixedSurface = gfld->ipdtmpl[9];
|
||||||
|
|
||||||
std::array<g2int, 2> key { parameterCategory, parameterNumber };
|
std::array<g2int, 2> key { { parameterCategory, parameterNumber } };
|
||||||
// Make sure the key exists
|
// Make sure the key exists
|
||||||
if (!m_grib2ParameterTable.contains(key))
|
if (!m_grib2ParameterTable.contains(key))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ protected:
|
|||||||
virtual void mousePressEvent(QMouseEvent *event) override;
|
virtual void mousePressEvent(QMouseEvent *event) override;
|
||||||
|
|
||||||
//! \copydoc QDialog::mouseMoveEvent
|
//! \copydoc QDialog::mouseMoveEvent
|
||||||
void mouseMoveEvent(QMouseEvent *event);
|
void mouseMoveEvent(QMouseEvent *event) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QScopedPointer<Ui::CSwiftLauncher> ui;
|
QScopedPointer<Ui::CSwiftLauncher> ui;
|
||||||
|
|||||||
Reference in New Issue
Block a user