Commit 9a1ca95a authored by Don Gagne's avatar Don Gagne

Merge pull request #1444 from DonLakeFlyer/SensorsSummary

Finish conversion of sensors summary
parents 4e2291e4 88ccbfec
...@@ -6,47 +6,29 @@ import QGroundControl.FactSystem 1.0 ...@@ -6,47 +6,29 @@ import QGroundControl.FactSystem 1.0
import QGroundControl.Controls 1.0 import QGroundControl.Controls 1.0
/* /*
IMPORTANT NOTE: Any changes made here must also be made to SensorsComponentSummaryFixedWing.qml IMPORTANT NOTE: Any changes made here must also be made to SensorsComponentSummary.qml
*/ */
Column { Column {
anchors.fill: parent Fact { id: mag0IdFact; name: "CAL_MAG0_ID" }
anchors.margins: 8 Fact { id: gyro0IdFact; name: "CAL_GYRO0_ID" }
Fact { id: accel0IdFact; name: "CAL_ACC0_ID" }
Component { anchors.fill: parent
id: component anchors.margins: 8
Row { VehicleSummaryRow {
width: parent.width labelText: "Compass:"
valueText: mag0IdFact.value == 0 ? "Setup required" : "Ready"
QGCLabel { id: label; text: labelText }
QGCLabel {
property Fact fact: Fact { name: factName }
horizontalAlignment: Text.AlignRight;
width: parent.width - label.contentWidth;
text: fact.value == 0 ? "Setup required" : "Ready"
}
}
}
Loader {
property string labelText: "Compass:"
property string factName: "CAL_MAG0_ID"
width: parent.width
sourceComponent: component
} }
Loader { VehicleSummaryRow {
property string labelText: "Gyro:" labelText: "Gyro:"
property string factName: "CAL_GYRO0_ID" valueText: gyro0IdFact.value == 0 ? "Setup required" : "Ready"
width: parent.width
sourceComponent: component
} }
Loader { VehicleSummaryRow {
property string labelText: "Accelerometer:" labelText: "Accelerometer:"
property string factName: "CAL_ACC0_ID" valueText: accel0IdFact.value == 0 ? "Setup required" : "Ready"
width: parent.width
sourceComponent: component
} }
} }
...@@ -23,17 +23,17 @@ Column { ...@@ -23,17 +23,17 @@ Column {
valueText: mag0IdFact.value == 0 ? "Setup required" : "Ready" valueText: mag0IdFact.value == 0 ? "Setup required" : "Ready"
} }
Row { VehicleSummaryRow {
labelText: "Gyro:" labelText: "Gyro:"
valueText: gyro0IdFact.value == 0 ? "Setup required" : "Ready" valueText: gyro0IdFact.value == 0 ? "Setup required" : "Ready"
} }
Row { VehicleSummaryRow {
labelText: "Accelerometer:" labelText: "Accelerometer:"
valueText: accel0IdFact.value == 0 ? "Setup required" : "Ready" valueText: accel0IdFact.value == 0 ? "Setup required" : "Ready"
} }
Row { VehicleSummaryRow {
labelText: "Airspeed:" labelText: "Airspeed:"
valueText: dPressOffFact.value == 0 ? "Setup required" : "Ready" valueText: dPressOffFact.value == 0 ? "Setup required" : "Ready"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment