1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00

OP-1435 System tab update : FusionAlgorithm, Mag used and Gpstype

This commit is contained in:
Laurent Lalanne 2014-09-18 23:25:47 +02:00
parent e464983cfe
commit 7d110d7122
3 changed files with 258 additions and 138 deletions

View File

@ -966,6 +966,99 @@ Item {
}
}
SvgElementPositionItem {
id: system_fusion_algo
elementName: "system-attitude-estimation-algo"
sceneSize: panels.sceneSize
y: Math.floor(scaledBounds.y * sceneItem.height)
z: system_bg.z+1
states: State {
name: "fading"
when: show_panels !== true
PropertyChanges { target: system_fusion_algo; x: Math.floor(scaledBounds.x * sceneItem.width) - (system_bg.width * 0.85); }
}
transitions: Transition {
SequentialAnimation {
PropertyAnimation { property: "x"; duration: 800 }
}
}
Text {
text: ["None", "Complementary", "CompMag", "Comp+Mag+GPS", "EKFIndoor", "EKFOutdoor"][RevoSettings.FusionAlgorithm]
anchors.centerIn: parent
color: "white"
font {
family: "Arial"
pixelSize: Math.floor(parent.height * 1.2)
weight: Font.DemiBold
}
}
}
SvgElementPositionItem {
id: system_mag_used
elementName: "system-mag-used"
sceneSize: panels.sceneSize
y: Math.floor(scaledBounds.y * sceneItem.height)
z: system_bg.z+1
states: State {
name: "fading"
when: show_panels !== true
PropertyChanges { target: system_mag_used; x: Math.floor(scaledBounds.x * sceneItem.width) - (system_bg.width * 0.85); }
}
transitions: Transition {
SequentialAnimation {
PropertyAnimation { property: "x"; duration: 800 }
}
}
Text {
text: ["Invalid", "OnBoard", "External"][MagState.Source]
anchors.centerIn: parent
color: "white"
font {
family: "Arial"
pixelSize: Math.floor(parent.height * 1.4)
weight: Font.DemiBold
}
}
}
SvgElementPositionItem {
id: system_gpstype
elementName: "system-gps-type"
sceneSize: panels.sceneSize
y: Math.floor(scaledBounds.y * sceneItem.height)
z: system_bg.z+1
states: State {
name: "fading"
when: show_panels !== true
PropertyChanges { target: system_gpstype; x: Math.floor(scaledBounds.x * sceneItem.width) - (system_bg.width * 0.85); }
}
transitions: Transition {
SequentialAnimation {
PropertyAnimation { property: "x"; duration: 800 }
}
}
Text {
text: ["Unknown", "NMEA", "UBX", "UBX7", "UBX8"][GPSPositionSensor.SensorType]
anchors.centerIn: parent
color: "white"
font {
family: "Arial"
pixelSize: Math.floor(parent.height * 1.4)
weight: Font.DemiBold
}
}
}
SvgElementImage {
id: system_mousearea
elementName: "system-panel-mousearea"

View File

@ -281,11 +281,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.140049"
inkscape:cx="179.9755"
inkscape:cy="32.445148"
inkscape:zoom="3.0264863"
inkscape:cx="102.91059"
inkscape:cy="69.619044"
inkscape:document-units="px"
inkscape:current-layer="svg2"
inkscape:current-layer="layer76"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
@ -298,8 +298,8 @@
inkscape:window-maximized="1"
showguides="false"
inkscape:guide-bbox="true"
inkscape:object-nodes="true"
inkscape:object-paths="true"
inkscape:object-nodes="false"
inkscape:object-paths="false"
inkscape:snap-bbox="true"
inkscape:bbox-nodes="false"
inkscape:snap-bbox-midpoints="true"
@ -311,7 +311,7 @@
inkscape:snap-intersection-paths="true"
inkscape:snap-object-midpoints="false"
inkscape:snap-center="false"
inkscape:snap-bbox-edge-midpoints="true">
inkscape:snap-bbox-edge-midpoints="false">
<sodipodi:guide
orientation="1,0"
position="320.03652,382.998"
@ -348,7 +348,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@ -1405,7 +1405,7 @@
transform="matrix(0.86009397,0,0,0.86009397,0.18825858,65.744733)">
<path
transform="translate(-0.6835781,-2.0507343)"
d="M 191.74365,291.50333 A 5.9813085,5.9813085 0 1 1 179.78104,291.50333 A 5.9813085,5.9813085 0 1 1 191.74365,291.50333 z"
d="M 191.74365,291.50333 C 191.74365,294.80671 189.06573,297.48463 185.76234,297.48463 C 182.45896,297.48463 179.78104,294.80671 179.78104,291.50333 C 179.78104,288.19994 182.45896,285.52202 185.76234,285.52202 C 189.06573,285.52202 191.74365,288.19994 191.74365,291.50333 z"
sodipodi:ry="5.9813085"
sodipodi:rx="5.9813085"
sodipodi:cy="291.50333"
@ -1478,7 +1478,7 @@
ry="0.80000001" />
<path
transform="matrix(0.25,0,0,0.25,114.18623,329.53888)"
d="M 157,441 A 2,2 0 1 1 153,441 A 2,2 0 1 1 157,441 z"
d="M 157,441 C 157,442.10457 156.10457,443 155,443 C 153.89543,443 153,442.10457 153,441 C 153,439.89543 153.89543,439 155,439 C 156.10457,439 157,439.89543 157,441 z"
sodipodi:ry="2"
sodipodi:rx="2"
sodipodi:cy="441"
@ -1494,7 +1494,7 @@
sodipodi:cy="441"
sodipodi:rx="2"
sodipodi:ry="2"
d="M 157,441 A 2,2 0 1 1 153,441 A 2,2 0 1 1 157,441 z"
d="M 157,441 C 157,442.10457 156.10457,443 155,443 C 153.89543,443 153,442.10457 153,441 C 153,439.89543 153.89543,439 155,439 C 156.10457,439 157,439.89543 157,441 z"
transform="matrix(0.625,0,0,0.625,55.875,163.98272)" />
<path
sodipodi:type="arc"
@ -1504,11 +1504,11 @@
sodipodi:cy="441"
sodipodi:rx="2"
sodipodi:ry="2"
d="M 157,441 A 2,2 0 1 1 153,441 A 2,2 0 1 1 157,441 z"
d="M 157,441 C 157,442.10457 156.10457,443 155,443 C 153.89543,443 153,442.10457 153,441 C 153,439.89543 153.89543,439 155,439 C 156.10457,439 157,439.89543 157,441 z"
transform="matrix(-0.25,0,0,-0.25,195.4413,550.05917)" />
<path
transform="matrix(-0.625,0,0,-0.625,253.625,715.23272)"
d="M 157,441 A 2,2 0 1 1 153,441 A 2,2 0 1 1 157,441 z"
d="M 157,441 C 157,442.10457 156.10457,443 155,443 C 153.89543,443 153,442.10457 153,441 C 153,439.89543 153.89543,439 155,439 C 156.10457,439 157,439.89543 157,441 z"
sodipodi:ry="2"
sodipodi:rx="2"
sodipodi:cy="441"
@ -1538,7 +1538,7 @@
id="rc-input-labels"
transform="translate(0,-2)">
<path
d="M 140,385 A 65,65 0 1 1 10,385 A 65,65 0 1 1 140,385 z"
d="M 140,385 C 140,420.89851 110.89851,450 75,450 C 39.101491,450 10,420.89851 10,385 C 10,349.10149 39.101491,320 75,320 C 110.89851,320 140,349.10149 140,385 z"
sodipodi:ry="65"
sodipodi:rx="65"
sodipodi:cy="385"
@ -1555,7 +1555,7 @@
sodipodi:cy="385"
sodipodi:rx="65"
sodipodi:ry="65"
d="M 140,385 A 65,65 0 1 1 10,385 A 65,65 0 1 1 140,385 z"
d="M 140,385 C 140,420.89851 110.89851,450 75,450 C 39.101491,450 10,420.89851 10,385 C 10,349.10149 39.101491,320 75,320 C 110.89851,320 140,349.10149 140,385 z"
transform="matrix(1.1599442,0,0,1.1601679,-0.06770889,-73.769595)" />
<rect
y="367.09421"
@ -1617,7 +1617,7 @@
style="fill:url(#linearGradient5057);fill-opacity:1;stroke:none;display:inline"
transform="matrix(0,1,-1,0,0,0)" />
<path
d="M 85,385 A 10,10 0 1 1 65,385 A 10,10 0 1 1 85,385 z"
d="M 85,385 C 85,390.52285 80.522847,395 75,395 C 69.477153,395 65,390.52285 65,385 C 65,379.47715 69.477153,375 75,375 C 80.522847,375 85,379.47715 85,385 z"
sodipodi:ry="10"
sodipodi:rx="10"
sodipodi:cy="385"
@ -1672,7 +1672,7 @@
transform="matrix(1.1599442,0,0,1.1601679,-0.06770889,-75.769595)">
<path
transform="translate(5,0)"
d="M 80,385 A 10,10 0 1 1 60,385 A 10,10 0 1 1 80,385 z"
d="M 80,385 C 80,390.52285 75.522847,395 70,395 C 64.477153,395 60,390.52285 60,385 C 60,379.47715 64.477153,375 70,375 C 75.522847,375 80,379.47715 80,385 z"
sodipodi:ry="10"
sodipodi:rx="10"
sodipodi:cy="385"
@ -2029,8 +2029,7 @@
inkscape:groupmode="layer"
id="layer59"
inkscape:label="system-panel"
style="display:inline"
sodipodi:insensitive="true">
style="display:inline">
<g
inkscape:groupmode="layer"
id="layer76"
@ -2184,9 +2183,9 @@
id="path11336"
inkscape:connector-curvature="0" />
</g>
</g>
<g
id="g11892">
id="fusionalgo-label"
transform="translate(0.18099223,-37.43501)">
<path
d="M 4.1879325,402.7612 L 7.4867606,394.17136 L 8.71137,394.17136 L 12.226995,402.7612 L 10.932073,402.7612 L 9.93012,400.15964 L 6.3383231,400.15964 L 5.3949637,402.7612 L 4.1879325,402.7612 M 6.6664481,399.23386 L 9.5785575,399.23386 L 8.6820731,396.85495 C 8.4086314,396.1323 8.2055066,395.53855 8.0726981,395.0737 C 7.9633194,395.62449 7.8090226,396.17136 7.6098075,396.71432 L 6.6664481,399.23386"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
@ -2238,13 +2237,14 @@
id="path11364"
inkscape:connector-curvature="0" />
<path
d="M 65,397.73972 L 65,396.53854 L 66.201172,396.53854 L 66.201172,397.73972 L 65,397.73972 M 65,402.7612 L 65,401.56003 L 66.201172,401.56003 L 66.201172,402.7612 L 65,402.7612"
d="M 62.811442,397.73972 L 62.811442,396.53854 L 64.012614,396.53854 L 64.012614,397.73972 L 62.811442,397.73972 M 62.811442,402.7612 L 62.811442,401.56003 L 64.012614,401.56003 L 64.012614,402.7612 L 62.811442,402.7612"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
id="path11366"
inkscape:connector-curvature="0" />
</g>
<g
id="g11905">
id="mag-used"
transform="translate(-0.72721087,-37.781958)">
<path
d="M 5.0961356,417.7612 L 5.0961356,409.17136 L 6.8070731,409.17136 L 8.8402762,415.25339 C 9.0277714,415.8198 9.16449,416.24362 9.2504325,416.52487 C 9.3480836,416.21237 9.5004272,415.75339 9.7074637,415.14792 L 11.764104,409.17136 L 13.293401,409.17136 L 13.293401,417.7612 L 12.197698,417.7612 L 12.197698,410.57175 L 9.7016044,417.7612 L 8.6762137,417.7612 L 6.1918387,410.4487 L 6.1918387,417.7612 L 5.0961356,417.7612"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
@ -2261,13 +2261,34 @@
id="path11396"
inkscape:connector-curvature="0" />
<path
d="M 65,412.73972 L 65,411.53854 L 66.201172,411.53854 L 66.201172,412.73972 L 65,412.73972 M 65,417.7612 L 65,416.56003 L 66.201172,416.56003 L 66.201172,417.7612 L 65,417.7612"
d="M 63.719645,412.73972 L 63.719645,411.53854 L 64.920817,411.53854 L 64.920817,412.73972 L 63.719645,412.73972 M 63.719645,417.7612 L 63.719645,416.56003 L 64.920817,416.56003 L 64.920817,417.7612 L 63.719645,417.7612"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
id="path11398"
inkscape:connector-curvature="0" />
<path
style="font-size:10.34432793px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline;font-family:Arial;-inkscape-font-specification:Arial"
inkscape:connector-curvature="0"
id="path4995"
d="M 35.617,417.76968 L 35.617,416.91237 C 35.162604,417.57184 34.545146,417.90158 33.764621,417.90158 C 33.42016,417.90158 33.09769,417.83563 32.797208,417.70374 C 32.500385,417.57184 32.278686,417.40697 32.13211,417.20914 C 31.989195,417.00763 31.888423,416.76216 31.829793,416.47272 C 31.789483,416.27855 31.769329,415.97079 31.76933,415.54946 L 31.76933,411.93334 L 32.75873,411.93334 L 32.75873,415.17026 C 32.758728,415.68685 32.778884,416.0349 32.819193,416.21443 C 32.881488,416.47456 33.013407,416.67972 33.214954,416.82993 C 33.416496,416.97648 33.665679,417.04976 33.962501,417.04976 C 34.259319,417.04976 34.537816,416.97465 34.797995,416.82444 C 35.058168,416.67057 35.24139,416.46356 35.347662,416.20343 C 35.457592,415.93965 35.512559,415.55862 35.512563,415.06035 L 35.512563,411.93334 L 36.501964,411.93334 L 36.501964,417.76968 L 35.617,417.76968" />
<path
style="font-size:10.34432793px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline;font-family:Arial;-inkscape-font-specification:Arial"
inkscape:connector-curvature="0"
id="path4997"
d="M 37.661762,416.02757 L 38.64017,415.8737 C 38.695135,416.26572 38.847209,416.56615 39.096394,416.77498 C 39.349238,416.98381 39.701025,417.08823 40.151754,417.08823 C 40.606143,417.08823 40.943272,416.99663 41.163142,416.81345 C 41.383005,416.6266 41.492938,416.4086 41.492942,416.15947 C 41.492938,415.93598 41.39583,415.76012 41.201618,415.6319 C 41.06603,415.54396 40.728901,415.43222 40.190231,415.29666 C 39.464668,415.11348 38.960807,414.95593 38.678646,414.82404 C 38.400147,414.68848 38.187609,414.50346 38.041032,414.26898 C 37.898118,414.03084 37.826662,413.76888 37.826662,413.48311 C 37.826662,413.22299 37.885292,412.98301 38.002555,412.76319 C 38.123481,412.5397 38.28655,412.35468 38.491759,412.20813 C 38.645665,412.09456 38.854538,411.9993 39.118379,411.92235 C 39.385883,411.84176 39.67171,411.80146 39.97586,411.80145 C 40.433913,411.80146 40.835171,411.86741 41.179631,411.99929 C 41.52775,412.13119 41.78426,412.31072 41.949166,412.53787 C 42.114061,412.76136 42.227658,413.06178 42.28996,413.43914 L 41.322545,413.57103 C 41.278567,413.27062 41.150313,413.03613 40.937778,412.8676 C 40.728901,412.69907 40.432082,412.6148 40.047317,412.6148 C 39.592924,412.6148 39.268621,412.68991 39.074407,412.84012 C 38.880189,412.99034 38.783082,413.1662 38.783083,413.3677 C 38.783082,413.49594 38.823391,413.61135 38.90401,413.71393 C 38.984626,413.82017 39.111049,413.90811 39.28328,413.97771 C 39.382218,414.01435 39.673541,414.09862 40.157251,414.23051 C 40.857157,414.41736 41.344528,414.57124 41.619366,414.69215 C 41.897858,414.80938 42.115894,414.98158 42.273469,415.20873 C 42.431036,415.43589 42.50982,415.71799 42.509826,416.05506 C 42.50982,416.3848 42.412712,416.69621 42.218501,416.98931 C 42.027946,417.27875 41.75128,417.50406 41.388505,417.66527 C 41.025722,417.82281 40.615303,417.90158 40.157251,417.90158 C 39.398708,417.90158 38.819726,417.74404 38.420303,417.42895 C 38.024541,417.11388 37.771694,416.64675 37.661762,416.02757" />
<path
style="font-size:10.34432793px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline;font-family:Arial;-inkscape-font-specification:Arial"
inkscape:connector-curvature="0"
id="path4999"
d="M 47.682194,415.89018 L 48.704574,416.01658 C 48.543334,416.61377 48.244681,417.07724 47.808617,417.40697 C 47.372544,417.73671 46.815547,417.90158 46.137628,417.90158 C 45.28381,417.90158 44.605888,417.63962 44.103861,417.11571 C 43.605495,416.58813 43.356313,415.84988 43.356314,414.90097 C 43.356313,413.9191 43.609159,413.15704 44.114854,412.6148 C 44.620547,412.07258 45.276482,411.80146 46.082663,411.80145 C 46.863186,411.80146 47.500798,412.06707 47.995503,412.59832 C 48.490199,413.12956 48.737548,413.87697 48.737554,414.84052 C 48.737548,414.89915 48.735716,414.98708 48.732058,415.10432 L 44.378695,415.10432 C 44.415336,415.74547 44.596727,416.23641 44.922865,416.57714 C 45.248998,416.91787 45.65575,417.08823 46.143125,417.08823 C 46.505902,417.08823 46.815547,416.99298 47.072062,416.80246 C 47.32857,416.61195 47.531946,416.30785 47.682194,415.89018 M 44.43366,414.29097 L 47.693187,414.29097 C 47.64921,413.80002 47.524618,413.43182 47.319413,413.18635 C 47.004267,412.80532 46.595681,412.6148 46.093656,412.6148 C 45.639261,412.6148 45.256327,412.76685 44.944851,413.07094 C 44.637036,413.37503 44.466639,413.78171 44.43366,414.29097" />
<path
style="font-size:10.34432793px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;display:inline;font-family:Arial;-inkscape-font-specification:Arial"
inkscape:connector-curvature="0"
id="path5001"
d="M 53.739527,417.76968 L 53.739527,417.03328 C 53.369413,417.61215 52.825242,417.90158 52.107016,417.90158 C 51.641628,417.90158 51.212887,417.77335 50.820794,417.51689 C 50.432361,417.26043 50.130045,416.90321 49.913843,416.44525 C 49.701304,415.98361 49.595035,415.45421 49.595036,414.85701 C 49.595035,414.27448 49.692143,413.7469 49.88636,413.27427 C 50.080576,412.79799 50.371898,412.43345 50.76033,412.18065 C 51.148761,411.92786 51.582996,411.80146 52.063042,411.80145 C 52.414825,411.80146 52.728135,411.87657 53.002973,412.02677 C 53.277803,412.17333 53.501334,412.36567 53.673567,412.60381 L 53.673567,409.71311 L 54.65747,409.71311 L 54.65747,417.76968 L 53.739527,417.76968 M 50.61192,414.85701 C 50.61192,415.60441 50.769489,416.16314 51.084635,416.53317 C 51.399775,416.90321 51.771716,417.08823 52.200459,417.08823 C 52.632861,417.08823 52.999304,416.91237 53.299793,416.56066 C 53.603938,416.20527 53.756011,415.66486 53.756016,414.93945 C 53.756011,414.14075 53.602106,413.55455 53.294295,413.18085 C 52.986479,412.80716 52.60721,412.62031 52.156484,412.6203 C 51.716749,412.62031 51.348472,412.79982 51.051654,413.15886 C 50.758496,413.51792 50.61192,414.08397 50.61192,414.85701" />
</g>
<g
id="g11911">
id="gps-type"
transform="translate(-0.47525777,-37.473886)">
<path
d="M 9.1508231,429.39206 L 9.1508231,428.38425 L 12.789495,428.37839 L 12.789495,431.56589 C 12.230893,432.0112 11.654722,432.34714 11.060979,432.5737 C 10.467223,432.79636 9.8578487,432.90768 9.2328544,432.90768 C 8.3891002,432.90768 7.6215228,432.728 6.93012,432.36862 C 6.242618,432.00534 5.7230872,431.4819 5.3715262,430.79831 C 5.0199629,430.11472 4.8441819,429.35105 4.8441825,428.50729 C 4.8441819,427.67136 5.0180098,426.89207 5.3656669,426.1694 C 5.7172279,425.44285 6.2211336,424.90379 6.8773856,424.55222 C 7.5336323,424.20066 8.2894909,424.02488 9.1449637,424.02487 C 9.7660519,424.02488 10.326598,424.12644 10.826604,424.32956 C 11.330503,424.52879 11.725034,424.80808 12.010198,425.16745 C 12.295346,425.52683 12.512143,425.99558 12.660589,426.5737 L 11.635198,426.85495 C 11.506285,426.41746 11.346128,426.07371 11.154729,425.8237 C 10.963316,425.57371 10.689879,425.37449 10.334417,425.22604 C 9.9789423,425.07371 9.5844115,424.99754 9.1508231,424.99753 C 8.6312874,424.99754 8.1820691,425.07761 7.8031669,425.23776 C 7.4242574,425.39402 7.1176171,425.60105 6.883245,425.85886 C 6.6527738,426.11668 6.4730865,426.39988 6.3441825,426.70847 C 6.1254306,427.23972 6.0160557,427.81589 6.0160575,428.43698 C 6.0160557,429.20261 6.1469149,429.84323 6.4086356,430.35886 C 6.6742581,430.87448 7.0590234,431.2573 7.5629325,431.50729 C 8.0668349,431.75729 8.6019906,431.88229 9.1684012,431.88229 C 9.6605833,431.88229 10.141052,431.78854 10.609807,431.60104 C 11.078551,431.40964 11.434019,431.20651 11.676214,430.99167 L 11.676214,429.39206 L 9.1508231,429.39206"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
@ -2284,12 +2305,13 @@
id="path11418"
inkscape:connector-curvature="0" />
<path
d="M 65,427.73972 L 65,426.53854 L 66.201172,426.53854 L 66.201172,427.73972 L 65,427.73972 M 65,432.7612 L 65,431.56003 L 66.201172,431.56003 L 66.201172,432.7612 L 65,432.7612"
d="M 63.467692,427.73972 L 63.467692,426.53854 L 64.668864,426.53854 L 64.668864,427.73972 L 63.467692,427.73972 M 63.467692,432.7612 L 63.467692,431.56003 L 64.668864,431.56003 L 64.668864,432.7612 L 63.467692,432.7612"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
id="path11420"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
<g
inkscape:groupmode="layer"
id="layer77"
@ -2392,7 +2414,8 @@
inkscape:connector-curvature="0" />
</g>
<g
id="system-attitude-estimation-algo">
id="system-attitude-estimation-algo"
transform="matrix(0.95014749,0,0,0.95014749,12.173664,-35.081741)">
<path
d="M 79.307073,399.74948 L 80.443792,400.03659 C 80.205503,400.97019 79.775816,401.68308 79.154729,402.17526 C 78.537536,402.66354 77.781677,402.90768 76.887151,402.90768 C 75.961366,402.90768 75.207461,402.72018 74.625432,402.34518 C 74.047306,401.96628 73.6059,401.4194 73.301214,400.70456 C 73.000432,399.98972 72.850041,399.22214 72.850042,398.40182 C 72.850041,397.5073 73.019963,396.728 73.359807,396.06393 C 73.703556,395.39597 74.189884,394.89011 74.818792,394.54636 C 75.451601,394.19871 76.146913,394.02488 76.904729,394.02487 C 77.764099,394.02488 78.486754,394.24363 79.072698,394.68112 C 79.658628,395.11863 80.066831,395.73386 80.297307,396.52682 L 79.178167,396.7905 C 78.978941,396.1655 78.689879,395.71043 78.310979,395.42526 C 77.932067,395.14011 77.455505,394.99754 76.881292,394.99753 C 76.221132,394.99754 75.668398,395.15574 75.223089,395.47214 C 74.78168,395.78855 74.471133,396.21433 74.291448,396.74948 C 74.111759,397.28074 74.021915,397.82956 74.021917,398.39597 C 74.021915,399.12644 74.127384,399.76511 74.338323,400.31198 C 74.553165,400.85495 74.885195,401.2612 75.334417,401.53073 C 75.783632,401.80026 76.26996,401.93503 76.793401,401.93503 C 77.430115,401.93503 77.969177,401.75144 78.410589,401.38425 C 78.851988,401.01706 79.150816,400.47214 79.307073,399.74948"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
@ -2409,7 +2432,7 @@
id="path11372"
inkscape:connector-curvature="0" />
<path
d="M 98.426214,405.14597 L 98.426214,396.53854 L 99.387151,396.53854 L 99.387151,397.34714 C 99.613712,397.03074 99.869571,396.79441 100.15473,396.63815 C 100.43988,396.478 100.78559,396.39793 101.19184,396.39792 C 101.72308,396.39793 102.19183,396.53464 102.59809,396.80807 C 103.00433,397.08152 103.31097,397.46824 103.51801,397.96823 C 103.72504,398.46433 103.82855,399.00925 103.82856,399.603 C 103.82855,400.23972 103.71332,400.81394 103.48285,401.32565 C 103.25629,401.83347 102.92426,402.22409 102.48676,402.49753 C 102.05316,402.76706 101.59613,402.90182 101.11567,402.90182 C 100.7641,402.90182 100.44769,402.82761 100.16645,402.67917 C 99.889102,402.53073 99.660587,402.34323 99.480901,402.11667 L 99.480901,405.14597 L 98.426214,405.14597 M 99.381292,399.68503 C 99.38129,400.48581 99.543399,401.07761 99.86762,401.46042 C 100.19184,401.84323 100.58441,402.03464 101.04535,402.03464 C 101.5141,402.03464 101.91449,401.83737 102.24653,401.44284 C 102.58246,401.0444 102.75043,400.42917 102.75043,399.59714 C 102.75043,398.80417 102.58637,398.21042 102.25824,397.81589 C 101.93402,397.42136 101.54535,397.2241 101.09223,397.22409 C 100.64301,397.2241 100.24457,397.43503 99.896917,397.8569 C 99.553165,398.27488 99.38129,398.88425 99.381292,399.68503"
d="M 98.426214,403.14597 L 98.426214,394.53854 L 99.387151,394.53854 L 99.387151,395.34714 C 99.613712,395.03074 99.869571,394.79441 100.15473,394.63815 C 100.43988,394.478 100.78559,394.39793 101.19184,394.39792 C 101.72308,394.39793 102.19183,394.53464 102.59809,394.80807 C 103.00433,395.08152 103.31097,395.46824 103.51801,395.96823 C 103.72504,396.46433 103.82855,397.00925 103.82856,397.603 C 103.82855,398.23972 103.71332,398.81394 103.48285,399.32565 C 103.25629,399.83347 102.92426,400.22409 102.48676,400.49753 C 102.05316,400.76706 101.59613,400.90182 101.11567,400.90182 C 100.7641,400.90182 100.44769,400.82761 100.16645,400.67917 C 99.889102,400.53073 99.660587,400.34323 99.480901,400.11667 L 99.480901,403.14597 L 98.426214,403.14597 M 99.381292,397.68503 C 99.38129,398.48581 99.543399,399.07761 99.86762,399.46042 C 100.19184,399.84323 100.58441,400.03464 101.04535,400.03464 C 101.5141,400.03464 101.91449,399.83737 102.24653,399.44284 C 102.58246,399.0444 102.75043,398.42917 102.75043,397.59714 C 102.75043,396.80417 102.58637,396.21042 102.25824,395.81589 C 101.93402,395.42136 101.54535,395.2241 101.09223,395.22409 C 100.64301,395.2241 100.24457,395.43503 99.896917,395.8569 C 99.553165,396.27488 99.38129,396.88425 99.381292,397.68503"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
id="path11374"
inkscape:connector-curvature="0" />
@ -2429,7 +2452,7 @@
id="path11380"
inkscape:connector-curvature="0" />
<path
d="M 128.60785,403.27682 L 129.63324,403.42917 C 129.67621,403.74557 129.79535,403.97604 129.99067,404.12057 C 130.25238,404.31589 130.6098,404.41354 131.06293,404.41354 C 131.55121,404.41354 131.92816,404.31589 132.19379,404.12057 C 132.45941,403.92526 132.6391,403.65182 132.73285,403.30026 C 132.78754,403.08542 132.81293,402.63425 132.80903,401.94675 C 132.34808,402.48972 131.77387,402.7612 131.08637,402.7612 C 130.2309,402.7612 129.56879,402.45261 129.10004,401.83542 C 128.63129,401.21823 128.39692,400.478 128.39692,399.61472 C 128.39692,399.02097 128.50434,398.47409 128.71918,397.97409 C 128.93403,397.47019 129.24457,397.08152 129.65082,396.80807 C 130.06098,396.53464 130.54145,396.39793 131.09223,396.39792 C 131.8266,396.39793 132.43207,396.6948 132.90864,397.28854 L 132.90864,396.53854 L 133.88129,396.53854 L 133.88129,401.91745 C 133.88129,402.8862 133.78168,403.57175 133.58246,403.97409 C 133.38715,404.38034 133.07465,404.70065 132.64496,404.93503 C 132.21918,405.1694 131.69379,405.28659 131.06879,405.28659 C 130.3266,405.28659 129.72699,405.11862 129.26996,404.78268 C 128.81293,404.45065 128.59223,403.9487 128.60785,403.27682 M 129.4809,399.53854 C 129.4809,400.35495 129.64301,400.95065 129.96723,401.32565 C 130.29145,401.70065 130.6977,401.88815 131.18598,401.88815 C 131.67035,401.88815 132.0766,401.70261 132.40473,401.33151 C 132.73285,400.95651 132.89691,400.37058 132.89692,399.5737 C 132.89691,398.81199 132.72699,398.23777 132.38715,397.85104 C 132.05121,397.46433 131.64496,397.27097 131.1684,397.27097 C 130.69965,397.27097 130.30121,397.46238 129.97309,397.84518 C 129.64496,398.2241 129.4809,398.78855 129.4809,399.53854"
d="M 128.60785,401.27682 L 129.63324,401.42917 C 129.67621,401.74557 129.79535,401.97604 129.99067,402.12057 C 130.25238,402.31589 130.6098,402.41354 131.06293,402.41354 C 131.55121,402.41354 131.92816,402.31589 132.19379,402.12057 C 132.45941,401.92526 132.6391,401.65182 132.73285,401.30026 C 132.78754,401.08542 132.81293,400.63425 132.80903,399.94675 C 132.34808,400.48972 131.77387,400.7612 131.08637,400.7612 C 130.2309,400.7612 129.56879,400.45261 129.10004,399.83542 C 128.63129,399.21823 128.39692,398.478 128.39692,397.61472 C 128.39692,397.02097 128.50434,396.47409 128.71918,395.97409 C 128.93403,395.47019 129.24457,395.08152 129.65082,394.80807 C 130.06098,394.53464 130.54145,394.39793 131.09223,394.39792 C 131.8266,394.39793 132.43207,394.6948 132.90864,395.28854 L 132.90864,394.53854 L 133.88129,394.53854 L 133.88129,399.91745 C 133.88129,400.8862 133.78168,401.57175 133.58246,401.97409 C 133.38715,402.38034 133.07465,402.70065 132.64496,402.93503 C 132.21918,403.1694 131.69379,403.28659 131.06879,403.28659 C 130.3266,403.28659 129.72699,403.11862 129.26996,402.78268 C 128.81293,402.45065 128.59223,401.9487 128.60785,401.27682 M 129.4809,397.53854 C 129.4809,398.35495 129.64301,398.95065 129.96723,399.32565 C 130.29145,399.70065 130.6977,399.88815 131.18598,399.88815 C 131.67035,399.88815 132.0766,399.70261 132.40473,399.33151 C 132.73285,398.95651 132.89691,398.37058 132.89692,397.5737 C 132.89691,396.81199 132.72699,396.23777 132.38715,395.85104 C 132.05121,395.46433 131.64496,395.27097 131.1684,395.27097 C 130.69965,395.27097 130.30121,395.46238 129.97309,395.84518 C 129.64496,396.2241 129.4809,396.78855 129.4809,397.53854"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
id="path11382"
inkscape:connector-curvature="0" />
@ -2444,7 +2467,7 @@
id="path11386"
inkscape:connector-curvature="0" />
<path
d="M 151.81684,405.14597 L 151.81684,396.53854 L 152.77778,396.53854 L 152.77778,397.34714 C 153.00434,397.03074 153.2602,396.79441 153.54535,396.63815 C 153.83051,396.478 154.17621,396.39793 154.58246,396.39792 C 155.11371,396.39793 155.58246,396.53464 155.98871,396.80807 C 156.39496,397.08152 156.7016,397.46824 156.90864,397.96823 C 157.11566,398.46433 157.21918,399.00925 157.21918,399.603 C 157.21918,400.23972 157.10394,400.81394 156.87348,401.32565 C 156.64691,401.83347 156.31488,402.22409 155.87739,402.49753 C 155.44379,402.76706 154.98676,402.90182 154.50629,402.90182 C 154.15473,402.90182 153.83832,402.82761 153.55707,402.67917 C 153.27973,402.53073 153.05121,402.34323 152.87153,402.11667 L 152.87153,405.14597 L 151.81684,405.14597 M 152.77192,399.68503 C 152.77192,400.48581 152.93402,401.07761 153.25824,401.46042 C 153.58246,401.84323 153.97504,402.03464 154.43598,402.03464 C 154.90473,402.03464 155.30512,401.83737 155.63715,401.44284 C 155.97308,401.0444 156.14105,400.42917 156.14106,399.59714 C 156.14105,398.80417 155.97699,398.21042 155.64887,397.81589 C 155.32465,397.42136 154.93598,397.2241 154.48285,397.22409 C 154.03363,397.2241 153.6352,397.43503 153.28754,397.8569 C 152.94379,398.27488 152.77192,398.88425 152.77192,399.68503"
d="M 151.81684,403.14597 L 151.81684,394.53854 L 152.77778,394.53854 L 152.77778,395.34714 C 153.00434,395.03074 153.2602,394.79441 153.54535,394.63815 C 153.83051,394.478 154.17621,394.39793 154.58246,394.39792 C 155.11371,394.39793 155.58246,394.53464 155.98871,394.80807 C 156.39496,395.08152 156.7016,395.46824 156.90864,395.96823 C 157.11566,396.46433 157.21918,397.00925 157.21918,397.603 C 157.21918,398.23972 157.10394,398.81394 156.87348,399.32565 C 156.64691,399.83347 156.31488,400.22409 155.87739,400.49753 C 155.44379,400.76706 154.98676,400.90182 154.50629,400.90182 C 154.15473,400.90182 153.83832,400.82761 153.55707,400.67917 C 153.27973,400.53073 153.05121,400.34323 152.87153,400.11667 L 152.87153,403.14597 L 151.81684,403.14597 M 152.77192,397.68503 C 152.77192,398.48581 152.93402,399.07761 153.25824,399.46042 C 153.58246,399.84323 153.97504,400.03464 154.43598,400.03464 C 154.90473,400.03464 155.30512,399.83737 155.63715,399.44284 C 155.97308,399.0444 156.14105,398.42917 156.14106,397.59714 C 156.14105,396.80417 155.97699,396.21042 155.64887,395.81589 C 155.32465,395.42136 154.93598,395.2241 154.48285,395.22409 C 154.03363,395.2241 153.6352,395.43503 153.28754,395.8569 C 152.94379,396.27488 152.77192,396.88425 152.77192,397.68503"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
id="path11388"
inkscape:connector-curvature="0" />
@ -2455,7 +2478,8 @@
inkscape:connector-curvature="0" />
</g>
<g
id="system-mag-used">
id="system-mag-used"
transform="translate(10,-52)">
<path
d="M 91.418401,413.57761 C 91.418401,412.15183 91.801213,411.0366 92.566839,410.2319 C 93.332461,409.42332 94.320742,409.01902 95.531682,409.01901 C 96.324646,409.01902 97.039489,409.20847 97.676214,409.58737 C 98.312925,409.96629 98.7973,410.49558 99.129339,411.17526 C 99.465268,411.85105 99.633236,412.61863 99.633245,413.478 C 99.633236,414.34909 99.457455,415.12839 99.105901,415.81589 C 98.754331,416.50339 98.256284,417.02487 97.611761,417.38034 C 96.967223,417.7319 96.271911,417.90768 95.525823,417.90768 C 94.717225,417.90768 93.99457,417.71237 93.357854,417.32175 C 92.721134,416.93112 92.238712,416.39792 91.910589,415.72214 C 91.582463,415.04636 91.418401,414.33152 91.418401,413.57761 M 92.590276,413.59518 C 92.590274,414.63034 92.867618,415.44675 93.422307,416.0444 C 93.980898,416.63815 94.680116,416.93503 95.519964,416.93503 C 96.375427,416.93503 97.078551,416.63425 97.629339,416.03268 C 98.184019,415.43112 98.461362,414.57761 98.46137,413.47214 C 98.461362,412.77292 98.342222,412.16355 98.103948,411.64401 C 97.869566,411.12058 97.523863,410.71629 97.066839,410.43112 C 96.613708,410.14207 96.103943,409.99754 95.537542,409.99753 C 94.73285,409.99754 94.039492,410.27488 93.457464,410.82956 C 92.879337,411.38035 92.590274,412.30222 92.590276,413.59518"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
@ -2493,7 +2517,8 @@
inkscape:connector-curvature="0" />
</g>
<g
id="system-gps-type">
id="system-gps-type"
transform="matrix(0.79929009,0,0,0.79929009,32.11488,36.677279)">
<path
d="M 83.756292,432.7612 L 83.756292,424.17136 L 86.996526,424.17136 C 87.566834,424.17136 88.00238,424.19871 88.303167,424.25339 C 88.725036,424.32371 89.078551,424.45847 89.363714,424.65768 C 89.648863,424.853 89.877379,425.1284 90.049261,425.48386 C 90.225034,425.83933 90.312925,426.22996 90.312932,426.65573 C 90.312925,427.38621 90.080503,428.00535 89.615667,428.51315 C 89.150817,429.01706 88.310974,429.26902 87.096136,429.26901 L 84.893011,429.26901 L 84.893011,432.7612 L 83.756292,432.7612 M 84.893011,428.25534 L 87.113714,428.25534 C 87.848084,428.25535 88.369568,428.11863 88.678167,427.84518 C 88.986754,427.57175 89.141051,427.18699 89.141057,426.69089 C 89.141051,426.33152 89.049254,426.02488 88.865667,425.77097 C 88.685974,425.51316 88.447692,425.34324 88.150823,425.2612 C 87.959412,425.21043 87.605896,425.18504 87.090276,425.18503 L 84.893011,425.18503 L 84.893011,428.25534"
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#e6e6e6;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial"
@ -2607,7 +2632,7 @@
sodipodi:end="7.1558499"
sodipodi:start="2.268928"
transform="matrix(0.86211044,0,0,0.86194421,-20.308987,63.354658)"
d="M 206.05385,346.92456 A 4,4.0625 0 1 1 211.19615,346.92456"
d="M 206.05385,346.92456 C 204.36155,345.48236 204.14082,342.91992 205.56082,341.20118 C 206.98083,339.48243 209.50385,339.25825 211.19615,340.70044 C 212.88845,342.14264 213.10918,344.70508 211.68918,346.42382 C 211.5395,346.60499 211.37453,346.77254 211.19615,346.92456"
sodipodi:ry="4.0625"
sodipodi:rx="4"
sodipodi:cy="343.8125"
@ -2623,7 +2648,7 @@
sodipodi:cy="343.8125"
sodipodi:rx="4"
sodipodi:ry="4.0625"
d="M 206.625,347.33073 A 4,4.0625 0 1 1 210.625,347.33073"
d="M 206.625,347.33073 C 204.71183,346.2089 204.05633,343.72431 205.1609,341.78125 C 206.26547,339.83819 208.71183,339.17244 210.625,340.29427 C 212.53817,341.4161 213.19367,343.90069 212.0891,345.84375 C 211.73803,346.46133 211.23308,346.97417 210.625,347.33073"
transform="matrix(1.4009295,0,0,1.4098503,-132.61235,-125.01936)"
sodipodi:start="2.0943951"
sodipodi:end="7.3303829"
@ -2664,11 +2689,11 @@
sodipodi:cy="347.5"
sodipodi:rx="52.5"
sodipodi:ry="52.5"
d="M 11.14525,322.85275 A 52.5,52.5 0 0 1 50.19341,295.51093"
d="M 11.14525,322.85275 C 19.03496,308.01436 33.551447,297.8498 50.19341,295.51093"
transform="matrix(0.99426257,0.08698671,-0.08748358,0.99994198,80.732904,11.07574)" />
<path
transform="matrix(0.95695029,0.08372205,-0.08414287,0.96175464,81.727104,24.47046)"
d="M 50.19341,295.51093 A 52.5,52.5 0 0 1 98.870565,315.17777"
d="M 50.19341,295.51093 C 68.767318,292.90053 87.322945,300.39749 98.870565,315.17777"
sodipodi:ry="52.5"
sodipodi:rx="52.5"
sodipodi:cy="347.5"
@ -2726,7 +2751,7 @@
sodipodi:cy="347.5"
sodipodi:rx="52.5"
sodipodi:ry="52.5"
d="M 11.14525,322.85275 A 52.5,52.5 0 0 1 50.19341,295.51093"
d="M 11.14525,322.85275 C 19.03496,308.01436 33.551447,297.8498 50.19341,295.51093"
transform="matrix(0.95695029,0.08372205,-0.08414287,0.96175464,81.727104,24.47046)" />
<path
style="fill:none;stroke:#000000;stroke-width:0.74074072px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
@ -2791,7 +2816,7 @@
<path
sodipodi:open="true"
transform="matrix(0.9168972,0.08021811,-0.08062108,0.92150318,82.802213,38.659321)"
d="M 11.14525,322.85275 A 52.5,52.5 0 0 1 50.19341,295.51093"
d="M 11.14525,322.85275 C 19.03496,308.01436 33.551447,297.8498 50.19341,295.51093"
sodipodi:ry="52.5"
sodipodi:rx="52.5"
sodipodi:cy="347.5"
@ -2809,7 +2834,7 @@
sodipodi:cy="347.5"
sodipodi:rx="52.5"
sodipodi:ry="52.5"
d="M 11.14525,322.85275 A 52.5,52.5 0 0 1 98.870565,315.17777"
d="M 11.14525,322.85275 C 24.757553,297.25172 56.546234,287.53295 82.147255,301.14525 C 88.643363,304.59929 94.34096,309.38014 98.870565,315.17777"
transform="matrix(0.9168972,0.08021811,-0.08062108,0.92150318,82.802213,38.659321)"
sodipodi:start="3.6302848"
sodipodi:end="5.6199602"
@ -3019,7 +3044,7 @@
<path
sodipodi:open="true"
transform="matrix(0.99426257,0.08698671,-0.08748358,0.99994198,80.732904,11.07574)"
d="M 50.19341,295.51093 A 52.5,52.5 0 0 1 98.870565,315.17777"
d="M 50.19341,295.51093 C 68.767318,292.90053 87.322945,300.39749 98.870565,315.17777"
sodipodi:ry="52.5"
sodipodi:rx="52.5"
sodipodi:cy="347.5"

Before

Width:  |  Height:  |  Size: 631 KiB

After

Width:  |  Height:  |  Size: 640 KiB

View File

@ -74,7 +74,9 @@ PfdQmlGadgetWidget::PfdQmlGadgetWidget(QWindow *parent) :
"VtolPathFollowerSettings" <<
"HwSettings" <<
"ManualControlCommand" <<
"SystemSettings";
"SystemSettings" <<
"RevoSettings" <<
"MagState";
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
UAVObjectManager *objManager = pm->getObject<UAVObjectManager>();