Skip to content
GitLab
Commit fc01014c authored by Don Gagne's avatar Don Gagne
Browse files

Modify UI to fit latest designer sketches

parent d84e7c94
Hide whitespace changes
Inline Side-by-side
qgroundcontrol.qrc
View file @ fc01014c
......@@ -269,6 +269,12 @@
<file alias="AirframeComponentSummary.qml">src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml</file>
<file alias="QGroundControl/Controls/setupButtonImage.png">files/Setup/cogwheels.png</file>
<file alias="QGroundControl/Controls/SensorsComponentIcon.png">src/AutoPilotPlugins/PX4/SensorsComponentIcon.png</file>
<file alias="QGroundControl/Controls/RadioComponentIcon.png">src/AutoPilotPlugins/PX4/RadioComponentIcon.png</file>
<file alias="QGroundControl/Controls/FlightModesComponentIcon.png">src/AutoPilotPlugins/PX4/FlightModesComponentIcon.png</file>
<file alias="QGroundControl/Controls/AirframeComponentIcon.png">src/AutoPilotPlugins/PX4/AirframeComponentIcon.png</file>
<file alias="QGroundControl/Controls/FirmwareUpgradeIcon.png">src/VehicleSetup/FirmwareUpgradeIcon.png</file>
<file alias="QGroundControl/Controls/VehicleSummaryIcon.png">src/VehicleSetup/VehicleSummaryIcon.png</file>
</qresource>
......
src/AutoPilotPlugins/PX4/AirframeComponent.cc
View file @ fc01014c
......@@ -133,9 +133,9 @@ QString AirframeComponent::description(void) const
"This will in turn set up the various tuning values for flight paramters.");
}
QString AirframeComponent::icon(void) const
QString AirframeComponent::iconResource(void) const
{
return ":/files/images/px4/menu/plane.png";
return "AirframeComponentIcon.png";
}
bool AirframeComponent::requiresSetup(void) const
......
src/AutoPilotPlugins/PX4/AirframeComponent.h
View file @ fc01014c
......@@ -43,7 +43,7 @@ public:
// Virtuals from VehicleComponent
virtual QString name(void) const;
virtual QString description(void) const;
virtual QString icon(void) const;
virtual QString iconResource(void) const;
virtual bool requiresSetup(void) const;
virtual bool setupComplete(void) const;
virtual QString setupStateDescription(void) const;
......
src/AutoPilotPlugins/PX4/AirframeComponentSummary.qml
View file @ fc01014c
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
Column {
anchors.fill: parent
......@@ -11,8 +12,8 @@ Column {
Row {
width: parent.width
Text { id: systemId; text: "System ID:" }
Text {
QGCLabel { id: systemId; text: "System ID:" }
QGCLabel {
horizontalAlignment: Text.AlignRight
width: parent.width - systemId.contentWidth
text: autopilot.parameters["MAV_SYS_ID"].value
......@@ -22,8 +23,8 @@ Column {
Row {
width: parent.width
Text { id: airframe; text: "Airframe:" }
Text {
QGCLabel { id: airframe; text: "Airframe:" }
QGCLabel {
horizontalAlignment: Text.AlignRight
width: parent.width - airframe.contentWidth
text: autopilot.parameters["SYS_AUTOSTART"].value == 0 ? "Setup required" : autopilot.parameters["SYS_AUTOSTART"].value
......
src/AutoPilotPlugins/PX4/FlightModesComponent.cc
View file @ fc01014c
......@@ -63,9 +63,9 @@ QString FlightModesComponent::description(void) const
"At a minimum the Main Mode Switch must be assigned prior to flight.");
}
QString FlightModesComponent::icon(void) const
QString FlightModesComponent::iconResource(void) const
{
return ":/files/images/px4/menu/toggle_switch.png";
return "FlightModesComponentIcon.png";
}
bool FlightModesComponent::requiresSetup(void) const
......
src/AutoPilotPlugins/PX4/FlightModesComponent.h
View file @ fc01014c
......@@ -43,7 +43,7 @@ public:
// Virtuals from VehicleComponent
virtual QString name(void) const;
virtual QString description(void) const;
virtual QString icon(void) const;
virtual QString iconResource(void) const;
virtual bool requiresSetup(void) const;
virtual bool setupComplete(void) const;
virtual QString setupStateDescription(void) const;
......
src/AutoPilotPlugins/PX4/FlightModesComponentSummary.qml
View file @ fc01014c
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
Column {
anchors.fill: parent
......@@ -11,8 +12,8 @@ Column {
Row {
width: parent.width
Text { id: mode; text: "Mode switch:" }
Text {
QGCLabel { id: mode; text: "Mode switch:" }
QGCLabel {
horizontalAlignment: Text.AlignRight
width: parent.width - mode.contentWidth
text: autopilot.parameters["RC_MAP_MODE_SW"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_MODE_SW"].value
......@@ -22,8 +23,8 @@ Column {
Row {
width: parent.width
Text { id: posctl; text: "Position Ctl switch:" }
Text {
QGCLabel { id: posctl; text: "Position Ctl switch:" }
QGCLabel {
horizontalAlignment: Text.AlignRight
width: parent.width - posctl.contentWidth
text: autopilot.parameters["RC_MAP_POSCTL_SW"].value == 0 ? "Not mapped" : autopilot.parameters["RC_MAP_POSCTL_SW"].value
......@@ -33,8 +34,8 @@ Column {
Row {
width: parent.width
Text { id: loiter; text: "Loiter switch:" }
Text {
QGCLabel { id: loiter; text: "Loiter switch:" }
QGCLabel {
horizontalAlignment: Text.AlignRight
width: parent.width - loiter.contentWidth
text: autopilot.parameters["RC_MAP_LOITER_SW"].value == 0 ? "Not mapped" : autopilot.parameters["RC_MAP_LOITER_SW"].value
......@@ -44,8 +45,8 @@ Column {
Row {
width: parent.width
Text { id: rtl; text: "Return switch:" }
Text {
QGCLabel { id: rtl; text: "Return switch:" }
QGCLabel {
horizontalAlignment: Text.AlignRight
width: parent.width - rtl.contentWidth
text: autopilot.parameters["RC_MAP_RETURN_SW"].value == 0 ? "Not mapped" : autopilot.parameters["RC_MAP_RETURN_SW"].value
......
src/AutoPilotPlugins/PX4/RadioComponent.cc
View file @ fc01014c
......@@ -49,9 +49,9 @@ QString RadioComponent::description(void) const
"Prior to flight you must also calibrate the extents for all of your channels.");
}
QString RadioComponent::icon(void) const
QString RadioComponent::iconResource(void) const
{
return ":/files/images/px4/menu/remote.png";
return "RadioComponentIcon.png";
}
bool RadioComponent::requiresSetup(void) const
......
src/AutoPilotPlugins/PX4/RadioComponent.h
View file @ fc01014c
......@@ -44,7 +44,7 @@ public:
// Virtuals from VehicleComponent
virtual QString name(void) const;
virtual QString description(void) const;
virtual QString icon(void) const;
virtual QString iconResource(void) const;
virtual bool requiresSetup(void) const;
virtual bool setupComplete(void) const;
virtual QString setupStateDescription(void) const;
......
src/AutoPilotPlugins/PX4/RadioComponentSummary.qml
View file @ fc01014c
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
Column {
anchors.fill: parent
......@@ -11,8 +12,8 @@ Column {
Row {
width: parent.width
Text { id: roll; text: "Roll:" }
Text {
QGCLabel { id: roll; text: "Roll:" }
QGCLabel {
horizontalAlignment: Text.AlignRight
width: parent.width - roll.contentWidth
text: autopilot.parameters["RC_MAP_ROLL"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_ROLL"].value
......@@ -22,8 +23,8 @@ Column {
Row {
width: parent.width
Text { id: pitch; text: "Pitch:" }
Text {
QGCLabel { id: pitch; text: "Pitch:" }
QGCLabel {
horizontalAlignment: Text.AlignRight
width: parent.width - pitch.contentWidth
text: autopilot.parameters["RC_MAP_PITCH"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_PITCH"].value
......@@ -33,8 +34,8 @@ Column {
Row {
width: parent.width
Text { id: yaw; text: "Yaw:" }
Text {
QGCLabel { id: yaw; text: "Yaw:" }
QGCLabel {
horizontalAlignment: Text.AlignRight
width: parent.width - yaw.contentWidth
text: autopilot.parameters["RC_MAP_YAW"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_YAW"].value
......@@ -44,8 +45,8 @@ Column {
Row {
width: parent.width
Text { id: throttle; text: "Throttle:" }
Text {
QGCLabel { id: throttle; text: "Throttle:" }
QGCLabel {
horizontalAlignment: Text.AlignRight
width: parent.width - throttle.contentWidth
text: autopilot.parameters["RC_MAP_THROTTLE"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_THROTTLE"].value
......@@ -55,8 +56,8 @@ Column {
Row {
width: parent.width
Text { id: mode; text: "Mode switch:" }
Text {
QGCLabel { id: mode; text: "Mode switch:" }
QGCLabel {
horizontalAlignment: Text.AlignRight
width: parent.width - mode.contentWidth
text: autopilot.parameters["RC_MAP_MODE_SW"].value == 0 ? "Setup required" : autopilot.parameters["RC_MAP_MODE_SW"].value
......
src/AutoPilotPlugins/PX4/SafetyComponent.cc
View file @ fc01014c
......@@ -48,9 +48,10 @@ QString SafetyComponent::description(void) const
return tr("The Safety Component is used to setup triggers for Return to Land as well as the settings for Return to Land itself.");
}
QString SafetyComponent::icon(void) const
QString SafetyComponent::iconResource(void) const
{
return ":/files/images/px4/menu/remote.png";
// FIXME: Need real icon
return "setupButtonImage.png";
}
bool SafetyComponent::requiresSetup(void) const
......
src/AutoPilotPlugins/PX4/SafetyComponent.h
View file @ fc01014c
......@@ -44,7 +44,7 @@ public:
// Virtuals from VehicleComponent
virtual QString name(void) const;
virtual QString description(void) const;
virtual QString icon(void) const;
virtual QString iconResource(void) const;
virtual bool requiresSetup(void) const;
virtual bool setupComplete(void) const;
virtual QString setupStateDescription(void) const;
......
src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
View file @ fc01014c
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
Column {
anchors.fill: parent
......@@ -11,8 +12,8 @@ Column {
Row {
width: parent.width
Text { id: rtlMinAlt; text: "RTL min alt:" }
Text {
QGCLabel { id: rtlMinAlt; text: "RTL min alt:" }
QGCLabel {
horizontalAlignment: Text.AlignRight;
width: parent.width - rtlMinAlt.contentWidth;
text: autopilot.parameters["RTL_RETURN_ALT"].valueString
......@@ -22,8 +23,8 @@ Column {
Row {
width: parent.width
Text { id: rtlHomeAlt; text: "RTL home alt:" }
Text {
QGCLabel { id: rtlHomeAlt; text: "RTL home alt:" }
QGCLabel {
horizontalAlignment: Text.AlignRight;
width: parent.width - rtlHomeAlt.contentWidth;
text: autopilot.parameters["RTL_DESCEND_ALT"].valueString
......@@ -33,8 +34,8 @@ Column {
Row {
width: parent.width
Text { id: rtlLoiter; text: "RTL loiter delay:" }
Text {
QGCLabel { id: rtlLoiter; text: "RTL loiter delay:" }
QGCLabel {
horizontalAlignment: Text.AlignRight;
width: parent.width - rtlLoiter.contentWidth;
text: autopilot.parameters["RTL_LAND_DELAY"].value < 0 ? "Disabled" : autopilot.parameters["RTL_LAND_DELAY"].valueString
......@@ -44,19 +45,19 @@ Column {
Row {
width: parent.width
Text { id: commLoss; text: "Telemetry loss RTL:" }
Text {
QGCLabel { id: commLoss; text: "Telemetry loss RTL:" }
QGCLabel {
horizontalAlignment: Text.AlignRight;
width: parent.width - commLoss.contentWidth;
text: autopilot.parameters["COM_DL_LOSS_EN"].value != 1 ? "Disabled" : autopilot.parameters["NAV_DLL_N"].valueString
text: autopilot.parameters["COM_DL_LOSS_EN"].value != 1 ? "Disabled" : autopilot.parameters["COM_DL_LOSS_T"].valueString
}
}
Row {
width: parent.width
Text { id: rcLoss; text: "RC loss RTL (seconds):" }
Text {
QGCLabel { id: rcLoss; text: "RC loss RTL (seconds):" }
QGCLabel {
horizontalAlignment: Text.AlignRight;
width: parent.width - rcLoss.contentWidth;
text: autopilot.parameters["COM_RC_LOSS_T"].valueString
......
src/AutoPilotPlugins/PX4/SensorsComponent.cc
View file @ fc01014c
......@@ -55,9 +55,9 @@ QString SensorsComponent::description(void) const
"Prior to flight you must calibrate the Magnetometer, Gyroscope and Accelerometer.");
}
QString SensorsComponent::icon(void) const
QString SensorsComponent::iconResource(void) const
{
return ":/files/images/px4/menu/sensors.png";
return "SensorsComponentIcon.png";
}
bool SensorsComponent::requiresSetup(void) const
......
src/AutoPilotPlugins/PX4/SensorsComponent.h
View file @ fc01014c
......@@ -43,7 +43,7 @@ public:
// Virtuals from VehicleComponent
virtual QString name(void) const;
virtual QString description(void) const;
virtual QString icon(void) const;
virtual QString iconResource(void) const;
virtual bool requiresSetup(void) const;
virtual bool setupComplete(void) const;
virtual QString setupStateDescription(void) const;
......
src/AutoPilotPlugins/PX4/SensorsComponentSummary.qml
View file @ fc01014c
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
Column {
anchors.fill: parent
......@@ -11,8 +12,8 @@ Column {
Row {
width: parent.width
Text { id: compass; text: "Compass:" }
Text {
QGCLabel { id: compass; text: "Compass:" }
QGCLabel {
horizontalAlignment: Text.AlignRight;
width: parent.width - compass.contentWidth;
property bool setupRequiredValue: autopilot.parameters["SENS_MAG_XOFF"] ? autopilot.parameters["SENS_MAG_XOFF"].value : autopilot.parameters["CAL_MAG0_ID"].value
......@@ -23,8 +24,8 @@ Column {
Row {
width: parent.width
Text { id: gyro; text: "Gyro:" }
Text {
QGCLabel { id: gyro; text: "Gyro:" }
QGCLabel {
horizontalAlignment: Text.AlignRight;
width: parent.width - gyro.contentWidth;
property bool setupRequiredValue: autopilot.parameters["SENS_GYRO_XOFF"] ? autopilot.parameters["SENS_GYRO_XOFF"].value : autopilot.parameters["CAL_GYRO0_ID"].value
......@@ -35,8 +36,8 @@ Column {
Row {
width: parent.width
Text { id: accel; text: "Accelerometer:" }
Text {
QGCLabel { id: accel; text: "Accelerometer:" }
QGCLabel {
horizontalAlignment: Text.AlignRight;
width: parent.width - accel.contentWidth;
property bool setupRequiredValue: autopilot.parameters["SENS_ACC_XOFF"] ? autopilot.parameters["SENS_ACC_XOFF"].value : autopilot.parameters["CAL_ACC0_ID"].value
......@@ -47,8 +48,8 @@ Column {
Row {
width: parent.width
Text { id: airspeed; text: "Airspeed:" }
Text {
QGCLabel { id: airspeed; text: "Airspeed:" }
QGCLabel {
horizontalAlignment: Text.AlignRight;
width: parent.width - airspeed.contentWidth;
text: autopilot.parameters["SENS_DPRES_OFF"].value == 0.0 ? "Setup required" : "Ready"
......
Supports Markdown
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