Commit f1c70192 authored by dogmaphobic's avatar dogmaphobic

Disabled Mapping as it seems the build system (TC) is having some issues with it.

parent d62d8f46
...@@ -42,10 +42,10 @@ Rectangle { ...@@ -42,10 +42,10 @@ Rectangle {
Component.onCompleted: Component.onCompleted:
{ {
mapBackground.visible = flightDisplay.loadSetting("enableMapBackground", false); //mapBackground.visible = flightDisplay.loadSetting("enableMapBackground", false);
mapBackground.alwaysNorth = flightDisplay.loadSetting("mapAlwaysNorth", false); //mapBackground.alwaysNorth = flightDisplay.loadSetting("mapAlwaysNorth", false);
attitudeWidget.visible = flightDisplay.loadSetting("enableattitudeWidget", true); attitudeWidget.visible = flightDisplay.loadSetting("enableattitudeWidget", true);
attitudeWidget.displayBackground = flightDisplay.loadSetting("displayRollPitchBackground", true); //attitudeWidget.displayBackground = flightDisplay.loadSetting("displayRollPitchBackground", true);
pitchWidget.visible = flightDisplay.loadSetting("enablepitchWidget", true); pitchWidget.visible = flightDisplay.loadSetting("enablepitchWidget", true);
altitudeWidget.visible = flightDisplay.loadSetting("enablealtitudeWidget", true); altitudeWidget.visible = flightDisplay.loadSetting("enablealtitudeWidget", true);
speedWidget.visible = flightDisplay.loadSetting("enablespeedWidget", true); speedWidget.visible = flightDisplay.loadSetting("enablespeedWidget", true);
...@@ -54,18 +54,19 @@ Rectangle { ...@@ -54,18 +54,19 @@ Rectangle {
currentSpeed.showGroundSpeed = flightDisplay.loadSetting("showGroundSpeed", true); currentSpeed.showGroundSpeed = flightDisplay.loadSetting("showGroundSpeed", true);
currentAltitude.showClimbRate = flightDisplay.loadSetting("showCurrentClimbRate", true); currentAltitude.showClimbRate = flightDisplay.loadSetting("showCurrentClimbRate", true);
currentAltitude.showAltitude = flightDisplay.loadSetting("showCurrentAltitude", true); currentAltitude.showAltitude = flightDisplay.loadSetting("showCurrentAltitude", true);
mapTypeMenu.update(); //mapTypeMenu.update();
} }
Rectangle { Rectangle {
id: windowBackground id: windowBackground
anchors.fill: parent anchors.fill: parent
anchors.centerIn: parent anchors.centerIn: parent
visible: !attitudeWidget.visible && !mapBackground.visible visible: !attitudeWidget.visible //&& !mapBackground.visible
color: Qt.hsla(0.25, 0.5, 0.45) color: Qt.hsla(0.25, 0.5, 0.45)
z: 0 z: 0
} }
/*
Menu { Menu {
id: mapTypeMenu id: mapTypeMenu
function setCurrentMap(map) { function setCurrentMap(map) {
...@@ -90,6 +91,7 @@ Rectangle { ...@@ -90,6 +91,7 @@ Rectangle {
setCurrentMap(mapBackground.mapItem.activeMapType.name); setCurrentMap(mapBackground.mapItem.activeMapType.name);
} }
} }
*/
Menu { Menu {
id: contextMenu id: contextMenu
...@@ -105,6 +107,7 @@ Rectangle { ...@@ -105,6 +107,7 @@ Rectangle {
} }
} }
/*
MenuItem { MenuItem {
text: "Display Attitude Background" text: "Display Attitude Background"
checkable: true checkable: true
...@@ -115,6 +118,7 @@ Rectangle { ...@@ -115,6 +118,7 @@ Rectangle {
flightDisplay.saveSetting("displayRollPitchBackground", attitudeWidget.displayBackground); flightDisplay.saveSetting("displayRollPitchBackground", attitudeWidget.displayBackground);
} }
} }
*/
MenuItem { MenuItem {
text: "Pitch Indicator" text: "Pitch Indicator"
...@@ -204,6 +208,7 @@ Rectangle { ...@@ -204,6 +208,7 @@ Rectangle {
} }
} }
/*
MenuSeparator {} MenuSeparator {}
MenuItem { MenuItem {
...@@ -236,6 +241,7 @@ Rectangle { ...@@ -236,6 +241,7 @@ Rectangle {
mapTypeMenu.popup(); mapTypeMenu.popup();
} }
} }
*/
MenuSeparator {} MenuSeparator {}
...@@ -263,15 +269,16 @@ Rectangle { ...@@ -263,15 +269,16 @@ Rectangle {
flightDisplay.saveSetting("showGroundSpeed", currentSpeed.showGroundSpeed); flightDisplay.saveSetting("showGroundSpeed", currentSpeed.showGroundSpeed);
compassIndicator.visible = true; compassIndicator.visible = true;
flightDisplay.saveSetting("enableCompassIndicator", compassIndicator.visible); flightDisplay.saveSetting("enableCompassIndicator", compassIndicator.visible);
mapBackground.visible = false; //mapBackground.visible = false;
flightDisplay.saveSetting("enableMapBackground", mapBackground.visible); //flightDisplay.saveSetting("enableMapBackground", mapBackground.visible);
mapBackground.alwaysNorth = false; //mapBackground.alwaysNorth = false;
flightDisplay.saveSetting("mapAlwaysNorth", mapBackground.alwaysNorth); //flightDisplay.saveSetting("mapAlwaysNorth", mapBackground.alwaysNorth);
} }
} }
} }
/*
QGCMapBackground { QGCMapBackground {
id: mapBackground id: mapBackground
anchors.centerIn: parent anchors.centerIn: parent
...@@ -281,13 +288,14 @@ Rectangle { ...@@ -281,13 +288,14 @@ Rectangle {
longitude: flightDisplay.longitude longitude: flightDisplay.longitude
z: 5 z: 5
} }
*/
QGCAttitudeWidget { QGCAttitudeWidget {
id: attitudeWidget id: attitudeWidget
anchors.centerIn: parent anchors.centerIn: parent
rollAngle: roll rollAngle: roll
pitchAngle: pitch pitchAngle: pitch
backgroundOpacity: mapBackground.visible ? 0.25 : 1.0 backgroundOpacity: 1.0 // mapBackground.visible ? 0.25 : 1.0
z: 10 z: 10
} }
......
Markdown is supported
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