@ -36,7 +36,7 @@ QGCView {
readonly property string levelHelp: qsTr ( "To level the horizon you need to place the vehicle in its level flight position and press OK." ) readonly property string levelHelp: qsTr ( "To level the horizon you need to place the vehicle in its level flight position and press OK." )
readonly property string airspeedHelp: qsTr ( "For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor." ) readonly property string airspeedHelp: qsTr ( "For Airspeed calibration you will need to keep your airspeed sensor out of any wind and then blow across the sensor." )
readonly property string statusTextAreaDefaultText: qsTr ( "Start the individual calibration steps by clicking one of the buttons above ." ) readonly property string statusTextAreaDefaultText: qsTr ( "Start the individual calibration steps by clicking one of the buttons to the left ." )
/ / U s e d t o p a s s w h a t t y p e o f c a l i b r a t i o n i s b e i n g p e r f o r m e d t o t h e p r e C a l i b r a t i o n D i a l o g / / U s e d t o p a s s w h a t t y p e o f c a l i b r a t i o n i s b e i n g p e r f o r m e d t o t h e p r e C a l i b r a t i o n D i a l o g
property string preCalibrationDialogType property string preCalibrationDialogType
@ -44,7 +44,7 @@ QGCView {
/ / U s e d t o p a s s h e l p t e x t t o t h e p r e C a l i b r a t i o n D i a l o g d i a l o g / / U s e d t o p a s s h e l p t e x t t o t h e p r e C a l i b r a t i o n D i a l o g d i a l o g
property string preCalibrationDialogHelp property string preCalibrationDialogHelp
readonly property int rotationColumnWidth: 25 0 readonly property int rotationColumnWidth: ScreenTools . defaultFontPixelWidth * 3 0
readonly property var rotations: [ readonly property var rotations: [
"ROTATION_NONE" , "ROTATION_NONE" ,
"ROTATION_YAW_45" , "ROTATION_YAW_45" ,
@ -114,7 +114,7 @@ QGCView {
onSetCompassRotations: { onSetCompassRotations: {
if ( showCompass0Rot || showCompass1Rot || showCompass2Rot ) { if ( showCompass0Rot || showCompass1Rot || showCompass2Rot ) {
showDialog ( compassRotation DialogComponent, qsTr ( "Set Compass Rotation(s)" ) , qgcView . showDialogDefaultWidth , StandardButton . Ok ) showDialog ( setOrientations DialogComponent, qsTr ( "Set Compass Rotation(s)" ) , qgcView . showDialogDefaultWidth , StandardButton . Ok )
} }
} }
@ -187,32 +187,55 @@ QGCView {
} }
Component { Component {
id: compassRotation DialogComponent id: setOrientations DialogComponent
QGCViewDialog { QGCViewDialog {
id: compassRotation Dialog id: setOrientations Dialog
Column { QGCFlickable {
anchors.fill: parent anchors.fill: parent
contentHeight: columnLayout . height
clip: true
Column {
id: columnLayout
anchors.margins: ScreenTools . defaultFontPixelWidth
anchors.left: parent . left
anchors.right: parent . right
anchors.top: parent . top
spacing: ScreenTools . defaultFontPixelHeight spacing: ScreenTools . defaultFontPixelHeight
QGCLabel { QGCLabel {
width: parent . width width: parent . width
wrapMode: Text . WordWrap wrapMode: Text . WordWrap
text: compassRotationText text: board RotationText
} }
Column {
QGCLabel {
text: qsTr ( "Autopilot Orientation:" )
}
FactComboBox {
id: boardRotationCombo
width: rotationColumnWidth ;
model: rotations
fact: sens_board_rot
}
}
Column {
/ / C o m p a s s 0 r o t a t i o n / / C o m p a s s 0 r o t a t i o n
Component { Component {
id: compass0ComponentLabel id: compass0ComponentLabel2
QGCLabel { QGCLabel {
text: qsTr ( "External Compass Orientation" ) text: qsTr ( "External Compass Orientation: " )
} }
} }
Component { Component {
id: compass0ComponentCombo id: compass0ComponentCombo2
FactComboBox { FactComboBox {
id: compass0RotationCombo id: compass0RotationCombo
@ -221,16 +244,23 @@ QGCView {
fact: cal_mag0_rot fact: cal_mag0_rot
} }
} }
Loader { sourceComponent: showCompass0Rot ? compass0ComponentLabel : null }
Loader { sourceComponent: showCompass0Rot ? compass0ComponentCombo : null } Loader { sourceComponent: showCompass0Rot ? compass0ComponentLabel2 : null }
Loader { sourceComponent: showCompass0Rot ? compass0ComponentCombo2 : null }
}
Column {
/ / C o m p a s s 1 r o t a t i o n / / C o m p a s s 1 r o t a t i o n
Component { Component {
id: compass1ComponentLabel id: compass1ComponentLabel2
QGCLabel { text: qsTr ( "Compass 1 Orientation" ) } QGCLabel {
text: qsTr ( "External Compass 1 Orientation:" )
} }
}
Component { Component {
id: compass1ComponentCombo id: compass1ComponentCombo2
FactComboBox { FactComboBox {
id: compass1RotationCombo id: compass1RotationCombo
@ -239,17 +269,25 @@ QGCView {
fact: cal_mag1_rot fact: cal_mag1_rot
} }
} }
Loader { sourceComponent: showCompass1Rot ? compass1ComponentLabel : null }
Loader { sourceComponent: showCompass1Rot ? compass1ComponentCombo : null } Loader { sourceComponent: showCompass1Rot ? compass1ComponentLabel2 : null }
Loader { sourceComponent: showCompass1Rot ? compass1ComponentCombo2 : null }
}
Column {
spacing: ScreenTools . defaultFontPixelWidth
/ / C o m p a s s 2 r o t a t i o n / / C o m p a s s 2 r o t a t i o n
Component { Component {
id: compass2ComponentLabel id: compass2ComponentLabel2
QGCLabel { text: qsTr ( "Compass 2 Orientation" ) } QGCLabel {
text: qsTr ( "Compass 2 Orientation" )
} }
}
Component { Component {
id: compass2ComponentCombo id: compass2ComponentCombo2
FactComboBox { FactComboBox {
id: compass1RotationCombo id: compass1RotationCombo
@ -258,26 +296,24 @@ QGCView {
fact: cal_mag2_rot fact: cal_mag2_rot
} }
} }
Loader { sourceComponent: showCompass2Rot ? compass2ComponentLabel : null } Loader { sourceComponent: showCompass2Rot ? compass2ComponentLabel2 : null }
Loader { sourceComponent: showCompass2Rot ? compass2ComponentCombo : null } Loader { sourceComponent: showCompass2Rot ? compass2ComponentCombo2 : null }
}
} / / C o l u m n } / / C o l u m n
} / / Q G C F l i c k a b l e
} / / Q G C V i e w D i a l o g } / / Q G C V i e w D i a l o g
} / / C o m p o n e n t - c o m p a s s R o t a t i o n D i a l o g C o m p o n e n t } / / C o m p o n e n t - s e t O r i e n t a t i o n s D i a l o g C o m p o n e n t
QGCViewPanel { QGCViewPanel {
id: panel id: panel
anchors.fill: parent anchors.fill: parent
Column { Column {
anchors.fill: parent id: buttonColumn
spacing: ScreenTools . defaultFontPixelHeight / 2
Row {
readonly property int buttonWidth: ScreenTools . defaultFontPixelWidth * 15 readonly property int buttonWidth: ScreenTools . defaultFontPixelWidth * 15
spacing: ScreenTools . defaultFontPixelWidth
QGCLabel { text: qsTr ( "Calibrate:" ) ; anchors.baseline: compassButton . baseline }
IndicatorButton { IndicatorButton {
id: compassButton id: compassButton
width: parent . buttonWidth width: parent . buttonWidth
@ -347,23 +383,36 @@ QGCView {
QGCButton { QGCButton {
id: cancelButton id: cancelButton
width: parent . buttonWidth
text: qsTr ( "Cancel" ) text: qsTr ( "Cancel" )
enabled: false enabled: false
onClicked: controller . cancelCalibration ( ) onClicked: controller . cancelCalibration ( )
} }
QGCButton {
width: parent . buttonWidth
text: qsTr ( "Set Orientations" )
onClicked: showDialog ( setOrientationsDialogComponent , qsTr ( "Set Orientations" ) , qgcView . showDialogDefaultWidth , StandardButton . Ok )
} }
} / / C o l u m n - B u t t o n s
Item { height: ScreenTools . defaultFontPixelHeight ; width: 10 } / / s p a c e r Column {
anchors.leftMargin: ScreenTools . defaultFontPixelWidth / 2
anchors.left: buttonColumn . right
anchors.right: parent . right
anchors.top: parent . top
anchors.bottom: parent . bottom
ProgressBar { ProgressBar {
id: progressBar id: progressBar
width: parent . width - rotationColumnWidth anchors.left: parent . left
anchors.right: parent . right
} }
Item { height: ScreenTools . defaultFontPixelHeight ; width: 10 } / / s p a c e r Item { height: ScreenTools . defaultFontPixelHeight ; width: 10 } / / s p a c e r
Item { Item {
property int calDisplayAreaWidth: parent . width - rotationColumnWidth property int calDisplayAreaWidth: parent . width
width: parent . width width: parent . width
height: parent . height - y height: parent . height - y
@ -402,12 +451,19 @@ QGCView {
Flow { Flow {
anchors.topMargin: ScreenTools . defaultFontPixelWidth anchors.topMargin: ScreenTools . defaultFontPixelWidth
anchors.top: orientationCalAreaHelpText . bottom anchors.top: orientationCalAreaHelpText . bottom
anchors.left: orientationCalAreaHelpText . left anchors.bottom: parent . bottom
anchors.left: parent . left
anchors.right: parent . right
width: parent . width width: parent . width
height: parent . height - orientationCalAreaHelpText . implicitHeight height: parent . height - orientationCalAreaHelpText . implicitHeight
spacing: ScreenTools . defaultFontPixelWidth spacing: ScreenTools . defaultFontPixelWidth / 2
property real indicatorWidth: ( width / 3 ) - ( spacing * 2 )
property real indicatorHeight: ( height / 2 ) - spacing
VehicleRotationCal { VehicleRotationCal {
width: parent . indicatorWidth
height: parent . indicatorHeight
visible: controller . orientationCalDownSideVisible visible: controller . orientationCalDownSideVisible
calValid: controller . orientationCalDownSideDone calValid: controller . orientationCalDownSideDone
calInProgress: controller . orientationCalDownSideInProgress calInProgress: controller . orientationCalDownSideInProgress
@ -415,6 +471,8 @@ QGCView {
imageSource: controller . orientationCalDownSideRotate ? "qrc:///qmlimages/VehicleDownRotate.png" : "qrc:///qmlimages/VehicleDown.png" imageSource: controller . orientationCalDownSideRotate ? "qrc:///qmlimages/VehicleDownRotate.png" : "qrc:///qmlimages/VehicleDown.png"
} }
VehicleRotationCal { VehicleRotationCal {
width: parent . indicatorWidth
height: parent . indicatorHeight
visible: controller . orientationCalUpsideDownSideVisible visible: controller . orientationCalUpsideDownSideVisible
calValid: controller . orientationCalUpsideDownSideDone calValid: controller . orientationCalUpsideDownSideDone
calInProgress: controller . orientationCalUpsideDownSideInProgress calInProgress: controller . orientationCalUpsideDownSideInProgress
@ -422,6 +480,8 @@ QGCView {
imageSource: controller . orientationCalUpsideDownSideRotate ? "qrc:///qmlimages/VehicleUpsideDownRotate.png" : "qrc:///qmlimages/VehicleUpsideDown.png" imageSource: controller . orientationCalUpsideDownSideRotate ? "qrc:///qmlimages/VehicleUpsideDownRotate.png" : "qrc:///qmlimages/VehicleUpsideDown.png"
} }
VehicleRotationCal { VehicleRotationCal {
width: parent . indicatorWidth
height: parent . indicatorHeight
visible: controller . orientationCalNoseDownSideVisible visible: controller . orientationCalNoseDownSideVisible
calValid: controller . orientationCalNoseDownSideDone calValid: controller . orientationCalNoseDownSideDone
calInProgress: controller . orientationCalNoseDownSideInProgress calInProgress: controller . orientationCalNoseDownSideInProgress
@ -429,6 +489,8 @@ QGCView {
imageSource: controller . orientationCalNoseDownSideRotate ? "qrc:///qmlimages/VehicleNoseDownRotate.png" : "qrc:///qmlimages/VehicleNoseDown.png" imageSource: controller . orientationCalNoseDownSideRotate ? "qrc:///qmlimages/VehicleNoseDownRotate.png" : "qrc:///qmlimages/VehicleNoseDown.png"
} }
VehicleRotationCal { VehicleRotationCal {
width: parent . indicatorWidth
height: parent . indicatorHeight
visible: controller . orientationCalTailDownSideVisible visible: controller . orientationCalTailDownSideVisible
calValid: controller . orientationCalTailDownSideDone calValid: controller . orientationCalTailDownSideDone
calInProgress: controller . orientationCalTailDownSideInProgress calInProgress: controller . orientationCalTailDownSideInProgress
@ -436,6 +498,8 @@ QGCView {
imageSource: controller . orientationCalTailDownSideRotate ? "qrc:///qmlimages/VehicleTailDownRotate.png" : "qrc:///qmlimages/VehicleTailDown.png" imageSource: controller . orientationCalTailDownSideRotate ? "qrc:///qmlimages/VehicleTailDownRotate.png" : "qrc:///qmlimages/VehicleTailDown.png"
} }
VehicleRotationCal { VehicleRotationCal {
width: parent . indicatorWidth
height: parent . indicatorHeight
visible: controller . orientationCalLeftSideVisible visible: controller . orientationCalLeftSideVisible
calValid: controller . orientationCalLeftSideDone calValid: controller . orientationCalLeftSideDone
calInProgress: controller . orientationCalLeftSideInProgress calInProgress: controller . orientationCalLeftSideInProgress
@ -443,6 +507,8 @@ QGCView {
imageSource: controller . orientationCalLeftSideRotate ? "qrc:///qmlimages/VehicleLeftRotate.png" : "qrc:///qmlimages/VehicleLeft.png" imageSource: controller . orientationCalLeftSideRotate ? "qrc:///qmlimages/VehicleLeftRotate.png" : "qrc:///qmlimages/VehicleLeft.png"
} }
VehicleRotationCal { VehicleRotationCal {
width: parent . indicatorWidth
height: parent . indicatorHeight
visible: controller . orientationCalRightSideVisible visible: controller . orientationCalRightSideVisible
calValid: controller . orientationCalRightSideDone calValid: controller . orientationCalRightSideDone
calInProgress: controller . orientationCalRightSideInProgress calInProgress: controller . orientationCalRightSideInProgress
@ -451,113 +517,6 @@ QGCView {
} }
} }
} }
Column {
anchors.leftMargin: ScreenTools . defaultFontPixelWidth
anchors.left: orientationCalArea . right
x: parent . width - rotationColumnWidth
spacing: ScreenTools . defaultFontPixelHeight
QGCLabel {
font.pointSize: ScreenTools . mediumFontPointSize
text: qsTr ( "Set Orientations" )
}
QGCLabel {
width: parent . width
wrapMode: Text . WordWrap
text: boardRotationText
}
Column {
QGCLabel {
text: qsTr ( "Autpilot Orientation:" )
}
FactComboBox {
id: boardRotationCombo
width: rotationColumnWidth ;
model: rotations
fact: sens_board_rot
}
}
Column {
/ / C o m p a s s 0 r o t a t i o n
Component {
id: compass0ComponentLabel2
QGCLabel {
text: qsTr ( "External Compass Orientation:" )
}
}
Component {
id: compass0ComponentCombo2
FactComboBox {
id: compass0RotationCombo
width: rotationColumnWidth
model: rotations
fact: cal_mag0_rot
}
}
Loader { sourceComponent: showCompass0Rot ? compass0ComponentLabel2 : null }
Loader { sourceComponent: showCompass0Rot ? compass0ComponentCombo2 : null }
}
Column {
/ / C o m p a s s 1 r o t a t i o n
Component {
id: compass1ComponentLabel2
QGCLabel {
text: qsTr ( "External Compass 1 Orientation:" )
}
}
Component {
id: compass1ComponentCombo2
FactComboBox {
id: compass1RotationCombo
width: rotationColumnWidth
model: rotations
fact: cal_mag1_rot
}
}
Loader { sourceComponent: showCompass1Rot ? compass1ComponentLabel2 : null }
Loader { sourceComponent: showCompass1Rot ? compass1ComponentCombo2 : null }
}
Column {
spacing: ScreenTools . defaultFontPixelWidth
/ / C o m p a s s 2 r o t a t i o n
Component {
id: compass2ComponentLabel2
QGCLabel {
text: qsTr ( "Compass 2 Orientation" )
}
}
Component {
id: compass2ComponentCombo2
FactComboBox {
id: compass1RotationCombo
width: rotationColumnWidth
model: rotations
fact: cal_mag2_rot
}
}
Loader { sourceComponent: showCompass2Rot ? compass2ComponentLabel2 : null }
Loader { sourceComponent: showCompass2Rot ? compass2ComponentCombo2 : null }
}
}
} }
} }
} / / Q G C V i e w P a n e l } / / Q G C V i e w P a n e l
Don Gagne
9 years ago
committed by
GitHub