Commit 4069ab9e authored by Don Gagne's avatar Don Gagne

Fix binding loop

parent 95cec0e0
...@@ -260,7 +260,7 @@ QGCView { ...@@ -260,7 +260,7 @@ QGCView {
thresholdValue: controller.manualModeThreshold thresholdValue: controller.manualModeThreshold
thresholdDragEnabled: false thresholdDragEnabled: false
onModeChannelIndexChanged: controller.manualModeChannelIndex = modeChannelIndex onModeChannelIndexSelected: controller.manualModeChannelIndex = index
} }
ModeSwitchDisplay { ModeSwitchDisplay {
...@@ -308,7 +308,7 @@ QGCView { ...@@ -308,7 +308,7 @@ QGCView {
thresholdValue: controller.acroModeThreshold thresholdValue: controller.acroModeThreshold
thresholdDragEnabled: true thresholdDragEnabled: true
onModeChannelIndexChanged: controller.acroModeChannelIndex = modeChannelIndex onModeChannelIndexSelected: controller.acroModeChannelIndex = index
onThresholdValueChanged: controller.acroModeThreshold = thresholdValue onThresholdValueChanged: controller.acroModeThreshold = thresholdValue
Behavior on y { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 1000 } } Behavior on y { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 1000 } }
...@@ -341,7 +341,7 @@ QGCView { ...@@ -341,7 +341,7 @@ QGCView {
thresholdValue: controller.posCtlModeThreshold thresholdValue: controller.posCtlModeThreshold
thresholdDragEnabled: true thresholdDragEnabled: true
onModeChannelIndexChanged: controller.posCtlModeChannelIndex = modeChannelIndex onModeChannelIndexSelected: controller.posCtlModeChannelIndex = index
onThresholdValueChanged: controller.posCtlModeThreshold = thresholdValue onThresholdValueChanged: controller.posCtlModeThreshold = thresholdValue
Behavior on y { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 1000 } } Behavior on y { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 1000 } }
...@@ -374,7 +374,7 @@ QGCView { ...@@ -374,7 +374,7 @@ QGCView {
thresholdValue: controller.loiterModeThreshold thresholdValue: controller.loiterModeThreshold
thresholdDragEnabled: true thresholdDragEnabled: true
onModeChannelIndexChanged: controller.loiterModeChannelIndex = modeChannelIndex onModeChannelIndexSelected: controller.loiterModeChannelIndex = index
onThresholdValueChanged: controller.loiterModeThreshold = thresholdValue onThresholdValueChanged: controller.loiterModeThreshold = thresholdValue
Behavior on y { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 1000 } } Behavior on y { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 1000 } }
...@@ -391,7 +391,7 @@ QGCView { ...@@ -391,7 +391,7 @@ QGCView {
thresholdValue: controller.returnModeThreshold thresholdValue: controller.returnModeThreshold
thresholdDragEnabled: true thresholdDragEnabled: true
onModeChannelIndexChanged: controller.returnModeChannelIndex = modeChannelIndex onModeChannelIndexSelected: controller.returnModeChannelIndex = index
onThresholdValueChanged: controller.returnModeThreshold = thresholdValue onThresholdValueChanged: controller.returnModeThreshold = thresholdValue
Behavior on y { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 1000 } } Behavior on y { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 1000 } }
...@@ -408,7 +408,7 @@ QGCView { ...@@ -408,7 +408,7 @@ QGCView {
thresholdValue: controller.offboardModeThreshold thresholdValue: controller.offboardModeThreshold
thresholdDragEnabled: true thresholdDragEnabled: true
onModeChannelIndexChanged: controller.offboardModeChannelIndex = modeChannelIndex onModeChannelIndexSelected: controller.offboardModeChannelIndex = index
onThresholdValueChanged: controller.offboardModeThreshold = thresholdValue onThresholdValueChanged: controller.offboardModeThreshold = thresholdValue
Behavior on y { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 1000 } } Behavior on y { PropertyAnimation { easing.type: Easing.InOutQuad; duration: 1000 } }
......
...@@ -45,6 +45,8 @@ Rectangle { ...@@ -45,6 +45,8 @@ Rectangle {
height: column.height + (ScreenTools.defaultFontPixelWidth * 2) height: column.height + (ScreenTools.defaultFontPixelWidth * 2)
color: _qgcPal.window color: _qgcPal.window
signal modeChannelIndexSelected(int index)
QGCPalette { id: _qgcPal; colorGroupEnabled: enabled } QGCPalette { id: _qgcPal; colorGroupEnabled: enabled }
Item { Item {
...@@ -82,7 +84,7 @@ Rectangle { ...@@ -82,7 +84,7 @@ Rectangle {
currentIndex: modeChannelIndex currentIndex: modeChannelIndex
enabled: modeChannelEnabled enabled: modeChannelEnabled
onActivated: modeChannelIndex = index onActivated: modeChannelIndexSelected(index)
} }
QGCLabel { QGCLabel {
......
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