Skip to content
GitLab
Commit 1386aaa0 authored by Rustom Jehangir's avatar Rustom Jehangir
Browse files

Update lightsComponent to new SetupPage structure.

parent 66adea1a
Hide whitespace changes
Inline Side-by-side
src/AutoPilotPlugins/APM/APMLightsComponent.cc
View file @ 1386aaa0
......@@ -30,7 +30,7 @@ QString APMLightsComponent::name(void) const
QString APMLightsComponent::description(void) const
{
return tr("The Lights Component is used to setup lights settings.");
return tr("Lights setup is used to adjust light output channels.");
}
QString APMLightsComponent::iconResource(void) const
......
src/AutoPilotPlugins/APM/APMLightsComponent.qml
View file @ 1386aaa0
......@@ -17,181 +17,174 @@ import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
QGCView {
id: _lightsView
viewPanel: panel
anchors.fill: parent
FactPanelController { id: controller; factPanel: panel }
QGCPalette { id: palette; colorGroupEnabled: enabled }
property Fact _rc5Function: controller.getParameterFact(-1, "RC5_FUNCTION")
property Fact _rc6Function: controller.getParameterFact(-1, "RC6_FUNCTION")
property Fact _rc7Function: controller.getParameterFact(-1, "RC7_FUNCTION")
property Fact _rc8Function: controller.getParameterFact(-1, "RC8_FUNCTION")
property Fact _rc9Function: controller.getParameterFact(-1, "RC9_FUNCTION")
property Fact _rc10Function: controller.getParameterFact(-1, "RC10_FUNCTION")
property Fact _rc11Function: controller.getParameterFact(-1, "RC11_FUNCTION")
property Fact _rc12Function: controller.getParameterFact(-1, "RC12_FUNCTION")
property Fact _rc13Function: controller.getParameterFact(-1, "RC13_FUNCTION")
property Fact _rc14Function: controller.getParameterFact(-1, "RC14_FUNCTION")
readonly property real _margins: ScreenTools.defaultFontPixelHeight
readonly property int _rcFunctionDisabled: 0
readonly property int _rcFunctionRCIN9: 59
readonly property int _rcFunctionRCIN10: 60
readonly property int _firstLightsOutChannel: 5
readonly property int _lastLightsOutChannel: 14
Component.onCompleted: {
calcLightOutValues()
}
/// Light output channels are stored in RC#_FUNCTION parameters. We need to loop through those
/// to find them and setup the ui accordindly.
function calcLightOutValues() {
lightsLoader.lights1OutIndex = 0
lightsLoader.lights2OutIndex = 0
for (var channel=_firstLightsOutChannel; channel<=_lastLightsOutChannel; channel++) {
var functionFact = controller.getParameterFact(-1, "RC" + channel + "_FUNCTION")
if (functionFact.value == _rcFunctionRCIN9) {
lightsLoader.lights1OutIndex = channel - 4
} else if (functionFact.value == _rcFunctionRCIN10) {
lightsLoader.lights2OutIndex = channel - 4
}
}
}
function setRCFunction(channel, rcFunction) {
// First clear any previous settings for this function
for (var index=_firstLightsOutChannel; index<=_lastLightsOutChannel; index++) {
var functionFact = controller.getParameterFact(-1, "RC" + index + "_FUNCTION")
if (functionFact.value != _rcFunctionDisabled && functionFact.value == rcFunction) {
functionFact.value = _rcFunctionDisabled
}
}
// Now set the function into the new channel
if (channel != 0) {
var functionFact = controller.getParameterFact(-1, "RC" + channel + "_FUNCTION")
functionFact.value = rcFunction
}
}
// Whenever any RC#_FUNCTION parameters chagnes we need to go looking for light output channels again
Connections { target: _rc5Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc6Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc7Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc8Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc9Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc10Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc11Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc12Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc13Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc14Function; onValueChanged: calcLightOutValues() }
ListModel {
id: lightsOutModel
ListElement { text: qsTr("Disabled"); value: 0 }
ListElement { text: qsTr("Channel 5"); value: 5 }
ListElement { text: qsTr("Channel 6"); value: 6 }
ListElement { text: qsTr("Channel 7"); value: 7 }
ListElement { text: qsTr("Channel 8"); value: 8 }
ListElement { text: qsTr("Channel 9"); value: 9 }
ListElement { text: qsTr("Channel 10"); value: 10 }
ListElement { text: qsTr("Channel 11"); value: 11 }
ListElement { text: qsTr("Channel 12"); value: 12 }
ListElement { text: qsTr("Channel 13"); value: 13 }
ListElement { text: qsTr("Channel 14"); value: 14 }
}
SetupPage {
id: lightsPage
pageComponent: lightsPageComponent
Component {
id: lightSettings
Item {
width: rectangle.x + rectangle.width
height: rectangle.y + rectangle.height
QGCLabel {
id: settingsLabel
text: qsTr("Light Settings")
font.family: ScreenTools.demiboldFontFamily
id: lightsPageComponent
Column {
spacing: _margins
width: availableWidth
FactPanelController { id: controller; factPanel: lightsPage.viewPanel }
QGCPalette { id: palette; colorGroupEnabled: true }
property Fact _rc5Function: controller.getParameterFact(-1, "RC5_FUNCTION")
property Fact _rc6Function: controller.getParameterFact(-1, "RC6_FUNCTION")
property Fact _rc7Function: controller.getParameterFact(-1, "RC7_FUNCTION")
property Fact _rc8Function: controller.getParameterFact(-1, "RC8_FUNCTION")
property Fact _rc9Function: controller.getParameterFact(-1, "RC9_FUNCTION")
property Fact _rc10Function: controller.getParameterFact(-1, "RC10_FUNCTION")
property Fact _rc11Function: controller.getParameterFact(-1, "RC11_FUNCTION")
property Fact _rc12Function: controller.getParameterFact(-1, "RC12_FUNCTION")
property Fact _rc13Function: controller.getParameterFact(-1, "RC13_FUNCTION")
property Fact _rc14Function: controller.getParameterFact(-1, "RC14_FUNCTION")
readonly property real _margins: ScreenTools.defaultFontPixelHeight
readonly property int _rcFunctionDisabled: 0
readonly property int _rcFunctionRCIN9: 59
readonly property int _rcFunctionRCIN10: 60
readonly property int _firstLightsOutChannel: 5
readonly property int _lastLightsOutChannel: 14
Component.onCompleted: {
calcLightOutValues()
}
Rectangle {
id: rectangle
anchors.topMargin: _margins / 2
anchors.top: settingsLabel.bottom
width: lights1Combo.x + lights1Combo.width + _margins
height: lights2Combo.y + lights2Combo.height + _margins
color: palette.windowShade
QGCLabel {
id: lights1Label
anchors.margins: _margins
anchors.left: parent.left
anchors.baseline: lights1Combo.baseline
text: qsTr("Lights 1:")
}
QGCComboBox {
id: lights1Combo
anchors.margins: _margins
anchors.top: parent.top
anchors.left: lights1Label.right
width: ScreenTools.defaultFontPixelWidth * 15
model: lightsOutModel
currentIndex: lights1OutIndex
onActivated: setRCFunction(lightsOutModel.get(index).value, lights1Function)
/// Light output channels are stored in RC#_FUNCTION parameters. We need to loop through those
/// to find them and setup the ui accordindly.
function calcLightOutValues() {
lightsLoader.lights1OutIndex = 0
lightsLoader.lights2OutIndex = 0
for (var channel=_firstLightsOutChannel; channel<=_lastLightsOutChannel; channel++) {
var functionFact = controller.getParameterFact(-1, "RC" + channel + "_FUNCTION")
if (functionFact.value == _rcFunctionRCIN9) {
lightsLoader.lights1OutIndex = channel - 4
} else if (functionFact.value == _rcFunctionRCIN10) {
lightsLoader.lights2OutIndex = channel - 4
}
}
}
QGCLabel {
id: lights2Label
anchors.margins: _margins
anchors.left: parent.left
anchors.baseline: lights2Combo.baseline
text: qsTr("Lights 2:")
function setRCFunction(channel, rcFunction) {
// First clear any previous settings for this function
for (var index=_firstLightsOutChannel; index<=_lastLightsOutChannel; index++) {
var functionFact = controller.getParameterFact(-1, "RC" + index + "_FUNCTION")
if (functionFact.value != _rcFunctionDisabled && functionFact.value == rcFunction) {
functionFact.value = _rcFunctionDisabled
}
}
QGCComboBox {
id: lights2Combo
anchors.margins: _margins
anchors.top: lights1Combo.bottom
anchors.left: lights2Label.right
width: lights1Combo.width
model: lightsOutModel
currentIndex: lights2OutIndex
onActivated: setRCFunction(lightsOutModel.get(index).value, lights2Function)
// Now set the function into the new channel
if (channel != 0) {
var functionFact = controller.getParameterFact(-1, "RC" + channel + "_FUNCTION")
functionFact.value = rcFunction
}
} // Rectangle
} // Item
} // Component - lightSettings
}
QGCViewPanel {
id: panel
anchors.fill: parent
// Whenever any RC#_FUNCTION parameters chagnes we need to go looking for light output channels again
Connections { target: _rc5Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc6Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc7Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc8Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc9Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc10Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc11Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc12Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc13Function; onValueChanged: calcLightOutValues() }
Connections { target: _rc14Function; onValueChanged: calcLightOutValues() }
ListModel {
id: lightsOutModel
ListElement { text: qsTr("Disabled"); value: 0 }
ListElement { text: qsTr("Channel 5"); value: 5 }
ListElement { text: qsTr("Channel 6"); value: 6 }
ListElement { text: qsTr("Channel 7"); value: 7 }
ListElement { text: qsTr("Channel 8"); value: 8 }
ListElement { text: qsTr("Channel 9"); value: 9 }
ListElement { text: qsTr("Channel 10"); value: 10 }
ListElement { text: qsTr("Channel 11"); value: 11 }
ListElement { text: qsTr("Channel 12"); value: 12 }
ListElement { text: qsTr("Channel 13"); value: 13 }
ListElement { text: qsTr("Channel 14"); value: 14 }
}
QGCFlickable {
clip: true
anchors.fill: parent
contentWidth: lightsLoader.x + lightsLoader.width
contentHeight: lightsLoader.y + lightsLoader.height
Component {
id: lightSettings
Item {
width: rectangle.x + rectangle.width
height: rectangle.y + rectangle.height
QGCLabel {
id: settingsLabel
text: qsTr("Light Settings")
font.family: ScreenTools.demiboldFontFamily
}
Rectangle {
id: rectangle
anchors.topMargin: _margins / 2
anchors.top: settingsLabel.bottom
width: lights1Combo.x + lights1Combo.width + _margins
height: lights2Combo.y + lights2Combo.height + _margins
color: palette.windowShade
QGCLabel {
id: lights1Label
anchors.margins: _margins
anchors.left: parent.left
anchors.baseline: lights1Combo.baseline
text: qsTr("Lights 1:")
}
QGCComboBox {
id: lights1Combo
anchors.margins: _margins
anchors.top: parent.top
anchors.left: lights1Label.right
width: ScreenTools.defaultFontPixelWidth * 15
model: lightsOutModel
currentIndex: lights1OutIndex
onActivated: setRCFunction(lightsOutModel.get(index).value, lights1Function)
}
QGCLabel {
id: lights2Label
anchors.margins: _margins
anchors.left: parent.left
anchors.baseline: lights2Combo.baseline
text: qsTr("Lights 2:")
}
QGCComboBox {
id: lights2Combo
anchors.margins: _margins
anchors.top: lights1Combo.bottom
anchors.left: lights2Label.right
width: lights1Combo.width
model: lightsOutModel
currentIndex: lights2OutIndex
onActivated: setRCFunction(lightsOutModel.get(index).value, lights2Function)
}
} // Rectangle
} // Item
} // Component - lightSettings
Loader {
id: lightsLoader
sourceComponent: lightSettings
anchors.margins: _margins
anchors.top: parent.top
property int lights1OutIndex: 0
property int lights2OutIndex: 0
property int lights1Function: _rcFunctionRCIN9
property int lights2Function: _rcFunctionRCIN10
}
} // Flickable
} // QGCViewPanel
} // QGCView
} // Column
} // Component
} // SetupPage
Supports Markdown
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