Skip to content

Q
qgroundcontrol
Commit 939b9c85 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Small screen fixes

parent e96f5f74
Show whitespace changes
Inline Side-by-side
Showing with 287 additions and 251 deletions
src/AutoPilotPlugins/APM/APMSensorsComponent.qml
View file @ 939b9c85
...@@ -27,20 +27,17 @@ QGCView { ...@@ -27,20 +27,17 @@ QGCView {
// Help text which is shown both in the status text area prior to pressing a cal button and in the // Help text which is shown both in the status text area prior to pressing a cal button and in the
// pre-calibration dialog. // pre-calibration dialog.
readonly property string orientationHelp: "If the orientation is in the direction of flight, select None." readonly property string orientationHelpSet: "If the orientation is in the direction of flight, select None."
readonly property string boardRotationText: "If the autopilot is mounted in flight direction, leave the default value (None)" readonly property string orientationHelpCal: "Before calibrating make sure orientation settings are correct. " + orientationHelpSet
readonly property string compassRotationText: "If the compass or GPS module is mounted in flight direction, leave the default value (None)" readonly property string compassRotationText: "If the compass or GPS module is mounted in flight direction, leave the default value (None)"
readonly property string compassHelp: "For Compass calibration you will need to rotate your vehicle through a number of positions. Most users prefer to do this wirelessly with the telemetry link." readonly property string compassHelp: "For Compass calibration you will need to rotate your vehicle through a number of positions."
readonly property string gyroHelp: "For Gyroscope calibration you will need to place your vehicle on a surface and leave it still." readonly property string gyroHelp: "For Gyroscope calibration you will need to place your vehicle on a surface and leave it still."
readonly property string accelHelp: "For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds." readonly property string accelHelp: "For Accelerometer calibration you will need to place your vehicle on all six sides on a perfectly level surface and hold it still in each orientation for a few seconds."
readonly property string levelHelp: "To level the horizon you need to place the vehicle in its level flight position and press OK." readonly property string levelHelp: "To level the horizon you need to place the vehicle in its level flight position and press OK."
readonly property string airspeedHelp: "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: "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: "Start the individual calibration steps by clicking one of the buttons above." readonly property string statusTextAreaDefaultText: "Start the individual calibration steps by clicking one of the buttons to the left."
// Used to pass what type of calibration is being performed to the preCalibrationDialog
property string preCalibrationDialogType
// Used to pass help text to the preCalibrationDialog dialog // Used to pass help text to the preCalibrationDialog dialog
property string preCalibrationDialogHelp property string preCalibrationDialogHelp
...@@ -100,6 +97,14 @@ QGCView { ...@@ -100,6 +97,14 @@ QGCView {
property bool showCompass2Rot: compass2Id.value > 0 && compass2External && compass2Use property bool showCompass2Rot: compass2Id.value > 0 && compass2External && compass2Use
property bool showCompass3Rot: compass3Id.value > 0 && compass3External && compass3Use property bool showCompass3Rot: compass3Id.value > 0 && compass3External && compass3Use
readonly property int _calTypeCompass: 1 ///< Calibrate compass
readonly property int _calTypeAccel: 2 ///< Calibrate accel
readonly property int _calTypeSet: 3 ///< Set orientations only
property bool _orientationsDialogShowCompass: true
property string _orientationDialogHelp: orientationHelpSet
property int _orientationDialogCalType
function validCompassOffsets(compassParamPrefix) { function validCompassOffsets(compassParamPrefix) {
var ofsX = controller.getParameterFact(-1, compassParamPrefix + "X") var ofsX = controller.getParameterFact(-1, compassParamPrefix + "X")
var ofsY = controller.getParameterFact(-1, compassParamPrefix + "Y") var ofsY = controller.getParameterFact(-1, compassParamPrefix + "Y")
...@@ -107,6 +112,34 @@ QGCView { ...@@ -107,6 +112,34 @@ QGCView {
return Math.sqrt(ofsX.value^2 + ofsY.value^2 + ofsZ.value^2) < 600 return Math.sqrt(ofsX.value^2 + ofsY.value^2 + ofsZ.value^2) < 600
} }
function showOrientationsDialog(calType) {
var dialogTitle
var buttons = StandardButton.Ok
_orientationDialogCalType = calType
switch (calType) {
case _calTypeCompass:
_orientationsDialogShowCompass = true
_orientationDialogHelp = orientationHelpCal
dialogTitle = qsTr("Calibrate Compass")
buttons |= StandardButton.Cancel
break
case _calTypeAccel:
_orientationsDialogShowCompass = false
_orientationDialogHelp = orientationHelpCal
dialogTitle = qsTr("Calibrate Accelerometer")
buttons |= StandardButton.Cancel
break
case _calTypeSet:
_orientationsDialogShowCompass = true
_orientationDialogHelp = orientationHelpSet
dialogTitle = qsTr("SetOrientations")
break
}
showDialog(orientationsDialogComponent, dialogTitle, qgcView.showDialogDefaultWidth, buttons)
}
APMSensorsComponentController { APMSensorsComponentController {
id: controller id: controller
factPanel: panel factPanel: panel
...@@ -116,6 +149,7 @@ QGCView { ...@@ -116,6 +149,7 @@ QGCView {
accelButton: accelButton accelButton: accelButton
nextButton: nextButton nextButton: nextButton
cancelButton: cancelButton cancelButton: cancelButton
setOrientationsButton: setOrientationsButton
orientationCalAreaHelpText: orientationCalAreaHelpText orientationCalAreaHelpText: orientationCalAreaHelpText
onResetStatusTextArea: statusLog.text = statusTextAreaDefaultText onResetStatusTextArea: statusLog.text = statusTextAreaDefaultText
...@@ -129,7 +163,7 @@ QGCView { ...@@ -129,7 +163,7 @@ QGCView {
} }
onCalibrationComplete: { onCalibrationComplete: {
if (preCalibrationDialogType == "accel") { if (_orientationDialogCalType == _calTypeAccel) {
_postCalibrationDialogText = qsTr("Accelerometer calibration complete.") _postCalibrationDialogText = qsTr("Accelerometer calibration complete.")
_postCalibrationDialogParams = [ "INS_ACCSCAL_X", "INS_ACCSCAL_Y", "INS_ACCSCAL_Z", _postCalibrationDialogParams = [ "INS_ACCSCAL_X", "INS_ACCSCAL_Y", "INS_ACCSCAL_Z",
"INS_ACC2SCAL_X", "INS_ACC2SCAL_Y", "INS_ACC2SCAL_Z", "INS_ACC2SCAL_X", "INS_ACC2SCAL_Y", "INS_ACC2SCAL_Z",
...@@ -137,7 +171,7 @@ QGCView { ...@@ -137,7 +171,7 @@ QGCView {
"INS_GYROFFS_X", "INS_GYROFFS_Y", "INS_GYROFFS_Z", "INS_GYROFFS_X", "INS_GYROFFS_Y", "INS_GYROFFS_Z",
"INS_GYR2OFFS_X", "INS_GYR2OFFS_Y", "INS_GYR2OFFS_Z", "INS_GYR2OFFS_X", "INS_GYR2OFFS_Y", "INS_GYR2OFFS_Z",
"INS_GYR3OFFS_X", "INS_GYR3OFFS_Y", "INS_GYR3OFFS_Z" ] "INS_GYR3OFFS_X", "INS_GYR3OFFS_Y", "INS_GYR3OFFS_Z" ]
} else if (preCalibrationDialogType == "compass") { } else if (_orientationDialogCalType == _calTypeCompass) {
_postCalibrationDialogText = qsTr("Compass calibration complete. ") _postCalibrationDialogText = qsTr("Compass calibration complete. ")
_postCalibrationDialogParams = []; _postCalibrationDialogParams = [];
if (compass1Id.value > 0) { if (compass1Id.value > 0) {
...@@ -179,42 +213,6 @@ QGCView { ...@@ -179,42 +213,6 @@ QGCView {
QGCPalette { id: qgcPal; colorGroupEnabled: panel.enabled } QGCPalette { id: qgcPal; colorGroupEnabled: panel.enabled }
Component {
id: preCalibrationDialogComponent
QGCViewDialog {
id: preCalibrationDialog
function accept() {
if (preCalibrationDialogType == "accel") {
controller.calibrateAccel()
} else if (preCalibrationDialogType == "compass") {
controller.calibrateCompass()
}
preCalibrationDialog.hideDialog()
}
QGCLabel {
id: label
anchors.left: parent.left
anchors.right: parent.right
wrapMode: Text.WordWrap
text: qsTr("Before calibrating make sure orientation settings are correct.")
}
Loader {
id: rotationsLoader
anchors.topMargin: ScreenTools.defaultFontPixelHeight
anchors.top: label.bottom
anchors.left: parent.left
anchors.right: parent.right
sourceComponent: rotationCombosComponent
property bool showCompassRotations: preCalibrationDialogType == "accel" ? false : true
}
}
}
Component { Component {
id: postCalibrationDialogComponent id: postCalibrationDialogComponent
...@@ -260,121 +258,146 @@ QGCView { ...@@ -260,121 +258,146 @@ QGCView {
} }
Component { Component {
id: rotationCombosComponent id: orientationsDialogComponent
Column { QGCViewDialog {
QGCLabel { id: orientationsDialog
font.pointSize: sideBarH1PointSize
text: qsTr("Set Orientations")
}
Item { function accept() {
width: 1 if (_orientationDialogCalType == _calTypeAccel) {
height: ScreenTools.defaultFontPixelHeight controller.calibrateAccel()
} else if (_orientationDialogCalType == _calTypeCompass) {
controller.calibrateCompass()
}
orientationsDialog.hideDialog()
} }
QGCFlickable {
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
QGCLabel { QGCLabel {
width: parent.width width: parent.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: orientationHelp text: _orientationDialogHelp
}
Item {
width: 1
height: ScreenTools.defaultFontPixelHeight
} }
// Board rotation Column {
QGCLabel { QGCLabel {
text: qsTr("Autopilot Orientation") text: qsTr("Autopilot Orientation:")
} }
FactComboBox { FactComboBox {
id: boardRotationCombo width: rotationColumnWidth
width: parent.width
fact: boardRot
indexModel: false indexModel: false
fact: boardRot
} }
Item {
width: 1
height: ScreenTools.defaultFontPixelHeight
} }
// Compass 1 rotation Column {
visible: _orientationsDialogShowCompass
Component {
id: compass1ComponentLabel
QGCLabel { QGCLabel {
text: qsTr("Compass 1 Orientation") text: qsTr("Compass 1 Orientation:")
visible: showCompassRotations && showCompass1Rot
} }
}
Component {
id: compass1ComponentCombo
FactComboBox { FactComboBox {
width: parent.width width: rotationColumnWidth
fact: compass1Rot
indexModel: false indexModel: false
visible: showCompassRotations && showCompass1Rot fact: compass1Rot
}
} }
Item { Loader { sourceComponent: showCompass1Rot ? compass1ComponentLabel : null }
width: 1 Loader { sourceComponent: showCompass1Rot ? compass1ComponentCombo : null }
height: ScreenTools.defaultFontPixelHeight
} }
// Compass 2 rotation Column {
visible: _orientationsDialogShowCompass
Component {
id: compass2ComponentLabel
QGCLabel { QGCLabel {
text: qsTr("Compass 2 Orientation") text: qsTr("Compass 2 Orientation:")
visible: showCompassRotations && showCompass2Rot }
} }
Component {
id: compass2ComponentCombo
FactComboBox { FactComboBox {
width: parent.width width: rotationColumnWidth
fact: compass2Rot
indexModel: false indexModel: false
visible: showCompassRotations && showCompass2Rot fact: compass2Rot
}
} }
Item { Loader { sourceComponent: showCompass2Rot ? compass2ComponentLabel : null }
width: 1 Loader { sourceComponent: showCompass2Rot ? compass2ComponentCombo : null }
height: ScreenTools.defaultFontPixelHeight
} }
// Compass 3 rotation Column {
visible: _orientationsDialogShowCompass
Component {
id: compass3ComponentLabel
QGCLabel { QGCLabel {
text: qsTr("Compass 3 Orientation") text: qsTr("Compass 3 Orientation")
visible: showCompassRotations && showCompass3Rot
} }
}
Component {
id: compass3ComponentCombo
FactComboBox { FactComboBox {
width: parent.width width: rotationColumnWidth
fact: compass3Rot
indexModel: false indexModel: false
visible: showCompassRotations && showCompass3Rot fact: compass3Rot
}
}
Loader { sourceComponent: showCompass3Rot ? compass3ComponentLabel : null }
Loader { sourceComponent: showCompass3Rot ? compass3ComponentCombo : null }
} }
} // Column } // Column
} // Component - Rotation combos } // QGCFlickable
} // QGCViewDialog
} // Component - orientationsDialogComponent
QGCViewPanel { QGCViewPanel {
id: panel id: panel
anchors.fill: parent anchors.fill: parent
Row { Column {
id: buttonsRow id: buttonColumn
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelHeight / 2
readonly property int buttonWidth: ScreenTools.defaultFontPixelWidth * 15 readonly property int buttonWidth: ScreenTools.defaultFontPixelWidth * 15
QGCLabel { text: qsTr("Calibrate:"); anchors.baseline: compassButton.baseline }
IndicatorButton { IndicatorButton {
id: accelButton id: accelButton
width: parent.buttonWidth width: parent.buttonWidth
text: qsTr("Accelerometer") text: qsTr("Accelerometer")
indicatorGreen: !accelCalNeeded indicatorGreen: !accelCalNeeded
onClicked: { onClicked: showOrientationsDialog(_calTypeAccel)
preCalibrationDialogType = "accel"
preCalibrationDialogHelp = accelHelp
showDialog(preCalibrationDialogComponent, qsTr("Calibrate Accelerometer"), qgcView.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Ok)
}
} }
IndicatorButton { IndicatorButton {
...@@ -387,15 +410,14 @@ QGCView { ...@@ -387,15 +410,14 @@ QGCView {
if (controller.accelSetupNeeded) { if (controller.accelSetupNeeded) {
showMessage(qsTr("Calibrate Compass"), qsTr("Accelerometer must be calibrated prior to Compass."), StandardButton.Ok) showMessage(qsTr("Calibrate Compass"), qsTr("Accelerometer must be calibrated prior to Compass."), StandardButton.Ok)
} else { } else {
preCalibrationDialogType = "compass" showOrientationsDialog(_calTypeCompass)
preCalibrationDialogHelp = compassHelp
showDialog(preCalibrationDialogComponent, qsTr("Calibrate Compass"), qgcView.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Ok)
} }
} }
} }
QGCButton { QGCButton {
id: nextButton id: nextButton
width: parent.buttonWidth
text: qsTr("Next") text: qsTr("Next")
enabled: false enabled: false
onClicked: controller.nextClicked() onClicked: controller.nextClicked()
...@@ -403,28 +425,39 @@ QGCView { ...@@ -403,28 +425,39 @@ 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()
} }
} // Row - Cal buttons
QGCButton {
id: setOrientationsButton
width: parent.buttonWidth
text: qsTr("Set Orientations")
onClicked: showOrientationsDialog(_calTypeSet)
}
} // Column - Buttons
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
anchors.topMargin: ScreenTools.defaultFontPixelHeight
anchors.top: buttonsRow.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: centerPanel.right anchors.right: parent.right
} }
Item { height: ScreenTools.defaultFontPixelHeight; width: 10 } // spacer
Item { Item {
id: centerPanel id: centerPanel
anchors.topMargin: ScreenTools.defaultFontPixelHeight width: parent.width
anchors.rightMargin: ScreenTools.defaultFontPixelHeight height: parent.height - y
anchors.top: progressBar.bottom
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: rotationsLoader.left
TextArea { TextArea {
id: statusTextArea id: statusTextArea
...@@ -523,16 +556,6 @@ QGCView { ...@@ -523,16 +556,6 @@ QGCView {
} }
} }
} // Item - Cal display area } // Item - Cal display area
} // Column - cal display
Loader {
id: rotationsLoader
anchors.top: centerPanel.top
anchors.bottom: parent.bottom
anchors.right: parent.right
width: rotationColumnWidth
sourceComponent: rotationCombosComponent
property bool showCompassRotations: true
}
} // QGCViewPanel } // QGCViewPanel
} // QGCView } // QGCView
src/AutoPilotPlugins/APM/APMSensorsComponentController.cc
View file @ 939b9c85
...@@ -26,6 +26,7 @@ APMSensorsComponentController::APMSensorsComponentController(void) : ...@@ -26,6 +26,7 @@ APMSensorsComponentController::APMSensorsComponentController(void) :
_accelButton(NULL), _accelButton(NULL),
_nextButton(NULL), _nextButton(NULL),
_cancelButton(NULL), _cancelButton(NULL),
_setOrientationsButton(NULL),
_showOrientationCalArea(false), _showOrientationCalArea(false),
_magCalInProgress(false), _magCalInProgress(false),
_accelCalInProgress(false), _accelCalInProgress(false),
...@@ -85,6 +86,7 @@ void APMSensorsComponentController::_startLogCalibration(void) ...@@ -85,6 +86,7 @@ void APMSensorsComponentController::_startLogCalibration(void)
_compassButton->setEnabled(false); _compassButton->setEnabled(false);
_accelButton->setEnabled(false); _accelButton->setEnabled(false);
_setOrientationsButton->setEnabled(false);
if (_accelCalInProgress) { if (_accelCalInProgress) {
_nextButton->setEnabled(true); _nextButton->setEnabled(true);
} }
...@@ -95,6 +97,7 @@ void APMSensorsComponentController::_startVisualCalibration(void) ...@@ -95,6 +97,7 @@ void APMSensorsComponentController::_startVisualCalibration(void)
{ {
_compassButton->setEnabled(false); _compassButton->setEnabled(false);
_accelButton->setEnabled(false); _accelButton->setEnabled(false);
_setOrientationsButton->setEnabled(false);
_cancelButton->setEnabled(true); _cancelButton->setEnabled(true);
_resetInternalState(); _resetInternalState();
...@@ -138,6 +141,7 @@ void APMSensorsComponentController::_stopCalibration(APMSensorsComponentControll ...@@ -138,6 +141,7 @@ void APMSensorsComponentController::_stopCalibration(APMSensorsComponentControll
_compassButton->setEnabled(true); _compassButton->setEnabled(true);
_accelButton->setEnabled(true); _accelButton->setEnabled(true);
_setOrientationsButton->setEnabled(true);
_nextButton->setEnabled(false); _nextButton->setEnabled(false);
_cancelButton->setEnabled(false); _cancelButton->setEnabled(false);
......
src/AutoPilotPlugins/APM/APMSensorsComponentController.h
View file @ 939b9c85
...@@ -36,6 +36,7 @@ public: ...@@ -36,6 +36,7 @@ public:
Q_PROPERTY(QQuickItem* accelButton MEMBER _accelButton) Q_PROPERTY(QQuickItem* accelButton MEMBER _accelButton)
Q_PROPERTY(QQuickItem* nextButton MEMBER _nextButton) Q_PROPERTY(QQuickItem* nextButton MEMBER _nextButton)
Q_PROPERTY(QQuickItem* cancelButton MEMBER _cancelButton) Q_PROPERTY(QQuickItem* cancelButton MEMBER _cancelButton)
Q_PROPERTY(QQuickItem* setOrientationsButton MEMBER _setOrientationsButton)
Q_PROPERTY(QQuickItem* orientationCalAreaHelpText MEMBER _orientationCalAreaHelpText) Q_PROPERTY(QQuickItem* orientationCalAreaHelpText MEMBER _orientationCalAreaHelpText)
Q_PROPERTY(bool compassSetupNeeded READ compassSetupNeeded NOTIFY setupNeededChanged) Q_PROPERTY(bool compassSetupNeeded READ compassSetupNeeded NOTIFY setupNeededChanged)
...@@ -123,6 +124,7 @@ private: ...@@ -123,6 +124,7 @@ private:
QQuickItem* _accelButton; QQuickItem* _accelButton;
QQuickItem* _nextButton; QQuickItem* _nextButton;
QQuickItem* _cancelButton; QQuickItem* _cancelButton;
QQuickItem* _setOrientationsButton;
QQuickItem* _orientationCalAreaHelpText; QQuickItem* _orientationCalAreaHelpText;
bool _showOrientationCalArea; bool _showOrientationCalArea;
......
src/AutoPilotPlugins/PX4/SensorsComponent.qml
View file @ 939b9c85
...@@ -108,6 +108,7 @@ QGCView { ...@@ -108,6 +108,7 @@ QGCView {
airspeedButton: airspeedButton airspeedButton: airspeedButton
levelButton: levelButton levelButton: levelButton
cancelButton: cancelButton cancelButton: cancelButton
setOrientationsButton: setOrientationsButton
orientationCalAreaHelpText: orientationCalAreaHelpText orientationCalAreaHelpText: orientationCalAreaHelpText
onResetStatusTextArea: statusLog.text = statusTextAreaDefaultText onResetStatusTextArea: statusLog.text = statusTextAreaDefaultText
...@@ -398,6 +399,7 @@ QGCView { ...@@ -398,6 +399,7 @@ QGCView {
} }
QGCButton { QGCButton {
id: setOrientationsButton
width: parent.buttonWidth width: parent.buttonWidth
text: qsTr("Set Orientations") text: qsTr("Set Orientations")
onClicked: showDialog(setOrientationsDialogComponent, qsTr("Set Orientations"), qgcView.showDialogDefaultWidth, StandardButton.Ok) onClicked: showDialog(setOrientationsDialogComponent, qsTr("Set Orientations"), qgcView.showDialogDefaultWidth, StandardButton.Ok)
......
src/AutoPilotPlugins/PX4/SensorsComponentController.cc
View file @ 939b9c85
...@@ -30,6 +30,7 @@ SensorsComponentController::SensorsComponentController(void) : ...@@ -30,6 +30,7 @@ SensorsComponentController::SensorsComponentController(void) :
_airspeedButton(NULL), _airspeedButton(NULL),
_levelButton(NULL), _levelButton(NULL),
_cancelButton(NULL), _cancelButton(NULL),
_setOrientationsButton(NULL),
_showOrientationCalArea(false), _showOrientationCalArea(false),
_gyroCalInProgress(false), _gyroCalInProgress(false),
_magCalInProgress(false), _magCalInProgress(false),
...@@ -98,6 +99,7 @@ void SensorsComponentController::_startVisualCalibration(void) ...@@ -98,6 +99,7 @@ void SensorsComponentController::_startVisualCalibration(void)
_accelButton->setEnabled(false); _accelButton->setEnabled(false);
_airspeedButton->setEnabled(false); _airspeedButton->setEnabled(false);
_levelButton->setEnabled(false); _levelButton->setEnabled(false);
_setOrientationsButton->setEnabled(false);
_cancelButton->setEnabled(true); _cancelButton->setEnabled(true);
_resetInternalState(); _resetInternalState();
...@@ -140,6 +142,7 @@ void SensorsComponentController::_stopCalibration(SensorsComponentController::St ...@@ -140,6 +142,7 @@ void SensorsComponentController::_stopCalibration(SensorsComponentController::St
_accelButton->setEnabled(true); _accelButton->setEnabled(true);
_airspeedButton->setEnabled(true); _airspeedButton->setEnabled(true);
_levelButton->setEnabled(true); _levelButton->setEnabled(true);
_setOrientationsButton->setEnabled(true);
_cancelButton->setEnabled(false); _cancelButton->setEnabled(false);
if (code == StopCalibrationSuccess) { if (code == StopCalibrationSuccess) {
......
src/AutoPilotPlugins/PX4/SensorsComponentController.h
View file @ 939b9c85
...@@ -40,6 +40,7 @@ public: ...@@ -40,6 +40,7 @@ public:
Q_PROPERTY(QQuickItem* airspeedButton MEMBER _airspeedButton) Q_PROPERTY(QQuickItem* airspeedButton MEMBER _airspeedButton)
Q_PROPERTY(QQuickItem* levelButton MEMBER _levelButton) Q_PROPERTY(QQuickItem* levelButton MEMBER _levelButton)
Q_PROPERTY(QQuickItem* cancelButton MEMBER _cancelButton) Q_PROPERTY(QQuickItem* cancelButton MEMBER _cancelButton)
Q_PROPERTY(QQuickItem* setOrientationsButton MEMBER _setOrientationsButton)
Q_PROPERTY(QQuickItem* orientationCalAreaHelpText MEMBER _orientationCalAreaHelpText) Q_PROPERTY(QQuickItem* orientationCalAreaHelpText MEMBER _orientationCalAreaHelpText)
Q_PROPERTY(bool showOrientationCalArea MEMBER _showOrientationCalArea NOTIFY showOrientationCalAreaChanged) Q_PROPERTY(bool showOrientationCalArea MEMBER _showOrientationCalArea NOTIFY showOrientationCalAreaChanged)
...@@ -121,6 +122,7 @@ private: ...@@ -121,6 +122,7 @@ private:
QQuickItem* _airspeedButton; QQuickItem* _airspeedButton;
QQuickItem* _levelButton; QQuickItem* _levelButton;
QQuickItem* _cancelButton; QQuickItem* _cancelButton;
QQuickItem* _setOrientationsButton;
QQuickItem* _orientationCalAreaHelpText; QQuickItem* _orientationCalAreaHelpText;
bool _showGyroCalArea; bool _showGyroCalArea;
......
src/FactSystem/FactControls/FactTextField.qml
View file @ 939b9c85
...@@ -21,7 +21,7 @@ QGCTextField { ...@@ -21,7 +21,7 @@ QGCTextField {
// At this point all Facts are numeric // At this point all Facts are numeric
validator: DoubleValidator {} validator: DoubleValidator {}
inputMethodHints: ScreenTools.isiOS ? inputMethodHints: ScreenTools.isiOS ?
Qt.ImhNone : // iOS numeric keyboard has not done button, we can't use eit Qt.ImhNone : // iOS numeric keyboard has not done button, we can't use it
Qt.ImhFormattedNumbersOnly // Forces use of virtual numeric keyboard Qt.ImhFormattedNumbersOnly // Forces use of virtual numeric keyboard
onEditingFinished: { onEditingFinished: {
......
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