rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

OP-1354 Waypoint heading/distance info, basic distance counter.

Browse Source
This commit is contained in:
Laurent Lalanne 2014-06-21 21:19:21 +02:00
parent 56e3b43e9f
commit 6bdb2fe0b3
2 changed files with 205 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
View File

@ -10,6 +10,12 @@ Item {
property real home_distance: Math.sqrt(Math.pow((TakeOffLocation.East - PositionState.East),2) +
Math.pow((TakeOffLocation.North - PositionState.North),2))
property real wp_heading: 180/3.1415 * Math.atan2(PathDesired.End_East - PositionState.East,
PathDesired.End_North - PositionState.North)
property real wp_distance: Math.sqrt(Math.pow((PathDesired.End_East - PositionState.East),2) +
Math.pow(( PathDesired.End_North - PositionState.North),2))
property real current_velocity: Math.sqrt(Math.pow(VelocityState.North,2)+Math.pow(VelocityState.East,2))
property real home_eta: (home_distance > 0 && current_velocity > 0 ? Math.round(home_distance/current_velocity) : 0)
@ -17,7 +23,28 @@ Item {
property real home_eta_m: (home_eta > 0 ? Math.floor((home_eta - home_eta_h*3600)/60) : 0)
property real home_eta_s: (home_eta > 0 ? Math.floor(home_eta - home_eta_h*3600 - home_eta_m*60) : 0)
function formatTime(time) {
property real wp_eta: (wp_distance > 0 && current_velocity > 0 ? Math.round(wp_distance/current_velocity) : 0)
property real wp_eta_h: (wp_eta > 0 ? Math.floor(wp_eta / 3600) : 0 )
property real wp_eta_m: (wp_eta > 0 ? Math.floor((wp_eta - wp_eta_h*3600)/60) : 0)
property real wp_eta_s: (wp_eta > 0 ? Math.floor(wp_eta - wp_eta_h*3600 - wp_eta_m*60) : 0)
property real posEast_old
property real posNorth_old
property real total_distance
property bool init_dist: false
function compute_distance(posEast,posNorth) {
if (total_distance == 0 && !init_dist){init_dist = "true"; posEast_old = posEast; posNorth_old = posNorth;}
if (posEast > posEast_old+3 || posEast < posEast_old-3 || posNorth > posNorth_old+3 || posNorth < posNorth_old-3) {
total_distance += Math.sqrt(Math.pow((posEast - posEast_old ),2) + Math.pow((posNorth - posNorth_old),2));
posEast_old = posEast;
posNorth_old = posNorth;
return total_distance;
}
}
function formatTime(time) {
if (time === 0)
return "00"
if (time < 10)
@ -120,14 +147,90 @@ Item {
SvgElementPositionItem {
sceneSize: info.sceneSize
elementName: "waypoint-description-text"
elementName: "waypoint-heading-text"
width: scaledBounds.width * sceneItem.width
height: scaledBounds.height * sceneItem.height
y: Math.floor(scaledBounds.y * sceneItem.height)
visible: SystemAlarms.Alarm_PathPlan == 1
Text {
text: WaypointActive.Index+" / "+PathPlan.WaypointCount+" "
text: " "+wp_heading.toFixed(1)+"°"
anchors.centerIn: parent
font.pixelSize: parent.height*1.1
color: "magenta"
}
}
SvgElementPositionItem {
sceneSize: info.sceneSize
elementName: "waypoint-distance-text"
width: scaledBounds.width * sceneItem.width
height: scaledBounds.height * sceneItem.height
y: Math.floor(scaledBounds.y * sceneItem.height)
visible: SystemAlarms.Alarm_PathPlan == 1
Text {
text: " "+wp_distance.toFixed(0)+" m"
anchors.centerIn: parent
font.pixelSize: parent.height*1.1
color: "magenta"
}
}
SvgElementPositionItem {
sceneSize: info.sceneSize
elementName: "waypoint-total-distance-text"
width: scaledBounds.width * sceneItem.width
height: scaledBounds.height * sceneItem.height
y: Math.floor(scaledBounds.y * sceneItem.height)
visible: true //total_distance > 5
property real total_distance: 0
Text {
text: " "+total_distance.toFixed(0)+" m"
anchors.centerIn: parent
font.pixelSize: parent.height*1.1
color: "magenta"
}
Timer {
interval: 1000; running: true; repeat: true;
onTriggered: {if (GPSPositionSensor.Status == 3) compute_distance(PositionState.East,PositionState.North)}
}
}
SvgElementPositionItem {
sceneSize: info.sceneSize
elementName: "waypoint-eta-text"
width: scaledBounds.width * sceneItem.width
height: scaledBounds.height * sceneItem.height
y: Math.floor(scaledBounds.y * sceneItem.height)
visible: SystemAlarms.Alarm_PathPlan == 1
Text {
text: formatTime(wp_eta_h) + ":" + formatTime(wp_eta_m) + ":" + formatTime(wp_eta_s)
anchors.centerIn: parent
font.pixelSize: parent.height*1.1
color: "magenta"
}
}
SvgElementPositionItem {
sceneSize: info.sceneSize
elementName: "waypoint-number-text"
width: scaledBounds.width * sceneItem.width
height: scaledBounds.height * sceneItem.height
y: Math.floor(scaledBounds.y * sceneItem.height)
visible: SystemAlarms.Alarm_PathPlan == 1
Text {
text: (WaypointActive.Index+1)+" / "+PathPlan.WaypointCount
anchors.centerIn: parent
font.pixelSize: parent.height*1.1
@ -153,8 +256,6 @@ Item {
}
}
SvgElementPositionItem {
sceneSize: info.sceneSize
elementName: "battery-volt-text"

115
ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg
View File

@ -50,11 +50,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="3.3787325"
inkscape:cx="305.54267"
inkscape:cy="416.93352"
inkscape:zoom="5.9383334"
inkscape:cx="248.68909"
inkscape:cy="451.58086"
inkscape:document-units="px"
inkscape:current-layer="layer18"
inkscape:current-layer="layer60"
showgrid="true"
fit-margin-top="0"
fit-margin-left="0"
@ -1378,11 +1378,48 @@
style="font-size:8px;fill:#ffffff"
id="path6377"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3906"
style="font-size:8px;fill:#ffffff"
d="m 290.04935,24.257889 4.93359,0 0,0.664062 -2.07031,0 0,5.167969 -0.79297,0 0,-5.167969 -2.07031,0 0,-0.664062" />
</g>
<g
transform="translate(0,12.99983)"
id="waypoint-total-distance-label"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans">
<path
d="m 262.75404,24.449065 0,0.769559 c -0.29949,-0.143229 -0.58206,-0.250004 -0.84768,-0.320324 -0.26565,-0.07031 -0.52216,-0.105467 -0.76956,-0.105472 -0.42971,5e-6 -0.76175,0.08335 -0.99614,0.250008 -0.23178,0.166678 -0.34767,0.403666 -0.34766,0.710964 -1e-5,0.257826 0.0768,0.453145 0.23047,0.585958 0.15626,0.130217 0.45054,0.235689 0.88284,0.316418 l 0.47659,0.09765 c 0.58855,0.111987 1.02217,0.30991 1.30082,0.593772 0.28126,0.281263 0.42189,0.65888 0.42189,1.132854 0,0.565125 -0.19011,0.993526 -0.57033,1.285202 -0.37762,0.291678 -0.93232,0.437516 -1.66412,0.437516 -0.27605,0 -0.57033,-0.03125 -0.88284,-0.09375 -0.30991,-0.0625 -0.63154,-0.154954 -0.96488,-0.277354 l 0,-0.81253 c 0.32032,0.179695 0.63413,0.315117 0.94144,0.406265 0.3073,0.09115 0.6094,0.136724 0.90628,0.136723 0.45054,1e-6 0.7982,-0.08854 1.04301,-0.265634 0.24479,-0.177089 0.36719,-0.429701 0.3672,-0.75784 -10e-6,-0.286466 -0.0886,-0.510432 -0.26563,-0.671899 -0.1745,-0.161462 -0.46226,-0.28256 -0.86332,-0.363295 l -0.48049,-0.09375 c -0.58856,-0.117188 -1.01436,-0.300789 -1.27739,-0.550801 C 259.13151,26.609299 259,26.261631 259,25.816299 c 0,-0.51564 0.18099,-0.921903 0.54299,-1.218795 0.3646,-0.296879 0.86591,-0.445322 1.50395,-0.445328 0.27345,6e-6 0.55211,0.02475 0.83598,0.07422 0.28385,0.04949 0.57423,0.123708 0.87112,0.222665"
id="path3913"
inkscape:connector-curvature="0" />
<path
d="m 264.2,24.25817 0.77785,0 0,3.475443 c 0,0.61309 0.11113,1.055023 0.33337,1.325803 0.22224,0.268226 0.58243,0.402339 1.08057,0.402339 0.49558,0 0.85449,-0.134113 1.07673,-0.402339 0.22224,-0.27078 0.33337,-0.712713 0.33337,-1.325803 l 0,-3.475443 0.77786,0 0,3.571238 c -10e-6,0.745925 -0.18521,1.309199 -0.55561,1.689824 -0.36786,0.380625 -0.91198,0.570938 -1.63235,0.570938 -0.72294,0 -1.26961,-0.190313 -1.64001,-0.570938 C 264.38392,29.138607 264.2,28.575333 264.2,27.829408 l 0,-3.571238"
id="path3915"
inkscape:connector-curvature="0" />
<path
d="m 269.94609,24.25817 1.17578,0 1.48827,3.968729 1.49608,-3.968729 1.17578,0 0,5.832 -0.76953,0 0,-5.121066 -1.5039,3.999978 -0.79296,0 -1.5039,-3.999978 0,5.121066 -0.76562,0 0,-5.832"
id="path3917"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3900"
style="font-size:8px;fill:#ffffff"
d="m 278.05325,24.906326 0,4.535157 0.95313,0 c 0.80468,0 1.39322,-0.182291 1.76562,-0.546875 0.375,-0.364582 0.5625,-0.940102 0.5625,-1.726563 0,-0.781246 -0.1875,-1.35286 -0.5625,-1.714844 -0.3724,-0.364578 -0.96094,-0.54687 -1.76562,-0.546875 l -0.95313,0 m -0.78906,-0.648437 1.62109,0 c 1.13021,6e-6 1.95964,0.235682 2.48829,0.707031 0.52864,0.468755 0.79296,1.203129 0.79296,2.203125 0,1.00521 -0.26563,1.743491 -0.79687,2.214844 -0.53125,0.471354 -1.35938,0.707031 -2.48438,0.707031 l -1.62109,0 0,-5.832031" />
<path
d="m 290.04935,24.257889 4.93359,0 0,0.664062 -2.07031,0 0,5.167969 -0.79297,0 0,-5.167969 -2.07031,0 0,-0.664062"
style="font-size:8px;fill:#ffffff"
id="path6379"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3902"
style="font-size:8px;fill:#ffffff"
d="m 283.42044,24.257889 0.78906,0 0,5.832031 -0.78906,0 0,-5.832031" />
<path
inkscape:connector-curvature="0"
id="path3904"
style="font-size:8px;fill:#ffffff"
d="m 289.27591,24.449295 0,0.769531 c -0.29948,-0.143224 -0.58204,-0.249995 -0.84766,-0.320312 -0.26562,-0.07031 -0.52214,-0.105464 -0.76953,-0.105469 -0.42969,5e-6 -0.76172,0.08334 -0.99609,0.25 -0.23177,0.166672 -0.34766,0.403651 -0.34766,0.710938 0,0.257816 0.0768,0.453128 0.23047,0.585937 0.15625,0.130212 0.45052,0.235681 0.88281,0.316406 l 0.47657,0.09766 c 0.58853,0.111982 1.02213,0.309898 1.30078,0.59375 0.28124,0.281252 0.42187,0.658856 0.42187,1.132812 0,0.565105 -0.19011,0.99349 -0.57031,1.285156 -0.37761,0.291667 -0.9323,0.4375 -1.66406,0.4375 -0.27605,0 -0.57032,-0.03125 -0.88282,-0.09375 -0.30989,-0.0625 -0.63151,-0.154947 -0.96484,-0.277343 l 0,-0.8125 c 0.32031,0.179688 0.63411,0.315104 0.94141,0.40625 0.30729,0.09115 0.60937,0.136719 0.90625,0.136718 0.45051,1e-6 0.79817,-0.08854 1.04297,-0.265625 0.24478,-0.177082 0.36718,-0.429686 0.36718,-0.757812 0,-0.286457 -0.0885,-0.510415 -0.26562,-0.671875 -0.17448,-0.161456 -0.46224,-0.28255 -0.86328,-0.363281 l -0.48047,-0.09375 c -0.58855,-0.117185 -1.01433,-0.300779 -1.27735,-0.550782 -0.26302,-0.249996 -0.39453,-0.597652 -0.39453,-1.042968 0,-0.515621 0.18099,-0.92187 0.54297,-1.21875 0.36458,-0.29687 0.86589,-0.445307 1.50391,-0.445313 0.27343,6e-6 0.55208,0.02475 0.83594,0.07422 0.28385,0.04949 0.57421,0.123703 0.87109,0.222656" />
</g>
<g
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
@ -1743,7 +1780,7 @@
<g
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff00ff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
id="waypoint-heading-text"
transform="translate(0,0.595158)">
transform="translate(2,0.595158)">
<path
d="m 216.29349,23.12117 c -0.60938,8e-6 -1.06836,0.300789 -1.37696,0.902344 -0.30469,0.597663 -0.45703,1.498052 -0.45703,2.701172 0,1.199222 0.15234,2.099611 0.45703,2.701172 0.3086,0.597657 0.76758,0.896485 1.37696,0.896484 0.61327,1e-6 1.07226,-0.298827 1.37695,-0.896484 0.30859,-0.601561 0.46289,-1.50195 0.46289,-2.701172 0,-1.20312 -0.1543,-2.103509 -0.46289,-2.701172 -0.30469,-0.601555 -0.76368,-0.902336 -1.37695,-0.902344 m 0,-0.9375 c 0.98046,9e-6 1.72851,0.38868 2.24414,1.166016 0.51952,0.773444 0.77929,1.898443 0.7793,3.375 -1e-5,1.472659 -0.25978,2.597658 -0.7793,3.375 -0.51563,0.773437 -1.26368,1.160156 -2.24414,1.160156 -0.98047,0 -1.73047,-0.386719 -2.25,-1.160156 -0.51563,-0.777342 -0.77344,-1.902341 -0.77344,-3.375 0,-1.476557 0.25781,-2.601556 0.77344,-3.375 0.51953,-0.777336 1.26953,-1.166007 2.25,-1.166016"
style="font-size:12px;fill:#ff00ff"
@ -1859,7 +1896,7 @@
<g
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff00ff;fill-opacity:1;stroke:none;display:inline;font-family:Sans"
id="waypoint-description-text"
transform="translate(0,0.595158)">
transform="translate(30,0.595158)">
<path
d="m 217.92825,10.523514 0,-3.5507815 1.07813,0 0,9.1171875 -1.07813,0 0,-0.984375 c -0.22656,0.390626 -0.51367,0.681641 -0.86132,0.873047 -0.34376,0.1875 -0.75782,0.28125 -1.24219,0.28125 -0.79297,0 -1.43946,-0.316406 -1.93946,-0.949219 -0.49609,-0.632811 -0.74414,-1.464841 -0.74414,-2.496094 0,-1.031245 0.24805,-1.863276 0.74414,-2.496093 0.5,-0.6328064 1.14649,-0.9492124 1.93946,-0.9492191 0.48437,6.7e-6 0.89843,0.09571 1.24219,0.2871094 0.34765,0.1875062 0.63476,0.4765687 0.86132,0.8671877 m -3.67382,2.291015 c -1e-5,0.792972 0.1621,1.416018 0.48632,1.869141 0.32813,0.44922 0.77734,0.673829 1.34766,0.673828 0.57031,1e-6 1.01953,-0.224608 1.34766,-0.673828 0.32812,-0.453123 0.49218,-1.076169 0.49218,-1.869141 0,-0.792964 -0.16406,-1.414057 -0.49218,-1.863281 -0.32813,-0.453119 -0.77735,-0.679682 -1.34766,-0.679687 -0.57032,5e-6 -1.01953,0.226568 -1.34766,0.679687 -0.32422,0.449224 -0.48633,1.070317 -0.48632,1.863281"
style="font-size:12px;fill:#ff00ff"
@ -1915,21 +1952,67 @@
style="font-size:12px;fill:#ff00ff"
id="path6364"
inkscape:connector-curvature="0" />
</g>
<g
transform="translate(-82,0.595158)"
id="waypoint-number-text"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff00ff;fill-opacity:1;stroke:none;display:inline;font-family:Sans">
<path
d="m 286.72318,10.283279 c -0.57813,6e-6 -1.03516,0.226568 -1.3711,0.679688 -0.33594,0.449223 -0.50391,1.06641 -0.5039,1.851562 -1e-5,0.785159 0.16601,1.404299 0.49804,1.857422 0.33594,0.44922 0.79492,0.673829 1.37696,0.673828 0.57421,10e-7 1.02929,-0.226561 1.36523,-0.679687 0.33593,-0.453123 0.5039,-1.07031 0.50391,-1.851563 -10e-6,-0.777339 -0.16798,-1.392573 -0.50391,-1.845703 -0.33594,-0.457025 -0.79102,-0.685541 -1.36523,-0.685547 m 0,-0.9140621 c 0.93749,6.7e-6 1.67382,0.3046939 2.20898,0.9140621 0.53515,0.609381 0.80273,1.45313 0.80273,2.53125 0,1.074221 -0.26758,1.917971 -0.80273,2.53125 -0.53516,0.609376 -1.27149,0.914063 -2.20898,0.914063 -0.94141,0 -1.67969,-0.304687 -2.21485,-0.914063 -0.53125,-0.613279 -0.79687,-1.457029 -0.79687,-2.53125 0,-1.07812 0.26562,-1.921869 0.79687,-2.53125 0.53516,-0.6093682 1.27344,-0.9140554 2.21485,-0.9140621"
inkscape:connector-curvature="0"
id="path3957"
style="font-size:12px;fill:#ff00ff"
id="path6366"
inkscape:connector-curvature="0" />
d="m 309.28568,10.810623 -1.70508,0 -0.49219,1.957031 1.7168,0 0.48047,-1.957031 m -0.87891,-3.3339842 -0.60938,2.4316406 1.71094,0 0.61524,-2.4316406 0.9375,0 -0.60352,2.4316406 1.82813,0 0,0.9023436 -2.05665,0 -0.48046,1.957031 1.86328,0 0,0.896485 -2.0918,0 -0.60937,2.425781 -0.9375,0 0.60351,-2.425781 -1.7168,0 -0.60351,2.425781 -0.94336,0 0.60937,-2.425781 -1.8457,0 0,-0.896485 2.0625,0 0.49219,-1.957031 -1.88672,0 0,-0.9023436 2.11523,0 0.59766,-2.4316406 0.94922,0" />
</g>
</g>
<g
inkscape:label="waypoint-total-distance-text"
id="g3878"
inkscape:groupmode="layer"
transform="translate(0,16)">
<g
transform="translate(0,0.595158)"
id="waypoint-total-distance-text"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ff00ff;fill-opacity:1;stroke:none;display:inline;font-family:Sans">
<path
d="m 295.31888,10.535233 c -0.1211,-0.07031 -0.25391,-0.121089 -0.39844,-0.152344 -0.14063,-0.03515 -0.29688,-0.05273 -0.46875,-0.05274 -0.60938,6e-6 -1.07813,0.199225 -1.40625,0.597657 -0.32422,0.394536 -0.48633,0.962894 -0.48633,1.705078 l 0,3.457031 -1.08398,0 0,-6.5625 1.08398,0 0,1.019531 c 0.22656,-0.398431 0.52148,-0.6933528 0.88477,-0.8847653 0.36328,-0.1953059 0.80468,-0.2929621 1.32422,-0.2929688 0.0742,6.7e-6 0.15624,0.00587 0.24609,0.017578 0.0898,0.00782 0.18945,0.021491 0.29883,0.041016 l 0.006,1.1074221"
inkscape:connector-curvature="0"
id="path3882"
style="font-size:12px;fill:#ff00ff"
id="path6368"
inkscape:connector-curvature="0" />
d="m 303.29349,23.12117 c -0.60938,8e-6 -1.06836,0.300789 -1.37696,0.902344 -0.30469,0.597663 -0.45703,1.498052 -0.45703,2.701172 0,1.199222 0.15234,2.099611 0.45703,2.701172 0.3086,0.597657 0.76758,0.896485 1.37696,0.896484 0.61327,1e-6 1.07226,-0.298827 1.37695,-0.896484 0.30859,-0.601561 0.46289,-1.50195 0.46289,-2.701172 0,-1.20312 -0.1543,-2.103509 -0.46289,-2.701172 -0.30469,-0.601555 -0.76368,-0.902336 -1.37695,-0.902344 m 0,-0.9375 c 0.98046,9e-6 1.72851,0.38868 2.24414,1.166016 0.51952,0.773444 0.77929,1.898443 0.7793,3.375 -1e-5,1.472659 -0.25978,2.597658 -0.7793,3.375 -0.51563,0.773437 -1.26368,1.160156 -2.24414,1.160156 -0.98047,0 -1.73047,-0.386719 -2.25,-1.160156 -0.51563,-0.777342 -0.77344,-1.902341 -0.77344,-3.375 0,-1.476557 0.25781,-2.601556 0.77344,-3.375 0.51953,-0.777336 1.26953,-1.166007 2.25,-1.166016" />
<path
d="m 305.28568,10.810623 -1.70508,0 -0.49219,1.957031 1.7168,0 0.48047,-1.957031 m -0.87891,-3.3339842 -0.60938,2.4316406 1.71094,0 0.61524,-2.4316406 0.9375,0 -0.60352,2.4316406 1.82813,0 0,0.9023436 -2.05665,0 -0.48046,1.957031 1.86328,0 0,0.896485 -2.0918,0 -0.60937,2.425781 -0.9375,0 0.60351,-2.425781 -1.7168,0 -0.60351,2.425781 -0.94336,0 0.60937,-2.425781 -1.8457,0 0,-0.896485 2.0625,0 0.49219,-1.957031 -1.88672,0 0,-0.9023436 2.11523,0 0.59766,-2.4316406 0.94922,0"
inkscape:connector-curvature="0"
id="path3884"
style="font-size:12px;fill:#ff00ff"
id="path6370"
inkscape:connector-curvature="0" />
d="m 310.93411,23.12117 c -0.60938,8e-6 -1.06836,0.300789 -1.37695,0.902344 -0.30469,0.597663 -0.45703,1.498052 -0.45703,2.701172 0,1.199222 0.15234,2.099611 0.45703,2.701172 0.30859,0.597657 0.76757,0.896485 1.37695,0.896484 0.61328,1e-6 1.07226,-0.298827 1.37696,-0.896484 0.30858,-0.601561 0.46288,-1.50195 0.46289,-2.701172 -10e-6,-1.20312 -0.15431,-2.103509 -0.46289,-2.701172 -0.3047,-0.601555 -0.76368,-0.902336 -1.37696,-0.902344 m 0,-0.9375 c 0.98047,9e-6 1.72851,0.38868 2.24414,1.166016 0.51953,0.773444 0.77929,1.898443 0.7793,3.375 -1e-5,1.472659 -0.25977,2.597658 -0.7793,3.375 -0.51563,0.773437 -1.26367,1.160156 -2.24414,1.160156 -0.98047,0 -1.73047,-0.386719 -2.25,-1.160156 -0.51562,-0.777342 -0.77344,-1.902341 -0.77343,-3.375 -1e-5,-1.476557 0.25781,-2.601556 0.77343,-3.375 0.51953,-0.777336 1.26953,-1.166007 2.25,-1.166016" />
<path
inkscape:connector-curvature="0"
id="path3886"
style="font-size:12px;fill:#ff00ff"
d="m 318.57474,23.12117 c -0.60938,8e-6 -1.06836,0.300789 -1.37696,0.902344 -0.30469,0.597663 -0.45703,1.498052 -0.45703,2.701172 0,1.199222 0.15234,2.099611 0.45703,2.701172 0.3086,0.597657 0.76758,0.896485 1.37696,0.896484 0.61327,1e-6 1.07226,-0.298827 1.37695,-0.896484 0.30859,-0.601561 0.46289,-1.50195 0.46289,-2.701172 0,-1.20312 -0.1543,-2.103509 -0.46289,-2.701172 -0.30469,-0.601555 -0.76368,-0.902336 -1.37695,-0.902344 m 0,-0.9375 c 0.98046,9e-6 1.72851,0.38868 2.24414,1.166016 0.51952,0.773444 0.77929,1.898443 0.7793,3.375 -1e-5,1.472659 -0.25978,2.597658 -0.7793,3.375 -0.51563,0.773437 -1.26368,1.160156 -2.24414,1.160156 -0.98047,0 -1.73047,-0.386719 -2.25,-1.160156 -0.51563,-0.777342 -0.77344,-1.902341 -0.77344,-3.375 0,-1.476557 0.25781,-2.601556 0.77344,-3.375 0.51953,-0.777336 1.26953,-1.166007 2.25,-1.166016" />
<path
inkscape:connector-curvature="0"
id="path3888"
style="font-size:12px;fill:#ff00ff"
d="m 326.21536,23.12117 c -0.60938,8e-6 -1.06836,0.300789 -1.37695,0.902344 -0.30469,0.597663 -0.45703,1.498052 -0.45703,2.701172 0,1.199222 0.15234,2.099611 0.45703,2.701172 0.30859,0.597657 0.76757,0.896485 1.37695,0.896484 0.61328,1e-6 1.07226,-0.298827 1.37696,-0.896484 0.30858,-0.601561 0.46288,-1.50195 0.46289,-2.701172 -10e-6,-1.20312 -0.15431,-2.103509 -0.46289,-2.701172 -0.3047,-0.601555 -0.76368,-0.902336 -1.37696,-0.902344 m 0,-0.9375 c 0.98047,9e-6 1.72851,0.38868 2.24414,1.166016 0.51953,0.773444 0.77929,1.898443 0.7793,3.375 -1e-5,1.472659 -0.25977,2.597658 -0.7793,3.375 -0.51563,0.773437 -1.26367,1.160156 -2.24414,1.160156 -0.98047,0 -1.73047,-0.386719 -2.25,-1.160156 -0.51562,-0.777342 -0.77344,-1.902341 -0.77343,-3.375 -1e-5,-1.476557 0.25781,-2.601556 0.77343,-3.375 0.51953,-0.777336 1.26953,-1.166007 2.25,-1.166016" />
<path
inkscape:connector-curvature="0"
id="path3890"
style="font-size:12px;fill:#ff00ff"
d="m 333.85599,23.12117 c -0.60938,8e-6 -1.06836,0.300789 -1.37696,0.902344 -0.30469,0.597663 -0.45703,1.498052 -0.45703,2.701172 0,1.199222 0.15234,2.099611 0.45703,2.701172 0.3086,0.597657 0.76758,0.896485 1.37696,0.896484 0.61327,1e-6 1.07226,-0.298827 1.37695,-0.896484 0.30859,-0.601561 0.46289,-1.50195 0.46289,-2.701172 0,-1.20312 -0.1543,-2.103509 -0.46289,-2.701172 -0.30469,-0.601555 -0.76368,-0.902336 -1.37695,-0.902344 m 0,-0.9375 c 0.98046,9e-6 1.72851,0.38868 2.24414,1.166016 0.51952,0.773444 0.77929,1.898443 0.7793,3.375 -1e-5,1.472659 -0.25978,2.597658 -0.7793,3.375 -0.51563,0.773437 -1.26368,1.160156 -2.24414,1.160156 -0.98047,0 -1.73047,-0.386719 -2.25,-1.160156 -0.51563,-0.777342 -0.77344,-1.902341 -0.77344,-3.375 0,-1.476557 0.25781,-2.601556 0.77344,-3.375 0.51953,-0.777336 1.26953,-1.166007 2.25,-1.166016" />
<path
inkscape:connector-curvature="0"
id="path3892"
style="font-size:12px;fill:#ff00ff"
d="m 341.49661,23.12117 c -0.60938,8e-6 -1.06836,0.300789 -1.37695,0.902344 -0.30469,0.597663 -0.45703,1.498052 -0.45703,2.701172 0,1.199222 0.15234,2.099611 0.45703,2.701172 0.30859,0.597657 0.76757,0.896485 1.37695,0.896484 0.61328,1e-6 1.07226,-0.298827 1.37696,-0.896484 0.30858,-0.601561 0.46288,-1.50195 0.46289,-2.701172 -10e-6,-1.20312 -0.15431,-2.103509 -0.46289,-2.701172 -0.3047,-0.601555 -0.76368,-0.902336 -1.37696,-0.902344 m 0,-0.9375 c 0.98047,9e-6 1.72851,0.38868 2.24414,1.166016 0.51953,0.773444 0.77929,1.898443 0.7793,3.375 -1e-5,1.472659 -0.25977,2.597658 -0.7793,3.375 -0.51563,0.773437 -1.26367,1.160156 -2.24414,1.160156 -0.98047,0 -1.73047,-0.386719 -2.25,-1.160156 -0.51562,-0.777342 -0.77344,-1.902341 -0.77343,-3.375 -1e-5,-1.476557 0.25781,-2.601556 0.77343,-3.375 0.51953,-0.777336 1.26953,-1.166007 2.25,-1.166016" />
<path
inkscape:connector-curvature="0"
id="path3894"
style="font-size:12px;fill:#ff00ff"
d="m 349.13724,23.12117 c -0.60938,8e-6 -1.06836,0.300789 -1.37696,0.902344 -0.30469,0.597663 -0.45703,1.498052 -0.45703,2.701172 0,1.199222 0.15234,2.099611 0.45703,2.701172 0.3086,0.597657 0.76758,0.896485 1.37696,0.896484 0.61327,1e-6 1.07226,-0.298827 1.37695,-0.896484 0.30859,-0.601561 0.46289,-1.50195 0.46289,-2.701172 0,-1.20312 -0.1543,-2.103509 -0.46289,-2.701172 -0.30469,-0.601555 -0.76368,-0.902336 -1.37695,-0.902344 m 0,-0.9375 c 0.98046,9e-6 1.72851,0.38868 2.24414,1.166016 0.51952,0.773444 0.77929,1.898443 0.7793,3.375 -1e-5,1.472659 -0.25978,2.597658 -0.7793,3.375 -0.51563,0.773437 -1.26368,1.160156 -2.24414,1.160156 -0.98047,0 -1.73047,-0.386719 -2.25,-1.160156 -0.51563,-0.777342 -0.77344,-1.902341 -0.77344,-3.375 0,-1.476557 0.25781,-2.601556 0.77344,-3.375 0.51953,-0.777336 1.26953,-1.166007 2.25,-1.166016" />
<path
inkscape:connector-curvature="0"
id="path3896"
style="font-size:12px;fill:#ff00ff"
d="m 356.77786,23.12117 c -0.60938,8e-6 -1.06836,0.300789 -1.37695,0.902344 -0.30469,0.597663 -0.45703,1.498052 -0.45703,2.701172 0,1.199222 0.15234,2.099611 0.45703,2.701172 0.30859,0.597657 0.76757,0.896485 1.37695,0.896484 0.61328,1e-6 1.07226,-0.298827 1.37696,-0.896484 0.30858,-0.601561 0.46288,-1.50195 0.46289,-2.701172 -10e-6,-1.20312 -0.15431,-2.103509 -0.46289,-2.701172 -0.3047,-0.601555 -0.76368,-0.902336 -1.37696,-0.902344 m 0,-0.9375 c 0.98047,9e-6 1.72851,0.38868 2.24414,1.166016 0.51953,0.773444 0.77929,1.898443 0.7793,3.375 -1e-5,1.472659 -0.25977,2.597658 -0.7793,3.375 -0.51563,0.773437 -1.26367,1.160156 -2.24414,1.160156 -0.98047,0 -1.73047,-0.386719 -2.25,-1.160156 -0.51562,-0.777342 -0.77344,-1.902341 -0.77343,-3.375 -1e-5,-1.476557 0.25781,-2.601556 0.77343,-3.375 0.51953,-0.777336 1.26953,-1.166007 2.25,-1.166016" />
</g>
</g>
</g>
@ -2855,7 +2938,7 @@
transform="translate(0,78)">
<path
transform="matrix(0.84971585,0,0,0.84971585,73.153736,57.627199)"
d="m 381.49999,370 a 91.010612,91.010612 0 1 1 -182.02122,0 91.010612,91.010612 0 1 1 182.02122,0 z"
d="m 381.49999,370 c 0,50.26377 -40.74684,91.01061 -91.01061,91.01061 -50.26377,0 -91.01061,-40.74684 -91.01061,-91.01061 0,-50.26377 40.74684,-91.01061 91.01061,-91.01061 50.26377,0 91.01061,40.74684 91.01061,91.01061 z"
sodipodi:ry="91.010612"
sodipodi:rx="91.010612"
sodipodi:cy="370"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 404 KiB

After

Width:  |  Height:  |  Size: 417 KiB