diff --git a/qgroundcontrol.qrc b/qgroundcontrol.qrc
index 2869e0398354c9acef40c066a945c70386ffcfb2..def0440d0bc4fef86500ef9161746a4191fa5301 100644
--- a/qgroundcontrol.qrc
+++ b/qgroundcontrol.qrc
@@ -128,6 +128,7 @@
src/FlightDisplay/qmldir
src/FlightMap/Widgets/CenterMapDropButton.qml
src/FlightMap/Widgets/CenterMapDropPanel.qml
+ src/FlightMap/Widgets/CompassRing.qml
src/FlightMap/Widgets/MapFitFunctions.qml
src/FlightMap/FlightMap.qml
src/FlightMap/Widgets/InstrumentSwipeView.qml
diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml
index 8fe27486dc96f64f62c6cd22caadca9704cdf4c5..3b3f41d6ee6ca062248180a285218dc523553e84 100644
--- a/src/FlightDisplay/FlightDisplayViewWidgets.qml
+++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml
@@ -69,7 +69,7 @@ Item {
instrumentsLoader.state = "topMode"
} else {
instrumentsLoader.source = "qrc:/qml/QGCInstrumentWidget.qml"
- instrumentsLoader.state = "centerMode"
+ instrumentsLoader.state = QGroundControl.settingsManager.appSettings.showLargeCompass.value == 1 ? "centerMode" : "topMode"
}
}
}
@@ -79,6 +79,11 @@ Item {
onValueChanged: _setInstrumentWidget()
}
+ Connections {
+ target: QGroundControl.settingsManager.appSettings.showLargeCompass
+ onValueChanged: _setInstrumentWidget()
+ }
+
Component.onCompleted: {
_setInstrumentWidget()
}
diff --git a/src/FlightMap/Widgets/CompassRing.qml b/src/FlightMap/Widgets/CompassRing.qml
new file mode 100644
index 0000000000000000000000000000000000000000..440174df423bbec6ac7cd712a9045a86acd5149f
--- /dev/null
+++ b/src/FlightMap/Widgets/CompassRing.qml
@@ -0,0 +1,85 @@
+/****************************************************************************
+ *
+ * (c) 2009-2016 QGROUNDCONTROL PROJECT
+ *
+ * QGroundControl is licensed according to the terms in the file
+ * COPYING.md in the root of the source code directory.
+ *
+ ****************************************************************************/
+
+import QtQuick 2.7
+import QtGraphicalEffects 1.0
+
+import QGroundControl.Controls 1.0
+import QGroundControl.ScreenTools 1.0
+import QGroundControl.Vehicle 1.0
+
+Item {
+ property real size: _defaultSize
+ property var vehicle: null
+
+ property real _defaultSize: ScreenTools.defaultFontPixelHeight * (10)
+ property real _sizeRatio: ScreenTools.isTinyScreen ? (size / _defaultSize) * 0.5 : size / _defaultSize
+ property int _fontSize: ScreenTools.defaultFontPointSize * _sizeRatio
+ property real _heading: vehicle ? vehicle.heading.rawValue : 0
+
+ width: size
+ height: size
+
+ Rectangle {
+ id: borderRect
+ anchors.fill: parent
+ radius: width / 2
+ color: "black"
+ }
+
+ Item {
+ id: instrument
+ anchors.fill: parent
+ visible: false
+
+ Image {
+ id: pointer
+ source: "/qmlimages/attitudePointer.svg"
+ mipmap: true
+ fillMode: Image.PreserveAspectFit
+ anchors.leftMargin: _pointerMargin
+ anchors.rightMargin: _pointerMargin
+ anchors.topMargin: _pointerMargin
+ anchors.bottomMargin: _pointerMargin
+ anchors.fill: parent
+ sourceSize.height: parent.height
+
+ transform: Rotation {
+ origin.x: pointer.width / 2
+ origin.y: pointer.height / 2
+ angle: _heading
+ }
+
+ readonly property real _pointerMargin: -10
+ }
+
+ Image {
+ source: "/qmlimages/compassInstrumentDial.svg"
+ mipmap: true
+ fillMode: Image.PreserveAspectFit
+ anchors.fill: parent
+ sourceSize.height: parent.height
+ }
+ }
+
+ Rectangle {
+ id: mask
+ anchors.fill: instrument
+ radius: width / 2
+ color: "black"
+ visible: false
+ }
+
+ OpacityMask {
+ anchors.fill: instrument
+ source: instrument
+ maskSource: mask
+ }
+
+}
diff --git a/src/FlightMap/Widgets/QGCAttitudeWidget.qml b/src/FlightMap/Widgets/QGCAttitudeWidget.qml
index 9c8619af7e8537561a4d1d4480c23a8a91b4de36..0d62241003f1588bff8a9ba5db0b022b3577edc8 100644
--- a/src/FlightMap/Widgets/QGCAttitudeWidget.qml
+++ b/src/FlightMap/Widgets/QGCAttitudeWidget.qml
@@ -14,11 +14,12 @@
* @author Gus Grubba
*/
-import QtQuick 2.7
-import QtGraphicalEffects 1.0
+import QtQuick 2.7
+import QtGraphicalEffects 1.0
-import QGroundControl 1.0
-import QGroundControl.Controls 1.0
+import QGroundControl 1.0
+import QGroundControl.Controls 1.0
+import QGroundControl.ScreenTools 1.0
Item {
id: root
@@ -26,6 +27,7 @@ Item {
property bool showPitch: true
property var vehicle: null
property real size
+ property bool showHeading: false
property real _rollAngle: vehicle ? vehicle.roll.rawValue : 0
property real _pitchAngle: vehicle ? vehicle.pitch.rawValue : 0
@@ -117,4 +119,16 @@ Item {
border.width: 2
}
+ QGCLabel {
+ anchors.bottomMargin: Math.round(ScreenTools.defaultFontPixelHeight * .75)
+ anchors.bottom: parent.bottom
+ anchors.horizontalCenter: parent.horizontalCenter
+ text: _headingString3
+ color: "white"
+ visible: showHeading
+
+ property string _headingString: vehicle ? vehicle.heading.rawValue.toFixed(0) : "OFF"
+ property string _headingString2: _headingString.length === 1 ? "0" + _headingString : _headingString
+ property string _headingString3: _headingString2.length === 2 ? "0" + _headingString2 : _headingString2
+ }
}
diff --git a/src/FlightMap/Widgets/QGCCompassWidget.qml b/src/FlightMap/Widgets/QGCCompassWidget.qml
index 484789a3fdd1ef4898dbc2f0ee1834c15695be44..431e2a8a26a917788e7152ead301bfdfb14a53aa 100644
--- a/src/FlightMap/Widgets/QGCCompassWidget.qml
+++ b/src/FlightMap/Widgets/QGCCompassWidget.qml
@@ -14,8 +14,8 @@
* @author Gus Grubba
*/
-import QtQuick 2.7
-import QtGraphicalEffects 1.0
+import QtQuick 2.7
+import QtGraphicalEffects 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
@@ -79,11 +79,15 @@ Item {
color: Qt.rgba(0,0,0,0.65)
QGCLabel {
- text: vehicle ? _heading.toFixed(0) : qsTr("OFF")
+ text: _headingString3
font.family: vehicle ? ScreenTools.demiboldFontFamily : ScreenTools.normalFontFamily
font.pointSize: _fontSize < 8 ? 8 : _fontSize;
color: "white"
anchors.centerIn: parent
+
+ property string _headingString: vehicle ? _heading.toFixed(0) : "OFF"
+ property string _headingString2: _headingString.length === 1 ? "0" + _headingString : _headingString
+ property string _headingString3: _headingString2.length === 2 ? "0" + _headingString2 : _headingString2
}
}
}
diff --git a/src/FlightMap/Widgets/QGCInstrumentWidget.qml b/src/FlightMap/Widgets/QGCInstrumentWidget.qml
index a8d36f39e5b1a5973d5fb33a1913b7f0aa9a0e48..85039a67f866dc1f8e8992ba305ac9b2c018c8ac 100644
--- a/src/FlightMap/Widgets/QGCInstrumentWidget.qml
+++ b/src/FlightMap/Widgets/QGCInstrumentWidget.qml
@@ -7,13 +7,6 @@
*
****************************************************************************/
-
-/**
- * @file
- * @brief QGC Fly View Widgets
- * @author Gus Grubba
- */
-
import QtQuick 2.7
import QGroundControl 1.0
@@ -23,34 +16,30 @@ import QGroundControl.FactSystem 1.0
import QGroundControl.FlightMap 1.0
import QGroundControl.Palette 1.0
-Item {
- id: instrumentPanel
- height: instrumentColumn.y + instrumentColumn.height + _topBottomMargin
- width: getPreferredInstrumentWidth()
-
- property var _qgcView: qgcView
- property real _maxHeight: maxHeight
- property real _defaultSize: ScreenTools.defaultFontPixelHeight * (9)
- property color _backgroundColor: qgcPal.window
- property real _spacing: ScreenTools.defaultFontPixelHeight * 0.33
- property real _topBottomMargin: (width * 0.05) / 2
- property real _availableValueHeight: _maxHeight - (attitudeWidget.height + _spacer1.height + _spacer2.height + (_spacing * 4)) - (_showCompass ? compass.height : 0)
- property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
-
- readonly property bool _showCompass: true // !ScreenTools.isShortScreen
+Rectangle {
+ id: instrumentPanel
+ height: instrumentColumn.height + (_topBottomMargin * 2)
+ width: getPreferredInstrumentWidth()
+ radius: _showLargeCompass ? width / 2 : ScreenTools.defaultFontPixelWidth / 2
+ color: _backgroundColor
+ border.width: _showLargeCompass ? 1 : 0
+ border.color: _isSatellite ? qgcPal.mapWidgetBorderLight : qgcPal.mapWidgetBorderDark
+
+ property var _qgcView: qgcView
+ property real _maxHeight: maxHeight
+ property real _defaultSize: ScreenTools.defaultFontPixelHeight * (9)
+ property color _backgroundColor: qgcPal.window
+ property real _spacing: ScreenTools.defaultFontPixelHeight * 0.33
+ property real _topBottomMargin: (width * 0.05) / 2
+ property real _availableValueHeight: _maxHeight - (outerCompass.height + _spacer1.height + _spacer2.height + (_spacing * 4)) - (_showLargeCompass ? compass.height : 0)
+ property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
+ property bool _showLargeCompass: QGroundControl.settingsManager.appSettings.showLargeCompass.value
+
+ readonly property real _outerRingRatio: 0.95
+ readonly property real _innerRingRatio: 0.80
QGCPalette { id: qgcPal }
- Rectangle {
- anchors.left: parent.left
- anchors.right: parent.right
- height: (_showCompass ? instrumentColumn.height : attitudeWidget.height) + (_topBottomMargin * 2)
- radius: width / 2
- color: _backgroundColor
- border.width: 1
- border.color: _isSatellite ? qgcPal.mapWidgetBorderLight : qgcPal.mapWidgetBorderDark
- }
-
MouseArea {
anchors.fill: parent
onClicked: _valuesWidget.showPicker()
@@ -66,23 +55,33 @@ Item {
Item {
width: parent.width
- height: attitudeWidget.height
+ height: outerCompass.height
- QGCAttitudeWidget {
- id: attitudeWidget
- size: parent.width * 0.95
- vehicle: _activeVehicle
+ CompassRing {
+ id: outerCompass
+ size: parent.width * _outerRingRatio
+ vehicle: _activeVehicle
anchors.horizontalCenter: parent.horizontalCenter
+ visible: !_showLargeCompass
+
+ }
+
+ QGCAttitudeWidget {
+ id: attitudeWidget
+ size: parent.width * (_showLargeCompass ? _outerRingRatio : _innerRingRatio)
+ vehicle: _activeVehicle
+ anchors.centerIn: outerCompass
+ showHeading: !_showLargeCompass
}
Image {
id: gearThingy
- anchors.bottom: attitudeWidget.bottom
- anchors.right: attitudeWidget.right
+ anchors.bottom: outerCompass.bottom
+ anchors.right: outerCompass.right
source: qgcPal.globalTheme == QGCPalette.Light ? "/res/gear-black.svg" : "/res/gear-white.svg"
mipmap: true
opacity: 0.5
- width: attitudeWidget.width * 0.15
+ width: outerCompass.width * 0.15
sourceSize.width: width
fillMode: Image.PreserveAspectFit
MouseArea {
@@ -96,11 +95,11 @@ Item {
}
Rectangle {
- id: _spacer1
- height: 1
- width: parent.width * 0.9
- color: qgcPal.text
- anchors.horizontalCenter: parent.horizontalCenter
+ id: _spacer1
+ anchors.horizontalCenter: parent.horizontalCenter
+ height: 1
+ width: parent.width * 0.9
+ color: qgcPal.text
}
Item {
@@ -110,8 +109,8 @@ Item {
Rectangle {
anchors.fill: _valuesWidget
color: _backgroundColor
- visible: !_showCompass
radius: _spacing
+ visible: !_showLargeCompass
}
InstrumentSwipeView {
@@ -127,20 +126,20 @@ Item {
}
Rectangle {
- id: _spacer2
- height: 1
- width: parent.width * 0.9
- color: qgcPal.text
- visible: _showCompass
- anchors.horizontalCenter: parent.horizontalCenter
+ id: _spacer2
+ anchors.horizontalCenter: parent.horizontalCenter
+ height: 1
+ width: parent.width * 0.9
+ color: qgcPal.text
+ visible: _showLargeCompass
}
QGCCompassWidget {
- id: compass
- size: parent.width * 0.95
- visible: _showCompass
- vehicle: _activeVehicle
- anchors.horizontalCenter: parent.horizontalCenter
+ id: compass
+ anchors.horizontalCenter: parent.horizontalCenter
+ size: parent.width * 0.95
+ vehicle: _activeVehicle
+ visible: _showLargeCompass
}
}
}
diff --git a/src/FlightMap/Widgets/ValuesWidget.qml b/src/FlightMap/Widgets/ValuesWidget.qml
index de26454016672258405da4939c86ef2491418370..46bcea1e3361a8d006770ee18e9409eca0a10c48 100644
--- a/src/FlightMap/Widgets/ValuesWidget.qml
+++ b/src/FlightMap/Widgets/ValuesWidget.qml
@@ -15,6 +15,7 @@ import QtQuick.Layouts 1.3
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.FactSystem 1.0
+import QGroundControl.FactControls 1.0
import QGroundControl.Controllers 1.0
import QGroundControl.Palette 1.0
import QGroundControl 1.0
@@ -147,21 +148,42 @@ QGCFlickable {
flickableDirection: Flickable.VerticalFlick
clip: true
- QGCLabel {
- id: _label
- text: qsTr("Select the values you want to display:")
- }
+ Column {
+ id: column
+ anchors.left: parent.left
+ anchors.right: parent.right
+ spacing: _margins
- Loader {
- id: _loader
- anchors.left: parent.left
- anchors.right: parent.right
- anchors.topMargin: _margins
- anchors.top: _label.bottom
- sourceComponent: factGroupList
-
- property var factGroup: _activeVehicle
- property var factGroupName: "Vehicle"
+ FactCheckBox {
+ text: qsTr("Show large compass")
+ fact: _showLargeCompass
+ visible: _showLargeCompass.visible
+
+ property Fact _showLargeCompass: QGroundControl.settingsManager.appSettings.showLargeCompass
+ }
+
+ Item {
+ width: 1
+ height: _margins
+ }
+
+ QGCLabel {
+ id: _label
+ anchors.left: parent.left
+ anchors.right: parent.right
+ wrapMode: Text.WordWrap
+ text: qsTr("Select the values you want to display:")
+ }
+
+ Loader {
+ id: _loader
+ anchors.left: parent.left
+ anchors.right: parent.right
+ sourceComponent: factGroupList
+
+ property var factGroup: _activeVehicle
+ property var factGroupName: "Vehicle"
+ }
}
}
}
diff --git a/src/FlightMap/qmldir b/src/FlightMap/qmldir
index e91e94d50b9f1de8d5c13f312c37b816912d7165..4626a3706ca6020a5eac6d9c9967fd96fbe3ea1d 100644
--- a/src/FlightMap/qmldir
+++ b/src/FlightMap/qmldir
@@ -8,6 +8,7 @@ QGCVideoBackground 1.0 QGCVideoBackground.qml
CameraWidget 1.0 CameraWidget.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
MapScale 1.0 MapScale.qml
diff --git a/src/Settings/App.SettingsGroup.json b/src/Settings/App.SettingsGroup.json
index a3b074c840e3453bbda5721a086abfbc59f1af76..d73f459253917a3371998b3a4a5867a99f8230bb 100644
--- a/src/Settings/App.SettingsGroup.json
+++ b/src/Settings/App.SettingsGroup.json
@@ -107,5 +107,12 @@
"type": "uint32",
"enumStrings": "Indoor,Outdoor",
"enumValues": "1,0"
+},
+{
+ "name": "ShowLargeCompass",
+ "shortDescription": "Show large compass",
+ "longDescription": "Show large compass on instrument panel",
+ "type": "bool",
+ "defaultValue": false
}
]
diff --git a/src/Settings/AppSettings.cc b/src/Settings/AppSettings.cc
index e30ca2c05c1209311df0a22e5cf1532d421da95a..22e0f3d56d16dda9a704f6d0d3216ded8e885cc9 100644
--- a/src/Settings/AppSettings.cc
+++ b/src/Settings/AppSettings.cc
@@ -28,6 +28,7 @@ const char* AppSettings::audioMutedName = "AudioMu
const char* AppSettings::virtualJoystickName = "VirtualTabletJoystick";
const char* AppSettings::appFontPointSizeName = "BaseDeviceFontPointSize";
const char* AppSettings::indoorPaletteName = "StyleIsDark";
+const char* AppSettings::showLargeCompassName = "ShowLargeCompass";
AppSettings::AppSettings(QObject* parent)
: SettingsGroup(appSettingsGroupName, QString() /* root settings group */, parent)
@@ -44,6 +45,7 @@ AppSettings::AppSettings(QObject* parent)
, _virtualJoystickFact(NULL)
, _appFontPointSizeFact(NULL)
, _indoorPaletteFact(NULL)
+ , _showLargeCompassFact(NULL)
{
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
qmlRegisterUncreatableType("QGroundControl.SettingsManager", 1, 0, "AppSettings", "Reference only");
@@ -171,3 +173,13 @@ void AppSettings::_indoorPaletteChanged(void)
qgcApp()->_loadCurrentStyleSheet();
QGCPalette::setGlobalTheme(indoorPalette()->rawValue().toBool() ? QGCPalette::Dark : QGCPalette::Light);
}
+
+Fact* AppSettings::showLargeCompass(void)
+{
+ if (!_showLargeCompassFact) {
+ _showLargeCompassFact = _createSettingsFact(showLargeCompassName);
+ }
+
+ return _showLargeCompassFact;
+}
+
diff --git a/src/Settings/AppSettings.h b/src/Settings/AppSettings.h
index 7e39514cab3f651ea39b15e94fb7e7e776205313..88b2be4bf7d9e7010cc348d812b75d9acc2544c3 100644
--- a/src/Settings/AppSettings.h
+++ b/src/Settings/AppSettings.h
@@ -32,6 +32,7 @@ public:
Q_PROPERTY(Fact* virtualJoystick READ virtualJoystick CONSTANT)
Q_PROPERTY(Fact* appFontPointSize READ appFontPointSize CONSTANT)
Q_PROPERTY(Fact* indoorPalette READ indoorPalette CONSTANT)
+ Q_PROPERTY(Fact* showLargeCompass READ showLargeCompass CONSTANT)
Fact* offlineEditingFirmwareType (void);
Fact* offlineEditingVehicleType (void);
@@ -46,6 +47,7 @@ public:
Fact* virtualJoystick (void);
Fact* appFontPointSize (void);
Fact* indoorPalette (void);
+ Fact* showLargeCompass (void);
static const char* appSettingsGroupName;
@@ -62,6 +64,7 @@ public:
static const char* virtualJoystickName;
static const char* appFontPointSizeName;
static const char* indoorPaletteName;
+ static const char* showLargeCompassName;
private slots:
void _indoorPaletteChanged(void);
@@ -80,6 +83,7 @@ private:
SettingsFact* _virtualJoystickFact;
SettingsFact* _appFontPointSizeFact;
SettingsFact* _indoorPaletteFact;
+ SettingsFact* _showLargeCompassFact;
};
#endif