From 24f9faa8fc3c360d8caf917d23b6d160b0bb57d0 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Fri, 21 Aug 2020 08:59:08 -0700 Subject: [PATCH] Remove unused code --- qgroundcontrol.qrc | 1 - src/FlightMap/Widgets/InstrumentSwipeView.qml | 101 ------------------------ src/QmlControls/QGroundControl/FlightMap/qmldir | 1 - 3 files changed, 103 deletions(-) delete mode 100644 src/FlightMap/Widgets/InstrumentSwipeView.qml diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc index fc2c910..647de10 100644 --- a/qgroundcontrol.qrc +++ b/qgroundcontrol.qrc @@ -235,7 +235,6 @@ src/FlightMap/Widgets/CompassRing.qml src/FlightMap/MapItems/CustomMapItems.qml src/FlightMap/FlightMap.qml - src/FlightMap/Widgets/InstrumentSwipeView.qml src/FlightMap/Widgets/MapFitFunctions.qml src/FlightMap/MapScale.qml src/FlightMap/MapItems/MissionItemIndicator.qml diff --git a/src/FlightMap/Widgets/InstrumentSwipeView.qml b/src/FlightMap/Widgets/InstrumentSwipeView.qml deleted file mode 100644 index c5aabec..0000000 --- a/src/FlightMap/Widgets/InstrumentSwipeView.qml +++ /dev/null @@ -1,101 +0,0 @@ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Layouts 1.2 - -import QGroundControl.Palette 1.0 -import QGroundControl.ScreenTools 1.0 -import QGroundControl.FlightMap 1.0 - -Item { - id: _root - clip: true - height: column.height - - property color textColor - property color backgroundColor - property var maxHeight ///< Maximum height that should be taken, smaller than this is ok - - property real _margins: ScreenTools.defaultFontPixelWidth / 2 - property real _pageWidth: _root.width - property int _currentPage: 0 - property int _maxPage: 3 - - onWidthChanged: showPage(_currentPage) - - function showPicker() { - valuesPage.showPicker() - } - - function showPage(pageIndex) { - pageRow.x = -(pageIndex * _pageWidth) - _currentPage = pageIndex - } - - function showNextPage() { - if (_currentPage == _maxPage) { - _currentPage = 0 - } else { - _currentPage++ - } - showPage(_currentPage) - } - - function currentPage() { - return _currentPage - } - - MouseArea { - anchors.fill: parent - onClicked: showNextPage() - } - - Column { - id: column - anchors.left: parent.left - anchors.right: parent.right - - Row { - id: pageRow - ValuesWidget { - id: valuesPage - width: _pageWidth - textColor: _root.textColor - maxHeight: _root.maxHeight - } - CameraWidget { - width: _pageWidth - textColor: _root.textColor - maxHeight: _root.maxHeight - } - VehicleHealthWidget { - width: _pageWidth - textColor: _root.textColor - maxHeight: _root.maxHeight - } - VibrationWidget { - width: _pageWidth - textColor: _root.textColor - backgroundColor: _root.backgroundColor - maxHeight: _root.maxHeight - } - } - - Row { - anchors.horizontalCenter: parent.horizontalCenter - spacing: _margins - - Repeater { - model: _maxPage + 1 - - Rectangle { - height: radius * 2 - width: radius * 2 - radius: ScreenTools.defaultFontPixelWidth / 3 - border.color: textColor - border.width: 1 - color: _currentPage == index ? textColor : "transparent" - } - } - } - } -} diff --git a/src/QmlControls/QGroundControl/FlightMap/qmldir b/src/QmlControls/QGroundControl/FlightMap/qmldir index 1d863ac..105ec06 100644 --- a/src/QmlControls/QGroundControl/FlightMap/qmldir +++ b/src/QmlControls/QGroundControl/FlightMap/qmldir @@ -8,7 +8,6 @@ QGCVideoBackground 1.0 QGCVideoBackground.qml CenterMapDropButton 1.0 CenterMapDropButton.qml CenterMapDropPanel 1.0 CenterMapDropPanel.qml CompassRing 1.0 CompassRing.qml -InstrumentSwipeView 1.0 InstrumentSwipeView.qml MapFitFunctions 1.0 MapFitFunctions.qml MapLineArrow 1.0 MapLineArrow.qml MapScale 1.0 MapScale.qml