lisonwu/qgroundcontrol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code changes for move to Qt6

Browse Source
This commit is contained in:
Don Gagne
2023-12-01 18:20:35 -08:00
committed by Don Gagne
parent 5d80bfab47
commit 9ba34601de
447 changed files with 4049 additions and 3906 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CodingStyle.qml
+6 -6
View File
@@ -8,13 +8,13 @@
****************************************************************************/
import QtQuick 2.5
import QtQuick.Controls 1.3
import QtQuick
import QtQuick.Controls
import QGroundControl 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl
import QGroundControl.ScreenTools
import QGroundControl.Controls
import QGroundControl.Palette
/// This is an example Qml file which is used to describe the QGroundControl coding style.
/// In general almost everything in here has some coding style meaning including order of
VideoReceiverApp/main.qml
+4 -4
View File
@@ -1,7 +1,7 @@
import QtQuick 2.12
import QtQuick.Window 2.12
import QtQuick.Layouts 1.3
import org.freedesktop.gstreamer.GLVideoItem 1.0
import QtQuick
import QtQuick.Window
import QtQuick.Layouts
import org.freedesktop.gstreamer.GLVideoItem
Window {
visible: true
custom-example/qgroundcontrol.qrc
+1 -1
View File
@@ -173,7 +173,7 @@
<file alias="QGroundControl/Controls/RallyPointMapVisuals.qml">../src/PlanView/RallyPointMapVisuals.qml</file>
<file alias="QGroundControl/Controls/RCChannelMonitor.qml">../src/QmlControls/RCChannelMonitor.qml</file>
<file alias="QGroundControl/Controls/RCToParamDialog.qml">../src/QmlControls/RCToParamDialog.qml</file>
<file alias="QGroundControl/Controls/RoundButton.qml">../src/QmlControls/RoundButton.qml</file>
<file alias="QGroundControl/Controls/QGCRoundButton.qml">../src/QmlControls/QGCRoundButton.qml</file>
<file alias="QGroundControl/Controls/SectionHeader.qml">../src/QmlControls/SectionHeader.qml</file>
<file alias="QGroundControl/Controls/SetupPage.qml">../src/AutoPilotPlugins/Common/SetupPage.qml</file>
<file alias="QGroundControl/Controls/SignalStrength.qml">../src/ui/toolbar/SignalStrength.qml</file>
custom-example/res/Custom/Camera/ZoomControl.qml
+2 -4
View File
@@ -1,7 +1,5 @@
import QtQuick 2.0
import QtQuick.Controls 2.4
import QtGraphicalEffects 1.0
import QtQuick
import QtQuick.Controls
Item {
id: _root
custom-example/res/Custom/Widgets/CustomArtificialHorizon.qml
+1 -1
View File
@@ -9,7 +9,7 @@
* @author Gus Grubba <gus@auterion.com>
*/
import QtQuick 2.11
import QtQuick
Item {
id: root
custom-example/res/Custom/Widgets/CustomAttitudeWidget.qml
+6 -7
View File
@@ -9,14 +9,13 @@
* @author Gus Grubba <gus@auterion.com>
*/
import QtQuick 2.11
import QtGraphicalEffects 1.0
import QtQuick
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FlightMap 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Palette
import QGroundControl.FlightMap
Item {
id: root
custom-example/res/Custom/Widgets/CustomIconButton.qml
+6 -7
View File
@@ -9,14 +9,13 @@
* @author Gus Grubba <gus@auterion.com>
*/
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick
import QtQuick.Controls
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
import QtGraphicalEffects 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.Palette
import QGroundControl.ScreenTools
Button {
id: _rootButton
custom-example/res/Custom/Widgets/CustomOnOffSwitch.qml
+4 -4
View File
@@ -9,11 +9,11 @@
* @author Gus Grubba <gus@auterion.com>
*/
import QtQuick 2.3
import QtQuick
import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette
import QGroundControl.ScreenTools
import QGroundControl.Controls
Rectangle {
id: _root
custom-example/res/Custom/Widgets/CustomQuickButton.qml
+6 -6
View File
@@ -9,13 +9,13 @@
* @author Gus Grubba <gus@auterion.com>
*/
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick
import QtQuick.Controls
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.Palette
import QGroundControl.ScreenTools
Button {
id: control
custom-example/res/Custom/Widgets/CustomSignalStrength.qml
+6 -6
View File
@@ -9,13 +9,13 @@
* @author Gus Grubba <gus@auterion.com>
*/
import QtQuick 2.11
import QtQuick.Controls 1.4
import QtQuick
import QtQuick.Controls
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Palette 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Palette
Item {
width: size
custom-example/res/Custom/Widgets/CustomToolBarButton.qml
+5 -5
View File
@@ -9,12 +9,12 @@
* @author Gus Grubba <gus@auterion.com>
*/
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick
import QtQuick.Controls
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controls
import QGroundControl.Palette
import QGroundControl.ScreenTools
Button {
id: button
custom-example/res/Custom/Widgets/CustomVehicleButton.qml
+5 -5
View File
@@ -9,12 +9,12 @@
* @author Gus Grubba <gus@auterion.com>
*/
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick
import QtQuick.Controls
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controls
import QGroundControl.Palette
import QGroundControl.ScreenTools
Button {
id: button
custom-example/res/CustomFlyViewOverlay.qml
+8 -8
View File
@@ -9,16 +9,16 @@
* @author Gus Grubba <gus@auterion.com>
*/
import QtQuick 2.12
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.Palette
import QGroundControl.ScreenTools
import Custom.Widgets 1.0
import Custom.Widgets
Item {
property var parentToolInsets // These insets tell you what screen real estate is available for positioning the controls in your overlay
qgroundcontrol.qrc
+1 -1
View File
@@ -173,7 +173,7 @@
<file alias="QGroundControl/Controls/RallyPointMapVisuals.qml">src/PlanView/RallyPointMapVisuals.qml</file>
<file alias="QGroundControl/Controls/RCChannelMonitor.qml">src/QmlControls/RCChannelMonitor.qml</file>
<file alias="QGroundControl/Controls/RCToParamDialog.qml">src/QmlControls/RCToParamDialog.qml</file>
<file alias="QGroundControl/Controls/RoundButton.qml">src/QmlControls/RoundButton.qml</file>
<file alias="QGroundControl/Controls/QGCRoundButton.qml">src/QmlControls/QGCRoundButton.qml</file>
<file alias="QGroundControl/Controls/SectionHeader.qml">src/QmlControls/SectionHeader.qml</file>
<file alias="QGroundControl/Controls/SetupPage.qml">src/AutoPilotPlugins/Common/SetupPage.qml</file>
<file alias="QGroundControl/Controls/SignalStrength.qml">src/ui/toolbar/SignalStrength.qml</file>
src/AnalyzeView/AnalyzePage.qml
+6 -6
View File
@@ -7,13 +7,13 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
/// Base view control for all Analyze pages
Item {
src/AnalyzeView/AnalyzeView.qml
+9 -11
View File
@@ -7,15 +7,15 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Window 2.2
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Window
import QtQuick.Controls
import QGroundControl 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.Controllers
import QGroundControl.ScreenTools
Rectangle {
id: _root
@@ -24,8 +24,6 @@ Rectangle {
signal popout()
ExclusiveGroup { id: setupButtonGroup }
readonly property real _defaultTextHeight: ScreenTools.defaultFontPixelHeight
readonly property real _defaultTextWidth: ScreenTools.defaultFontPixelWidth
readonly property real _horizontalMargin: _defaultTextWidth / 2
@@ -87,7 +85,7 @@ Rectangle {
id: subMenu
imageResource: modelData.icon
setupIndicator: false
exclusiveGroup: setupButtonGroup
autoExclusive: true
text: modelData.title
onClicked: {
src/AnalyzeView/GeoTagController.cc
+1 -1
View File
@@ -244,7 +244,7 @@ void GeoTagWorker::run()
}
// Tag images
int maxIndex = std::min(_imageIndices.count(), _triggerIndices.count());
auto maxIndex = std::min(_imageIndices.count(), _triggerIndices.count());
maxIndex = std::min(maxIndex, _imageList.count());
for(int i = 0; i < maxIndex; i++) {
int imageIndex = _imageIndices[i];
src/AnalyzeView/GeoTagPage.qml
+23 -29
View File
@@ -7,18 +7,18 @@
*
****************************************************************************/
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.11
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl
import QGroundControl.Palette
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
AnalyzePage {
id: geoTagPage
@@ -65,20 +65,18 @@ AnalyzePage {
//-- Log File
QGCButton {
text: qsTr("Select log file")
onClicked: openLogFile.open()
onClicked: openLogFile.openForLoad()
Layout.minimumWidth:_minWidth
Layout.maximumWidth:_maxWidth
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter
FileDialog {
QGCFileDialog {
id: openLogFile
title: qsTr("Select log file")
folder: shortcuts.home
nameFilters: [qsTr("ULog file (*.ulg)"), qsTr("PX4 log file (*.px4log)"), qsTr("All Files (*)")]
defaultSuffix: "ulg"
selectExisting: true
onAccepted: {
geoController.logFile = openLogFile.fileUrl
onAcceptedForLoad: (file) => {
geoController.logFile = openLogFile.file
close()
}
}
@@ -93,19 +91,17 @@ AnalyzePage {
//-- Image Directory
QGCButton {
text: qsTr("Select image directory")
onClicked: selectImageDir.open()
onClicked: selectImageDir.openForLoad()
Layout.minimumWidth:_minWidth
Layout.maximumWidth:_maxWidth
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter
FileDialog {
QGCFileDialog {
id: selectImageDir
title: qsTr("Select image directory")
folder: shortcuts.home
selectFolder: true
selectExisting: true
onAccepted: {
geoController.imageDirectory = selectImageDir.folder
onAcceptedForLoad: (file) => {
geoController.imageDirectory = selectImageDir.file
close()
}
}
@@ -120,19 +116,17 @@ AnalyzePage {
//-- Save Directory
QGCButton {
text: qsTr("(Optionally) Select save directory")
onClicked: selectDestDir.open()
onClicked: selectDestDir.openForLoad()
Layout.minimumWidth:_minWidth
Layout.maximumWidth:_maxWidth
Layout.fillWidth: true
Layout.alignment: Qt.AlignVCenter
FileDialog {
QGCFileDialog {
id: selectDestDir
title: qsTr("Select save directory")
folder: shortcuts.home
selectFolder: true
selectExisting: true
onAccepted: {
geoController.saveDirectory = selectDestDir.folder
onAcceptedForLoad: (file) => {
geoController.saveDirectory = selectDestDir.file
close()
}
}
src/AnalyzeView/LogDownloadController.cc
+8
View File
@@ -724,7 +724,9 @@ QGCLogModel::QGCLogModel(QObject* parent)
QGCLogEntry*
QGCLogModel::get(int index)
{
qDebug() << "QGCLogModel::get" << index;
if (index < 0 || index >= _logEntries.count()) {
qDebug() << "QGCLogModel::get failed";
return nullptr;
}
return _logEntries[index];
@@ -795,3 +797,9 @@ QGCLogModel::roleNames() const {
roles[ObjectRole] = "logEntry";
return roles;
}
int QGCLogModel::columnCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);
return 4;
}
src/AnalyzeView/LogDownloadController.h
+1
View File
@@ -52,6 +52,7 @@ public:
int rowCount (const QModelIndex & parent = QModelIndex()) const;
QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const;
int columnCount (const QModelIndex &parent) const;
signals:
void countChanged ();
src/AnalyzeView/LogDownloadPage.qml
+105 -73
View File
@@ -7,16 +7,17 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import Qt.labs.qmlmodels
import QGroundControl 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.Controllers
import QGroundControl.ScreenTools
AnalyzePage {
id: logDownloadPage
@@ -26,7 +27,7 @@ AnalyzePage {
property real _margin: ScreenTools.defaultFontPixelWidth
property real _butttonWidth: ScreenTools.defaultFontPixelWidth * 10
QGCPalette { id: palette; colorGroupEnabled: enabled }
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
Component {
id: pageComponent
@@ -48,74 +49,106 @@ AnalyzePage {
}
}
TableView {
id: tableView
Layout.fillHeight: true
model: logController.model
selectionMode: SelectionMode.MultiSelection
ColumnLayout {
Layout.fillWidth: true
Layout.fillHeight: true
spacing: 0
TableViewColumn {
title: qsTr("Id")
width: ScreenTools.defaultFontPixelWidth * 6
horizontalAlignment: Text.AlignHCenter
delegate : Text {
color: styleData.textColor
horizontalAlignment: Text.AlignHCenter
text: {
var o = logController.model.get(styleData.row)
return o ? o.id : ""
}
}
HorizontalHeaderView {
Layout.fillWidth: true
model: [ qsTr("Id"), qsTr("Date"), qsTr("Size"), qsTr("Status") ]
syncView: tableView
clip: true
}
TableViewColumn {
title: qsTr("Date")
width: ScreenTools.defaultFontPixelWidth * 34
horizontalAlignment: Text.AlignHCenter
delegate: Text {
color: styleData.textColor
text: {
var o = logController.model.get(styleData.row)
if (o) {
//-- Have we received this entry already?
if(logController.model.get(styleData.row).received) {
var d = logController.model.get(styleData.row).time
if(d.getUTCFullYear() < 2010)
return qsTr("Date Unknown")
else
return d.toLocaleString(undefined, "short")
TableView {
id: tableView
Layout.fillWidth: true
model: logController.model
selectionBehavior: TableView.SelectRows
selectionMode: TableView.ExtendedSelection
columnWidthProvider: columnWidth
selectionModel: ItemSelectionModel {}
property int modelCount: model.count
onModelCountChanged: console.log("modelCount", modelCount)
onColumnsChanged: console.log("columns", columns)
function columnWidth(column) {
switch (column) {
case 0:
return ScreenTools.defaultFontPixelWidth * 6
case 1:
return ScreenTools.defaultFontPixelWidth * 34
case 2:
return ScreenTools.defaultFontPixelWidth * 18
case 3:
return ScreenTools.defaultFontPixelWidth * 22
default:
return 0
}
}
delegate: DelegateChooser {
DelegateChoice {
column: 0
delegate : Text {
color: qgcPal.text
//horizontalAlignment: Text.AlignHCenter
Component.onCompleted: console.log("index", index, text)
text: {
var o = logController.model.get(index)
return o ? o.id : ""
}
}
return ""
}
}
}
TableViewColumn {
title: qsTr("Size")
width: ScreenTools.defaultFontPixelWidth * 18
horizontalAlignment: Text.AlignHCenter
delegate : Text {
color: styleData.textColor
horizontalAlignment: Text.AlignRight
text: {
var o = logController.model.get(styleData.row)
return o ? o.sizeStr : ""
DelegateChoice {
column: 1
delegate: Text {
color: qgcPal.text
text: {
var o = logController.model.get(index)
if (o) {
//-- Have we received this entry already?
if(logController.model.get(index).received) {
var d = logController.model.get(index).time
if(d.getUTCFullYear() < 2010)
return qsTr("Date Unknown")
else
return d.toLocaleString(undefined, "short")
}
}
return ""
}
}
}
}
}
TableViewColumn {
title: qsTr("Status")
width: ScreenTools.defaultFontPixelWidth * 22
horizontalAlignment: Text.AlignHCenter
delegate : Text {
color: styleData.textColor
horizontalAlignment: Text.AlignHCenter
text: {
var o = logController.model.get(styleData.row)
return o ? o.status : ""
DelegateChoice {
column: 2
delegate : Text {
color: qgcPal.text
//horizontalAlignment: Text.AlignRight
Component.onCompleted: console.log("size", index, logController.model.get(index).sizeStr)
text: {
var o = logController.model.get(index)
return o ? o.sizeStr : ""
}
}
}
DelegateChoice {
column: 3
delegate : Text {
color: qgcPal.text
//horizontalAlignment: Text.AlignHCenter
text: {
var o = logController.model.get(index)
return o ? o.status : ""
}
}
}
}
}
@@ -136,7 +169,7 @@ AnalyzePage {
}
}
QGCButton {
enabled: !logController.requestingList && !logController.downloadingLogs && tableView.selection.count > 0
enabled: !logController.requestingList && !logController.downloadingLogs && tableView.selectionModel.selectedIndexes.count > 0
text: qsTr("Download")
width: _butttonWidth
onClicked: {
@@ -146,7 +179,7 @@ AnalyzePage {
if (o) o.selected = false
}
//-- Flag selected log files
tableView.selection.forEach(function(rowIndex){
tableView.selectionModel.selectedIndexes.forEach(function(rowIndex){
var o = logController.model.get(rowIndex)
if (o) o.selected = true
})
@@ -155,7 +188,6 @@ AnalyzePage {
logController.download()
} else {
fileDialog.title = qsTr("Select save directory")
fileDialog.selectExisting = true
fileDialog.folder = QGroundControl.settingsManager.appSettings.logSavePath
fileDialog.selectFolder = true
fileDialog.openForLoad()
@@ -163,7 +195,7 @@ AnalyzePage {
}
QGCFileDialog {
id: fileDialog
onAcceptedForLoad: {
onAcceptedForLoad: (file) => {
logController.download(file)
close()
}
@@ -175,7 +207,7 @@ AnalyzePage {
width: _butttonWidth
onClicked: mainWindow.showMessageDialog(qsTr("Delete All Log Files"),
qsTr("All log files will be erased permanently. Is this really what you want?"),
StandardButton.Yes | StandardButton.No,
Dialog.Yes | Dialog.No,
function() { logController.eraseAll() })
}
QGCButton {
src/AnalyzeView/MAVLinkInspectorController.cc
-2
View File
@@ -14,8 +14,6 @@
QGC_LOGGING_CATEGORY(MAVLinkInspectorLog, "MAVLinkInspectorLog")
QT_CHARTS_USE_NAMESPACE
Q_DECLARE_METATYPE(QAbstractSeries*)
#define UPDATE_FREQUENCY (1000 / 15) // 15Hz
src/AnalyzeView/MAVLinkInspectorController.h
+1 -3
View File
@@ -20,12 +20,10 @@
#include <QString>
#include <QDebug>
#include <QVariantList>
#include <QtCharts/QAbstractSeries>
#include <QAbstractSeries>
Q_DECLARE_LOGGING_CATEGORY(MAVLinkInspectorLog)
QT_CHARTS_USE_NAMESPACE
class QGCMAVLinkMessage;
class QGCMAVLinkSystem;
class MAVLinkChartController;
src/AnalyzeView/MAVLinkInspectorPage.qml
+11 -11
View File
@@ -7,18 +7,18 @@
*
****************************************************************************/
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.11
import QtQuick.Dialogs 1.3
import QtQuick.Window 2.2
import QtCharts 2.3
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QtQuick.Dialogs
import QtQuick.Window
import QtCharts
import QGroundControl 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.Controllers
import QGroundControl.ScreenTools
AnalyzePage {
headerComponent: headerComponent
src/AnalyzeView/MavlinkConsolePage.qml
+22 -22
View File
@@ -7,19 +7,19 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.3
import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl
import QGroundControl.Palette
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
AnalyzePage {
id: mavlinkConsolePage
@@ -128,12 +128,18 @@ AnalyzePage {
Layout.preferredWidth: parent.width
Layout.fillHeight: true
readOnly: _separateCommandInput
frameVisible: false
textFormat: TextEdit.RichText
inputMethodHints: Qt.ImhNoAutoUppercase | Qt.ImhMultiLine
text: "> "
focus: true
color: qgcPal.text
selectedTextColor: qgcPal.windowShade
selectionColor: qgcPal.text
font.pointSize: ScreenTools.defaultFontPointSize
font.family: ScreenTools.fixedFontFamily
// FIXME-QT6 - menu: not supported directly
/*
menu: Menu {
id: contextMenu
MenuItem {
@@ -149,15 +155,9 @@ AnalyzePage {
}
}
}
*/
style: TextAreaStyle {
textColor: qgcPal.text
backgroundColor: qgcPal.windowShade
selectedTextColor: qgcPal.windowShade
selectionColor: qgcPal.text
font.pointSize: ScreenTools.defaultFontPointSize
font.family: ScreenTools.fixedFontFamily
}
background: Rectangle { color: qgcPal.windowShade }
Keys.onPressed: {
if (event.key == Qt.Key_Tab) { // ignore tabs
@@ -253,7 +253,7 @@ AnalyzePage {
onClicked: {
// disable middle-click pasting (we could add support for that if needed)
}
onWheel: {
onWheel: (wheel) => {
// increase scrolling speed (the default is a single line)
var numLines = 4
var flickable = textConsole.flickableItem
src/AnalyzeView/PX4LogParser.cc
+1 -1
View File
@@ -42,7 +42,7 @@ bool PX4LogParser::getTagsFromLog(QByteArray& log, QList<GeoTagWorker::cameraFee
// extract trigger data
int index = 1;
int sequence = -1;
while(index < log.count() - 1) {
while(index < log.length() - 1) {
// first extract trigger
index = log.indexOf(triggerHeader, index + 1);
src/AnalyzeView/ULogParser.cc
+2 -2
View File
@@ -57,7 +57,7 @@ QString ULogParser::extractArraySize(QString &typeNameFull, int &arraySize)
return typeNameFull;
}
arraySize = typeNameFull.midRef(startPos + 1, endPos - startPos - 1).toInt();
arraySize = typeNameFull.mid(startPos + 1, endPos - startPos - 1).toInt();
return typeNameFull.mid(0, startPos);
}
@@ -99,7 +99,7 @@ bool ULogParser::getTagsFromLog(QByteArray& log, QList<GeoTagWorker::cameraFeedb
int index = ULOG_FILE_HEADER_LEN;
bool geotagFound = false;
while(index < log.count() - 1) {
while(index < log.length() - 1) {
ULogMessageHeader header;
memset(&header, 0, sizeof(header));
src/AnalyzeView/VibrationPage.qml
+11 -11
View File
@@ -7,18 +7,18 @@
*
****************************************************************************/
import QtQuick 2.11
import QtQuick.Controls 2.4
import QtQuick.Dialogs 1.3
import QtQuick.Layouts 1.11
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl
import QGroundControl.Palette
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
AnalyzePage {
id: vibrationPage
src/AutoPilotPlugins/APM/APMAirframeComponent.qml
+12 -12
View File
@@ -8,17 +8,17 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.Controllers
import QGroundControl.ScreenTools
SetupPage {
id: airframePage
@@ -88,7 +88,7 @@ SetupPage {
Layout.fillWidth: true
spacing: _boxSpace
ExclusiveGroup {
ButtonGroup {
id: airframeTypeExclusive
}
@@ -152,7 +152,7 @@ SetupPage {
// Although this item is invisible we still use it to manage state
id: airframeCheckBox
checked: object.frameClass === _frameClass.rawValue
exclusiveGroup: airframeTypeExclusive
buttonGroup: airframeTypeExclusive
visible: false
onCheckedChanged: {
src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
+7 -7
View File
@@ -1,11 +1,11 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Controllers
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMCameraComponent.qml
+10 -10
View File
@@ -8,14 +8,14 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
SetupPage {
id: cameraPage
@@ -30,7 +30,7 @@ SetupPage {
FactPanelController { id: controller; }
QGCPalette { id: palette; colorGroupEnabled: true }
QGCPalette { id: qgcPal; colorGroupEnabled: true }
property Fact _mountRetractX: controller.getParameterFact(-1, "MNT_RETRACT_X")
property Fact _mountRetractY: controller.getParameterFact(-1, "MNT_RETRACT_Y")
@@ -229,7 +229,7 @@ SetupPage {
anchors.top: directionLabel.bottom
width: mountAngMaxField.x + mountAngMaxField.width + _margins
height: servoPWMMaxField.y + servoPWMMaxField.height + _margins
color: palette.windowShade
color: qgcPal.windowShade
FactCheckBox {
id: mountStabCheckBox
@@ -413,7 +413,7 @@ SetupPage {
anchors.top: settingsLabel.bottom
width: gimbalModeCombo.x + gimbalModeCombo.width + _margins
height: gimbalModeCombo.y + gimbalModeCombo.height + _margins
color: palette.windowShade
color: qgcPal.windowShade
QGCLabel {
id: gimbalTypeLabel
src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml
+6 -6
View File
@@ -1,10 +1,10 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMCameraSubComponent.qml
+19 -16
View File
@@ -8,17 +8,17 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4
import QtQuick
import QtQuick.Controls
import QtQuick.Controls
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.SettingsManager 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.SettingsManager
SetupPage {
id: cameraPage
@@ -33,7 +33,7 @@ SetupPage {
FactPanelController { id: controller; }
QGCPalette { id: palette; colorGroupEnabled: true }
QGCPalette { id: qgcPal; colorGroupEnabled: true }
property bool _oldFW: !(globals.activeVehicle.firmwareMajorVersion > 3 || globals.activeVehicle.firmwareMinorVersion > 5 || globals.activeVehicle.firmwarePatchVersion >= 2)
@@ -219,6 +219,8 @@ SetupPage {
property var _fact: controller.getParameterFact(-1, "MNT_JSTICK_SPD")
property bool _loadComplete: false
/*
// FIXME-QT6 - Controls 2 doesn't style controls this way
// Override style to make handles smaller than default
style: SliderStyle {
handle: Rectangle {
@@ -233,6 +235,7 @@ SetupPage {
property real _radius: Math.round(ScreenTools.defaultFontPixelHeight * 0.35)
}
}
*/
onValueChanged: {
if (_loadComplete) {
@@ -242,15 +245,15 @@ SetupPage {
MouseArea {
anchors.fill: parent
onWheel: {
onWheel: (wheel) => {
// do nothing
wheel.accepted = true;
}
onPressed: {
onPressed: (mouse) => {
// propogate/accept
mouse.accepted = false;
}
onReleased: {
onReleased: (mouse) => {
// propogate/accept
mouse.accepted = false;
}
@@ -294,7 +297,7 @@ SetupPage {
id: rectangle
height: innerColumn.height + _margins*2
width: innerColumn.width + _margins*2
color: palette.windowShade
color: qgcPal.windowShade
// Section Content - 3 Rows
Column {
@@ -458,7 +461,7 @@ SetupPage {
anchors.top: settingsLabel.bottom
width: gimbalModeCombo.x + gimbalModeCombo.width + _margins
height: gimbalModeCombo.y + gimbalModeCombo.height + _margins
color: palette.windowShade
color: qgcPal.windowShade
QGCLabel {
id: gimbalTypeLabel
src/AutoPilotPlugins/APM/APMFlightModesComponent.qml
+9 -9
View File
@@ -8,16 +8,16 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.Controllers
import QGroundControl.ScreenTools
SetupPage {
id: flightModePage
src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml
+6 -6
View File
@@ -1,10 +1,10 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMFollowComponent.qml
+12 -12
View File
@@ -8,18 +8,18 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
SetupPage {
id: followPage
@@ -432,7 +432,7 @@ SetupPage {
MouseArea {
anchors.fill: parent
onClicked: {
onClicked: (mouse) => {
// Translate x,y to centered
var x = mouse.x - (width / 2)
var y = (height - mouse.y) - (height / 2)
src/AutoPilotPlugins/APM/APMFollowComponentSummary.qml
+6 -6
View File
@@ -7,13 +7,13 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMHeliComponent.qml
+8 -9
View File
@@ -7,16 +7,15 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
SetupPage {
id: safetyPage
src/AutoPilotPlugins/APM/APMLightsComponent.qml
+8 -8
View File
@@ -8,15 +8,15 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
SetupPage {
id: lightsPage
src/AutoPilotPlugins/APM/APMLightsComponentSummary.qml
+6 -6
View File
@@ -1,10 +1,10 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMMotorComponent.cc
+1 -1
View File
@@ -31,5 +31,5 @@ QString APMMotorComponent::motorIndexToLetter(int index)
{
char letter = 'A';
return QString(letter + index);
return QString(char(letter + index));
}
src/AutoPilotPlugins/APM/APMMotorComponent.qml
+13 -13
View File
@@ -7,14 +7,14 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.ScreenTools
SetupPage {
id: motorPage
@@ -62,11 +62,11 @@ SetupPage {
id: slider
height: ScreenTools.defaultFontPixelHeight * _sliderHeight
orientation: Qt.Vertical
minimumValue: 0
maximumValue: 100
from: 0
to: 100
stepSize: 1
value: 0
updateValueWhileDragging: false
live: false
onValueChanged: {
controller.vehicle.motorTest(index + 1, value, value == 0 ? 0 : _motorTimeoutSecs, true)
@@ -100,11 +100,11 @@ SetupPage {
id: allSlider
height: ScreenTools.defaultFontPixelHeight * _sliderHeight
orientation: Qt.Vertical
minimumValue: 0
maximumValue: 100
from: 0
to: 100
stepSize: 1
value: 0
updateValueWhileDragging: false
live: false
onValueChanged: {
for (var sliderIndex=0; sliderIndex<sliderRepeater.count; sliderIndex++) {
src/AutoPilotPlugins/APM/APMNotSupported.qml
+2 -2
View File
@@ -8,9 +8,9 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick
import QGroundControl.Controls 1.0
import QGroundControl.Controls
QGCLabel {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMPowerComponent.qml
+12 -12
View File
@@ -8,16 +8,16 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
SetupPage {
id: powerPage
@@ -308,7 +308,7 @@ SetupPage {
sensorCombo.currentIndex = sensorModel.count - 1
}
QGCPalette { id: palette; colorGroupEnabled: true }
QGCPalette { id: qgcPal; colorGroupEnabled: true }
ListModel {
id: sensorModel
@@ -540,7 +540,7 @@ SetupPage {
QGCPopupDialog {
title: qsTr("Calculate Voltage Multiplier")
buttons: StandardButton.Close
buttons: Dialog.Close
property Fact vehicleVoltageFact
property Fact battVoltMultFact
@@ -593,7 +593,7 @@ SetupPage {
QGCPopupDialog {
title: qsTr("Calculate Amps per Volt")
buttons: StandardButton.Close
buttons: Dialog.Close
property Fact vehicleCurrentFact
property Fact battAmpPerVoltFact
src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
+6 -6
View File
@@ -7,13 +7,13 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml
+6 -6
View File
@@ -1,10 +1,10 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMRemoteSupportComponent.qml
+9 -9
View File
@@ -7,16 +7,16 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Palette
import QGroundControl.FactControls
import QGroundControl.FactSystem
SetupPage {
pageComponent: pageComponent
src/AutoPilotPlugins/APM/APMSafetyComponent.qml
+9 -9
View File
@@ -7,16 +7,16 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Qt5Compat.GraphicalEffects
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
SetupPage {
id: safetyPage
src/AutoPilotPlugins/APM/APMSafetyComponentCopter.qml
+8 -9
View File
@@ -8,16 +8,15 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
SetupPage {
id: safetyPage
src/AutoPilotPlugins/APM/APMSafetyComponentPlane.qml
+10 -11
View File
@@ -8,15 +8,14 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtGraphicalEffects 1.0
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
SetupPage {
id: safetyPage
@@ -32,7 +31,7 @@ SetupPage {
FactPanelController { id: controller; factPanel: safetyPage.viewPanel }
QGCPalette { id: palette; colorGroupEnabled: true }
QGCPalette { id: qgcPal; colorGroupEnabled: true }
property Fact _failsafeBattMah: controller.getParameterFact(-1, "r.BATT_LOW_MAH")
property Fact _failsafeBattVoltage: controller.getParameterFact(-1, "r.BATT_LOW_VOLT")
@@ -57,7 +56,7 @@ SetupPage {
Rectangle {
width: throttlePWMField.x + throttlePWMField.width + _margins
height: gcsCheckbox.y + gcsCheckbox.height + _margins
color: palette.windowShade
color: qgcPal.windowShade
QGCCheckBox {
id: throttleEnableCheckBox
@@ -146,7 +145,7 @@ SetupPage {
Rectangle {
width: rltAltField.x + rltAltField.width + _margins
height: rltAltField.y + rltAltField.height + _margins
color: palette.windowShade
color: qgcPal.windowShade
QGCRadioButton {
id: returnAtCurrentRadio
src/AutoPilotPlugins/APM/APMSafetyComponentRover.qml
+7 -8
View File
@@ -8,15 +8,14 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtGraphicalEffects 1.0
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
SetupPage {
id: safetyPage
src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml
+8 -9
View File
@@ -8,16 +8,15 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtGraphicalEffects 1.0
import QtQuick
import QtQuick.Controls
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
SetupPage {
id: safetyPage
src/AutoPilotPlugins/APM/APMSafetyComponentSummary.qml
+6 -6
View File
@@ -1,10 +1,10 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
+6 -6
View File
@@ -1,10 +1,10 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
+6 -6
View File
@@ -1,10 +1,10 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml
+6 -6
View File
@@ -7,13 +7,13 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMSafetyComponentSummarySub.qml
+7 -7
View File
@@ -1,11 +1,11 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMSensorsComponent.qml
+24 -28
View File
@@ -8,21 +8,21 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.ArduPilot 1.0
import QGroundControl.QGCPositionManager 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
import QGroundControl.ArduPilot
import QGroundControl.QGCPositionManager
SetupPage {
id: sensorsPage
@@ -89,7 +89,7 @@ SetupPage {
function showOrientationsDialog(calType) {
var dialogTitle
var dialogButtons = StandardButton.Ok
var dialogButtons = Dialog.Ok
_showSimpleAccelCalOption = false
_orientationDialogCalType = calType
@@ -98,13 +98,13 @@ SetupPage {
_orientationsDialogShowCompass = true
_orientationDialogHelp = orientationHelpCal
dialogTitle = qsTr("Calibrate Compass")
dialogButtons |= StandardButton.Cancel
dialogButtons |= Dialog.Cancel
break
case _calTypeAccel:
_orientationsDialogShowCompass = false
_orientationDialogHelp = orientationHelpCal
dialogTitle = qsTr("Calibrate Accelerometer")
dialogButtons |= StandardButton.Cancel
dialogButtons |= Dialog.Cancel
break
case _calTypeSet:
_orientationsDialogShowCompass = true
@@ -271,7 +271,7 @@ SetupPage {
QGCPopupDialog {
id: postOnboardCompassCalibrationDialog
title: qsTr("Calibration complete")
buttons: StandardButton.Ok
buttons: Dialog.Ok
Column {
width: 40 * ScreenTools.defaultFontPixelWidth
@@ -598,7 +598,7 @@ SetupPage {
QGCPopupDialog {
title: qsTr("Compass Motor Interference Calibration")
buttons: StandardButton.Cancel | StandardButton.Ok
buttons: Dialog.Cancel | Dialog.Ok
onAccepted: controller.calibrateMotorInterference()
@@ -699,7 +699,7 @@ SetupPage {
} else {
mainWindow.showMessageDialog(_levelHorizonText,
qsTr("To level the horizon you need to place the vehicle in its level flight position and press Ok."),
StandardButton.Cancel | StandardButton.Ok,
Dialog.Cancel | Dialog.Ok,
function() { controller.levelHorizon() })
}
}
@@ -711,7 +711,7 @@ SetupPage {
visible: globals.activeVehicle && (globals.activeVehicle.multiRotor | globals.activeVehicle.rover | globals.activeVehicle.sub)
onClicked: mainWindow.showMessageDialog(qsTr("Calibrate Gyro"),
qsTr("For Gyroscope calibration you will need to place your vehicle on a surface and leave it still.\n\nClick Ok to start calibration."),
StandardButton.Cancel | StandardButton.Ok,
Dialog.Cancel | Dialog.Ok,
function() { controller.calibrateGyro() })
}
@@ -720,7 +720,7 @@ SetupPage {
text: _calibratePressureText
onClicked: mainWindow.showMessageDialog(_calibratePressureText,
qsTr("Pressure calibration will set the %1 to zero at the current pressure reading. %2").arg(_altText).arg(_helpTextFW),
StandardButton.Cancel | StandardButton.Ok,
Dialog.Cancel | Dialog.Ok,
function() { controller.calibratePressure() })
readonly property string _altText: globals.activeVehicle.sub ? qsTr("depth") : qsTr("altitude")
@@ -792,13 +792,9 @@ SetupPage {
id: statusTextArea
anchors.fill: parent
readOnly: true
frameVisible: false
text: statusTextAreaDefaultText
style: TextAreaStyle {
textColor: qgcPal.text
backgroundColor: qgcPal.windowShade
}
color: qgcPal.text
background: Rectangle { color: qgcPal.windowShade }
}
Rectangle {
src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml
+10 -10
View File
@@ -1,14 +1,14 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.ArduPilot 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
import QGroundControl.Controllers
import QGroundControl.ArduPilot
/*
IMPORTANT NOTE: Any changes made here must also be made to SensorsComponentSummary.qml
src/AutoPilotPlugins/APM/APMSubFrameComponent.qml
+13 -13
View File
@@ -8,18 +8,18 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
SetupPage {
id: subFramePage
@@ -63,7 +63,7 @@ SetupPage {
id: mainColumn
width: availableWidth
QGCPalette { id: palette; colorGroupEnabled: true }
QGCPalette { id: qgcPal; colorGroupEnabled: true }
property real _minW: ScreenTools.defaultFontPixelWidth * 30
property real _boxWidth: _minW
@@ -200,7 +200,7 @@ SetupPage {
QGCPopupDialog {
id: confirmFrameDialog
title: qsTr("Frame selection")
buttons: StandardButton.Close
buttons: Dialog.Close
ColumnLayout {
QGCLabel {
src/AutoPilotPlugins/APM/APMSubFrameComponentSummary.qml
+7 -7
View File
@@ -1,11 +1,11 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Controllers
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/APM/APMSubMotorComponent.qml
+12 -12
View File
@@ -7,15 +7,15 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 2.4
import QtQuick.Dialogs 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.ScreenTools
import QGroundControl.Controllers
SetupPage {
id: motorPage
@@ -77,7 +77,7 @@ SetupPage {
id: slider
height: ScreenTools.defaultFontPixelHeight * _sliderHeight
orientation: Qt.Vertical
maximumValue: 100
to: 100
value: neutralValue
// Give slider 'center sprung' behavior
@@ -90,15 +90,15 @@ SetupPage {
// Disable mouse scroll
MouseArea {
anchors.fill: parent
onWheel: {
onWheel: (wheel) => {
// do nothing
wheel.accepted = true;
}
onPressed: {
onPressed: (mouse) => {
// propogate/accept
mouse.accepted = false;
}
onReleased: {
onReleased: (mouse) => {
// propogate/accept
mouse.accepted = false;
}
src/AutoPilotPlugins/APM/APMTuningComponentCopter.qml
+24 -24
View File
@@ -8,16 +8,16 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Vehicle 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Vehicle
SetupPage {
id: tuningPage
@@ -156,12 +156,12 @@ SetupPage {
text: qsTr("Slide to the right if the copter is sluggish or slide to the left if the copter is twitchy")
}
Slider {
QGCSlider {
id: rollPitch
anchors.left: parent.left
anchors.right: parent.right
minimumValue: 0.08
maximumValue: 0.4
from: 0.08
to: 0.4
stepSize: 0.01
tickmarksEnabled: true
@@ -189,12 +189,12 @@ SetupPage {
text: qsTr("Slide to the right to climb more aggressively or slide to the left to climb more gently")
}
Slider {
QGCSlider {
id: climb
anchors.left: parent.left
anchors.right: parent.right
minimumValue: 0.3
maximumValue: 1.0
from: 0.3
to: 1.0
stepSize: 0.02
tickmarksEnabled: true
value: _rateClimbP.value
@@ -222,12 +222,12 @@ SetupPage {
text: qsTr("Slide to the left for soft control, slide to the right for crisp control")
}
Slider {
QGCSlider {
id: atcInputTC
anchors.left: parent.left
anchors.right: parent.right
minimumValue: _atcInputTC.min
maximumValue: _atcInputTC.max
from: _atcInputTC.min
to: _atcInputTC.max
stepSize: _atcInputTC.increment
tickmarksEnabled: true
@@ -252,11 +252,11 @@ SetupPage {
text: qsTr("Adjust the amount the motors spin to indicate armed")
}
Slider {
QGCSlider {
anchors.left: parent.left
anchors.right: parent.right
minimumValue: 0
maximumValue: Math.max(0.3, _motSpinArm.rawValue)
from: 0
to: Math.max(0.3, _motSpinArm.rawValue)
stepSize: 0.01
tickmarksEnabled: true
value: _motSpinArm.rawValue
@@ -288,11 +288,11 @@ SetupPage {
visible: _motSpinMin.rawValue < _motSpinArm.rawValue
}
Slider {
QGCSlider {
anchors.left: parent.left
anchors.right: parent.right
minimumValue: 0
maximumValue: Math.max(0.3, _motSpinMin.rawValue)
from: 0
to: Math.max(0.3, _motSpinMin.rawValue)
stepSize: 0.01
tickmarksEnabled: true
value: _motSpinMin.rawValue
src/AutoPilotPlugins/APM/APMTuningComponentSub.qml
+11 -11
View File
@@ -8,14 +8,14 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
SetupPage {
id: tuningPage
@@ -30,7 +30,7 @@ SetupPage {
FactPanelController { id: controller; }
QGCPalette { id: palette; colorGroupEnabled: true }
QGCPalette { id: qgcPal; colorGroupEnabled: true }
property real _margins: ScreenTools.defaultFontPixelHeight
@@ -65,7 +65,7 @@ SetupPage {
anchors.left: parent.left
anchors.right: parent.right
height: posColumn.height + _margins*2
color: palette.windowShade
color: qgcPal.windowShade
Column {
id: posColumn
@@ -101,7 +101,7 @@ SetupPage {
anchors.left: parent.left
anchors.right: parent.right
height: velColumn.height + _margins*2
color: palette.windowShade
color: qgcPal.windowShade
Component {
id: velColumnUpTo36
@@ -167,7 +167,7 @@ SetupPage {
anchors.left: parent.left
anchors.right: parent.right
height: wpnavColumn.height + _margins*2
color: palette.windowShade
color: qgcPal.windowShade
// WPNAV parameters up to 3.5
Component {
src/AutoPilotPlugins/Common/ESP8266Component.qml
+22 -19
View File
@@ -8,18 +8,18 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
Item {
@@ -446,16 +446,19 @@ Item {
MessageDialog {
id: rebootDialog
visible: false
icon: StandardIcon.Warning
standardButtons: StandardButton.Yes | StandardButton.No
buttons: MessageDialog.Yes | MessageDialog.No
title: qsTr("Reboot WiFi Bridge")
text: qsTr("This will restart the WiFi Bridge so the settings you've changed can take effect. Note that you may have to change your computer WiFi settings and QGroundControl link settings to match these changes. Are you sure you want to restart it?")
onYes: {
controller.reboot()
rebootDialog.visible = false
}
onNo: {
rebootDialog.visible = false
onButtonClicked: function (button, role) {
switch (button) {
case MessageDialog.Yes:
controller.reboot()
rebootDialog.visible = false
break;
case MessageDialog.No:
rebootDialog.visible = false
break;
}
}
}
}
src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
+7 -7
View File
@@ -1,11 +1,11 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
import QGroundControl.Controllers
Item {
anchors.fill: parent
src/AutoPilotPlugins/Common/MotorComponent.qml
+13 -13
View File
@@ -7,14 +7,14 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.ScreenTools
SetupPage {
id: motorPage
@@ -62,11 +62,11 @@ SetupPage {
id: slider
height: ScreenTools.defaultFontPixelHeight * _sliderHeight
orientation: Qt.Vertical
minimumValue: 0
maximumValue: 100
from: 0
to: 100
stepSize: 1
value: 0
updateValueWhileDragging: false
live: false
onValueChanged: {
controller.vehicle.motorTest(index + 1, value, value == 0 ? 0 : _motorTimeoutSecs, true)
@@ -100,11 +100,11 @@ SetupPage {
id: allSlider
height: ScreenTools.defaultFontPixelHeight * _sliderHeight
orientation: Qt.Vertical
minimumValue: 0
maximumValue: 100
from: 0
to: 100
stepSize: 1
value: 0
updateValueWhileDragging: false
live: false
onValueChanged: {
for (var sliderIndex=0; sliderIndex<sliderRepeater.count; sliderIndex++) {
src/AutoPilotPlugins/Common/RadioComponent.qml
+18 -18
View File
@@ -7,18 +7,18 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 2.4
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.11
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.Palette 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
import QGroundControl.Palette
SetupPage {
id: radioPage
@@ -58,7 +58,7 @@ SetupPage {
QGCPopupDialog {
title: qsTr("Spektrum Bind")
buttons: StandardButton.Ok | StandardButton.Cancel
buttons: Dialog.Ok | Dialog.Cancel
onAccepted: { controller.spektrumBindMode(radioGroup.checkedButton.bindMode) }
@@ -199,7 +199,7 @@ SetupPage {
Connections {
target: controller
onRollChannelRCValueChanged: rollLoader.item.rcValue = rcValue
onRollChannelRCValueChanged: (rcValue) => rollLoader.item.rcValue = rcValue
}
}
@@ -228,7 +228,7 @@ SetupPage {
Connections {
target: controller
onPitchChannelRCValueChanged: pitchLoader.item.rcValue = rcValue
onPitchChannelRCValueChanged: (rcValue) => pitchLoader.item.rcValue = rcValue
}
}
@@ -257,7 +257,7 @@ SetupPage {
Connections {
target: controller
onYawChannelRCValueChanged: yawLoader.item.rcValue = rcValue
onYawChannelRCValueChanged: (rcValue) => yawLoader.item.rcValue = rcValue
}
}
@@ -285,7 +285,7 @@ SetupPage {
Connections {
target: controller
onThrottleChannelRCValueChanged: throttleLoader.item.rcValue = rcValue
onThrottleChannelRCValueChanged: (rcValue) => throttleLoader.item.rcValue = rcValue
}
}
} // Column - Attitude Control labels
@@ -323,7 +323,7 @@ SetupPage {
mainWindow.showMessageDialog(qsTr("Zero Trims"),
qsTr("Before calibrating you should zero all your trims and subtrims. Click Ok to start Calibration.\n\n%1").arg(
(QGroundControl.multiVehicleManager.activeVehicle.px4Firmware ? "" : qsTr("Please ensure all motor power is disconnected AND all props are removed from the vehicle."))),
StandardButton.Ok,
Dialog.Ok,
function() { controller.nextButtonClicked() })
}
} else {
@@ -392,7 +392,7 @@ SetupPage {
text: qsTr("Copy Trims")
onClicked: mainWindow.showMessageDialog(qsTr("Copy Trims"),
qsTr("Center your sticks and move throttle all the way down, then press Ok to copy trims. After pressing Ok, reset the trims on your radio back to zero."),
StandardButton.Ok | StandardButton.Cancel,
Dialog.Ok | Dialog.Cancel,
function() { controller.copyTrims() })
}
}
src/AutoPilotPlugins/Common/SetupPage.qml
+11 -11
View File
@@ -7,18 +7,18 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
/// Base view control for all Setup pages
Item {
src/AutoPilotPlugins/Common/SyslinkComponent.qml
+9 -9
View File
@@ -9,16 +9,16 @@
import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
SetupPage {
id: syslinkPage
src/AutoPilotPlugins/PX4/ActuatorComponent.qml
+23 -19
View File
@@ -1,13 +1,13 @@
import QtQuick 2.12
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.3
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactControls
import QGroundControl.FactSystem
import QGroundControl.ScreenTools
SetupPage {
id: actuatorPage
@@ -163,7 +163,7 @@ SetupPage {
cache: false
MouseArea {
anchors.fill: parent
onClicked: {
onClicked: (mouse) => {
if (mouse.button == Qt.LeftButton) {
actuators.imageClicked(mouse.x, mouse.y);
}
@@ -379,22 +379,26 @@ SetupPage {
MessageDialog {
id: motorAssignmentConfirmDialog
visible: false
icon: StandardIcon.Warning
standardButtons: StandardButton.Yes | StandardButton.No
//icon: StandardIcon.Warning
buttons: MessageDialog.Yes | MessageDialog.No
title: qsTr("Motor Order Identification and Assignment")
text: actuators.motorAssignmentMessage
onYes: {
console.log(actuators.motorAssignmentActive)
actuators.startMotorAssignment()
text: actuators.motorAssignmentMessage
onButtonClicked: function (button, role) {
switch (button) {
case MessageDialog.Yes:
console.log(actuators.motorAssignmentActive)
actuators.startMotorAssignment()
break;
}
}
}
MessageDialog {
id: motorAssignmentFailureDialog
visible: false
icon: StandardIcon.Critical
standardButtons: StandardButton.Ok
//icon: StandardIcon.Critical
buttons: MessageDialog.Ok
title: qsTr("Error")
text: actuators.motorAssignmentMessage
text: actuators.motorAssignmentMessage
}
}
QGCButton {
src/AutoPilotPlugins/PX4/ActuatorFact.qml
+7 -7
View File
@@ -1,11 +1,11 @@
import QtQuick 2.12
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.3
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactControls
import QGroundControl.ScreenTools
Loader {
property var fact
src/AutoPilotPlugins/PX4/ActuatorSlider.qml
+8 -8
View File
@@ -1,9 +1,9 @@
import QtQuick 2.12
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.3
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controls
import QGroundControl.ScreenTools
Column {
property var channel
@@ -37,11 +37,11 @@ Column {
QGCSlider {
id: channelSlider
orientation: Qt.Vertical
minimumValue: snap ? channel.min - snapRange : channel.min
maximumValue: channel.max
from: snap ? channel.min - snapRange : channel.min
to: channel.max
stepSize: (channel.max-channel.min)/100
value: defaultVal
updateValueWhileDragging: true
live: true
anchors.horizontalCenter: parent.horizontalCenter
height: ScreenTools.defaultFontPixelHeight * _sliderHeight
indicatorBarVisible: sendTimer.running
src/AutoPilotPlugins/PX4/AirframeComponent.qml
+13 -13
View File
@@ -8,17 +8,17 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Controls
import QtQuick.Dialogs
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.Controllers
import QGroundControl.ScreenTools
SetupPage {
id: airframePage
@@ -122,7 +122,7 @@ SetupPage {
qsTr("Clicking 'Apply' will save the changes you have made to your airframe configuration.<br><br>\
All vehicle parameters other than Radio Calibration will be reset.<br><br>\
Your vehicle will also be restarted in order to complete the process."),
StandardButton.Apply | StandardButton.Cancel,
Dialog.Apply | Dialog.Cancel,
function() { controller.changeAutostart() })
}
@@ -139,7 +139,7 @@ SetupPage {
width: parent.width
spacing: _boxSpace
ExclusiveGroup {
ButtonGroup {
id: airframeTypeExclusive
}
@@ -194,7 +194,7 @@ SetupPage {
// Although this item is invisible we still use it to manage state
id: airframeCheckBox
checked: modelData.name === controller.currentAirframeType
exclusiveGroup: airframeTypeExclusive
buttonGroup: airframeTypeExclusive
visible: false
onCheckedChanged: {
src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml
+7 -7
View File
@@ -1,11 +1,11 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Controllers
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/PX4/BatteryParams.qml
+10 -10
View File
@@ -7,17 +7,17 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
// Exposes the set of battery parameters for new and old firmwares
// Older firmware: BAT_* naming
src/AutoPilotPlugins/PX4/CameraComponent.qml
+9 -10
View File
@@ -8,17 +8,16 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.2
import QtGraphicalEffects 1.0
import QtQuick
import QtQuick.Controls
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.ScreenTools
SetupPage {
id: cameraPage
src/AutoPilotPlugins/PX4/CameraComponentSummary.qml
+6 -6
View File
@@ -1,10 +1,10 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml
+7 -7
View File
@@ -1,11 +1,11 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
import QGroundControl.ScreenTools
Item {
anchors.fill: parent
src/AutoPilotPlugins/PX4/PX4FlightBehaviorCopter.qml
+8 -8
View File
@@ -7,15 +7,15 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.Controls
import QGroundControl.Palette
import QGroundControl.ScreenTools
SetupPage {
id: flightBehavior
src/AutoPilotPlugins/PX4/PX4FlightModes.qml
+11 -11
View File
@@ -8,18 +8,18 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.Controllers
import QGroundControl.ScreenTools
/// PX4 Flight Mode configuration. This control will load either the Simple or Advanced Flight Mode config
/// based on current parameter settings.
src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml
+6 -6
View File
@@ -1,10 +1,10 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/PX4/PX4SimpleFlightModes.qml
+9 -9
View File
@@ -7,16 +7,16 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.Controllers
import QGroundControl.ScreenTools
Item {
id: root
src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml
+5 -5
View File
@@ -7,12 +7,12 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl
import QGroundControl.Controls
SetupPage {
id: tuningPage
src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAll.qml
+7 -7
View File
@@ -7,14 +7,14 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.ScreenTools
Item {
width: availableWidth
src/AutoPilotPlugins/PX4/PX4TuningComponentCopterAttitude.qml
+9 -9
View File
@@ -7,16 +7,16 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Vehicle 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.ScreenTools
import QGroundControl.Vehicle
ColumnLayout {
width: availableWidth
src/AutoPilotPlugins/PX4/PX4TuningComponentCopterPosition.qml
+9 -9
View File
@@ -7,16 +7,16 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Vehicle 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.ScreenTools
import QGroundControl.Vehicle
ColumnLayout {
width: availableWidth
src/AutoPilotPlugins/PX4/PX4TuningComponentCopterRate.qml
+9 -9
View File
@@ -7,16 +7,16 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Vehicle 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.ScreenTools
import QGroundControl.Vehicle
ColumnLayout {
width: availableWidth
src/AutoPilotPlugins/PX4/PX4TuningComponentCopterVelocity.qml
+9 -9
View File
@@ -7,16 +7,16 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Vehicle 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.ScreenTools
import QGroundControl.Vehicle
ColumnLayout {
width: availableWidth
src/AutoPilotPlugins/PX4/PX4TuningComponentPlane.qml
+5 -5
View File
@@ -7,12 +7,12 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl
import QGroundControl.Controls
SetupPage {
id: tuningPage
src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAll.qml
+7 -7
View File
@@ -7,14 +7,14 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.ScreenTools
Item {
width: availableWidth
src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneAttitude.qml
+9 -9
View File
@@ -7,16 +7,16 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Vehicle 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.ScreenTools
import QGroundControl.Vehicle
ColumnLayout {
width: availableWidth
src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneRate.qml
+9 -9
View File
@@ -7,16 +7,16 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Vehicle 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.ScreenTools
import QGroundControl.Vehicle
ColumnLayout {
width: availableWidth
src/AutoPilotPlugins/PX4/PX4TuningComponentPlaneTECS.qml
+9 -9
View File
@@ -7,16 +7,16 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Vehicle 1.0
import QGroundControl
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.ScreenTools
import QGroundControl.Vehicle
ColumnLayout {
width: availableWidth
src/AutoPilotPlugins/PX4/PX4TuningComponentVTOL.qml
+5 -5
View File
@@ -8,12 +8,12 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.Controls 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controls
import QGroundControl.FactSystem
import QGroundControl.ScreenTools
SetupPage {
id: tuningPage
src/AutoPilotPlugins/PX4/PowerComponent.qml
+14 -14
View File
@@ -7,18 +7,18 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.2
import QtQuick
import QtQuick.Controls
import QtQuick.Dialogs
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.PX4 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
import QGroundControl.PX4
// Note: This setup supports back compat on battery parameter naming
// Older firmware: Single battery setup using BAT_* naming
@@ -413,7 +413,7 @@ SetupPage {
QGCPopupDialog {
title: qsTr("Calculate Voltage Divider")
buttons: StandardButton.Close
buttons: Dialog.Close
property alias batteryIndex: batParams.batteryIndex
@@ -471,7 +471,7 @@ SetupPage {
QGCPopupDialog {
title: qsTr("Calculate Amps per Volt")
buttons: StandardButton.Close
buttons: Dialog.Close
property alias batteryIndex: batParams.batteryIndex
@@ -530,7 +530,7 @@ SetupPage {
QGCPopupDialog {
id: escCalibrationDlg
title: qsTr("ESC Calibration")
buttons: StandardButton.Ok
buttons: Dialog.Ok
acceptButtonEnabled: false
Connections {
src/AutoPilotPlugins/PX4/PowerComponentSummary.qml
+6 -6
View File
@@ -12,13 +12,13 @@
/// @brief Battery, propeller and magnetometer summary
/// @author Gus Grubba <gus@auterion.com>
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/PX4/SafetyComponent.qml
+14 -15
View File
@@ -8,18 +8,17 @@
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.2
import QtGraphicalEffects 1.0
import QtQuick
import QtQuick.Controls
import QtQuick.Controls
import QtQuick.Layouts
import QGroundControl 1.0
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Palette 1.0
import QGroundControl
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Palette
SetupPage {
id: safetyPage
@@ -172,7 +171,7 @@ SetupPage {
Layout.minimumWidth:_editFieldWidth
Layout.fillWidth: true
currentIndex: _collisionPrevention ? (_collisionPrevention.rawValue > 0 ? 1 : 0) : 0
onActivated: {
onActivated: (index) => {
if(_collisionPrevention) {
_collisionPrevention.value = index > 0 ? 5 : -1
console.log('Collision prevention enabled: ' + _collisionPrevention.value)
@@ -210,11 +209,11 @@ SetupPage {
Layout.minimumHeight: ScreenTools.defaultFontPixelHeight * 2
Layout.fillWidth: true
Layout.fillHeight: true
maximumValue: QGroundControl.unitsConversion.metersToAppSettingsHorizontalDistanceUnits(15)
minimumValue: QGroundControl.unitsConversion.metersToAppSettingsHorizontalDistanceUnits(1)
to: QGroundControl.unitsConversion.metersToAppSettingsHorizontalDistanceUnits(15)
from: QGroundControl.unitsConversion.metersToAppSettingsHorizontalDistanceUnits(1)
stepSize: 1
displayValue: true
updateValueWhileDragging: false
live: false
Layout.alignment: Qt.AlignVCenter
value: {
if (_collisionPrevention && _collisionPrevention.rawValue > 0) {
src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
+6 -6
View File
@@ -1,10 +1,10 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick
import QtQuick.Controls
import QGroundControl.FactSystem 1.0
import QGroundControl.FactControls 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
import QGroundControl.FactSystem
import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
Item {
anchors.fill: parent
src/AutoPilotPlugins/PX4/SensorsComponent.qml
+3 -3
View File
@@ -7,10 +7,10 @@
*
****************************************************************************/
import QtQuick 2.3
import QtQuick
import QGroundControl.Controls 1.0
import QGroundControl.PX4 1.0
import QGroundControl.Controls
import QGroundControl.PX4
SetupPage {
pageComponent: pageComponent

Some files were not shown because too many files have changed in this diff Show More