Skip to content

Q
qgroundcontrol
Unverified Commit da8e98a1 authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #6974 from Williangalvani/subCamera2 

Create simplified camera page for sub
parents b51f2735 23308cf8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 579 additions and 0 deletions
src/AutoPilotPlugins/APM/APMCameraComponent.cc
View file @ da8e98a1
...@@ -54,7 +54,11 @@ QStringList APMCameraComponent::setupCompleteChangedTriggerList(void) const ...@@ -54,7 +54,11 @@ QStringList APMCameraComponent::setupCompleteChangedTriggerList(void) const
QUrl APMCameraComponent::setupSource(void) const QUrl APMCameraComponent::setupSource(void) const
{ {
if (_vehicle->sub()) {
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMCameraSubComponent.qml"));
}
return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMCameraComponent.qml")); return QUrl::fromUserInput(QStringLiteral("qrc:/qml/APMCameraComponent.qml"));
} }
QUrl APMCameraComponent::summaryQmlSource(void) const QUrl APMCameraComponent::summaryQmlSource(void) const
......
src/AutoPilotPlugins/APM/APMCameraSubComponent.qml 0 → 100644
View file @ da8e98a1
This diff is collapsed.
src/FirmwarePlugin/APM/APMResources.qrc
View file @ da8e98a1
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<file alias="APMAirframeComponent.qml">../../AutoPilotPlugins/APM/APMAirframeComponent.qml</file> <file alias="APMAirframeComponent.qml">../../AutoPilotPlugins/APM/APMAirframeComponent.qml</file>
<file alias="APMAirframeComponentSummary.qml">../../AutoPilotPlugins/APM/APMAirframeComponentSummary.qml</file> <file alias="APMAirframeComponentSummary.qml">../../AutoPilotPlugins/APM/APMAirframeComponentSummary.qml</file>
<file alias="APMCameraComponent.qml">../../AutoPilotPlugins/APM/APMCameraComponent.qml</file> <file alias="APMCameraComponent.qml">../../AutoPilotPlugins/APM/APMCameraComponent.qml</file>
<file alias="APMCameraSubComponent.qml">../../AutoPilotPlugins/APM/APMCameraSubComponent.qml</file>
<file alias="APMCameraComponentSummary.qml">../../AutoPilotPlugins/APM/APMCameraComponentSummary.qml</file> <file alias="APMCameraComponentSummary.qml">../../AutoPilotPlugins/APM/APMCameraComponentSummary.qml</file>
<file alias="APMFlightModesComponent.qml">../../AutoPilotPlugins/APM/APMFlightModesComponent.qml</file> <file alias="APMFlightModesComponent.qml">../../AutoPilotPlugins/APM/APMFlightModesComponent.qml</file>
<file alias="APMFlightModesComponentSummary.qml">../../AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml</file> <file alias="APMFlightModesComponentSummary.qml">../../AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml</file>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment