From 44e40518ba054c8458281b5c78134b915aa10d74 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Thu, 22 Oct 2015 14:51:25 -0400 Subject: [PATCH] Preliminary work on the Flight View --- QGCApplication.pro | 4 +- qgcresources.qrc | 219 ++++++++++++++++++++++++++++++++++++++++++ qgroundcontrol.qrc | 211 ---------------------------------------- src/ui/MainWindow.qml | 65 ++++++++----- 4 files changed, 261 insertions(+), 238 deletions(-) create mode 100644 qgcresources.qrc diff --git a/QGCApplication.pro b/QGCApplication.pro index c6235a36f..cd24b64e4 100644 --- a/QGCApplication.pro +++ b/QGCApplication.pro @@ -127,7 +127,9 @@ include(QGCExternalLibs.pri) # Main QGroundControl portion of project file # -RESOURCES += qgroundcontrol.qrc +RESOURCES += \ + qgroundcontrol.qrc \ + qgcresources.qrc DEPENDPATH += \ . \ diff --git a/qgcresources.qrc b/qgcresources.qrc new file mode 100644 index 000000000..7e27e2ef3 --- /dev/null +++ b/qgcresources.qrc @@ -0,0 +1,219 @@ + + + src/AutoPilotPlugins/PX4/Images/SafetyComponentTree.svg + src/AutoPilotPlugins/PX4/Images/SafetyComponentHome.png + src/AutoPilotPlugins/PX4/Images/SafetyComponentArrowDown.png + src/AutoPilotPlugins/PX4/Images/SafetyComponentPlane.png + src/AutoPilotPlugins/PX4/Images/VehicleDown.png + src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png + src/AutoPilotPlugins/PX4/Images/VehicleLeft.png + src/AutoPilotPlugins/PX4/Images/VehicleRight.png + src/AutoPilotPlugins/PX4/Images/VehicleNoseDown.png + src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png + src/AutoPilotPlugins/PX4/Images/VehicleDownRotate.png + src/AutoPilotPlugins/PX4/Images/VehicleLeftRotate.png + src/AutoPilotPlugins/PX4/Images/VehicleNoseDownRotate.png + src/AutoPilotPlugins/PX4/Images/AirframeStandardPlane.png + src/AutoPilotPlugins/PX4/Images/AirframeFlyingWing.png + src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorX.png + src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorPlus.png + src/AutoPilotPlugins/PX4/Images/AirframeOctoRotorX.png + src/AutoPilotPlugins/PX4/Images/AirframeOctoRotorPlus.png + src/AutoPilotPlugins/PX4/Images/AirframeHexaRotorX.png + src/AutoPilotPlugins/PX4/Images/AirframeHexaRotorPlus.png + src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorH.png + src/AutoPilotPlugins/PX4/Images/AirframeSimulation.png + src/QmlControls/arrow-down.png + resources/CogWheels.png + src/AutoPilotPlugins/PX4/Images/SensorsComponentIcon.png + src/AutoPilotPlugins/PX4/Images/RadioComponentIcon.png + src/AutoPilotPlugins/PX4/Images/FlightModesComponentIcon.png + src/AutoPilotPlugins/PX4/Images/AirframeComponentIcon.png + src/AutoPilotPlugins/PX4/Images/SafetyComponentIcon.png + src/AutoPilotPlugins/PX4/Images/PowerComponentIcon.png + src/VehicleSetup/FirmwareUpgradeIcon.png + src/VehicleSetup/VehicleSummaryIcon.png + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_01cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_02cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_03cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_04cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_05cell.svg + src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_06cell.svg + + src/FlightMap/Images/attitudeDial.svg + src/FlightMap/Images/attitudeInstrument.svg + src//FlightMap/Images/attitudePointer.svg + src/FlightMap/Images/buttonHome.svg + src/FlightMap/Images/buttonLeft.svg + src/FlightMap/Images/buttonMore.svg + src/FlightMap/Images/buttonRight.svg + src/FlightMap/Images/compass.svg + src/FlightMap/Images/compassInstrumentAirplane.svg + src/FlightMap/Images/compassInstrumentDial.svg + src/FlightMap/Images/compassNeedle.svg + src/FlightMap/Images/crossHair.svg + src/FlightMap/Images/rollDialWhite.svg + src/FlightMap/Images/rollPointerWhite.svg + src/FlightMap/Images/scale.png + src/FlightMap/Images/scale_end.png + src/FlightMap/Images/airplaneOutline.svg + src/FlightMap/Images/airplaneOpaque.svg + src/FlightMap/Images/ZoomPlus.svg + src/FlightMap/Images/ZoomMinus.svg + + + src/FlightMap/Images/Help.svg + src/FlightMap/Images/HelpBlack.svg + src/FlightMap/Images/MapAddMission.svg + src/FlightMap/Images/MapAddMissionBlack.svg + src/FlightMap/Images/MapCenter.svg + src/FlightMap/Images/MapCenterBlack.svg + src/FlightMap/Images/MapHome.svg + src/FlightMap/Images/MapHomeBlack.svg + src/FlightMap/Images/MapSync.svg + src/FlightMap/Images/MapSyncBlack.svg + src/FlightMap/Images/MapSyncChanged.svg + src/FlightMap/Images/MapType.svg + src/FlightMap/Images/MapTypeBlack.svg + src/FlightMap/Images/TrashDelete.svg + src/FlightMap/Images/TrashDeleteBlack.svg + src/FlightMap/Images/XDelete.svg + src/FlightMap/Images/XDeleteBlack.svg + + + + + resources/LeftArrow.svg + resources/RightArrow.svg + resources/DownArrow.svg + resources/UpArrow.svg + resources/BottomArrow.svg + resources/JumpArrow.svg + resources/PlusSign.svg + resources/MinusSign.svg + resources/Play.svg + resources/Pause.svg + resources/Stop.svg + resources/Launch.svg + resources/Land.svg + resources/Kill.svg + resources/Shutdown.svg + resources/Antenna_T.svg + resources/Antenna_RC.svg + resources/Gps.svg + resources/Megaphone.png + resources/Yield.png + resources/Battery_0.svg + resources/Battery_20.svg + resources/Battery_40.svg + resources/Battery_60.svg + resources/Battery_80.svg + resources/Battery_100.svg + resources/SystemLockScreen.svg + resources/SplashScreen.png + resources/QGroundControlConnect.svg + + + + resources/firmware/px4.png + resources/firmware/apm.png + resources/firmware/3drradio.png + + + + resources/mavs/helicopter.svg + resources/mavs/unknown.svg + resources/mavs/fixed-wing.svg + resources/mavs/groundstation.svg + resources/mavs/generic.svg + resources/mavs/quadrotor.svg + resources/mavs/coaxial.svg + resources/mavs/airship.svg + resources/mavs/antenna-tracker.svg + resources/mavs/flapping-wing.svg + resources/mavs/free-balloon.svg + resources/mavs/ground-rover.svg + resources/mavs/hexarotor.svg + resources/mavs/kite.svg + resources/mavs/octorotor.svg + resources/mavs/rocket.svg + resources/mavs/submarine.svg + resources/mavs/surface-boat.svg + resources/mavs/tricopter.svg + + + + resources/mapproviders/openstreetmap.png + resources/mapproviders/google.png + resources/mapproviders/yahoo.png + resources/mapproviders/googleearth.svg + + + + resources/calibration/accel_back.png + resources/calibration/accel_front.png + resources/calibration/accel_right.png + resources/calibration/accel_down.png + resources/calibration/accel_up.png + resources/calibration/accel_left.png + + + + resources/calibration/mode1/radioCenter.png + resources/calibration/mode1/radioHome.png + resources/calibration/mode1/radioRollLeft.png + resources/calibration/mode1/radioRollRight.png + resources/calibration/mode1/radioPitchUp.png + resources/calibration/mode1/radioPitchDown.png + resources/calibration/mode1/radioYawLeft.png + resources/calibration/mode1/radioYawRight.png + resources/calibration/mode1/radioThrottleUp.png + resources/calibration/mode1/radioThrottleDown.png + resources/calibration/mode1/radioSwitchMinMax.png + + + + resources/calibration/mode2/radioCenter.png + resources/calibration/mode2/radioHome.png + resources/calibration/mode2/radioRollLeft.png + resources/calibration/mode2/radioRollRight.png + resources/calibration/mode2/radioPitchUp.png + resources/calibration/mode2/radioPitchDown.png + resources/calibration/mode2/radioYawLeft.png + resources/calibration/mode2/radioYawRight.png + resources/calibration/mode2/radioThrottleUp.png + resources/calibration/mode2/radioThrottleDown.png + resources/calibration/mode2/radioSwitchMinMax.png + + + + resources/calibration/joystick/joystickCenter.png + resources/calibration/joystick/joystickRollLeft.png + resources/calibration/joystick/joystickRollRight.png + resources/calibration/joystick/joystickPitchUp.png + resources/calibration/joystick/joystickPitchDown.png + resources/calibration/joystick/joystickYawLeft.png + resources/calibration/joystick/joystickYawRight.png + resources/calibration/joystick/joystickThrottleUp.png + resources/calibration/joystick/joystickThrottleDown.png + + + + resources/styles/style-dark.css + resources/styles/style-light.css + + + + resources/styles/Vera.ttf + + + + resources/audio/alert.wav + + + + src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml + src/AutoPilotPlugins/PX4/ParameterFactMetaData.xml + + + diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index b0c13016f..ac6c0333e 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -3,89 +3,6 @@ src/comm/MockLink.params src/FactSystem/FactSystemTest.qml - - - src/AutoPilotPlugins/PX4/Images/SafetyComponentTree.svg - src/AutoPilotPlugins/PX4/Images/SafetyComponentHome.png - src/AutoPilotPlugins/PX4/Images/SafetyComponentArrowDown.png - src/AutoPilotPlugins/PX4/Images/SafetyComponentPlane.png - src/AutoPilotPlugins/PX4/Images/VehicleDown.png - src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png - src/AutoPilotPlugins/PX4/Images/VehicleLeft.png - src/AutoPilotPlugins/PX4/Images/VehicleRight.png - src/AutoPilotPlugins/PX4/Images/VehicleNoseDown.png - src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png - src/AutoPilotPlugins/PX4/Images/VehicleDownRotate.png - src/AutoPilotPlugins/PX4/Images/VehicleLeftRotate.png - src/AutoPilotPlugins/PX4/Images/VehicleNoseDownRotate.png - src/AutoPilotPlugins/PX4/Images/AirframeStandardPlane.png - src/AutoPilotPlugins/PX4/Images/AirframeFlyingWing.png - src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorX.png - src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorPlus.png - src/AutoPilotPlugins/PX4/Images/AirframeOctoRotorX.png - src/AutoPilotPlugins/PX4/Images/AirframeOctoRotorPlus.png - src/AutoPilotPlugins/PX4/Images/AirframeHexaRotorX.png - src/AutoPilotPlugins/PX4/Images/AirframeHexaRotorPlus.png - src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorH.png - src/AutoPilotPlugins/PX4/Images/AirframeSimulation.png - src/QmlControls/arrow-down.png - resources/CogWheels.png - src/AutoPilotPlugins/PX4/Images/SensorsComponentIcon.png - src/AutoPilotPlugins/PX4/Images/RadioComponentIcon.png - src/AutoPilotPlugins/PX4/Images/FlightModesComponentIcon.png - src/AutoPilotPlugins/PX4/Images/AirframeComponentIcon.png - src/AutoPilotPlugins/PX4/Images/SafetyComponentIcon.png - src/AutoPilotPlugins/PX4/Images/PowerComponentIcon.png - src/VehicleSetup/FirmwareUpgradeIcon.png - src/VehicleSetup/VehicleSummaryIcon.png - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_01cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_02cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_03cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_04cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_05cell.svg - src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_06cell.svg - - src/FlightMap/Images/attitudeDial.svg - src/FlightMap/Images/attitudeInstrument.svg - src//FlightMap/Images/attitudePointer.svg - src/FlightMap/Images/buttonHome.svg - src/FlightMap/Images/buttonLeft.svg - src/FlightMap/Images/buttonMore.svg - src/FlightMap/Images/buttonRight.svg - src/FlightMap/Images/compass.svg - src/FlightMap/Images/compassInstrumentAirplane.svg - src/FlightMap/Images/compassInstrumentDial.svg - src/FlightMap/Images/compassNeedle.svg - src/FlightMap/Images/crossHair.svg - src/FlightMap/Images/rollDialWhite.svg - src/FlightMap/Images/rollPointerWhite.svg - src/FlightMap/Images/scale.png - src/FlightMap/Images/scale_end.png - src/FlightMap/Images/airplaneOutline.svg - src/FlightMap/Images/airplaneOpaque.svg - src/FlightMap/Images/ZoomPlus.svg - src/FlightMap/Images/ZoomMinus.svg - - - src/FlightMap/Images/Help.svg - src/FlightMap/Images/HelpBlack.svg - src/FlightMap/Images/MapAddMission.svg - src/FlightMap/Images/MapAddMissionBlack.svg - src/FlightMap/Images/MapCenter.svg - src/FlightMap/Images/MapCenterBlack.svg - src/FlightMap/Images/MapHome.svg - src/FlightMap/Images/MapHomeBlack.svg - src/FlightMap/Images/MapSync.svg - src/FlightMap/Images/MapSyncBlack.svg - src/FlightMap/Images/MapSyncChanged.svg - src/FlightMap/Images/MapType.svg - src/FlightMap/Images/MapTypeBlack.svg - src/FlightMap/Images/TrashDelete.svg - src/FlightMap/Images/TrashDeleteBlack.svg - src/FlightMap/Images/XDelete.svg - src/FlightMap/Images/XDeleteBlack.svg - - src/test.qml src/QmlControls/QmlTest.qml @@ -97,7 +14,6 @@ src/FactSystem/FactControls/FactComboBox.qml src/QmlControls/QGroundControl.Controls.qmldir - src/QmlControls/QGCButton.qml src/QmlControls/QGCRadioButton.qml @@ -168,7 +84,6 @@ src/FlightDisplay/FlightDisplayViewDelayLoadInner.qml src/FlightDisplay/FlightDisplayViewDelayLoadOuter.qml - src/FlightMap/qmldir src/FlightMap/FlightMap.qml @@ -190,130 +105,4 @@ src/FlightMap/MapItems/MissionLineView.qml - - resources/LeftArrow.svg - resources/RightArrow.svg - resources/DownArrow.svg - resources/UpArrow.svg - resources/BottomArrow.svg - resources/JumpArrow.svg - resources/PlusSign.svg - resources/MinusSign.svg - resources/Play.svg - resources/Pause.svg - resources/Stop.svg - resources/Launch.svg - resources/Land.svg - resources/Kill.svg - resources/Shutdown.svg - resources/Antenna_T.svg - resources/Antenna_RC.svg - resources/Gps.svg - resources/Megaphone.png - resources/Yield.png - resources/Battery_0.svg - resources/Battery_20.svg - resources/Battery_40.svg - resources/Battery_60.svg - resources/Battery_80.svg - resources/Battery_100.svg - resources/SystemLockScreen.svg - resources/SplashScreen.png - resources/QGroundControlConnect.svg - - - resources/firmware/px4.png - resources/firmware/apm.png - resources/firmware/3drradio.png - - - resources/mavs/helicopter.svg - resources/mavs/unknown.svg - resources/mavs/fixed-wing.svg - resources/mavs/groundstation.svg - resources/mavs/generic.svg - resources/mavs/quadrotor.svg - resources/mavs/coaxial.svg - resources/mavs/airship.svg - resources/mavs/antenna-tracker.svg - resources/mavs/flapping-wing.svg - resources/mavs/free-balloon.svg - resources/mavs/ground-rover.svg - resources/mavs/hexarotor.svg - resources/mavs/kite.svg - resources/mavs/octorotor.svg - resources/mavs/rocket.svg - resources/mavs/submarine.svg - resources/mavs/surface-boat.svg - resources/mavs/tricopter.svg - - - resources/mapproviders/openstreetmap.png - resources/mapproviders/google.png - resources/mapproviders/yahoo.png - resources/mapproviders/googleearth.svg - - - resources/calibration/accel_back.png - resources/calibration/accel_front.png - resources/calibration/accel_right.png - resources/calibration/accel_down.png - resources/calibration/accel_up.png - resources/calibration/accel_left.png - - - - resources/calibration/mode1/radioCenter.png - resources/calibration/mode1/radioHome.png - resources/calibration/mode1/radioRollLeft.png - resources/calibration/mode1/radioRollRight.png - resources/calibration/mode1/radioPitchUp.png - resources/calibration/mode1/radioPitchDown.png - resources/calibration/mode1/radioYawLeft.png - resources/calibration/mode1/radioYawRight.png - resources/calibration/mode1/radioThrottleUp.png - resources/calibration/mode1/radioThrottleDown.png - resources/calibration/mode1/radioSwitchMinMax.png - - - - resources/calibration/mode2/radioCenter.png - resources/calibration/mode2/radioHome.png - resources/calibration/mode2/radioRollLeft.png - resources/calibration/mode2/radioRollRight.png - resources/calibration/mode2/radioPitchUp.png - resources/calibration/mode2/radioPitchDown.png - resources/calibration/mode2/radioYawLeft.png - resources/calibration/mode2/radioYawRight.png - resources/calibration/mode2/radioThrottleUp.png - resources/calibration/mode2/radioThrottleDown.png - resources/calibration/mode2/radioSwitchMinMax.png - - - - resources/calibration/joystick/joystickCenter.png - resources/calibration/joystick/joystickRollLeft.png - resources/calibration/joystick/joystickRollRight.png - resources/calibration/joystick/joystickPitchUp.png - resources/calibration/joystick/joystickPitchDown.png - resources/calibration/joystick/joystickYawLeft.png - resources/calibration/joystick/joystickYawRight.png - resources/calibration/joystick/joystickThrottleUp.png - resources/calibration/joystick/joystickThrottleDown.png - - - - resources/styles/style-dark.css - resources/styles/style-light.css - - - resources/styles/Vera.ttf - - - resources/audio/alert.wav - - - src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml - src/AutoPilotPlugins/PX4/ParameterFactMetaData.xml - diff --git a/src/ui/MainWindow.qml b/src/ui/MainWindow.qml index 1df038053..dc37c2861 100644 --- a/src/ui/MainWindow.qml +++ b/src/ui/MainWindow.qml @@ -30,41 +30,43 @@ import QGroundControl.FlightDisplay 1.0 import QGroundControl.ScreenTools 1.0 /// Qml for MainWindow -FlightDisplayView { +Item { id: _root - topMargin: toolbarLoader.height + (ScreenTools.defaultFontPixelHeight / 2) - property var _toolbar: toolbarLoader.item readonly property string _planViewSource: "MissionEditor.qml" readonly property string _setupViewSource: "SetupView.qml" Connections { + target: controller onShowFlyView: { - setupViewLoader.visible = false - planViewLoader.visible = false - _root.hideWidgets = false + flightView.visible = true + setupViewLoader.visible = false + planViewLoader.visible = false + _root.hideWidgets = false } onShowPlanView: { - if (planViewLoader.source != _planViewSource) { - planViewLoader.source = _planViewSource + if (planViewLoader.source != _planViewSource) { + planViewLoader.source = _planViewSource } - setupViewLoader.visible = false - planViewLoader.visible = true - _root.hideWidgets = true + flightView.visible = false + setupViewLoader.visible = false + planViewLoader.visible = true + _root.hideWidgets = true } onShowSetupView: { - if (setupViewLoader.source != _setupViewSource) { - setupViewLoader.source = _setupViewSource + if (setupViewLoader.source != _setupViewSource) { + setupViewLoader.source = _setupViewSource } - setupViewLoader.visible = true - planViewLoader.visible = false - _root.hideWidgets = true + flightView.visible = false + setupViewLoader.visible = true + planViewLoader.visible = false + _root.hideWidgets = true } onShowToolbarMessage: _toolbar.showToolbarMessage(message) @@ -83,19 +85,30 @@ FlightDisplayView { } Loader { - id: toolbarLoader - width: parent.width - height: item ? item.height : 0 - z: _root.zOrderTopMost + id: toolbarLoader + width: parent.width + height: item ? item.height : 0 + z: _root.zOrderTopMost + } + + FlightDisplayView { + id: flightView + anchors.left: parent.left + anchors.right: parent.right + anchors.top: toolbarLoader.bottom + anchors.bottom: parent.bottom + visible: true + + property real zOrder: _root.zOrderTopMost } Loader { - id: planViewLoader - anchors.left: parent.left - anchors.right: parent.right - anchors.top: toolbarLoader.bottom - anchors.bottom: parent.bottom - visible: false + id: planViewLoader + anchors.left: parent.left + anchors.right: parent.right + anchors.top: toolbarLoader.bottom + anchors.bottom: parent.bottom + visible: false property real zOrder: _root.zOrderTopMost } -- 2.22.0