From 74766ba839300715ecdad4d730a3afb2544f2afc Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Wed, 15 Mar 2017 12:13:29 -0700 Subject: [PATCH] FirmwarePlugin support indoor/outdoor brand image --- src/FirmwarePlugin/APM/APMFirmwarePlugin.h | 3 ++- src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h | 3 ++- src/FirmwarePlugin/FirmwarePlugin.h | 7 +++++-- src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h | 3 ++- src/Vehicle/Vehicle.cc | 9 +++++++-- src/Vehicle/Vehicle.h | 6 ++++-- 6 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/FirmwarePlugin/APM/APMFirmwarePlugin.h b/src/FirmwarePlugin/APM/APMFirmwarePlugin.h index faf3c0b76..672216919 100644 --- a/src/FirmwarePlugin/APM/APMFirmwarePlugin.h +++ b/src/FirmwarePlugin/APM/APMFirmwarePlugin.h @@ -95,7 +95,8 @@ public: QObject* loadParameterMetaData (const QString& metaDataFile); GeoFenceManager* newGeoFenceManager (Vehicle* vehicle) { return new APMGeoFenceManager(vehicle); } RallyPointManager* newRallyPointManager (Vehicle* vehicle) { return new APMRallyPointManager(vehicle); } - QString brandImage (const Vehicle* vehicle) const { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImage"); } + QString brandImageIndoor (const Vehicle* vehicle) const { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImage"); } + QString brandImageOutdoor (const Vehicle* vehicle) const { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImage"); } QString missionFlightMode (void) final; QString rtlFlightMode (void) final; diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h index e1b8150b6..58123f35b 100644 --- a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h +++ b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h @@ -83,7 +83,8 @@ public: bool supportsMotorInterference(void); - QString brandImage(const Vehicle* vehicle) const { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImageSub"); } + QString brandImageIndoor(const Vehicle* vehicle) const { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImageSub"); } + QString brandImageOutdoor(const Vehicle* vehicle) const { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/APM/BrandImageSub"); } const FirmwarePlugin::remapParamNameMajorVersionMap_t& paramNameRemapMajorVersionMap(void) const final { return _remapParamName; } int remapParamNameHigestMinorVersionNumber(int majorVersionNumber) const final; const QVariantList& toolBarIndicators(const Vehicle* vehicle) final; diff --git a/src/FirmwarePlugin/FirmwarePlugin.h b/src/FirmwarePlugin/FirmwarePlugin.h index e63836d45..a6bfa5c30 100644 --- a/src/FirmwarePlugin/FirmwarePlugin.h +++ b/src/FirmwarePlugin/FirmwarePlugin.h @@ -245,8 +245,11 @@ public: /// Return the resource file which contains the set of params loaded for offline editing. virtual QString offlineEditingParamFile(Vehicle* vehicle) { Q_UNUSED(vehicle); return QString(); } - /// Return the resource file which contains the brand image for the vehicle. - virtual QString brandImage(const Vehicle* vehicle) const { Q_UNUSED(vehicle) return QString(); } + /// Return the resource file which contains the brand image for the vehicle for Indoor theme. + virtual QString brandImageIndoor(const Vehicle* vehicle) const { Q_UNUSED(vehicle) return QString(); } + + /// Return the resource file which contains the brand image for the vehicle for Outdoor theme. + virtual QString brandImageOutdoor(const Vehicle* vehicle) const { Q_UNUSED(vehicle) return QString(); } /// Return the resource file which contains the vehicle icon used in the flight view when the view is dark (Satellite for instance) virtual QString vehicleImageOpaque(const Vehicle* vehicle) const; diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h index d6787c9f8..ef0eed447 100644 --- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h +++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h @@ -58,7 +58,8 @@ public: bool adjustIncomingMavlinkMessage (Vehicle* vehicle, mavlink_message_t* message) override; GeoFenceManager* newGeoFenceManager (Vehicle* vehicle) override { return new PX4GeoFenceManager(vehicle); } QString offlineEditingParamFile(Vehicle* vehicle) override { Q_UNUSED(vehicle); return QStringLiteral(":/FirmwarePlugin/PX4/PX4.OfflineEditing.params"); } - QString brandImage (const Vehicle* vehicle) const override { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/PX4/BrandImage"); } + QString brandImageIndoor (const Vehicle* vehicle) const override { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/PX4/BrandImage"); } + QString brandImageOutdoor (const Vehicle* vehicle) const override { Q_UNUSED(vehicle); return QStringLiteral("/qmlimages/PX4/BrandImage"); } QString missionFlightMode (void) override; QString rtlFlightMode (void) override; QString takeControlFlightMode (void) override; diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc index 0ea67378c..b21c0494f 100644 --- a/src/Vehicle/Vehicle.cc +++ b/src/Vehicle/Vehicle.cc @@ -2192,9 +2192,14 @@ void Vehicle::_newGeoFenceAvailable(void) } } -QString Vehicle::brandImage(void) const +QString Vehicle::brandImageIndoor(void) const { - return _firmwarePlugin->brandImage(this); + return _firmwarePlugin->brandImageIndoor(this); +} + +QString Vehicle::brandImageOutdoor(void) const +{ + return _firmwarePlugin->brandImageOutdoor(this); } QStringList Vehicle::unhealthySensors(void) const diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h index e10775014..7de40fe74 100644 --- a/src/Vehicle/Vehicle.h +++ b/src/Vehicle/Vehicle.h @@ -290,7 +290,8 @@ public: Q_PROPERTY(bool coaxialMotors READ coaxialMotors CONSTANT) Q_PROPERTY(bool xConfigMotors READ xConfigMotors CONSTANT) Q_PROPERTY(bool isOfflineEditingVehicle READ isOfflineEditingVehicle CONSTANT) - Q_PROPERTY(QString brandImage READ brandImage NOTIFY firmwareTypeChanged) + Q_PROPERTY(QString brandImageIndoor READ brandImageIndoor NOTIFY firmwareTypeChanged) + Q_PROPERTY(QString brandImageOutdoor READ brandImageOutdoor NOTIFY firmwareTypeChanged) Q_PROPERTY(QStringList unhealthySensors READ unhealthySensors NOTIFY unhealthySensorsChanged) Q_PROPERTY(QString missionFlightMode READ missionFlightMode CONSTANT) Q_PROPERTY(QString rtlFlightMode READ rtlFlightMode CONSTANT) @@ -567,7 +568,8 @@ public: uint8_t baseMode () const { return _base_mode; } uint32_t customMode () const { return _custom_mode; } bool isOfflineEditingVehicle () const { return _offlineEditingVehicle; } - QString brandImage () const; + QString brandImageIndoor () const; + QString brandImageOutdoor () const; QStringList unhealthySensors () const; QString missionFlightMode () const; QString rtlFlightMode () const; -- 2.22.0