Skip to content

Q
qgroundcontrol
Commit e6ffc87d authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Contrast and Gadget tweaks

parent da099c28
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 13030 additions and 12799 deletions
qgroundcontrol.qrc
View file @ e6ffc87d
...@@ -341,7 +341,9 @@ ...@@ -341,7 +341,9 @@
<file alias="compassNeedle.svg">src/ui/flightdisplay/components/compassNeedle.svg</file> <file alias="compassNeedle.svg">src/ui/flightdisplay/components/compassNeedle.svg</file>
<file alias="crossHair.svg">src/ui/flightdisplay/components/crossHair.svg</file> <file alias="crossHair.svg">src/ui/flightdisplay/components/crossHair.svg</file>
<file alias="rollDial.svg">src/ui/flightdisplay/components/rollDial.svg</file> <file alias="rollDial.svg">src/ui/flightdisplay/components/rollDial.svg</file>
<file alias="rollDialWhite.svg">src/ui/flightdisplay/components/rollDialWhite.svg</file>
<file alias="rollPointer.svg">src/ui/flightdisplay/components/rollPointer.svg</file> <file alias="rollPointer.svg">src/ui/flightdisplay/components/rollPointer.svg</file>
<file alias="rollPointerWhite.svg">src/ui/flightdisplay/components/rollPointerWhite.svg</file>
</qresource> </qresource>
<qresource prefix="/AutoPilotPlugins/PX4"> <qresource prefix="/AutoPilotPlugins/PX4">
<file alias="ParameterFactMetaData.xml">src/AutoPilotPlugins/PX4/ParameterFactMetaData.xml</file> <file alias="ParameterFactMetaData.xml">src/AutoPilotPlugins/PX4/ParameterFactMetaData.xml</file>
......
src/ui/flightdisplay/FlightDisplay.qml
View file @ e6ffc87d
...@@ -57,14 +57,16 @@ Rectangle { ...@@ -57,14 +57,16 @@ Rectangle {
//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 {
...@@ -292,20 +294,31 @@ Rectangle { ...@@ -292,20 +294,31 @@ Rectangle {
QGCAttitudeWidget { QGCAttitudeWidget {
id: attitudeWidget id: attitudeWidget
anchors.centerIn: parent anchors.centerIn: parent
rollAngle: roll rollAngle: roll
pitchAngle: pitch pitchAngle: pitch
backgroundOpacity: 1.0 // mapBackground.visible ? 0.25 : 1.0 useWhite: true // !mapBackground.visible
z: 10 backgroundOpacity: 1.0 // mapBackground.visible ? 0.25 : 1.0
z: 10
} }
QGCPitchWidget { QGCPitchWidget {
id: pitchWidget id: pitchWidget
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
opacity: 0.5
pitchAngle: pitch pitchAngle: pitch
rollAngle: roll rollAngle: roll
z: 20 color: Qt.rgba(0,0,0,0) // mapBackground.visible ? Qt.rgba(0,0,0,0.5) : Qt.rgba(0,0,0,0)
opacity: 0.75 // mapBackground.visible ? 1 : 0.75
z: 25 // mapBackground.visible ? 20 : 25
}
Image {
anchors.centerIn: parent
source: "/qml/crossHair.svg"
mipmap: true
width: 260
fillMode: Image.PreserveAspectFit
z: 20 // mapBackground.visible ? 25 : 20
} }
QGCAltitudeWidget { QGCAltitudeWidget {
...@@ -327,30 +340,30 @@ Rectangle { ...@@ -327,30 +340,30 @@ Rectangle {
QGCCurrentSpeed { QGCCurrentSpeed {
id: currentSpeed id: currentSpeed
anchors.left: parent.left anchors.left: parent.left
width: 80 width: 75
airspeed: flightDisplay.airSpeed airspeed: flightDisplay.airSpeed
groundspeed: flightDisplay.groundSpeed groundspeed: flightDisplay.groundSpeed
showAirSpeed: true showAirSpeed: true
showGroundSpeed: true showGroundSpeed: true
visible: currentSpeed.showGroundSpeed || currentSpeed.showAirSpeed visible: (currentSpeed.showGroundSpeed || currentSpeed.showAirSpeed)
z: 50 z: 50
} }
QGCCurrentAltitude { QGCCurrentAltitude {
id: currentAltitude id: currentAltitude
anchors.right: parent.right anchors.right: parent.right
width: 80 width: 75
altitude: flightDisplay.altitudeWGS84 altitude: flightDisplay.altitudeWGS84
vertZ: flightDisplay.climbRate vertZ: flightDisplay.climbRate
showAltitude: true showAltitude: true
showClimbRate: true showClimbRate: true
visible: (currentAltitude.showAltitude || currentAltitude.showClimbRate) visible: (currentAltitude.showAltitude || currentAltitude.showClimbRate)
z: 60 z: 60
} }
QGCCompass { QGCCompass {
id: compassIndicator id: compassIndicator
y: root.height * 0.65 y: root.height * 0.7
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
heading: isNaN(flightDisplay.heading) ? 0 : flightDisplay.heading heading: isNaN(flightDisplay.heading) ? 0 : flightDisplay.heading
z: 70 z: 70
......
src/ui/flightdisplay/components/QGCAltitudeWidget.qml
View file @ e6ffc87d
...@@ -34,8 +34,8 @@ import QtQuick 2.4 ...@@ -34,8 +34,8 @@ import QtQuick 2.4
Rectangle { Rectangle {
id: root id: root
property real altitude: 50 property real altitude: 50
property real _reticleSpacing: 29 property real _reticleSpacing: 16
property real _reticleHeight: 1 property real _reticleHeight: 2
property real _reticleSlot: _reticleSpacing + _reticleHeight property real _reticleSlot: _reticleSpacing + _reticleHeight
property var _speedArray: [] property var _speedArray: []
property int _currentCenter: 0 property int _currentCenter: 0
...@@ -75,26 +75,26 @@ Rectangle { ...@@ -75,26 +75,26 @@ Rectangle {
GradientStop { position: 1.0; color: Qt.rgba(0,0,0,0.65) } GradientStop { position: 1.0; color: Qt.rgba(0,0,0,0.65) }
} }
Column{ Column{
id: col
width: parent.width width: parent.width
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: _reticleSpacing spacing: _reticleSpacing
Repeater { Repeater {
model: _speedArray model: _speedArray
anchors.left: parent.left
Rectangle { Rectangle {
property int _alt: modelData property int _alt: modelData
width: (_alt % 10 === 0) ? 15 : 30 width: (_alt % 10 === 0) ? 10 : 15
anchors.left: parent.left
height: _reticleHeight height: _reticleHeight
color: Qt.rgba(1,1,1,0.35) color: Qt.rgba(1,1,1,0.35)
Text { Text {
visible: (_alt % 10 === 0) visible: (_alt % 10 === 0)
anchors.horizontalCenter: parent.horizontalCenter x: 20
anchors.horizontalCenterOffset: 25
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
antialiasing: true antialiasing: true
font.weight: _alt < 0 ? Font.Light : Font.DemiBold font.weight: Font.DemiBold
text: _alt < 0 ? -_alt : _alt text: _alt
color: _alt < 0 ? "#ef2526" : "white" color: _alt < 0 ? "#f8983a" : "white"
style: Text.Outline style: Text.Outline
styleColor: Qt.rgba(0,0,0,0.25) styleColor: Qt.rgba(0,0,0,0.25)
} }
......
src/ui/flightdisplay/components/QGCAttitudeWidget.qml
View file @ e6ffc87d
...@@ -35,6 +35,7 @@ Item { ...@@ -35,6 +35,7 @@ Item {
property real pitchAngle: 0 property real pitchAngle: 0
property real backgroundOpacity: 1 property real backgroundOpacity: 1
property bool displayBackground: true property bool displayBackground: true
property bool useWhite: true
anchors.fill: parent anchors.fill: parent
...@@ -94,9 +95,9 @@ Item { ...@@ -94,9 +95,9 @@ Item {
Image { Image {
id: rollDial id: rollDial
anchors { bottom: root.verticalCenter; horizontalCenter: parent.horizontalCenter} anchors { bottom: root.verticalCenter; horizontalCenter: parent.horizontalCenter}
source: "/qml/rollDial.svg" source: useWhite ? "/qml/rollDialWhite.svg" : "/qml/rollDial.svg"
mipmap: true mipmap: true
width: 250 width: 260
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
transform: Rotation { transform: Rotation {
origin.x: rollDial.width / 2 origin.x: rollDial.width / 2
...@@ -108,18 +109,10 @@ Item { ...@@ -108,18 +109,10 @@ Item {
Image { Image {
id: pointer id: pointer
anchors { bottom: root.verticalCenter; horizontalCenter: parent.horizontalCenter} anchors { bottom: root.verticalCenter; horizontalCenter: parent.horizontalCenter}
source: "/qml/rollPointer.svg" source: useWhite ? "/qml/rollPointerWhite.svg" : "/qml/rollPointer.svg"
smooth: true smooth: true
width: rollDial.width width: rollDial.width
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
} }
Image {
anchors.centerIn: parent
source: "/qml/crossHair.svg"
mipmap: true
width: rollDial.width
fillMode: Image.PreserveAspectFit
}
} }
src/ui/flightdisplay/components/QGCCompass.qml
View file @ e6ffc87d
...@@ -31,7 +31,7 @@ import QtQuick 2.4 ...@@ -31,7 +31,7 @@ import QtQuick 2.4
Item { Item {
id: root id: root
width: parent.width * 0.25 > 150 ? parent.width * 0.25 : 150 width: 120
height: width height: width
property real heading : 0 property real heading : 0
Image { Image {
...@@ -60,8 +60,8 @@ Item { ...@@ -60,8 +60,8 @@ Item {
anchors.centerIn: compass anchors.centerIn: compass
width: 40 width: 40
height: 25 height: 25
border.color: Qt.rgba(1,1,1,0.25) border.color: Qt.rgba(1,1,1,0.15)
color: Qt.rgba(1,1,1,0.1) color: Qt.rgba(0,0,0,0.25)
Text { Text {
text: heading.toFixed(0) text: heading.toFixed(0)
font.weight: Font.DemiBold font.weight: Font.DemiBold
......
src/ui/flightdisplay/components/QGCCurrentAltitude.qml
View file @ e6ffc87d
...@@ -45,14 +45,14 @@ Rectangle { ...@@ -45,14 +45,14 @@ Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
spacing: 4 spacing: 4
Text { Text {
text: 'h: ' + altitude.toFixed(1) text: 'h: ' + altitude.toFixed(0)
font.weight: Font.DemiBold font.weight: Font.DemiBold
color: "white" color: "white"
anchors.right: parent.right anchors.right: parent.right
visible: showAltitude visible: showAltitude
} }
Text { Text {
text: 'vZ: ' + vertZ.toFixed(1) text: 'vZ: ' + vertZ.toFixed(0)
color: "white" color: "white"
font.weight: showAltitude ? Font.Normal : Font.DemiBold font.weight: showAltitude ? Font.Normal : Font.DemiBold
anchors.right: parent.right anchors.right: parent.right
......
src/ui/flightdisplay/components/QGCCurrentSpeed.qml
View file @ e6ffc87d
...@@ -45,14 +45,14 @@ Rectangle { ...@@ -45,14 +45,14 @@ Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
spacing: 4 spacing: 4
Text { Text {
text: 'GS: ' + groundspeed.toFixed(1) text: 'GS: ' + groundspeed.toFixed(0)
font.weight: Font.DemiBold font.weight: Font.DemiBold
color: "white" color: "white"
anchors.right: parent.right anchors.right: parent.right
visible: showGroundSpeed visible: showGroundSpeed
} }
Text { Text {
text: 'AS: ' + airspeed.toFixed(1) text: 'AS: ' + airspeed.toFixed(0)
color: "white" color: "white"
anchors.right: parent.right anchors.right: parent.right
font.weight: showAirSpeed ? Font.Normal : Font.DemiBold font.weight: showAirSpeed ? Font.Normal : Font.DemiBold
......
src/ui/flightdisplay/components/QGCMapBackground.qml
View file @ e6ffc87d
...@@ -62,17 +62,19 @@ Rectangle { ...@@ -62,17 +62,19 @@ Rectangle {
Plugin { Plugin {
id: mapPlugin id: mapPlugin
name: "osm" name: "google"
} }
Map { Map {
id: map id: map
property real lon: (longitude > -180.1 && longitude < 180.1) ? longitude : 0
property real lat: (latitude > -180.1 && latitude < 180.1) ? latitude : 0
plugin: mapPlugin plugin: mapPlugin
width: 1 width: 1
height: 1 height: 1
zoomLevel: zoomLevel zoomLevel: zoomLevel
anchors.centerIn: parent anchors.centerIn: parent
center: map.visible ? QtPositioning.coordinate(latitude, longitude) : QtPositioning.coordinate(0,0) center: map.visible ? QtPositioning.coordinate(lat, lon) : QtPositioning.coordinate(0,0)
transform: Rotation { transform: Rotation {
origin.x: map.width / 2 origin.x: map.width / 2
origin.y: map.height / 2 origin.y: map.height / 2
......
src/ui/flightdisplay/components/QGCPitchWidget.qml
View file @ e6ffc87d
...@@ -33,26 +33,27 @@ Rectangle { ...@@ -33,26 +33,27 @@ Rectangle {
property real pitchAngle: 0 property real pitchAngle: 0
property real rollAngle: 0 property real rollAngle: 0
property real _reticleHeight: 1 property real _reticleHeight: 1
property real _reticleSpacing: 20 property real _reticleSpacing: 17
property real _reticleSlot: _reticleSpacing + _reticleHeight property real _reticleSlot: _reticleSpacing + _reticleHeight
height: 130 height: 110
width: parent.width width: 120
radius: 8
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
clip: true clip: true
color: Qt.rgba(0,0,0,0)
Item { Item {
height: parent.height height: parent.height
width: parent.width width: parent.width
Column{ Column{
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: _reticleSpacing spacing: _reticleSpacing
Repeater { Repeater {
model: 36 model: 36
Rectangle { Rectangle {
property int _pitch: -(modelData * 5 - 90)
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: ((modelData * 5 - 90) % 10) === 0 ? 50 : 30 width: (_pitch % 10) === 0 ? 50 : 30
height: _reticleHeight height: _reticleHeight
color: "white" color: "white"
antialiasing: true antialiasing: true
...@@ -63,9 +64,9 @@ Rectangle { ...@@ -63,9 +64,9 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
smooth: true smooth: true
font.weight: Font.DemiBold font.weight: Font.DemiBold
text: -(modelData * 5 - 90) text: _pitch
color: "white" color: "white"
visible: ((modelData * 5 - 90) % 10) === 0 visible: (_pitch != 0) && ((_pitch % 10) === 0)
} }
Text { Text {
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
...@@ -73,9 +74,9 @@ Rectangle { ...@@ -73,9 +74,9 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
smooth: true smooth: true
font.weight: Font.DemiBold font.weight: Font.DemiBold
text: -(modelData * 5 - 90) text: _pitch
color: "white" color: "white"
visible: ((modelData * 5 - 90) % 10) === 0 visible: (_pitch != 0) && ((_pitch % 10) === 0)
} }
} }
} }
......
src/ui/flightdisplay/components/QGCSpeedWidget.qml
View file @ e6ffc87d
...@@ -28,16 +28,19 @@ This file is part of the QGROUNDCONTROL project ...@@ -28,16 +28,19 @@ This file is part of the QGROUNDCONTROL project
*/ */
import QtQuick 2.4 import QtQuick 2.4
import QGroundControl.ScreenTools 1.0
Rectangle { Rectangle {
id: root id: root
property ScreenTools screenTools: ScreenTools { }
property real speed: 0 property real speed: 0
property real _reticleSpacing: 14 property real _reticleSpacing: 10
property real _reticleHeight: 1 property real _reticleHeight: 2
property real _reticleSlot: _reticleSpacing + _reticleHeight property real _reticleSlot: _reticleSpacing + _reticleHeight
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
z:10
height: parent.height * 0.75 > 280 ? 280 : parent.height * 0.75 height: parent.height * 0.75 > 280 ? 280 : parent.height * 0.75
clip: true clip: true
smooth: true smooth: true
...@@ -49,6 +52,7 @@ Rectangle { ...@@ -49,6 +52,7 @@ Rectangle {
GradientStop { position: 1.0; color: Qt.rgba(0,0,0,0.65) } GradientStop { position: 1.0; color: Qt.rgba(0,0,0,0.65) }
} }
Column{ Column{
id: col
width: parent.width width: parent.width
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
spacing: _reticleSpacing spacing: _reticleSpacing
...@@ -56,19 +60,19 @@ Rectangle { ...@@ -56,19 +60,19 @@ Rectangle {
model: 40 model: 40
Rectangle { Rectangle {
property int _speed: -(index - 20) property int _speed: -(index - 20)
width: (_speed % 5 === 0) ? 15 : 30 width: (_speed % 5 === 0) ? 10 : 15
anchors.right: parent.right anchors.right: parent.right
height: _reticleHeight height: _reticleHeight
color: Qt.rgba(1,1,1,0.35) color: Qt.rgba(1,1,1,0.35)
Text { Text {
visible: (_speed % 5 === 0) visible: (_speed % 5 === 0)
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.horizontalCenterOffset: -25 anchors.horizontalCenterOffset: -30
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
antialiasing: true antialiasing: true
font.weight: _speed < 0 ? Font.Light : Font.DemiBold font.weight: Font.DemiBold
text: _speed < 0 ? -_speed : _speed text: _speed
color: _speed < 0 ? "#ef2526" : "white" color: _speed < 0 ? "#f8983a" : "white"
style: Text.Outline style: Text.Outline
styleColor: Qt.rgba(0,0,0,0.25) styleColor: Qt.rgba(0,0,0,0.25)
} }
......
src/ui/flightdisplay/components/compass.svg
View file @ e6ffc87d
This diff is collapsed.
src/ui/flightdisplay/components/compassNeedle.svg
View file @ e6ffc87d
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 288 158.4" enable-background="new 0 0 288 158.4" xml:space="preserve"> viewBox="0 0 288 158.4" enable-background="new 0 0 288 158.4" xml:space="preserve">
<g id="Layer_2"> <polygon points="279,7.2 144,151.2 9,7.2 "/>
<polygon opacity="0.5" fill="#FFFFFF" points="272.25,9 144,149.4 15.75,9 "/>
</g>
<g id="Layer_1">
<polygon opacity="0.75" fill="none" stroke="#000000" stroke-width="12" stroke-linejoin="round" stroke-miterlimit="10" points="
279,7.2 144,151.2 9,7.2 "/>
</g>
</svg> </svg>
src/ui/flightdisplay/components/crossHair.svg
View file @ e6ffc87d
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 288 36" enable-background="new 0 0 288 36" xml:space="preserve"> viewBox="0 288 288 36" enable-background="new 0 288 288 36" xml:space="preserve">
<rect fill="none" width="288" height="36"/> <rect y="288" fill="none" width="288" height="36"/>
<line fill="none" stroke="#D32027" stroke-width="2" stroke-miterlimit="10" x1="0" y1="18" x2="72" y2="18"/> <line fill="none" stroke="#7D1317" stroke-width="4" stroke-miterlimit="10" x1="0" y1="306" x2="72" y2="306"/>
<line fill="none" stroke="#D32027" stroke-width="2" stroke-miterlimit="10" x1="288" y1="18" x2="216" y2="18"/> <line fill="none" stroke="#7D1317" stroke-width="4" stroke-miterlimit="10" x1="288" y1="306" x2="216" y2="306"/>
<polyline fill="none" stroke="#D32027" stroke-width="2" stroke-linecap="round" stroke-miterlimit="10" points="194.488,31.07 <polyline fill="none" stroke="#7D1317" stroke-width="4" stroke-linecap="round" stroke-miterlimit="10" points="194.488,319.07
144,18 93.512,31.07 "/> 144,306 93.512,319.07 "/>
</svg> </svg>
src/ui/flightdisplay/components/rollDial.svg
View file @ e6ffc87d
...@@ -3,36 +3,30 @@ ...@@ -3,36 +3,30 @@
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 288 159.854" enable-background="new 0 0 288 159.854" xml:space="preserve"> viewBox="0 0 288 159.854" enable-background="new 0 0 288 159.854" xml:space="preserve">
<g id="Layer_1"> <g id="Layer_1">
<text transform="matrix(1 0 0 1 136.0895 12.201)" fill="#E0E0E0" font-family="'Arial-BoldMT'" font-size="14.2222">00</text> <text transform="matrix(1 0 0 1 136.0895 12.201)" font-family="'Arial-BoldMT'" font-size="14.2222">00</text>
<text transform="matrix(0.9659 -0.2588 0.2588 0.9659 98.1424 19.2784)" font-family="'Arial-BoldMT'" font-size="14.2218">15</text>
<text transform="matrix(0.9659 -0.2588 0.2588 0.9659 98.1424 19.2784)" fill="#E0E0E0" font-family="'Arial-BoldMT'" font-size="14.2218">15</text> <text transform="matrix(0.866 -0.5 0.5 0.866 63.3229 35.9389)" font-family="'Arial-BoldMT'" font-size="14.2219">30</text>
<text transform="matrix(0.866 -0.5 0.5 0.866 63.3229 35.9389)" fill="#E0E0E0" font-family="'Arial-BoldMT'" font-size="14.2219">30</text> <text transform="matrix(0.7071 -0.7071 0.7071 0.7071 33.9995 61.0398)" font-family="'Arial-BoldMT'" font-size="14.2221">45</text>
<text transform="matrix(0.5 -0.866 0.866 0.5 12.1723 92.8793)" font-family="'Arial-BoldMT'" font-size="14.2219">60</text>
<text transform="matrix(0.7071 -0.7071 0.7071 0.7071 33.9995 61.0398)" fill="#E0E0E0" font-family="'Arial-BoldMT'" font-size="14.2221">45</text> <text transform="matrix(0.9659 0.2588 -0.2588 0.9659 174.5744 15.1842)" font-family="'Arial-BoldMT'" font-size="14.2218">15</text>
<text transform="matrix(0.5 -0.866 0.866 0.5 12.1723 92.8793)" fill="#E0E0E0" font-family="'Arial-BoldMT'" font-size="14.2219">60</text> <text transform="matrix(0.866 0.5 -0.5 0.866 210.9767 28.0287)" font-family="'Arial-BoldMT'" font-size="14.2219">30</text>
<text transform="matrix(0.7071 0.7071 -0.7071 0.7071 242.8152 49.8557)" font-family="'Arial-BoldMT'" font-size="14.2221">45</text>
<text transform="matrix(0.9659 0.2588 -0.2588 0.9659 174.5744 15.1842)" fill="#E0E0E0" font-family="'Arial-BoldMT'" font-size="14.2218">15</text> <text transform="matrix(0.5 0.866 -0.866 0.5 267.9185 79.1788)" font-family="'Arial-BoldMT'" font-size="14.2219">60</text>
<text transform="matrix(0.866 0.5 -0.5 0.866 210.9767 28.0287)" fill="#E0E0E0" font-family="'Arial-BoldMT'" font-size="14.2219">30</text>
<text transform="matrix(0.7071 0.7071 -0.7071 0.7071 242.8152 49.8557)" fill="#E0E0E0" font-family="'Arial-BoldMT'" font-size="14.2221">45</text>
<text transform="matrix(0.5 0.866 -0.866 0.5 267.9185 79.1788)" fill="#E0E0E0" font-family="'Arial-BoldMT'" font-size="14.2219">60</text>
</g> </g>
<g id="Layer_3"> <g id="Layer_3">
<rect id="rect5769" y="153.455" fill="none" width="288" height="6.4"/> <rect id="rect5769" y="153.455" fill="none" width="288" height="6.4"/>
</g> </g>
<g id="Layer_2"> <g id="Layer_2">
<line fill="none" stroke="#E0E0E0" stroke-width="4" x1="144.1" y1="23.855" x2="144.1" y2="16.355"/> <line fill="none" stroke="#000000" stroke-width="4" x1="144.1" y1="23.855" x2="144.1" y2="16.355"/>
<line fill="none" stroke="#E0E0E0" stroke-width="4" x1="108.9" y1="28.455" x2="107" y2="21.255"/> <line fill="none" stroke="#000000" stroke-width="4" x1="108.9" y1="28.455" x2="107" y2="21.255"/>
<line fill="none" stroke="#E0E0E0" stroke-width="4" x1="76.1" y1="41.955" x2="72.4" y2="35.455"/> <line fill="none" stroke="#000000" stroke-width="4" x1="76.1" y1="41.955" x2="72.4" y2="35.455"/>
<line fill="none" stroke="#E0E0E0" stroke-width="4" x1="47.9" y1="63.555" x2="42.7" y2="58.355"/> <line fill="none" stroke="#000000" stroke-width="4" x1="47.9" y1="63.555" x2="42.7" y2="58.355"/>
<line fill="none" stroke="#E0E0E0" stroke-width="4" x1="26.3" y1="91.755" x2="19.8" y2="88.055"/> <line fill="none" stroke="#000000" stroke-width="4" x1="26.3" y1="91.755" x2="19.8" y2="88.055"/>
<line fill="none" stroke="#E0E0E0" stroke-width="4" x1="179.3" y1="28.455" x2="181.2" y2="21.255"/> <line fill="none" stroke="#000000" stroke-width="4" x1="179.3" y1="28.455" x2="181.2" y2="21.255"/>
<line fill="none" stroke="#E0E0E0" stroke-width="4" x1="212.1" y1="42.155" x2="215.8" y2="35.655"/> <line fill="none" stroke="#000000" stroke-width="4" x1="212.1" y1="42.155" x2="215.8" y2="35.655"/>
<line fill="none" stroke="#E0E0E0" stroke-width="4" x1="240.3" y1="63.755" x2="245.5" y2="58.555"/> <line fill="none" stroke="#000000" stroke-width="4" x1="240.3" y1="63.755" x2="245.5" y2="58.555"/>
<line fill="none" stroke="#E0E0E0" stroke-width="4" x1="261.9" y1="91.955" x2="268.4" y2="88.255"/> <line fill="none" stroke="#000000" stroke-width="4" x1="261.9" y1="91.955" x2="268.4" y2="88.255"/>
<path fill="none" stroke="#E0E0E0" stroke-width="2" stroke-linecap="round" stroke-linejoin="bevel" d="M262.4,92.955 <path fill="none" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="bevel" d="M262.4,92.955
c-11.6-20.6-28.6-37.9-48.9-50s-44.1-19.1-69.5-19.1s-49.2,6.9-69.4,19s-37.2,29.3-48.9,50"/> c-11.6-20.6-28.6-37.9-48.9-50s-44.1-19.1-69.5-19.1s-49.2,6.9-69.4,19s-37.2,29.3-48.9,50"/>
</g> </g>
</svg> </svg>
src/ui/flightdisplay/components/rollDialWhite.svg 0 → 100644
View file @ e6ffc87d
This diff is collapsed.
src/ui/flightdisplay/components/rollPointer.svg
View file @ e6ffc87d
...@@ -2,18 +2,15 @@ ...@@ -2,18 +2,15 @@
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> <!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 288 288 129.6" enable-background="new 0 288 288 129.6" xml:space="preserve"> viewBox="0 288 288 129.6" enable-background="new 0 288 288 129.6" xml:space="preserve">
<g id="svg5772" sodipodi:docname="rollPointer.svg" inkscape:version="0.48.2 r9819" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"> <g id="svg5772" inkscape:version="0.48.2 r9819" sodipodi:docname="rollPointer.svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
<sodipodi:namedview inkscape:window-x="0" inkscape:window-width="1920" inkscape:window-height="1152" inkscape:pageopacity="0.0" inkscape:document-units="px" inkscape:pageshadow="2" inkscape:current-layer="layer5" inkscape:window-y="22" inkscape:window-maximized="1" inkscape:showpageshadow="false" inkscape:guide-bbox="true" id="base" showguides="true" inkscape:zoom="3" borderopacity="1.0" inkscape:cy="66.806039" bordercolor="#666666" pagecolor="#ffffff" showgrid="true" inkscape:cx="74.271777"> <sodipodi:namedview id="base" inkscape:current-layer="layer5" inkscape:showpageshadow="false" inkscape:document-units="px" inkscape:window-width="1920" inkscape:window-y="22" inkscape:window-maximized="1" inkscape:guide-bbox="true" inkscape:window-height="1152" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:window-x="0" pagecolor="#ffffff" inkscape:zoom="3" inkscape:cx="74.271777" inkscape:cy="66.806039" bordercolor="#666666" showgrid="true" showguides="true" borderopacity="1.0">
<inkscape:grid type="xygrid" snapvisiblegridlinesonly="true" id="grid5780" empspacing="5" visible="true" enabled="true"> <inkscape:grid type="xygrid" id="grid5780" snapvisiblegridlinesonly="true" empspacing="5" enabled="true" visible="true">
</inkscape:grid> </inkscape:grid>
</sodipodi:namedview> </sodipodi:namedview>
<rect id="rect5782" y="405.5" fill="none" width="288" height="12.1"/> <rect id="rect5782" y="405.5" fill="none" width="288" height="12.1"/>
<path id="path6692" inkscape:connector-curvature="0" fill="#9F0022" d="M137.9,312.4C144,288,144,288,144,288l6.1,24.4l0,0H137.9z
"/>
</g> </g>
<g id="Layer_2"> <g id="Layer_2">
<path id="path6692_1_" inkscape:connector-curvature="0" opacity="0.5" fill="none" stroke="#FFFFFF" d="M137.7,312.8 <path id="path6692_1_" inkscape:connector-curvature="0" d="M135,313.2c9-25.2,9-25.2,9-25.2l9,25.2l0,0H135z"/>
c6.3-25.2,6.3-25.2,6.3-25.2l6.3,25.2l0,0H137.7z"/>
</g> </g>
</svg> </svg>
src/ui/flightdisplay/components/rollPointerWhite.svg 0 → 100644
View file @ e6ffc87d
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 288 288 129.6" enable-background="new 0 288 288 129.6" xml:space="preserve">
<g id="svg5772" sodipodi:docname="rollPointer.svg" inkscape:version="0.48.2 r9819" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<sodipodi:namedview inkscape:window-height="1152" inkscape:window-width="1920" inkscape:document-units="px" inkscape:showpageshadow="false" inkscape:current-layer="layer5" inkscape:window-x="0" inkscape:guide-bbox="true" inkscape:pageshadow="2" inkscape:window-maximized="1" inkscape:pageopacity="0.0" inkscape:window-y="22" bordercolor="#666666" borderopacity="1.0" inkscape:cy="66.806039" showguides="true" inkscape:cx="74.271777" id="base" pagecolor="#ffffff" inkscape:zoom="3" showgrid="true">
<inkscape:grid type="xygrid" snapvisiblegridlinesonly="true" visible="true" enabled="true" empspacing="5" id="grid5780">
</inkscape:grid>
</sodipodi:namedview>
<rect id="rect5782" y="405.5" fill="none" width="288" height="12.1"/>
</g>
<g id="Layer_2">
<path id="path6692_1_" inkscape:connector-curvature="0" fill="#FFFFFF" d="M135,313.2c9-25.2,9-25.2,9-25.2l9,25.2l0,0H135z"/>
</g>
</svg>
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