From f8e7f1e2f3e542d54cd9885db7cefbeaa493a5c6 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sun, 30 Aug 2015 10:46:23 -0700 Subject: [PATCH] Restructuring flight map code --- qgroundcontrol.qrc | 73 +++++++++--------- .../FlightMap.qml} | 2 +- .../Images}/attitudeDial.svg | 0 .../Images}/attitudeInstrument.svg | 0 .../Images}/attitudePointer.svg | 0 .../Images}/buttonHome.svg | 0 .../Images}/buttonLeft.svg | 0 .../Images}/buttonMore.svg | 0 .../Images}/buttonRight.svg | 0 .../Images}/compass.svg | 0 .../Images}/compassInstrumentAirplane.svg | 0 .../Images}/compassInstrumentDial.svg | 0 .../Images}/compassNeedle.svg | 0 .../Images}/crossHair.svg | 0 .../Images}/rollDialWhite.svg | 0 .../Images}/rollPointerWhite.svg | 0 .../qmlcommon => FlightMap/Images}/scale.png | Bin .../Images}/scale_end.png | Bin .../MapItems}/QGCWaypoint.qml | 0 .../MapItems}/VehicleMapItem.qml | 0 .../QGCVideoBackground.qml | 0 .../Widgets}/QGCAltitudeWidget.qml | 0 .../Widgets}/QGCArtificialHorizon.qml | 0 .../Widgets}/QGCAttitudeHUD.qml | 0 .../Widgets}/QGCAttitudeWidget.qml | 0 .../Widgets}/QGCCompassHUD.qml | 0 .../Widgets}/QGCCompassWidget.qml | 0 .../Widgets}/QGCCurrentAltitude.qml | 0 .../Widgets}/QGCCurrentSpeed.qml | 0 .../Widgets}/QGCHudMessage.qml | 0 .../Widgets}/QGCMapToolButton.qml | 0 .../Widgets}/QGCPitchIndicator.qml | 0 .../Widgets}/QGCSlider.qml | 0 .../Widgets}/QGCSpeedWidget.qml | 0 .../Widgets}/QGCWaypointEditor.qml | 0 src/{ui/qmlcommon => FlightMap}/qmldir | 13 +++- src/ui/flightdisplay/FlightDisplay.qml | 4 +- src/ui/mapdisplay/MapDisplay.qml | 4 +- 38 files changed, 52 insertions(+), 44 deletions(-) rename src/{ui/qmlcommon/QGCMapBackground.qml => FlightMap/FlightMap.qml} (99%) rename src/{ui/qmlcommon => FlightMap/Images}/attitudeDial.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/attitudeInstrument.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/attitudePointer.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/buttonHome.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/buttonLeft.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/buttonMore.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/buttonRight.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/compass.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/compassInstrumentAirplane.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/compassInstrumentDial.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/compassNeedle.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/crossHair.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/rollDialWhite.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/rollPointerWhite.svg (100%) rename src/{ui/qmlcommon => FlightMap/Images}/scale.png (100%) rename src/{ui/qmlcommon => FlightMap/Images}/scale_end.png (100%) rename src/{ui/qmlcommon => FlightMap/MapItems}/QGCWaypoint.qml (100%) rename src/{ui/qmlcommon => FlightMap/MapItems}/VehicleMapItem.qml (100%) rename src/{ui/qmlcommon => FlightMap}/QGCVideoBackground.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCAltitudeWidget.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCArtificialHorizon.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCAttitudeHUD.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCAttitudeWidget.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCCompassHUD.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCCompassWidget.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCCurrentAltitude.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCCurrentSpeed.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCHudMessage.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCMapToolButton.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCPitchIndicator.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCSlider.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCSpeedWidget.qml (100%) rename src/{ui/qmlcommon => FlightMap/Widgets}/QGCWaypointEditor.qml (100%) rename src/{ui/qmlcommon => FlightMap}/qmldir (87%) diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index 4291c8265..5d90fb8f6 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -43,22 +43,22 @@ src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_04cell.svg src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_05cell.svg src/AutoPilotPlugins/PX4/Images/PowerComponentBattery_06cell.svg - src/ui/qmlcommon/attitudeDial.svg - src/ui/qmlcommon/attitudeInstrument.svg - src/ui/qmlcommon/attitudePointer.svg - src/ui/qmlcommon/buttonHome.svg - src/ui/qmlcommon/buttonLeft.svg - src/ui/qmlcommon/buttonMore.svg - src/ui/qmlcommon/buttonRight.svg - src/ui/qmlcommon/compass.svg - src/ui/qmlcommon/compassInstrumentAirplane.svg - src/ui/qmlcommon/compassInstrumentDial.svg - src/ui/qmlcommon/compassNeedle.svg - src/ui/qmlcommon/crossHair.svg - src/ui/qmlcommon/rollDialWhite.svg - src/ui/qmlcommon/rollPointerWhite.svg - src/ui/qmlcommon/scale.png - src/ui/qmlcommon/scale_end.png + 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/test.qml @@ -118,25 +118,28 @@ src/ui/toolbar/MainToolBar.qml src/ui/flightdisplay/FlightDisplay.qml src/ui/mapdisplay/MapDisplay.qml - src/ui/qmlcommon/QGCAltitudeWidget.qml - src/ui/qmlcommon/QGCArtificialHorizon.qml - src/ui/qmlcommon/QGCAttitudeWidget.qml - src/ui/qmlcommon/QGCAttitudeHUD.qml - src/ui/qmlcommon/QGCCompassWidget.qml - src/ui/qmlcommon/QGCCompassHUD.qml - src/ui/qmlcommon/QGCCurrentAltitude.qml - src/ui/qmlcommon/QGCCurrentSpeed.qml - src/ui/qmlcommon/QGCHudMessage.qml - src/ui/qmlcommon/QGCMapBackground.qml - src/ui/qmlcommon/QGCMapToolButton.qml - src/ui/qmlcommon/QGCPitchIndicator.qml - src/ui/qmlcommon/QGCSlider.qml - src/ui/qmlcommon/QGCSpeedWidget.qml - src/ui/qmlcommon/QGCVideoBackground.qml - src/ui/qmlcommon/QGCWaypointEditor.qml - src/ui/qmlcommon/qmldir - src/ui/qmlcommon/QGCWaypoint.qml - src/ui/qmlcommon/VehicleMapItem.qml + + + src/FlightMap/qmldir + src/FlightMap/FlightMap.qml + src/FlightMap/QGCVideoBackground.qml + + src/FlightMap/Widgets/QGCAltitudeWidget.qml + src/FlightMap/Widgets/QGCArtificialHorizon.qml + src/FlightMap/Widgets/QGCAttitudeWidget.qml + src/FlightMap/Widgets/QGCAttitudeHUD.qml + src/FlightMap/Widgets/QGCCompassWidget.qml + src/FlightMap/Widgets/QGCCompassHUD.qml + src/FlightMap/Widgets/QGCCurrentAltitude.qml + src/FlightMap/Widgets/QGCCurrentSpeed.qml + src/FlightMap/Widgets/QGCHudMessage.qml + src/FlightMap/Widgets/QGCMapToolButton.qml + src/FlightMap/Widgets/QGCPitchIndicator.qml + src/FlightMap/Widgets/QGCSlider.qml + src/FlightMap/Widgets/QGCSpeedWidget.qml + src/FlightMap/Widgets/QGCWaypointEditor.qml + src/FlightMap/MapItems/QGCWaypoint.qml + src/FlightMap/MapItems/VehicleMapItem.qml resources/LeftArrow.svg diff --git a/src/ui/qmlcommon/QGCMapBackground.qml b/src/FlightMap/FlightMap.qml similarity index 99% rename from src/ui/qmlcommon/QGCMapBackground.qml rename to src/FlightMap/FlightMap.qml index 472698bb7..ed7d3a038 100644 --- a/src/ui/qmlcommon/QGCMapBackground.qml +++ b/src/FlightMap/FlightMap.qml @@ -33,7 +33,7 @@ import QtLocation 5.3 import QtPositioning 5.3 import QGroundControl.Controls 1.0 -import QGroundControl.FlightControls 1.0 +import QGroundControl.FlightMap 1.0 import QGroundControl.ScreenTools 1.0 import QGroundControl.MavManager 1.0 import QGroundControl.MultiVehicleManager 1.0 diff --git a/src/ui/qmlcommon/attitudeDial.svg b/src/FlightMap/Images/attitudeDial.svg similarity index 100% rename from src/ui/qmlcommon/attitudeDial.svg rename to src/FlightMap/Images/attitudeDial.svg diff --git a/src/ui/qmlcommon/attitudeInstrument.svg b/src/FlightMap/Images/attitudeInstrument.svg similarity index 100% rename from src/ui/qmlcommon/attitudeInstrument.svg rename to src/FlightMap/Images/attitudeInstrument.svg diff --git a/src/ui/qmlcommon/attitudePointer.svg b/src/FlightMap/Images/attitudePointer.svg similarity index 100% rename from src/ui/qmlcommon/attitudePointer.svg rename to src/FlightMap/Images/attitudePointer.svg diff --git a/src/ui/qmlcommon/buttonHome.svg b/src/FlightMap/Images/buttonHome.svg similarity index 100% rename from src/ui/qmlcommon/buttonHome.svg rename to src/FlightMap/Images/buttonHome.svg diff --git a/src/ui/qmlcommon/buttonLeft.svg b/src/FlightMap/Images/buttonLeft.svg similarity index 100% rename from src/ui/qmlcommon/buttonLeft.svg rename to src/FlightMap/Images/buttonLeft.svg diff --git a/src/ui/qmlcommon/buttonMore.svg b/src/FlightMap/Images/buttonMore.svg similarity index 100% rename from src/ui/qmlcommon/buttonMore.svg rename to src/FlightMap/Images/buttonMore.svg diff --git a/src/ui/qmlcommon/buttonRight.svg b/src/FlightMap/Images/buttonRight.svg similarity index 100% rename from src/ui/qmlcommon/buttonRight.svg rename to src/FlightMap/Images/buttonRight.svg diff --git a/src/ui/qmlcommon/compass.svg b/src/FlightMap/Images/compass.svg similarity index 100% rename from src/ui/qmlcommon/compass.svg rename to src/FlightMap/Images/compass.svg diff --git a/src/ui/qmlcommon/compassInstrumentAirplane.svg b/src/FlightMap/Images/compassInstrumentAirplane.svg similarity index 100% rename from src/ui/qmlcommon/compassInstrumentAirplane.svg rename to src/FlightMap/Images/compassInstrumentAirplane.svg diff --git a/src/ui/qmlcommon/compassInstrumentDial.svg b/src/FlightMap/Images/compassInstrumentDial.svg similarity index 100% rename from src/ui/qmlcommon/compassInstrumentDial.svg rename to src/FlightMap/Images/compassInstrumentDial.svg diff --git a/src/ui/qmlcommon/compassNeedle.svg b/src/FlightMap/Images/compassNeedle.svg similarity index 100% rename from src/ui/qmlcommon/compassNeedle.svg rename to src/FlightMap/Images/compassNeedle.svg diff --git a/src/ui/qmlcommon/crossHair.svg b/src/FlightMap/Images/crossHair.svg similarity index 100% rename from src/ui/qmlcommon/crossHair.svg rename to src/FlightMap/Images/crossHair.svg diff --git a/src/ui/qmlcommon/rollDialWhite.svg b/src/FlightMap/Images/rollDialWhite.svg similarity index 100% rename from src/ui/qmlcommon/rollDialWhite.svg rename to src/FlightMap/Images/rollDialWhite.svg diff --git a/src/ui/qmlcommon/rollPointerWhite.svg b/src/FlightMap/Images/rollPointerWhite.svg similarity index 100% rename from src/ui/qmlcommon/rollPointerWhite.svg rename to src/FlightMap/Images/rollPointerWhite.svg diff --git a/src/ui/qmlcommon/scale.png b/src/FlightMap/Images/scale.png similarity index 100% rename from src/ui/qmlcommon/scale.png rename to src/FlightMap/Images/scale.png diff --git a/src/ui/qmlcommon/scale_end.png b/src/FlightMap/Images/scale_end.png similarity index 100% rename from src/ui/qmlcommon/scale_end.png rename to src/FlightMap/Images/scale_end.png diff --git a/src/ui/qmlcommon/QGCWaypoint.qml b/src/FlightMap/MapItems/QGCWaypoint.qml similarity index 100% rename from src/ui/qmlcommon/QGCWaypoint.qml rename to src/FlightMap/MapItems/QGCWaypoint.qml diff --git a/src/ui/qmlcommon/VehicleMapItem.qml b/src/FlightMap/MapItems/VehicleMapItem.qml similarity index 100% rename from src/ui/qmlcommon/VehicleMapItem.qml rename to src/FlightMap/MapItems/VehicleMapItem.qml diff --git a/src/ui/qmlcommon/QGCVideoBackground.qml b/src/FlightMap/QGCVideoBackground.qml similarity index 100% rename from src/ui/qmlcommon/QGCVideoBackground.qml rename to src/FlightMap/QGCVideoBackground.qml diff --git a/src/ui/qmlcommon/QGCAltitudeWidget.qml b/src/FlightMap/Widgets/QGCAltitudeWidget.qml similarity index 100% rename from src/ui/qmlcommon/QGCAltitudeWidget.qml rename to src/FlightMap/Widgets/QGCAltitudeWidget.qml diff --git a/src/ui/qmlcommon/QGCArtificialHorizon.qml b/src/FlightMap/Widgets/QGCArtificialHorizon.qml similarity index 100% rename from src/ui/qmlcommon/QGCArtificialHorizon.qml rename to src/FlightMap/Widgets/QGCArtificialHorizon.qml diff --git a/src/ui/qmlcommon/QGCAttitudeHUD.qml b/src/FlightMap/Widgets/QGCAttitudeHUD.qml similarity index 100% rename from src/ui/qmlcommon/QGCAttitudeHUD.qml rename to src/FlightMap/Widgets/QGCAttitudeHUD.qml diff --git a/src/ui/qmlcommon/QGCAttitudeWidget.qml b/src/FlightMap/Widgets/QGCAttitudeWidget.qml similarity index 100% rename from src/ui/qmlcommon/QGCAttitudeWidget.qml rename to src/FlightMap/Widgets/QGCAttitudeWidget.qml diff --git a/src/ui/qmlcommon/QGCCompassHUD.qml b/src/FlightMap/Widgets/QGCCompassHUD.qml similarity index 100% rename from src/ui/qmlcommon/QGCCompassHUD.qml rename to src/FlightMap/Widgets/QGCCompassHUD.qml diff --git a/src/ui/qmlcommon/QGCCompassWidget.qml b/src/FlightMap/Widgets/QGCCompassWidget.qml similarity index 100% rename from src/ui/qmlcommon/QGCCompassWidget.qml rename to src/FlightMap/Widgets/QGCCompassWidget.qml diff --git a/src/ui/qmlcommon/QGCCurrentAltitude.qml b/src/FlightMap/Widgets/QGCCurrentAltitude.qml similarity index 100% rename from src/ui/qmlcommon/QGCCurrentAltitude.qml rename to src/FlightMap/Widgets/QGCCurrentAltitude.qml diff --git a/src/ui/qmlcommon/QGCCurrentSpeed.qml b/src/FlightMap/Widgets/QGCCurrentSpeed.qml similarity index 100% rename from src/ui/qmlcommon/QGCCurrentSpeed.qml rename to src/FlightMap/Widgets/QGCCurrentSpeed.qml diff --git a/src/ui/qmlcommon/QGCHudMessage.qml b/src/FlightMap/Widgets/QGCHudMessage.qml similarity index 100% rename from src/ui/qmlcommon/QGCHudMessage.qml rename to src/FlightMap/Widgets/QGCHudMessage.qml diff --git a/src/ui/qmlcommon/QGCMapToolButton.qml b/src/FlightMap/Widgets/QGCMapToolButton.qml similarity index 100% rename from src/ui/qmlcommon/QGCMapToolButton.qml rename to src/FlightMap/Widgets/QGCMapToolButton.qml diff --git a/src/ui/qmlcommon/QGCPitchIndicator.qml b/src/FlightMap/Widgets/QGCPitchIndicator.qml similarity index 100% rename from src/ui/qmlcommon/QGCPitchIndicator.qml rename to src/FlightMap/Widgets/QGCPitchIndicator.qml diff --git a/src/ui/qmlcommon/QGCSlider.qml b/src/FlightMap/Widgets/QGCSlider.qml similarity index 100% rename from src/ui/qmlcommon/QGCSlider.qml rename to src/FlightMap/Widgets/QGCSlider.qml diff --git a/src/ui/qmlcommon/QGCSpeedWidget.qml b/src/FlightMap/Widgets/QGCSpeedWidget.qml similarity index 100% rename from src/ui/qmlcommon/QGCSpeedWidget.qml rename to src/FlightMap/Widgets/QGCSpeedWidget.qml diff --git a/src/ui/qmlcommon/QGCWaypointEditor.qml b/src/FlightMap/Widgets/QGCWaypointEditor.qml similarity index 100% rename from src/ui/qmlcommon/QGCWaypointEditor.qml rename to src/FlightMap/Widgets/QGCWaypointEditor.qml diff --git a/src/ui/qmlcommon/qmldir b/src/FlightMap/qmldir similarity index 87% rename from src/ui/qmlcommon/qmldir rename to src/FlightMap/qmldir index e7929ffb3..7b559fec9 100644 --- a/src/ui/qmlcommon/qmldir +++ b/src/FlightMap/qmldir @@ -1,5 +1,10 @@ -Module QGroundControl.FlightControls +Module QGroundControl.FlightMap +# Main view controls +FlightMap 1.0 FlightMap.qml +QGCVideoBackground 1.0 QGCVideoBackground.qml + +# Widgets QGCAltitudeWidget 1.0 QGCAltitudeWidget.qml QGCArtificialHorizon 1.0 QGCArtificialHorizon.qml QGCAttitudeHUD 1.0 QGCAttitudeHUD.qml @@ -9,12 +14,12 @@ QGCCompassWidget 1.0 QGCCompassWidget.qml QGCCurrentAltitude 1.0 QGCCurrentAltitude.qml QGCCurrentSpeed 1.0 QGCCurrentSpeed.qml QGCHudMessage 1.0 QGCHudMessage.qml -QGCMapBackground 1.0 QGCMapBackground.qml QGCMapToolButton 1.0 QGCMapToolButton.qml QGCPitchIndicator 1.0 QGCPitchIndicator.qml QGCSlider 1.0 QGCSlider.qml QGCSpeedWidget 1.0 QGCSpeedWidget.qml -QGCVideoBackground 1.0 QGCVideoBackground.qml -QGCWaypoint 1.0 QGCWaypoint.qml QGCWaypointEditor 1.0 QGCWaypointEditor.qml + +# MapQuickItems VehicleMapItem 1.0 VehicleMapItem.qml +QGCWaypoint 1.0 QGCWaypoint.qml diff --git a/src/ui/flightdisplay/FlightDisplay.qml b/src/ui/flightdisplay/FlightDisplay.qml index 0d4a7dd76..2b9e06d0e 100644 --- a/src/ui/flightdisplay/FlightDisplay.qml +++ b/src/ui/flightdisplay/FlightDisplay.qml @@ -32,7 +32,7 @@ import QtQuick.Controls 1.3 import QtQuick.Controls.Styles 1.2 import QtQuick.Dialogs 1.2 -import QGroundControl.FlightControls 1.0 +import QGroundControl.FlightMap 1.0 import QGroundControl.MavManager 1.0 import QGroundControl.ScreenTools 1.0 import QGroundControl.Controls 1.0 @@ -336,7 +336,7 @@ Item { z: 10 } - QGCMapBackground { + FlightMap { id: mapBackground anchors.fill: parent mapName: 'MainFlightDisplay' diff --git a/src/ui/mapdisplay/MapDisplay.qml b/src/ui/mapdisplay/MapDisplay.qml index a60ebb8c6..e6b72443e 100644 --- a/src/ui/mapdisplay/MapDisplay.qml +++ b/src/ui/mapdisplay/MapDisplay.qml @@ -34,7 +34,7 @@ import QtQuick.Layouts 1.1 import QGroundControl.Palette 1.0 import QGroundControl.Controls 1.0 -import QGroundControl.FlightControls 1.0 +import QGroundControl.FlightMap 1.0 Rectangle { QGCPalette { id: __palette; colorGroupEnabled: true } @@ -60,7 +60,7 @@ Rectangle { //---------------------------------------------------------------------------------------- // Map View - QGCMapBackground { + FlightMap { id: mapBackground Layout.fillWidth: true Layout.minimumWidth: 300 -- 2.22.0