Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
994ad2d1
Commit
994ad2d1
authored
Mar 06, 2017
by
Jacob Walser
Browse files
Add ROV flightmap image for Sub
parent
6e388c70
Changes
4
Show whitespace changes
Inline
Side-by-side
qgcresources.qrc
View file @
994ad2d1
...
...
@@ -166,6 +166,7 @@
<file alias="APM/BrandImage">src/FirmwarePlugin/APM/APMBrandImage.png</file>
<file alias="APM/BrandImageSub">src/FirmwarePlugin/APM/APMBrandImageSub.png</file>
<file alias="PX4/BrandImage">src/FirmwarePlugin/PX4/PX4BrandImage.png</file>
<file alias="subVehicleArrowOpaque.png">src/FlightMap/Images/sub.png</file>
</qresource>
<qresource prefix="/res">
<file alias="action.svg">resources/action.svg</file>
...
...
src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc
View file @
994ad2d1
...
...
@@ -231,3 +231,14 @@ APMSubmarineFactGroup::APMSubmarineFactGroup(QObject* parent)
_lightsLevel2Fact
.
setRawValue
(
std
::
numeric_limits
<
float
>::
quiet_NaN
());
_pilotGainFact
.
setRawValue
(
std
::
numeric_limits
<
float
>::
quiet_NaN
());
}
QString
ArduSubFirmwarePlugin
::
vehicleImageOpaque
(
const
Vehicle
*
vehicle
)
const
{
Q_UNUSED
(
vehicle
);
return
QStringLiteral
(
"/qmlimages/subVehicleArrowOpaque.png"
);
}
QString
ArduSubFirmwarePlugin
::
vehicleImageOutline
(
const
Vehicle
*
vehicle
)
const
{
return
vehicleImageOpaque
(
vehicle
);
}
src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h
View file @
994ad2d1
...
...
@@ -115,6 +115,12 @@ public:
bool
supportsMotorInterference
(
void
);
/// 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
override
;
/// Return the resource file which contains the vehicle icon used in the flight view when the view is light (Map for instance)
virtual
QString
vehicleImageOutline
(
const
Vehicle
*
vehicle
)
const
override
;
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
;
}
...
...
src/FlightMap/Images/sub.png
0 → 100644
View file @
994ad2d1
103 KB
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment