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
4069ab9e
Commit
4069ab9e
authored
Oct 25, 2015
by
Don Gagne
Browse files
Fix binding loop
parent
95cec0e0
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/AutoPilotPlugins/PX4/FlightModesComponent.qml
View file @
4069ab9e
...
...
@@ -260,7 +260,7 @@ QGCView {
thresholdValue
:
controller
.
manualModeThreshold
thresholdDragEnabled
:
false
onModeChannelIndex
Chang
ed
:
controller
.
manualModeChannelIndex
=
modeChannelI
ndex
onModeChannelIndex
Select
ed
:
controller
.
manualModeChannelIndex
=
i
ndex
}
ModeSwitchDisplay
{
...
...
@@ -308,7 +308,7 @@ QGCView {
thresholdValue
:
controller
.
acroModeThreshold
thresholdDragEnabled
:
true
onModeChannelIndex
Chang
ed
:
controller
.
acroModeChannelIndex
=
modeChannelI
ndex
onModeChannelIndex
Select
ed
:
controller
.
acroModeChannelIndex
=
i
ndex
onThresholdValueChanged
:
controller
.
acroModeThreshold
=
thresholdValue
Behavior
on
y
{
PropertyAnimation
{
easing.type
:
Easing
.
InOutQuad
;
duration
:
1000
}
}
...
...
@@ -341,7 +341,7 @@ QGCView {
thresholdValue
:
controller
.
posCtlModeThreshold
thresholdDragEnabled
:
true
onModeChannelIndex
Chang
ed
:
controller
.
posCtlModeChannelIndex
=
modeChannelI
ndex
onModeChannelIndex
Select
ed
:
controller
.
posCtlModeChannelIndex
=
i
ndex
onThresholdValueChanged
:
controller
.
posCtlModeThreshold
=
thresholdValue
Behavior
on
y
{
PropertyAnimation
{
easing.type
:
Easing
.
InOutQuad
;
duration
:
1000
}
}
...
...
@@ -374,7 +374,7 @@ QGCView {
thresholdValue
:
controller
.
loiterModeThreshold
thresholdDragEnabled
:
true
onModeChannelIndex
Chang
ed
:
controller
.
loiterModeChannelIndex
=
modeChannelI
ndex
onModeChannelIndex
Select
ed
:
controller
.
loiterModeChannelIndex
=
i
ndex
onThresholdValueChanged
:
controller
.
loiterModeThreshold
=
thresholdValue
Behavior
on
y
{
PropertyAnimation
{
easing.type
:
Easing
.
InOutQuad
;
duration
:
1000
}
}
...
...
@@ -391,7 +391,7 @@ QGCView {
thresholdValue
:
controller
.
returnModeThreshold
thresholdDragEnabled
:
true
onModeChannelIndex
Chang
ed
:
controller
.
returnModeChannelIndex
=
modeChannelI
ndex
onModeChannelIndex
Select
ed
:
controller
.
returnModeChannelIndex
=
i
ndex
onThresholdValueChanged
:
controller
.
returnModeThreshold
=
thresholdValue
Behavior
on
y
{
PropertyAnimation
{
easing.type
:
Easing
.
InOutQuad
;
duration
:
1000
}
}
...
...
@@ -408,7 +408,7 @@ QGCView {
thresholdValue
:
controller
.
offboardModeThreshold
thresholdDragEnabled
:
true
onModeChannelIndex
Chang
ed
:
controller
.
offboardModeChannelIndex
=
modeChannelI
ndex
onModeChannelIndex
Select
ed
:
controller
.
offboardModeChannelIndex
=
i
ndex
onThresholdValueChanged
:
controller
.
offboardModeThreshold
=
thresholdValue
Behavior
on
y
{
PropertyAnimation
{
easing.type
:
Easing
.
InOutQuad
;
duration
:
1000
}
}
...
...
src/QmlControls/ModeSwitchDisplay.qml
View file @
4069ab9e
...
...
@@ -45,6 +45,8 @@ Rectangle {
height
:
column
.
height
+
(
ScreenTools
.
defaultFontPixelWidth
*
2
)
color
:
_qgcPal
.
window
signal
modeChannelIndexSelected
(
int
index
)
QGCPalette
{
id
:
_qgcPal
;
colorGroupEnabled
:
enabled
}
Item
{
...
...
@@ -82,7 +84,7 @@ Rectangle {
currentIndex
:
modeChannelIndex
enabled
:
modeChannelEnabled
onActivated
:
modeChannelIndex
=
index
onActivated
:
modeChannelIndex
Selected
(
index
)
}
QGCLabel
{
...
...
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