From 98ef25c9d3ba861f4737512e2b7bb221e19f3cfe Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 27 Dec 2015 17:11:34 -0800 Subject: [PATCH] Revert "New Vehicle Summary format" --- .../APM/APMAirframeComponentSummary.qml | 42 ++--- .../APM/APMCameraComponentSummary.qml | 57 +++---- .../APM/APMFlightModesComponentSummary.qml | 65 ++++---- .../APM/APMPowerComponentSummary.qml | 29 ++-- .../APM/APMRadioComponentSummary.qml | 59 +++---- .../APM/APMSafetyComponentSummaryCopter.qml | 95 +++++++----- .../APM/APMSafetyComponentSummaryPlane.qml | 58 +++---- .../APM/APMSafetyComponentSummaryRover.qml | 1 + .../APM/APMSensorsComponentSummary.qml | 37 +++-- .../PX4/AirframeComponentSummary.qml | 48 +++--- .../PX4/FlightModesComponentSummary.qml | 58 +++---- .../PX4/PX4RadioComponentSummary.qml | 68 ++++---- .../PX4/PowerComponentSummary.qml | 46 +++--- .../PX4/SafetyComponentSummary.qml | 66 ++++---- .../PX4/SensorsComponentSummary.qml | 51 +++--- src/VehicleSetup/VehicleSummary.qml | 145 ++++++++++++------ 16 files changed, 526 insertions(+), 399 deletions(-) diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml index f7bf543ae5..3e697b1b1b 100644 --- a/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMAirframeComponentSummary.qml @@ -1,21 +1,18 @@ -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"; + + } } } diff --git a/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml b/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml index c2b44806e7..62ebfae01f 100644 --- a/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMCameraComponentSummary.qml @@ -1,18 +1,15 @@ 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 + } } } diff --git a/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml b/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml index 0e42ff1be6..4454fe0648 100644 --- a/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMFlightModesComponentSummary.qml @@ -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 + } } } diff --git a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml index f3bead9df2..2575a6d7ba 100644 --- a/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml @@ -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 + } } } diff --git a/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml b/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml index fa40c10835..a41fa81d6d 100644 --- a/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMRadioComponentSummary.qml @@ -1,18 +1,15 @@ -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 + } } } diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml index c3d31eb291..0d2328082b 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml @@ -1,17 +1,15 @@ -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 + } } } diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml index 88544a95de..260bc98170 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml @@ -1,17 +1,15 @@ -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 + } } } diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml index aec51fbb40..ace3b3a1d4 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSummaryRover.qml @@ -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 diff --git a/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml b/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml index fcc70f8cd7..75902f5514 100644 --- a/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml @@ -1,18 +1,21 @@ -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" + } } } diff --git a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml index dedb7b97af..75dc76ddb0 100644 --- a/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml @@ -1,18 +1,16 @@ -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 diff --git a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml index f3e17e8740..bbf7cf4438 100644 --- a/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml @@ -1,17 +1,15 @@ -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 + + VehicleSummaryRow { + labelText: "Mode switch:" + valueText: modeSwFact.value == 0 ? "Setup required" : modeSwFact.valueString + } + + VehicleSummaryRow { + labelText: "Position Ctl switch:" + valueText: posCtlSwFact.value == 0 ? "Disabled" : posCtlSwFact.valueString + } + + VehicleSummaryRow { + labelText: "Loiter switch:" + valueText: loiterSwFact.value == 0 ? "Disabled" : loiterSwFact.valueString + } + + VehicleSummaryRow { + labelText: "Return switch:" + valueText: returnSwFact.value == 0 ? "Disabled" : returnSwFact.valueString + } } } diff --git a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml index 2b56f350cc..663d2649be 100644 --- a/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/PX4RadioComponentSummary.qml @@ -1,17 +1,15 @@ -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,31 +22,43 @@ FactPanel { property Fact mapAux1Fact: controller.getParameterFact(-1, "RC_MAP_AUX1") property Fact mapAux2Fact: controller.getParameterFact(-1, "RC_MAP_AUX2") - Grid { - id: grid - rows: 7 - columns: 2 - spacing: ScreenTools.defaultFontPixelWidth / 2 + Column { + anchors.fill: parent + anchors.margins: 8 - QGCLabel { text: "Roll:" } - QGCLabel { text: mapRollFact.value == 0 ? "Setup required" : mapRollFact.valueString } + VehicleSummaryRow { + labelText: "Roll:" + valueText: mapRollFact.value == 0 ? "Setup required" : mapRollFact.valueString + } - QGCLabel { text: "Pitch:" } - QGCLabel { text: mapPitchFact.value == 0 ? "Setup required" : mapPitchFact.valueString } + VehicleSummaryRow { + labelText: "Pitch:" + valueText: mapPitchFact.value == 0 ? "Setup required" : mapPitchFact.valueString + } - QGCLabel { text: "Yaw:" } - QGCLabel { text: mapYawFact.value == 0 ? "Setup required" : mapYawFact.valueString } + VehicleSummaryRow { + labelText: "Yaw:" + valueText: mapYawFact.value == 0 ? "Setup required" : mapYawFact.valueString + } - QGCLabel { text: "Throttle:" } - QGCLabel { text: mapThrottleFact.value == 0 ? "Setup required" : mapThrottleFact.valueString } + VehicleSummaryRow { + labelText: "Throttle:" + valueText: mapThrottleFact.value == 0 ? "Setup required" : mapThrottleFact.valueString + } - QGCLabel { text: "Flaps:" } - QGCLabel { text: mapFlapsFact.value == 0 ? "Disabled" : mapFlapsFact.valueString } + VehicleSummaryRow { + labelText: "Flaps:" + valueText: mapFlapsFact.value == 0 ? "Disabled" : mapFlapsFact.valueString + } - QGCLabel { text: "Aux1:" } - QGCLabel { text: mapAux1Fact.value == 0 ? "Disabled" : mapAux1Fact.valueString } + VehicleSummaryRow { + labelText: "Aux1:" + valueText: mapAux1Fact.value == 0 ? "Disabled" : mapAux1Fact.valueString + } - QGCLabel { text: "Aux2:" } - QGCLabel { text: mapAux2Fact.value == 0 ? "Disabled" : mapAux2Fact.valueString } + VehicleSummaryRow { + labelText: "Aux2:" + valueText: mapAux2Fact.value == 0 ? "Disabled" : mapAux2Fact.valueString + } } } diff --git a/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml b/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml index 5ad17dcc21..3343295371 100644 --- a/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/PowerComponentSummary.qml @@ -25,20 +25,18 @@ /// @brief Battery, propeller and magnetometer summary /// @author Gus Grubba -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 } @@ -47,19 +45,23 @@ FactPanel { property Fact batVEmptyFact: controller.getParameterFact(-1, "BAT_V_EMPTY") property Fact batCellsFact: controller.getParameterFact(-1, "BAT_N_CELLS") - Grid { - id: grid - rows: 3 - columns: 2 - spacing: ScreenTools.defaultFontPixelWidth / 2 + Column { + anchors.fill: parent + anchors.margins: 8 - QGCLabel { text: "Battery Full:" } - FactLabel { fact: batVChargedFact } + VehicleSummaryRow { + labelText: "Battery Full:" + valueText: batVChargedFact.valueString + } - QGCLabel { text: "Battery Empty:" } - FactLabel { fact: batVEmptyFact } + VehicleSummaryRow { + labelText: "Battery Empty:" + valueText: batVEmptyFact.valueString + } - QGCLabel { text: "Number of Cells:" } - FactLabel { fact: batCellsFact } + VehicleSummaryRow { + labelText: "Number of Cells:" + valueText: batCellsFact.valueString + } } -} +} \ No newline at end of file diff --git a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml index 28b925ef27..46785ad603 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml @@ -1,17 +1,15 @@ -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 } @@ -22,25 +20,33 @@ FactPanel { property Fact commDLLossFact: controller.getParameterFact(-1, "COM_DL_LOSS_EN") property Fact commRCLossFact: controller.getParameterFact(-1, "COM_RC_LOSS_T") - Grid { - id: grid - rows: 5 - columns: 2 - spacing: ScreenTools.defaultFontPixelWidth / 2 - - QGCLabel { text: "RTL min alt:" } - QGCLabel { text: returnAltFact.valueString } - - QGCLabel { text: "RTL home alt:" } - QGCLabel { text: descendAltFact.valueString } - - QGCLabel { text: "RTL loiter delay:" } - QGCLabel { text: landDelayFact.value < 0 ? "Disabled" : landDelayFact.valueString } - - QGCLabel { text: "Telemetry loss RTL:" } - QGCLabel { text: commDLLossFact.value != -1 ? "Disabled" : commDLLossFact.valueString } - - QGCLabel { text: "RC loss RTL (seconds):" } - QGCLabel { text: commRCLossFact.valueString } + Column { + anchors.fill: parent + anchors.margins: 8 + + VehicleSummaryRow { + labelText: "RTL min alt:" + valueText: returnAltFact.valueString + } + + VehicleSummaryRow { + labelText: "RTL home alt:" + valueText: descendAltFact.valueString + } + + VehicleSummaryRow { + labelText: "RTL loiter delay:" + valueText: landDelayFact.value < 0 ? "Disabled" : landDelayFact.valueString + } + + VehicleSummaryRow { + labelText: "Telemetry loss RTL:" + valueText: commDLLossFact.value != -1 ? "Disabled" : commDLLossFact.valueString + } + + VehicleSummaryRow { + labelText: "RC loss RTL (seconds):" + valueText: commRCLossFact.valueString + } } } diff --git a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml index 4997fe1f39..2f7a3edb9f 100644 --- a/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml +++ b/src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml @@ -1,17 +1,20 @@ -import QtQuick 2.5 +import QtQuick 2.2 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.FactSystem 1.0 +import QGroundControl.FactControls 1.0 +import QGroundControl.Controls 1.0 +import QGroundControl.Palette 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 } FactPanelController { id: controller; factPanel: panel } @@ -20,19 +23,23 @@ FactPanel { property Fact gyro0IdFact: controller.getParameterFact(-1, "CAL_GYRO0_ID") property Fact accel0IdFact: controller.getParameterFact(-1, "CAL_ACC0_ID") - Grid { - id: grid - rows: 3 - columns: 2 - spacing: ScreenTools.defaultFontPixelWidth / 2 + Column { + anchors.fill: parent + anchors.margins: 8 - QGCLabel { text: "Compass:" } - QGCLabel { text: mag0IdFact.value == 0 ? "Setup required" : "Ready" } + VehicleSummaryRow { + labelText: "Compass:" + valueText: mag0IdFact.value == 0 ? "Setup required" : "Ready" + } - QGCLabel { text: "Gyro:" } - QGCLabel { text: gyro0IdFact.value == 0 ? "Setup required" : "Ready" } + VehicleSummaryRow { + labelText: "Gyro:" + valueText: gyro0IdFact.value == 0 ? "Setup required" : "Ready" + } - QGCLabel { text: "Accelerometer:" } - QGCLabel { text: accel0IdFact.value == 0 ? "Setup required" : "Ready" } + VehicleSummaryRow { + labelText: "Accelerometer:" + valueText: accel0IdFact.value == 0 ? "Setup required" : "Ready" + } } -} +} \ No newline at end of file diff --git a/src/VehicleSetup/VehicleSummary.qml b/src/VehicleSetup/VehicleSummary.qml index 7b0b58897f..ed126b21bc 100644 --- a/src/VehicleSetup/VehicleSummary.qml +++ b/src/VehicleSetup/VehicleSummary.qml @@ -36,63 +36,122 @@ Rectangle { anchors.fill: parent color: qgcPal.window - readonly property real _margins: ScreenTools.defaultFontPixelHeight + property real _minSummaryW: ScreenTools.defaultFontPixelWidth * 30 + property real _summaryBoxWidth: _minSummaryW + property real _summaryBoxSpace: ScreenTools.defaultFontPixelWidth + + function computeSummaryBoxSize() { + var sw = 0 + var rw = 0 + var idx = Math.floor(_summaryRoot.width / (_minSummaryW + ScreenTools.defaultFontPixelWidth)) + if(idx < 1) { + _summaryBoxWidth = _summaryRoot.width + _summaryBoxSpace = 0 + } else { + _summaryBoxSpace = 0 + if(idx > 1) { + _summaryBoxSpace = ScreenTools.defaultFontPixelWidth + sw = _summaryBoxSpace * (idx - 1) + } + rw = _summaryRoot.width - sw + _summaryBoxWidth = rw / idx + } + } function capitalizeWords(sentence) { return sentence.replace(/(?:^|\s)\S/g, function(a) { return a.toUpperCase(); }); } - QGCPalette { id: qgcPal; colorGroupEnabled: enabled } + QGCPalette { + id: qgcPal + colorGroupEnabled: enabled + } + + Component.onCompleted: { + computeSummaryBoxSize() + } + + onWidthChanged: { + computeSummaryBoxSize() + } Flickable { clip: true anchors.fill: parent - contentHeight: summaryFlow.y + summaryFlow.height + contentHeight: summaryColumn.height + contentWidth: _summaryRoot.width flickableDirection: Flickable.VerticalFlick + boundsBehavior: Flickable.StopAtBounds + + Column { + id: summaryColumn + width: _summaryRoot.width + spacing: ScreenTools.defaultFontPixelHeight + + QGCLabel { + width: parent.width + wrapMode: Text.WordWrap + color: setupComplete ? qgcPal.text : qgcPal.warningText + font.weight: Font.DemiBold + text: setupComplete ? + "Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component." : + "WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left." + property bool setupComplete: multiVehicleManager.activeVehicle.autopilot.setupComplete + } - QGCLabel { - id: topLabel - width: parent.width - wrapMode: Text.WordWrap - color: setupComplete ? qgcPal.text : qgcPal.warningText - font.weight: setupComplete ? Font.Normal : Font.DemiBold - text: setupComplete ? - "Below you will find a summary of the settings for your vehicle. To the left are the setup menus for each component." : - "WARNING: Your vehicle requires setup prior to flight. Please resolve the items marked in red using the menu on the left." - property bool setupComplete: multiVehicleManager.activeVehicle.autopilot.setupComplete - } - - Flow { - id: summaryFlow - anchors.topMargin: _margins - anchors.top: topLabel.bottom - width: parent.width - spacing: ScreenTools.defaultFontPixelWidth - - Repeater { - model: multiVehicleManager.activeVehicle.autopilot.vehicleComponents + Flow { + id: _flowCtl + width: _summaryRoot.width + spacing: _summaryBoxSpace - QGCLabel { - width: summaryRectangle.width - height: summaryRectangle.y + summaryRectangle.height - text: capitalizeWords(modelData.name) - font.weight: Font.DemiBold - visible: modelData.summaryQmlSource.toString() != "" - color: modelData.setupComplete ? qgcPal.text : "red" + Repeater { + model: multiVehicleManager.activeVehicle.autopilot.vehicleComponents + // Outer summary item rectangle Rectangle { - id: summaryRectangle - y: parent.contentHeight + (_margins / 2) - width: summaryLoader.width + _margins - height: summaryLoader.height + _margins - color: qgcPal.windowShade - - Loader { - id: summaryLoader - anchors.margins: _margins / 2 - anchors.left: parent.left - anchors.top: parent.top - source: modelData.summaryQmlSource + width: _summaryBoxWidth + height: ScreenTools.defaultFontPixelHeight * 13 + color: qgcPal.window + visible: modelData.summaryQmlSource.toString() != "" + + readonly property real titleHeight: ScreenTools.defaultFontPixelHeight * 2 + + // Title bar + Rectangle { + id: titleBar + width: parent.width + height: titleHeight + color: qgcPal.windowShade + + // Title text + QGCLabel { + anchors.fill: parent + verticalAlignment: TextEdit.AlignVCenter + horizontalAlignment: TextEdit.AlignHCenter + text: capitalizeWords(modelData.name) + } + + // Setup indicator + Rectangle { + anchors.rightMargin: ScreenTools.defaultFontPixelWidth / 3 + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + width: ScreenTools.defaultFontPixelWidth + height: width + radius: width / 2 + color: modelData.setupComplete ? "#00d932" : "red" + visible: modelData.requiresSetup + } + } + + // Summary Qml + Rectangle { + anchors.top: titleBar.bottom + width: parent.width + Loader { + anchors.fill: parent + source: modelData.summaryQmlSource + } } } } -- GitLab