rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity

OP-1438 VSI_Arc_PFD+Status : Typo (CruiseCtrl), little cleanup

Browse Source
This commit is contained in:
Laurent Lalanne 2014-08-20 13:32:19 +02:00
parent 8d0f4e71ea
commit 8447f474fd
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
View File

@ -63,11 +63,10 @@ Item {
} }
function hide_display_rcinput(){ function hide_display_rcinput(){
console.log("module: "+hide_display_rc); if (hide_display_rc == false)
if (hide_display_rc == false) hide_display_rc = true;
hide_display_rc = true; else
else hide_display_rc = false;
hide_display_rc = false;
} }
SvgElementImage { SvgElementImage {
@ -92,7 +91,6 @@ Item {
} }
} }
Repeater { Repeater {
id: satNumberBar id: satNumberBar
@ -369,7 +367,7 @@ Item {
states: State { states: State {
name: "fading" name: "fading"
when: TakeOffLocation.Status !== 0 when: TakeOffLocation.Status !== 0
PropertyChanges { target: home_bg; x: Math.floor(scaledBounds.x * sceneItem.width) + home_bg.width; } PropertyChanges { target: home_bg; x: Math.floor(scaledBounds.x * sceneItem.width) + home_bg.width; }
} }
transitions: Transition { transitions: Transition {
@ -390,7 +388,7 @@ Item {
states: State { states: State {
name: "fading_heading" name: "fading_heading"
when: TakeOffLocation.Status !== 0 when: TakeOffLocation.Status !== 0
PropertyChanges { target: home_heading_text; x: Math.floor(scaledBounds.x * sceneItem.width) + home_bg.width } PropertyChanges { target: home_heading_text; x: Math.floor(scaledBounds.x * sceneItem.width) + home_bg.width; }
} }
transitions: Transition { transitions: Transition {
@ -420,7 +418,7 @@ Item {
states: State { states: State {
name: "fading_distance" name: "fading_distance"
when: TakeOffLocation.Status !== 0 when: TakeOffLocation.Status !== 0
PropertyChanges { target: home_distance_text; x: Math.floor(scaledBounds.x * sceneItem.width) + home_bg.width; } PropertyChanges { target: home_distance_text; x: Math.floor(scaledBounds.x * sceneItem.width) + home_bg.width; }
} }
transitions: Transition { transitions: Transition {
@ -451,7 +449,7 @@ Item {
states: State { states: State {
name: "fading_distance" name: "fading_distance"
when: TakeOffLocation.Status !== 0 when: TakeOffLocation.Status !== 0
PropertyChanges { target: home_eta_text; x: Math.floor(scaledBounds.x * sceneItem.width) + home_bg.width; } PropertyChanges { target: home_eta_text; x: Math.floor(scaledBounds.x * sceneItem.width) + home_bg.width; }
} }
transitions: Transition { transitions: Transition {
@ -481,7 +479,7 @@ Item {
states: State { states: State {
name: "fading" name: "fading"
when: hide_display_rc !== true when: hide_display_rc !== true
PropertyChanges { target: rc_input_bg; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.91); } PropertyChanges { target: rc_input_bg; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.91); }
} }
transitions: Transition { transitions: Transition {
@ -500,7 +498,7 @@ Item {
states: State { states: State {
name: "fading" name: "fading"
when: hide_display_rc !== true when: hide_display_rc !== true
PropertyChanges { target: rc_input_labels; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.91); } PropertyChanges { target: rc_input_labels; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.91); }
} }
transitions: Transition { transitions: Transition {
@ -521,7 +519,7 @@ Item {
states: State { states: State {
name: "fading" name: "fading"
when: hide_display_rc !== true when: hide_display_rc !== true
PropertyChanges { target: rc_input_icon; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.91); } PropertyChanges { target: rc_input_icon; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.91); }
} }
transitions: Transition { transitions: Transition {
@ -539,12 +537,12 @@ Item {
width: scaledBounds.width * sceneItem.width width: scaledBounds.width * sceneItem.width
height: scaledBounds.height * sceneItem.height height: scaledBounds.height * sceneItem.height
x: (scaledBounds.x * sceneItem.width) + (ManualControlCommand.Roll * rc_stick.width *2.5) x: (scaledBounds.x * sceneItem.width) + (ManualControlCommand.Roll * rc_stick.width * 2.5)
y: (scaledBounds.y * sceneItem.height) + (ManualControlCommand.Pitch * rc_stick.width * 2.5) y: (scaledBounds.y * sceneItem.height) + (ManualControlCommand.Pitch * rc_stick.width * 2.5)
smooth: true smooth: true
//rotate it around the center of horizon //rotate it around his center
transform: Rotation { transform: Rotation {
angle: ManualControlCommand.Yaw * 90 angle: ManualControlCommand.Yaw * 90
origin.y : rc_stick.height / 2 origin.y : rc_stick.height / 2
@ -554,7 +552,7 @@ Item {
states: State { states: State {
name: "fading" name: "fading"
when: hide_display_rc !== true when: hide_display_rc !== true
PropertyChanges { target: rc_stick; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.91); } PropertyChanges { target: rc_stick; x: Math.floor(scaledBounds.x * sceneItem.width) - (rc_input_bg.width * 0.91); }
} }
transitions: Transition { transitions: Transition {

2
ground/openpilotgcs/share/openpilotgcs/pfd/default/Warnings.qml
View File

@ -227,7 +227,7 @@ Item {
Text { Text {
anchors.centerIn: parent anchors.centerIn: parent
text: ["MANUAL"," "," ", " ", " ", " ", " ", " ", " ", text: ["MANUAL"," "," ", " ", " ", " ", " ", " ", " ",
"ALT HOLD", "ALT VARIO", "CRUIZECTRL", "AUTO"][thrust_mode.toString()] "ALT HOLD", "ALT VARIO", "CRUISECTRL", "AUTO"][thrust_mode.toString()]
font { font {
family: "Arial" family: "Arial"
pixelSize: Math.floor(parent.height * 0.8) pixelSize: Math.floor(parent.height * 0.8)