Skip to content

Q
qgroundcontrol
Commit e55deea4 authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Get rid of QGCView, QGCViewPanel and FactPanel. All messages and dialogs are... 

Get rid of QGCView, QGCViewPanel and FactPanel. All messages and dialogs are now handled in the root window.
parent 1c4fdc2e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3485 additions and 3617 deletions
qgroundcontrol.qrc
View file @ e55deea4
......@@ -18,6 +18,7 @@
</qresource>
<qresource prefix="/qml">
<file alias="CorridorScanEditor.qml">src/PlanView/CorridorScanEditor.qml</file>
<file alias="QGCViewDialogContainer.qml">src/QmlControls/QGCViewDialogContainer.qml</file>
<file alias="QGroundControl/Controls/CameraCalc.qml">src/PlanView/CameraCalc.qml</file>
<file alias="QGroundControl/Controls/CorridorScanMapVisual.qml">src/PlanView/CorridorScanMapVisual.qml</file>
<file alias="QGroundControl/Controls/EditPositionDialog.qml">src/QmlControls/EditPositionDialog.qml</file>
......@@ -45,9 +46,7 @@
<file alias="LinkSettings.qml">src/ui/preferences/LinkSettings.qml</file>
<file alias="LogDownloadPage.qml">src/AnalyzeView/LogDownloadPage.qml</file>
<file alias="LogReplaySettings.qml">src/ui/preferences/LogReplaySettings.qml</file>
<file alias="MainWindowHybrid.qml">src/ui/MainWindowHybrid.qml</file>
<file alias="MainWindowInner.qml">src/ui/MainWindowInner.qml</file>
<file alias="MainWindowNative.qml">src/ui/MainWindowNative.qml</file>
<file alias="MainQmlWindow.qml">src/ui/MainQmlWindow.qml</file>
<file alias="MavlinkConsolePage.qml">src/AnalyzeView/MavlinkConsolePage.qml</file>
<file alias="MavlinkSettings.qml">src/ui/preferences/MavlinkSettings.qml</file>
<file alias="MissionSettingsEditor.qml">src/PlanView/MissionSettingsEditor.qml</file>
......@@ -115,11 +114,8 @@
<file alias="QGroundControl/Controls/QGCSwitch.qml">src/QmlControls/QGCSwitch.qml</file>
<file alias="QGroundControl/Controls/QGCTextField.qml">src/QmlControls/QGCTextField.qml</file>
<file alias="QGroundControl/Controls/QGCToolBarButton.qml">src/QmlControls/QGCToolBarButton.qml</file>
<file alias="QGroundControl/Controls/QGCView.qml">src/QmlControls/QGCView.qml</file>
<file alias="QGroundControl/Controls/QGCViewDialog.qml">src/QmlControls/QGCViewDialog.qml</file>
<file alias="QGroundControl/Controls/QGCViewDialogContainer.qml">src/QmlControls/QGCViewDialogContainer.qml</file>
<file alias="QGroundControl/Controls/QGCViewMessage.qml">src/QmlControls/QGCViewMessage.qml</file>
<file alias="QGroundControl/Controls/QGCViewPanel.qml">src/QmlControls/QGCViewPanel.qml</file>
<file alias="QGroundControl/Controls/qmldir">src/QmlControls/QGroundControl.Controls.qmldir</file>
<file alias="QGroundControl/Controls/RallyPointEditorHeader.qml">src/PlanView/RallyPointEditorHeader.qml</file>
<file alias="QGroundControl/Controls/RallyPointItemEditor.qml">src/PlanView/RallyPointItemEditor.qml</file>
......@@ -143,7 +139,6 @@
<file alias="QGroundControl/FactControls/FactCheckBox.qml">src/FactSystem/FactControls/FactCheckBox.qml</file>
<file alias="QGroundControl/FactControls/FactComboBox.qml">src/FactSystem/FactControls/FactComboBox.qml</file>
<file alias="QGroundControl/FactControls/FactLabel.qml">src/FactSystem/FactControls/FactLabel.qml</file>
<file alias="QGroundControl/FactControls/FactPanel.qml">src/FactSystem/FactControls/FactPanel.qml</file>
<file alias="QGroundControl/FactControls/FactTextField.qml">src/FactSystem/FactControls/FactTextField.qml</file>
<file alias="QGroundControl/FactControls/FactTextFieldGrid.qml">src/FactSystem/FactControls/FactTextFieldGrid.qml</file>
<file alias="QGroundControl/FactControls/FactTextFieldRow.qml">src/FactSystem/FactControls/FactTextFieldRow.qml</file>
......
src/Airmap/AirmapSettings.qml
View file @ e55deea4
This diff is collapsed.
src/AnalyzeView/AnalyzePage.qml
View file @ e55deea4
......@@ -16,55 +16,40 @@ import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
/// Base view control for all Analyze pages
QGCView {
id: analyePage
viewPanel: analyzePanel
Item {
anchors.fill: parent
property alias pageComponent: pageLoader.sourceComponent
property alias pageName: pageNameLabel.text
property alias pageDescription: pageDescriptionLabel.text
property real availableWidth: width - pageLoader.x
property real availableHeight: height - pageLoader.y
property real _margins: ScreenTools.defaultFontPixelHeight / 2
QGCPalette { id: qgcPal; colorGroupEnabled: analyzePanel.enabled }
QGCViewPanel {
id: analyzePanel
property real _margins: ScreenTools.defaultFontPixelHeight * 0.5
QGCFlickable {
anchors.fill: parent
QGCFlickable {
anchors.fill: parent
contentWidth: pageLoader.x + pageLoader.item.width
contentHeight: pageLoader.y + pageLoader.item.height
clip: true
Column {
id: headingColumn
width: analyzePanel.width
spacing: _margins
QGCLabel {
id: pageNameLabel
font.pointSize: ScreenTools.largeFontPointSize
visible: !ScreenTools.isShortScreen
}
QGCLabel {
id: pageDescriptionLabel
anchors.left: parent.left
anchors.right: parent.right
wrapMode: Text.WordWrap
visible: !ScreenTools.isShortScreen
}
contentWidth: pageLoader.x + pageLoader.item.width
contentHeight: pageLoader.y + pageLoader.item.height
clip: true
Column {
id: headingColumn
width: parent.width
spacing: _margins
QGCLabel {
id: pageNameLabel
font.pointSize: ScreenTools.largeFontPointSize
visible: !ScreenTools.isShortScreen
}
Loader {
id: pageLoader
anchors.topMargin: _margins
anchors.top: headingColumn.bottom
QGCLabel {
id: pageDescriptionLabel
anchors.left: parent.left
anchors.right: parent.right
wrapMode: Text.WordWrap
visible: !ScreenTools.isShortScreen
}
}
Loader {
id: pageLoader
anchors.topMargin: _margins
anchors.top: headingColumn.bottom
}
}
}
src/AnalyzeView/GeoTagPage.qml
View file @ e55deea4
......@@ -40,7 +40,7 @@ AnalyzePage {
ProgressBar {
id: progressBar
width: qgcView.width -_margin * 5
width: geoTagPage.width -_margin * 5
maximumValue: 100
value: geoController.progress
}
......@@ -62,7 +62,7 @@ AnalyzePage {
// Horizontal spacer line
Rectangle {
height: 1
width: qgcView.width * 1.0
width: geoTagPage.width * 1.0
color: qgcPal.windowShadeDark
anchors.horizontalCenter: parent.horizontalCenter
}
......@@ -118,7 +118,7 @@ AnalyzePage {
// Horizontal spacer line
Rectangle {
height: 1
width: qgcView.width * 1.0
width: geoTagPage.width * 1.0
color: qgcPal.windowShadeDark
anchors.horizontalCenter: parent.horizontalCenter
}
......
src/AnalyzeView/LogDownloadPage.qml
View file @ e55deea4
......@@ -117,25 +117,21 @@ AnalyzePage {
}
}
}
Column {
spacing: _margin
Layout.alignment: Qt.AlignTop | Qt.AlignLeft
QGCButton {
enabled: !logController.requestingList && !logController.downloadingLogs
text: qsTr("Refresh")
width: _butttonWidth
onClicked: {
if (!QGroundControl.multiVehicleManager.activeVehicle || QGroundControl.multiVehicleManager.activeVehicle.isOfflineEditingVehicle) {
logDownloadPage.showMessage(qsTr("Log Refresh"), qsTr("You must be connected to a vehicle in order to download logs."), StandardButton.Ok)
mainWindow.showMessageDialog(qsTr("Log Refresh"), qsTr("You must be connected to a vehicle in order to download logs."))
} else {
logController.refresh()
}
}
}
QGCButton {
enabled: !logController.requestingList && !logController.downloadingLogs && tableView.selection.count > 0
text: qsTr("Download")
......@@ -151,54 +147,46 @@ AnalyzePage {
var o = logController.model.get(rowIndex)
if (o) o.selected = true
})
fileDialog.qgcView = logDownloadPage
fileDialog.title = qsTr("Select save directory")
fileDialog.selectExisting = true
fileDialog.folder = QGroundControl.settingsManager.appSettings.logSavePath
fileDialog.selectFolder = true
fileDialog.openForLoad()
}
QGCFileDialog {
id: fileDialog
onAcceptedForLoad: {
logController.download(file)
close()
}
}
}
QGCButton {
enabled: !logController.requestingList && !logController.downloadingLogs && logController.model.count > 0
text: qsTr("Erase All")
width: _butttonWidth
onClicked: logDownloadPage.showDialog(eraseAllMessage,
qsTr("Delete All Log Files"),
logDownloadPage.showDialogDefaultWidth,
StandardButton.Yes | StandardButton.No)
onClicked: mainWindow.showDialog(
eraseAllMessage,
qsTr("Delete All Log Files"),
mainWindow.showDialogDefaultWidth,
StandardButton.Yes | StandardButton.No)
Component {
id: eraseAllMessage
QGCViewMessage {
message: qsTr("All log files will be erased permanently. Is this really what you want?")
function accept() {
hideDialog()
logController.eraseAll()
}
}
}
}
QGCButton {
text: qsTr("Cancel")
width: _butttonWidth
enabled: logController.requestingList || logController.downloadingLogs
onClicked: logController.cancel()
}
} // Column - Buttons
} // RowLayout
} // Component
} // AnalyzePage
}
}
}
}
src/AutoPilotPlugins/APM/APMAirframeComponent.qml
View file @ e55deea4
......@@ -33,7 +33,6 @@ SetupPage {
APMAirframeComponentController {
id: controller
factPanel: airframePage.viewPanel
}
ExclusiveGroup {
......
src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
View file @ e55deea4
......@@ -7,19 +7,16 @@ import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
Item {
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
APMAirframeComponentController {
id: controller
factPanel: panel
}
property bool _frameAvailable: controller.parameterExists(-1, "FRAME")
property Fact _frame: controller.getParameterFact(-1, "FRAME", false)
property Fact _frameClass: controller.getParameterFact(-1, "FRAME_CLASS", false)
property Fact _frameType: controller.getParameterFact(-1, "FRAME_TYPE", false)
......
src/AutoPilotPlugins/APM/APMCameraComponent.qml
View file @ e55deea4
......@@ -28,7 +28,7 @@ SetupPage {
spacing: _margins
width: availableWidth
FactPanelController { id: controller; factPanel: cameraPage.viewPanel }
FactPanelController { id: controller; }
QGCPalette { id: palette; colorGroupEnabled: true }
......
src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml
View file @ e55deea4
import QtQuick 2.3
import QtQuick.Controls 1.2
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
Item {
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
FactPanelController { id: controller; }
property Fact _mountRCInTilt: controller.getParameterFact(-1, "MNT_RC_IN_TILT")
property Fact _mountRCInRoll: controller.getParameterFact(-1, "MNT_RC_IN_ROLL")
......
src/AutoPilotPlugins/APM/APMCameraSubComponent.qml
View file @ e55deea4
......@@ -31,7 +31,7 @@ SetupPage {
spacing: _margins
width: availableWidth
FactPanelController { id: controller; factPanel: cameraPage.viewPanel }
FactPanelController { id: controller; }
QGCPalette { id: palette; colorGroupEnabled: true }
......
src/AutoPilotPlugins/APM/APMFlightModesComponent.qml
View file @ e55deea4
......@@ -37,7 +37,6 @@ SetupPage {
APMFlightModesComponentController {
id: controller
factPanel: flightModePage.viewPanel
}
Component {
......
src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml
View file @ e55deea4
......@@ -6,13 +6,11 @@ import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
Item {
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
FactPanelController { id: controller; }
property var _vehicle: controller.vehicle
......
src/AutoPilotPlugins/APM/APMHeliComponent.qml
View file @ e55deea4
......@@ -30,7 +30,7 @@ SetupPage {
width: availableWidth
spacing: _margins
FactPanelController { id: controller; factPanel: safetyPage.viewPanel }
FactPanelController { id: controller; }
QGCPalette { id: ggcPal; colorGroupEnabled: true }
......
src/AutoPilotPlugins/APM/APMLightsComponent.qml
View file @ e55deea4
......@@ -29,7 +29,7 @@ SetupPage {
spacing: _margins
width: availableWidth
FactPanelController { id: controller; factPanel: lightsPage.viewPanel }
FactPanelController { id: controller; }
QGCPalette { id: palette; colorGroupEnabled: true }
......
src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml
View file @ e55deea4
......@@ -6,13 +6,11 @@ import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
Item {
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
FactPanelController { id: controller; }
property Fact _rc5Function: controller.getParameterFact(-1, "r.SERVO5_FUNCTION")
property Fact _rc6Function: controller.getParameterFact(-1, "r.SERVO6_FUNCTION")
......
src/AutoPilotPlugins/APM/APMPowerComponent.qml
View file @ e55deea4
......@@ -25,7 +25,6 @@ SetupPage {
FactPanelController {
id: controller
factPanel: powerPage.viewPanel
}
Component {
......@@ -388,7 +387,7 @@ SetupPage {
onClicked: {
_calcVoltageDlgVehicleVoltage = vehicleVoltage
_calcVoltageDlgBattVoltMultParam = battVoltMult
showDialog(calcVoltageMultiplierDlgComponent, qsTr("Calculate Voltage Multiplier"), qgcView.showDialogDefaultWidth, StandardButton.Close)
mainWindow.showDialog(calcVoltageMultiplierDlgComponent, qsTr("Calculate Voltage Multiplier"), mainWindow.showDialogDefaultWidth, StandardButton.Close)
}
}
......@@ -420,7 +419,7 @@ SetupPage {
onClicked: {
_calcAmpsPerVoltDlgVehicleCurrent = vehicleCurrent
_calcAmpsPerVoltDlgBattAmpPerVoltParam = battAmpPerVolt
showDialog(calcAmpsPerVoltDlgComponent, qsTr("Calculate Amps per Volt"), qgcView.showDialogDefaultWidth, StandardButton.Close)
mainWindow.showDialog(calcAmpsPerVoltDlgComponent, qsTr("Calculate Amps per Volt"), mainWindow.showDialogDefaultWidth, StandardButton.Close)
}
}
......
src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
View file @ e55deea4
......@@ -15,20 +15,17 @@ import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
Item {
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
FactPanelController { id: controller; }
property Fact _batt1Monitor: controller.getParameterFact(-1, "BATT_MONITOR")
property Fact _batt2Monitor: controller.getParameterFact(-1, "BATT2_MONITOR", false /* reportMissing */)
property bool _batt2MonitorAvailable: controller.parameterExists(-1, "BATT2_MONITOR")
property bool _batt1MonitorEnabled: _batt1Monitor.rawValue !== 0
property bool _batt2MonitorEnabled: _batt2MonitorAvailable && _batt2Monitor.rawValue !== 0
property Fact _battCapacity: controller.getParameterFact(-1, "BATT_CAPACITY", false /* reportMissing */)
property Fact _batt2Capacity: controller.getParameterFact(-1, "BATT2_CAPACITY", false /* reportMissing */)
property bool _battCapacityAvailable: controller.parameterExists(-1, "BATT_CAPACITY")
......
src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml
View file @ e55deea4
......@@ -6,13 +6,12 @@ import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
Item {
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
FactPanelController { id: controller; }
property Fact mapRollFact: controller.getParameterFact(-1, "RCMAP_ROLL")
property Fact mapPitchFact: controller.getParameterFact(-1, "RCMAP_PITCH")
......
src/AutoPilotPlugins/APM/APMSafetyComponent.qml
View file @ e55deea4
......@@ -30,7 +30,7 @@ SetupPage {
width: availableWidth
spacing: _margins
FactPanelController { id: controller; factPanel: safetyPage.viewPanel }
FactPanelController { id: controller; }
QGCPalette { id: ggcPal; colorGroupEnabled: true }
......
src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml
View file @ e55deea4
......@@ -31,7 +31,7 @@ SetupPage {
width: availableWidth
spacing: _margins
FactPanelController { id: controller; factPanel: safetyPage.viewPanel }
FactPanelController { id: controller; }
QGCPalette { id: ggcPal; colorGroupEnabled: true }
......
src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml
View file @ e55deea4
......@@ -6,14 +6,11 @@ import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
Item {
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
FactPanelController { id: controller; }
property Fact _copterFenceAction: controller.getParameterFact(-1, "FENCE_ACTION", false /* reportMissing */)
property Fact _copterFenceEnable: controller.getParameterFact(-1, "FENCE_ENABLE", false /* reportMissing */)
......
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
View file @ e55deea4
......@@ -6,13 +6,11 @@ import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
Item {
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
FactPanelController { id: controller; }
property Fact _failsafeThrEnable: controller.getParameterFact(-1, "FS_THR_ENABLE")
......
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
View file @ e55deea4
......@@ -6,13 +6,11 @@ import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
Item {
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
FactPanelController { id: controller; }
property Fact _failsafeBattMah: controller.getParameterFact(-1, "FS_BATT_MAH")
property Fact _failsafeBattVoltage: controller.getParameterFact(-1, "FS_BATT_VOLTAGE")
......
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml
View file @ e55deea4
......@@ -15,13 +15,11 @@ import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
Item {
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
FactPanelController { id: controller; }
property Fact _failsafeThrEnable: controller.getParameterFact(-1, "FS_THR_ENABLE")
property Fact _failsafeThrValue: controller.getParameterFact(-1, "FS_THR_VALUE")
......
src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml
View file @ e55deea4
......@@ -7,16 +7,13 @@ import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
FactPanel {
id: panel
Item {
anchors.fill: parent
color: qgcPal.windowShadeDark
property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property bool _firmware34: _activeVehicle.versionCompare(3, 5, 0) < 0
property bool _firmware34: activeVehicle.versionCompare(3, 5, 0) < 0
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
FactPanelController { id: controller; }
// Enable/Action parameters
property Fact _failsafeBatteryEnable: controller.getParameterFact(-1, "r.BATT_FS_LOW_ACT")
......
src/AutoPilotPlugins/APM/APMSensorsComponent.qml
View file @ e55deea4
......@@ -108,7 +108,7 @@ SetupPage {
break
}
showDialog(orientationsDialogComponent, dialogTitle, qgcView.showDialogDefaultWidth, buttons)
mainWindow.showDialog(orientationsDialogComponent, dialogTitle, mainWindow.showDialogDefaultWidth, buttons)
}
APMSensorParams {
......@@ -118,7 +118,6 @@ SetupPage {
APMSensorsComponentController {
id: controller
factPanel: sensorsPage.viewPanel
statusLog: statusTextArea
progressBar: progressBar
nextButton: nextButton
......@@ -131,20 +130,20 @@ SetupPage {
onWaitingForCancelChanged: {
if (controller.waitingForCancel) {
showDialog(waitForCancelDialogComponent, qsTr("Calibration Cancel"), qgcView.showDialogDefaultWidth, 0)
mainWindow.showDialog(waitForCancelDialogComponent, qsTr("Calibration Cancel"), mainWindow.showDialogDefaultWidth, 0)
}
}
onCalibrationComplete: {
switch (calType) {
case APMSensorsComponentController.CalTypeAccel:
showDialog(postCalibrationComponent, qsTr("Accelerometer calibration complete"), qgcView.showDialogDefaultWidth, StandardButton.Ok)
mainWindow.showDialog(postCalibrationComponent, qsTr("Accelerometer calibration complete"), mainWindow.showDialogDefaultWidth, StandardButton.Ok)
break
case APMSensorsComponentController.CalTypeOffboardCompass:
showDialog(postCalibrationComponent, qsTr("Compass calibration complete"), qgcView.showDialogDefaultWidth, StandardButton.Ok)
mainWindow.showDialog(postCalibrationComponent, qsTr("Compass calibration complete"), mainWindow.showDialogDefaultWidth, StandardButton.Ok)
break
case APMSensorsComponentController.CalTypeOnboardCompass:
showDialog(postOnboardCompassCalibrationComponent, qsTr("Calibration complete"), qgcView.showDialogDefaultWidth, StandardButton.Ok)
mainWindow.showDialog(postOnboardCompassCalibrationComponent, qsTr("Calibration complete"), mainWindow.showDialogDefaultWidth, StandardButton.Ok)
break
}
}
......@@ -158,7 +157,7 @@ SetupPage {
var usingUDP = controller.usingUDPLink()
var isSub = QGroundControl.multiVehicleManager.activeVehicle.sub;
if (usingUDP && !isSub) {
showMessage(qsTr("Sensor Calibration"), qsTr("Performing sensor calibration over a WiFi connection can be unreliable. If you run into problems try using a direct USB connection instead."), StandardButton.Ok)
mainWindow.showMessageDialog(qsTr("Sensor Calibration"), qsTr("Performing sensor calibration over a WiFi connection can be unreliable. If you run into problems try using a direct USB connection instead."))
}
}
......@@ -556,7 +555,7 @@ SetupPage {
onClicked: {
if (controller.accelSetupNeeded) {
showMessage(qsTr("Calibrate Compass"), qsTr("Accelerometer must be calibrated prior to Compass."), StandardButton.Ok)
mainWindow.showMessageDialog(qsTr("Calibrate Compass"), qsTr("Accelerometer must be calibrated prior to Compass."))
} else {
showOrientationsDialog(_calTypeCompass)
}
......@@ -571,9 +570,9 @@ SetupPage {
onClicked: {
if (controller.accelSetupNeeded) {
showMessage(_levelHorizonText, qsTr("Accelerometer must be calibrated prior to Level Horizon."), StandardButton.Ok)
mainWindow.showMessageDialog(_levelHorizonText, qsTr("Accelerometer must be calibrated prior to Level Horizon."))
} else {
showDialog(levelHorizonDialogComponent, _levelHorizonText, qgcView.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Ok)
mainWindow.showDialog(levelHorizonDialogComponent, _levelHorizonText, mainWindow.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Ok)
}
}
}
......@@ -581,7 +580,7 @@ SetupPage {
QGCButton {
width: _buttonWidth
text: _calibratePressureText
onClicked: showDialog(calibratePressureDialogComponent, _calibratePressureText, qgcView.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Ok)
onClicked: mainWindow.showDialog(calibratePressureDialogComponent, _calibratePressureText, mainWindow.showDialogDefaultWidth, StandardButton.Cancel | StandardButton.Ok)
readonly property string _calibratePressureText: _activeVehicle.fixedWing ? qsTr("Cal Baro/Airspeed") : qsTr("Calibrate Pressure")
}
......@@ -591,7 +590,7 @@ SetupPage {
text: qsTr("CompassMot")
visible: _activeVehicle ? _activeVehicle.supportsMotorInterference : false
onClicked: showDialog(compassMotDialogComponent, qsTr("CompassMot - Compass Motor Interference Calibration"), qgcView.showDialogFullWidth, StandardButton.Cancel | StandardButton.Ok)
onClicked: mainWindow.showDialog(compassMotDialogComponent, qsTr("CompassMot - Compass Motor Interference Calibration"), mainWindow.showDialogFullWidth, StandardButton.Cancel | StandardButton.Ok)
}
QGCButton {
......
src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml
View file @ e55deea4
......@@ -13,14 +13,11 @@ import QGroundControl.ArduPilot 1.0
IMPORTANT NOTE: Any changes made here must also be made to SensorsComponentSummary.qml
*/
FactPanel {
id: panel