Skip to content

Q
qgroundcontrol
Commit 98ef25c9 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Revert "New Vehicle Summary format"

parent 7558a754
Hide whitespace changes
Inline Side-by-side
Showing with 526 additions and 399 deletions
src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml
View file @ 98ef25c9
import QtQuick 2.5
import QtQuick 2.2
import QtQuick.Controls 1.2
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.ScreenTools 1.0
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
FactPanel {
id: panel
width: grid.width
height: grid.height
color: qgcPal.windowShade
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
APMAirframeComponentController {
id: controller
factPanel: panel
......@@ -23,13 +20,20 @@ FactPanel {
property Fact sysIdFact: controller.getParameterFact(-1, "FRAME")
Grid {
id: grid
rows: 1
columns: 2
spacing: ScreenTools.defaultFontPixelWidth / 2
QGCLabel { text: "Frame Type:" }
QGCLabel { text: sysIdFact.enumStringValue }
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
id: nameRow;
labelText: "Frame Type:"
valueText: sysIdFact.valueString === "0" ? "Plus"
: sysIdFact.valueString === "1" ? "X"
: sysIdFact.valueString === "2" ? "V"
: sysIdFact.valueString == "3" ? "H"
:/* Fact.value == 10 */ "New Y6";
}
}
}
src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml
View file @ 98ef25c9
import QtQuick 2.5
import QtQuick.Controls 1.2
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.ScreenTools 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
width: grid.width
height: grid.height
color: qgcPal.windowShade
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
......@@ -22,22 +19,28 @@ FactPanel {
property Fact _mountRCInPan: controller.getParameterFact(-1, "MNT_RC_IN_PAN")
property Fact _mountType: controller.getParameterFact(-1, "MNT_TYPE")
Grid {
id: grid
rows: 4
columns: 2
spacing: ScreenTools.defaultFontPixelWidth / 2
QGCLabel { text: "Gimbal type:" }
QGCLabel { text: _mountType.enumStringValue }
QGCLabel { text: "Tilt input channel:" }
QGCLabel { text: _mountRCInTilt.enumStringValue }
QGCLabel { text: "Pan input channel:" }
QGCLabel { text: _mountRCInPan.enumStringValue }
QGCLabel { text: "Roll input channel:" }
QGCLabel { text: _mountRCInRoll.enumStringValue }
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: "Gimbal type:"
valueText: _mountType.enumStringValue
}
VehicleSummaryRow {
labelText: "Tilt input channel:"
valueText: _mountRCInTilt.enumStringValue
}
VehicleSummaryRow {
labelText: "Pan input channel:"
valueText: _mountRCInPan.enumStringValue
}
VehicleSummaryRow {
labelText: "Roll input channel:"
valueText: _mountRCInRoll.enumStringValue
}
}
}
src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml
View file @ 98ef25c9
......@@ -4,15 +4,12 @@ import QtQuick.Controls 1.2
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.ScreenTools 1.0
FactPanel {
id: panel
width: grid.width
height: grid.height
color: qgcPal.windowShade
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
......@@ -24,28 +21,38 @@ FactPanel {
property Fact flightMode5: controller.getParameterFact(-1, "FLTMODE5")
property Fact flightMode6: controller.getParameterFact(-1, "FLTMODE6")
Grid {
id: grid
rows: 6
columns: 2
spacing: ScreenTools.defaultFontPixelWidth / 2
QGCLabel { text: "Flight Mode 1:" }
QGCLabel { text: flightMode1.enumStringValue }
QGCLabel { text: "Flight Mode 2:" }
QGCLabel { text: flightMode2.enumStringValue }
QGCLabel { text: "Flight Mode 3:" }
QGCLabel { text: flightMode3.enumStringValue }
QGCLabel { text: "Flight Mode 4:" }
QGCLabel { text: flightMode4.enumStringValue }
QGCLabel { text: "Flight Mode 5:" }
QGCLabel { text: flightMode5.enumStringValue }
QGCLabel { text: "Flight Mode 6:" }
QGCLabel { text: flightMode6.enumStringValue }
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: "Flight Mode 1:"
valueText: flightMode1.enumStringValue
}
VehicleSummaryRow {
labelText: "Flight Mode 2:"
valueText: flightMode2.enumStringValue
}
VehicleSummaryRow {
labelText: "Flight Mode 3:"
valueText: flightMode3.enumStringValue
}
VehicleSummaryRow {
labelText: "Flight Mode 4:"
valueText: flightMode4.enumStringValue
}
VehicleSummaryRow {
labelText: "Flight Mode 5:"
valueText: flightMode5.enumStringValue
}
VehicleSummaryRow {
labelText: "Flight Mode 6:"
valueText: flightMode6.enumStringValue
}
}
}
src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
View file @ 98ef25c9
......@@ -27,15 +27,12 @@ import QtQuick.Controls 1.2
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.ScreenTools 1.0
FactPanel {
id: panel
width: grid.width
height: grid.height
color: qgcPal.windowShade
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
......@@ -43,16 +40,18 @@ FactPanel {
property Fact battCapacity: controller.getParameterFact(-1, "BATT_CAPACITY")
property Fact battMonitor: controller.getParameterFact(-1, "BATT_MONITOR")
Grid {
id: grid
rows: 2
columns: 2
spacing: ScreenTools.defaultFontPixelWidth / 2
Column {
anchors.fill: parent
anchors.margins: 8
QGCLabel { text: "Battery monitor:" }
QGCLabel { text: battMonitor.enumStringValue }
VehicleSummaryRow {
labelText: "Battery monitor:"
valueText: battMonitor.enumStringValue
}
QGCLabel { text: "Battery capacity:" }
FactLabel { fact: battCapacity }
VehicleSummaryRow {
labelText: "Battery capacity:"
valueText: battCapacity.valueString
}
}
}
src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml
View file @ 98ef25c9
import QtQuick 2.5
import QtQuick 2.2
import QtQuick.Controls 1.2
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.ScreenTools 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
width: grid.width
height: grid.height
color: qgcPal.windowShade
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
......@@ -22,22 +19,28 @@ FactPanel {
property Fact mapYawFact: controller.getParameterFact(-1, "RCMAP_YAW")
property Fact mapThrottleFact: controller.getParameterFact(-1, "RCMAP_THROTTLE")
Grid {
id: grid
rows: 4
columns: 2
spacing: ScreenTools.defaultFontPixelWidth / 2
QGCLabel { text: "Roll:" }
QGCLabel { text: mapRollFact.value == 0 ? "Setup required" : "Channel " + mapRollFact.valueString }
QGCLabel { text: "Pitch:" }
QGCLabel { text: mapPitchFact.value == 0 ? "Setup required" : "Channel " + mapPitchFact.valueString }
QGCLabel { text: "Yaw:" }
QGCLabel { text: mapYawFact.value == 0 ? "Setup required" : "Channel " + mapYawFact.valueString }
QGCLabel { text: "Throttle:" }
QGCLabel { text: mapThrottleFact.value == 0 ? "Setup required" : "Channel " + mapThrottleFact.valueString }
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: "Roll:"
valueText: mapRollFact.value == 0 ? "Setup required" : "Channel " + mapRollFact.valueString
}
VehicleSummaryRow {
labelText: "Pitch:"
valueText: mapPitchFact.value == 0 ? "Setup required" : "Channel " + mapPitchFact.valueString
}
VehicleSummaryRow {
labelText: "Yaw:"
valueText: mapYawFact.value == 0 ? "Setup required" : "Channel " + mapYawFact.valueString
}
VehicleSummaryRow {
labelText: "Throttle:"
valueText: mapThrottleFact.value == 0 ? "Setup required" : "Channel " + mapThrottleFact.valueString
}
}
}
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
View file @ 98ef25c9
import QtQuick 2.5
import QtQuick 2.2
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.ScreenTools 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
width: grid.width
height: grid.height
color: qgcPal.windowShade
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
......@@ -83,42 +81,55 @@ FactPanel {
}
}
Grid {
id: grid
rows: 8
columns: 2
spacing: ScreenTools.defaultFontPixelWidth / 2
QGCLabel { text: "Throttle failsafe:" }
QGCLabel { text: _failsafeThrEnableText }
QGCLabel { text: "Battery failsafe:" }
QGCLabel { text: _failsafeBattEnableText }
QGCLabel { text: "GeoFence:" }
QGCLabel { text: _fenceEnable.value == 0 || _fenceType == 0 ?
"Disabled" :
(_fenceType.value == 1 ?
"Altitude" :
(_fenceType.value == 2 ? "Circle" : "Altitude,Circle")) }
QGCLabel { text: "GeoFence:"; visible: _fenceEnable.value != 0 }
QGCLabel { text: _fenceAction.value == 0 ?
"Report only" :
(_fenceAction.value == 1 ? "RTL or Land" : "Unknown")
visible: _fenceEnable.value != 0
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: "Throttle failsafe:"
valueText: _failsafeThrEnableText
}
VehicleSummaryRow {
labelText: "Battery failsafe:"
valueText: _failsafeBattEnableText
}
QGCLabel { text: "RTL min alt:" }
QGCLabel { text: _rtlAltFact.value == 0 ? "current" : _rtlAltFact.valueString }
VehicleSummaryRow {
labelText: "GeoFence:"
valueText: _fenceEnable.value == 0 || _fenceType == 0 ?
"Disabled" :
(_fenceType.value == 1 ?
"Altitude" :
(_fenceType.value == 2 ? "Circle" : "Altitude,Circle"))
}
QGCLabel { text: "RTL loiter time:" }
QGCLabel { text: _rtlLoitTimeFact.valueString }
VehicleSummaryRow {
labelText: "GeoFence:"
valueText: _fenceAction.value == 0 ?
"Report only" :
(_fenceAction.value == 1 ? "RTL or Land" : "Unknown")
visible: _fenceEnable.value != 0
}
QGCLabel { text: "RTL final alt:" }
QGCLabel { text: _rtlAltFinalFact.value == 0 ? "Land" : _rtlAltFinalFact.valueString }
VehicleSummaryRow {
labelText: "RTL min alt:"
valueText: _rtlAltFact.value == 0 ? "current" : _rtlAltFact.valueString
}
QGCLabel { text: "Descent speed:" }
QGCLabel { text: _landSpeedFact.valueString }
VehicleSummaryRow {
labelText: "RTL loiter time:"
valueText: _rtlLoitTimeFact.valueString
}
VehicleSummaryRow {
labelText: "RTL final alt:"
valueText: _rtlAltFinalFact.value == 0 ? "Land" : _rtlAltFinalFact.valueString
}
VehicleSummaryRow {
labelText: "Descent speed:"
valueText: _landSpeedFact.valueString
}
}
}
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
View file @ 98ef25c9
import QtQuick 2.5
import QtQuick 2.2
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.ScreenTools 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
width: grid.width
height: grid.height
color: qgcPal.windowShade
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
......@@ -24,22 +22,28 @@ FactPanel {
property Fact _rtlAltFact: controller.getParameterFact(-1, "ALT_HOLD_RTL")
Grid {
id: grid
rows: 4
columns: 2
spacing: ScreenTools.defaultFontPixelWidth / 2
QGCLabel { text: "Throttle failsafe:" }
QGCLabel { text: _failsafeThrEnable.value != 0 ? _failsafeThrValue.valueString : "Disabled" }
QGCLabel { text: "Voltage failsafe:" }
QGCLabel { text: _failsafeBattVoltage.value == 0 ? "Disabled" : _failsafeBattVoltage.valueString }
QGCLabel { text: "mAh failsafe:" }
QGCLabel { text: _failsafeBattMah.value == 0 ? "Disabled" : _failsafeBattMah.valueString }
QGCLabel { text: "RTL min alt:" }
QGCLabel { text: _rtlAltFact.value < 0 ? "current" : _rtlAltFact.valueString }
Column {
anchors.fill: parent
anchors.margins: 8
VehicleSummaryRow {
labelText: "Throttle failsafe:"
valueText: _failsafeThrEnable.value != 0 ? _failsafeThrValue.valueString : "Disabled"
}
VehicleSummaryRow {
labelText: "Voltage failsafe:"
valueText: _failsafeBattVoltage.value == 0 ? "Disabled" : _failsafeBattVoltage.valueString
}
VehicleSummaryRow {
labelText: "mAh failsafe:"
valueText: _failsafeBattMah.value == 0 ? "Disabled" : _failsafeBattMah.valueString
}
VehicleSummaryRow {
labelText: "RTL min alt:"
valueText: _rtlAltFact.value < 0 ? "current" : _rtlAltFact.valueString
}
}
}
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml
View file @ 98ef25c9
......@@ -26,6 +26,7 @@ import QtQuick 2.5
import QGroundControl.Controls 1.0
QGCLabel {
anchors.fill: parent
text: "Not supported"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
......
src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml
View file @ 98ef25c9
import QtQuick 2.5
import QtQuick.Controls 1.2
import QtQuick 2.5
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.2
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.Controllers 1.0
/*
IMPORTANT NOTE: Any changes made here must also be made to SensorsComponentSummary.qml
*/
FactPanel {
id: panel
width: grid.width
height: grid.height
color: qgcPal.windowShade
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
APMSensorsComponentController { id: controller; factPanel: panel }
......@@ -20,16 +23,18 @@ FactPanel {
property bool accelCalNeeded: controller.accelSetupNeeded
property bool compassCalNeeded: controller.compassSetupNeeded
Grid {
id: grid
rows: 2
columns: 2
spacing: ScreenTools.defaultFontPixelWidth / 2
Column {
anchors.fill: parent
anchors.margins: 8
QGCLabel { text: "Compass:" }
QGCLabel { text: compassCalNeeded ? "Setup required" : "Ready" }
VehicleSummaryRow {
labelText: "Compass:"
valueText: compassCalNeeded ? "Setup required" : "Ready"
}
QGCLabel { text: "Accelerometer:" }
QGCLabel { text: accelCalNeeded ? "Setup required" : "Ready" }
VehicleSummaryRow {
labelText: "Accelerometer:"
valueText: accelCalNeeded ? "Setup required" : "Ready"
}
}
}
src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml
View file @ 98ef25c9
import QtQuick 2.5
import QtQuick 2.2
import QtQuick.Controls 1.2
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.ScreenTools 1.0
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
FactPanel {
id: panel
width: grid.width
height: grid.height
color: qgcPal.windowShade
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
AirframeComponentController { id: controller; factPanel: panel }
......@@ -22,19 +20,23 @@ FactPanel {
property bool autoStartSet: sysAutoStartFact.value != 0
Grid {
id: grid
rows: 3
columns: 2
spacing: ScreenTools.defaultFontPixelWidth / 2
Column {
anchors.fill: parent
anchors.margins: 8
QGCLabel { text: "System ID:" }
FactLabel { fact: sysIdFact }
VehicleSummaryRow {
labelText: "System ID:"
valueText: sysIdFact.valueString
}
QGCLabel { text: "Airframe type:" }
QGCLabel { text: autoStartSet ? controller.currentAirframeType : "Setup required" }
VehicleSummaryRow {
labelText: "Airframe type:"
valueText: autoStartSet ? controller.currentAirframeType : "Setup required"
}
QGCLabel { text: "Vehicle:" }
QGCLabel { text: autoStartSet ? controller.currentVehicleName : "Setup required" }
VehicleSummaryRow {
labelText: "Vehicle:"
valueText: autoStartSet ? controller.currentVehicleName : "Setup required"
}
}
}
}
\ No newline at end of file
src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml
View file @ 98ef25c9
import QtQuick 2.5
import QtQuick 2.2
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.ScreenTools 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
width: grid.width
height: grid.height
color: qgcPal.windowShade
id: panel
anchors.fill: parent
color: qgcPal.windowShadeDark
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
FactPanelController { id: controller; factPanel: panel }
......@@ -21,22 +19,28 @@ FactPanel {
property Fact loiterSwFact: controller.getParameterFact(-1, "RC_MAP_LOITER_SW")
property Fact returnSwFact: controller.getParameterFact(-1, "RC_MAP_RETURN_SW")
Grid {
id: grid
rows: 4
columns: 2
spacing: ScreenTools.defaultFontPixelWidth / 2
QGCLabel { text: "Mode switch:" }
QGCLabel { text: modeSwFact.value == 0 ? "Setup required" : modeSwFact.valueString }
QGCLabel { text: "Position Ctl switch:" }
QGCLabel { text: posCtlSwFact.value == 0 ? "Disabled" : posCtlSwFact.valueString }
QGCLabel { text: "Loiter switch:" }
QGCLabel { text: loiterSwFact.value == 0 ? "Disabled" : loiterSwFact.valueString }
QGCLabel { text: "Return switch:" }
QGCLabel { text: returnSwFact.value == 0 ? "Disabled" : returnSwFact.valueString }
Column {
anchors.fill: parent
anchors.margins: 8