From 8eab7400b7cd389c4bccbd1c2324fc2451264119 Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh>
Date: Fri, 22 Aug 2014 13:57:03 +0200
Subject: [PATCH] OP-1438 VSI_Arc_PFD+Status : DemiBold font weight on top

---
 .../share/openpilotgcs/pfd/default/Info.qml   |   7 +
 .../share/openpilotgcs/pfd/default/pfd.svg    | 120 ++++++------------
 2 files changed, 43 insertions(+), 84 deletions(-)

diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
index 81f1e9d90..002115442 100644
--- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
+++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/Info.qml
@@ -118,6 +118,7 @@ Item {
             anchors.centerIn: parent
             font.pixelSize: Math.floor(parent.height*1.3)
             font.family: "Arial"
+            font.weight: Font.DemiBold
             color: "white"
         }
     }
@@ -142,6 +143,7 @@ Item {
             font {
                 family: "Arial"
                 pixelSize: Math.floor(parent.height * 1.5)
+                weight: Font.DemiBold
             }
         }
     }
@@ -162,6 +164,7 @@ Item {
             font {
                 family: "Arial"
                 pixelSize: Math.floor(parent.height * 1.5)
+                weight: Font.DemiBold
             }
         }
     }
@@ -184,6 +187,7 @@ Item {
             font {
                 family: "Arial"
                 pixelSize: Math.floor(parent.height * 1.5)
+                weight: Font.DemiBold
             }
         }
 
@@ -209,6 +213,7 @@ Item {
             font {
                 family: "Arial"
                 pixelSize: Math.floor(parent.height * 1.5)
+                weight: Font.DemiBold
             }
         }
     }
@@ -229,6 +234,7 @@ Item {
             font {
                 family: "Arial"
                 pixelSize: Math.floor(parent.height * 1.5)
+                weight: Font.DemiBold
             }
         }
     }
@@ -250,6 +256,7 @@ Item {
             font {
                 family: "Arial"
                 pixelSize: Math.floor(parent.height * 1.5)
+                weight: Font.DemiBold
             }
         }
     }
diff --git a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg
index 7afaa1861..7b817cfbb 100644
--- a/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg
+++ b/ground/openpilotgcs/share/openpilotgcs/pfd/default/pfd.svg
@@ -203,7 +203,7 @@
      inkscape:cx="485.36821"
      inkscape:cy="163.50228"
      inkscape:document-units="px"
-     inkscape:current-layer="g3935"
+     inkscape:current-layer="svg2"
      showgrid="true"
      fit-margin-top="0"
      fit-margin-left="0"
@@ -312,7 +312,8 @@
      inkscape:groupmode="layer"
      id="layer69"
      inkscape:label="foreground_layer"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <rect
        style="fill:url(#radialGradient4865);fill-opacity:1;stroke:none"
        id="foreground"
@@ -1299,7 +1300,8 @@
      inkscape:groupmode="layer"
      id="layer83"
      inkscape:label="rc-input-panel"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <g
        inkscape:groupmode="layer"
        id="layer86"
@@ -1336,7 +1338,7 @@
                ry="0.80000001" />
             <path
                transform="matrix(0.25,0,0,0.25,114.18623,329.53888)"
-               d="m 157,441 c 0,1.10457 -0.89543,2 -2,2 c -1.10457,0 -2,-0.89543 -2,-2 c 0,-1.10457 0.89543,-2 2,-2 c 1.10457,0 2,0.89543 2,2 z"
+               d="m 157,441 a 2,2 0 1 1 -4,0 a 2,2 0 1 1 4,0 z"
                sodipodi:ry="2"
                sodipodi:rx="2"
                sodipodi:cy="441"
@@ -1352,7 +1354,7 @@
                sodipodi:cy="441"
                sodipodi:rx="2"
                sodipodi:ry="2"
-               d="m 157,441 c 0,1.10457 -0.89543,2 -2,2 c -1.10457,0 -2,-0.89543 -2,-2 c 0,-1.10457 0.89543,-2 2,-2 c 1.10457,0 2,0.89543 2,2 z"
+               d="m 157,441 a 2,2 0 1 1 -4,0 a 2,2 0 1 1 4,0 z"
                transform="matrix(0.625,0,0,0.625,55.875,163.98272)" />
             <path
                sodipodi:type="arc"
@@ -1362,11 +1364,11 @@
                sodipodi:cy="441"
                sodipodi:rx="2"
                sodipodi:ry="2"
-               d="m 157,441 c 0,1.10457 -0.89543,2 -2,2 c -1.10457,0 -2,-0.89543 -2,-2 c 0,-1.10457 0.89543,-2 2,-2 c 1.10457,0 2,0.89543 2,2 z"
+               d="m 157,441 a 2,2 0 1 1 -4,0 a 2,2 0 1 1 4,0 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 c 0,1.10457 -0.89543,2 -2,2 c -1.10457,0 -2,-0.89543 -2,-2 c 0,-1.10457 0.89543,-2 2,-2 c 1.10457,0 2,0.89543 2,2 z"
+               d="m 157,441 a 2,2 0 1 1 -4,0 a 2,2 0 1 1 4,0 z"
                sodipodi:ry="2"
                sodipodi:rx="2"
                sodipodi:cy="441"
@@ -1396,7 +1398,7 @@
          id="rc-input-labels"
          transform="translate(0,-2)">
         <path
-           d="m 140,385 c 0,35.89851 -29.10149,65 -65,65 C 39.101491,450 10,420.89851 10,385 c 0,-35.89851 29.101491,-65 65,-65 c 35.89851,0 65,29.10149 65,65 z"
+           d="m 140,385 a 65,65 0 1 1 -130,0 a 65,65 0 1 1 130,0 z"
            sodipodi:ry="65"
            sodipodi:rx="65"
            sodipodi:cy="385"
@@ -1413,7 +1415,7 @@
            sodipodi:cy="385"
            sodipodi:rx="65"
            sodipodi:ry="65"
-           d="m 140,385 c 0,35.89851 -29.10149,65 -65,65 C 39.101491,450 10,420.89851 10,385 c 0,-35.89851 29.101491,-65 65,-65 c 35.89851,0 65,29.10149 65,65 z"
+           d="m 140,385 a 65,65 0 1 1 -130,0 a 65,65 0 1 1 130,0 z"
            transform="matrix(1.1599442,0,0,1.1601679,-0.06770889,-73.769595)" />
         <rect
            y="367.09421"
@@ -1475,7 +1477,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 c 0,5.52285 -4.477153,10 -10,10 c -5.522847,0 -10,-4.47715 -10,-10 c 0,-5.52285 4.477153,-10 10,-10 c 5.522847,0 10,4.47715 10,10 z"
+           d="m 85,385 a 10,10 0 1 1 -20,0 a 10,10 0 1 1 20,0 z"
            sodipodi:ry="10"
            sodipodi:rx="10"
            sodipodi:cy="385"
@@ -1509,7 +1511,8 @@
        inkscape:groupmode="layer"
        id="layer93"
        inkscape:label="rc-throttle"
-       style="display:inline">
+       style="display:inline"
+       sodipodi:insensitive="true">
       <path
          style="fill:#00ff00;fill-opacity:0.6125;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
          d="m 92.727829,445.54335 c -3.74455,0.37024 -7.701236,0.3364 -11.59944,0 l 0,-60.31428 l 11.59944,0 z"
@@ -1521,14 +1524,15 @@
        inkscape:groupmode="layer"
        id="layer87"
        inkscape:label="rc-stick"
-       style="display:inline">
+       style="display:inline"
+       sodipodi:insensitive="true">
       <g
          id="rc-stick"
          style="fill:#e58956;fill-opacity:1"
          transform="matrix(1.1599442,0,0,1.1601679,-0.06770889,-75.769595)">
         <path
            transform="translate(5,0)"
-           d="m 80,385 c 0,5.52285 -4.477153,10 -10,10 c -5.522847,0 -10,-4.47715 -10,-10 c 0,-5.52285 4.477153,-10 10,-10 c 5.522847,0 10,4.47715 10,10 z"
+           d="m 80,385 a 10,10 0 1 1 -20,0 a 10,10 0 1 1 20,0 z"
            sodipodi:ry="10"
            sodipodi:rx="10"
            sodipodi:cy="385"
@@ -1551,7 +1555,8 @@
        inkscape:groupmode="layer"
        id="layer90"
        inkscape:label="rc-input-panel-mousearea"
-       style="display:inline">
+       style="display:inline"
+       sodipodi:insensitive="true">
       <rect
          style="fill:#191919;fill-opacity:0;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="rc-input-panel-mousearea"
@@ -1567,12 +1572,14 @@
      inkscape:groupmode="layer"
      id="layer84"
      inkscape:label="battery-panel"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <g
        inkscape:groupmode="layer"
        id="layer85"
        inkscape:label="battery-bg"
-       style="display:inline">
+       style="display:inline"
+       sodipodi:insensitive="true">
       <g
          id="battery-bg"
          transform="matrix(1.1599442,0,0,1.1601679,-0.0677089,-75.769597)"
@@ -1622,7 +1629,8 @@
     <g
        inkscape:groupmode="layer"
        id="layer88"
-       inkscape:label="battery-labels">
+       inkscape:label="battery-labels"
+       sodipodi:insensitive="true">
       <g
          id="battery-labels"
          transform="translate(0,-2)">
@@ -1704,7 +1712,8 @@
     <g
        inkscape:groupmode="layer"
        id="layer89"
-       inkscape:label="battery-panel-mousearea">
+       inkscape:label="battery-panel-mousearea"
+       sodipodi:insensitive="true">
       <rect
          style="fill:#191919;fill-opacity:0;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          id="battery-panel-mousearea"
@@ -1719,7 +1728,8 @@
        inkscape:groupmode="layer"
        id="layer91"
        inkscape:label="battery-text"
-       style="display:inline">
+       style="display:inline"
+       sodipodi:insensitive="true">
       <g
          id="battery-milliamp-text"
          transform="matrix(0.95,0,0,0.95,-1.4,17.75)">
@@ -2342,67 +2352,7 @@
          style="display:inline"
          sodipodi:insensitive="true">
         <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="matrix(1.0767613,0,0,1.0767613,19.497871,6.4920315)">
-          <path
-             d="m 217.92825,10.523514 l 0,-3.5507815 l 1.07813,0 l 0,9.1171875 l -1.07813,0 l 0,-0.984375 c -0.22656,0.390626 -0.51367,0.681641 -0.86132,0.873047 c -0.34376,0.1875 -0.75782,0.28125 -1.24219,0.28125 c -0.79297,0 -1.43946,-0.316406 -1.93946,-0.949219 c -0.49609,-0.632811 -0.74414,-1.464841 -0.74414,-2.496094 c 0,-1.031245 0.24805,-1.863276 0.74414,-2.496093 c 0.5,-0.6328064 1.14649,-0.9492124 1.93946,-0.9492191 c 0.48437,6.7e-6 0.89843,0.09571 1.24219,0.2871094 c 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 c 0.32813,0.44922 0.77734,0.673829 1.34766,0.673828 c 0.57031,1e-6 1.01953,-0.224608 1.34766,-0.673828 c 0.32812,-0.453123 0.49218,-1.076169 0.49218,-1.869141 c 0,-0.792964 -0.16406,-1.414057 -0.49218,-1.863281 c -0.32813,-0.453119 -0.77735,-0.679682 -1.34766,-0.679687 c -0.57032,5e-6 -1.01953,0.226568 -1.34766,0.679687 c -0.32422,0.449224 -0.48633,1.070317 -0.48632,1.863281"
-             style="font-size:12px;fill:#ff00ff"
-             id="path6344"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 226.84036,12.539139 l 0,0.527344 l -4.95703,0 c 0.0469,0.742189 0.26953,1.308595 0.66797,1.699218 c 0.40234,0.38672 0.96093,0.580079 1.67578,0.580078 c 0.41406,10e-7 0.81445,-0.05078 1.20117,-0.152343 c 0.39062,-0.101562 0.77734,-0.253905 1.16016,-0.457032 l 0,1.019532 c -0.38673,0.164062 -0.78321,0.289062 -1.18945,0.375 c -0.40626,0.08594 -0.81837,0.128906 -1.23633,0.128906 c -1.04688,0 -1.87696,-0.304687 -2.49024,-0.914063 c -0.60937,-0.609373 -0.91406,-1.433591 -0.91406,-2.472656 c 0,-1.074214 0.28906,-1.925776 0.86719,-2.554687 c 0.58203,-0.6328064 1.36523,-0.9492124 2.34961,-0.9492191 c 0.88281,6.7e-6 1.58007,0.2851627 2.0918,0.8554691 c 0.51561,0.566411 0.77343,1.337895 0.77343,2.314453 m -1.07812,-0.316406 c -0.008,-0.58984 -0.17384,-1.060542 -0.49805,-1.41211 c -0.32032,-0.351557 -0.7461,-0.527338 -1.27734,-0.527344 c -0.60157,6e-6 -1.08399,0.169928 -1.44727,0.509766 c -0.35938,0.339849 -0.56641,0.818364 -0.62109,1.435547 l 3.84375,-0.0059"
-             style="font-size:12px;fill:#ff00ff"
-             id="path6346"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 232.79349,9.7207794 l 0,1.0195316 c -0.30469,-0.156245 -0.6211,-0.273432 -0.94922,-0.351563 c -0.32813,-0.07812 -0.66797,-0.117182 -1.01953,-0.117187 c -0.53516,5e-6 -0.9375,0.08204 -1.20703,0.246093 c -0.26563,0.164068 -0.39844,0.410162 -0.39844,0.738282 c 0,0.250004 0.0957,0.44727 0.28711,0.591797 c 0.1914,0.140629 0.57617,0.275394 1.1543,0.404296 l 0.36914,0.08203 c 0.76562,0.164066 1.30858,0.396487 1.6289,0.697265 c 0.32422,0.296878 0.48632,0.712893 0.48633,1.248047 c -1e-5,0.609376 -0.24219,1.091798 -0.72656,1.447266 c -0.48048,0.355469 -1.14258,0.533203 -1.98633,0.533203 c -0.35157,0 -0.71875,-0.03516 -1.10156,-0.105469 c -0.37891,-0.06641 -0.7793,-0.167968 -1.20117,-0.304687 l 0,-1.113282 c 0.39843,0.207033 0.79101,0.363283 1.17773,0.46875 c 0.38672,0.101564 0.76953,0.152345 1.14844,0.152344 c 0.50781,1e-6 0.89843,-0.08594 1.17187,-0.257812 c 0.27344,-0.17578 0.41015,-0.421874 0.41016,-0.738282 c -1e-5,-0.292966 -0.0996,-0.517575 -0.29883,-0.673828 c -0.19532,-0.156247 -0.62696,-0.306638 -1.29492,-0.451172 l -0.375,-0.08789 c -0.66797,-0.140622 -1.15039,-0.355466 -1.44727,-0.644531 c -0.29687,-0.292965 -0.44531,-0.693356 -0.44531,-1.201172 c 0,-0.617182 0.21875,-1.093744 0.65625,-1.4296878 c 0.4375,-0.335931 1.05859,-0.5038996 1.86328,-0.5039063 c 0.39844,6.7e-6 0.77343,0.029304 1.125,0.087891 c 0.35156,0.0586 0.67578,0.1464909 0.97266,0.2636719"
-             style="font-size:12px;fill:#ff00ff"
-             id="path6348"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 239.59036,9.7793732 l 0,1.0078128 c -0.30469,-0.167964 -0.61133,-0.292963 -0.91992,-0.375 c -0.30469,-0.08593 -0.61328,-0.128901 -0.92578,-0.128907 c -0.69922,6e-6 -1.24219,0.222662 -1.62891,0.667969 c -0.38672,0.441411 -0.58008,1.062504 -0.58007,1.863281 c -1e-5,0.800784 0.19335,1.42383 0.58007,1.869141 c 0.38672,0.441407 0.92969,0.66211 1.62891,0.662109 c 0.3125,10e-7 0.62109,-0.04101 0.92578,-0.123046 c 0.30859,-0.08594 0.61523,-0.21289 0.91992,-0.38086 l 0,0.996094 c -0.30078,0.140625 -0.61328,0.246094 -0.9375,0.316406 c -0.32031,0.07031 -0.66211,0.105469 -1.02539,0.105469 c -0.98828,0 -1.77344,-0.310547 -2.35547,-0.931641 c -0.58203,-0.621092 -0.87304,-1.458982 -0.87304,-2.513672 c 0,-1.070308 0.29296,-1.912104 0.8789,-2.52539 c 0.58984,-0.613275 1.39648,-0.9199154 2.41992,-0.9199221 c 0.33203,6.7e-6 0.65625,0.035163 0.97266,0.1054688 c 0.3164,0.066413 0.62304,0.1679752 0.91992,0.3046875"
-             style="font-size:12px;fill:#ff00ff"
-             id="path6350"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 245.27982,10.535233 c -0.1211,-0.07031 -0.25392,-0.121089 -0.39844,-0.152344 c -0.14063,-0.03515 -0.29688,-0.05273 -0.46875,-0.05274 c -0.60938,6e-6 -1.07813,0.199225 -1.40625,0.597657 c -0.32422,0.394536 -0.48633,0.962894 -0.48633,1.705078 l 0,3.457031 l -1.08398,0 l 0,-6.5625 l 1.08398,0 l 0,1.019531 c 0.22656,-0.398431 0.52148,-0.6933528 0.88477,-0.8847653 c 0.36327,-0.1953059 0.80468,-0.2929621 1.32421,-0.2929688 c 0.0742,6.7e-6 0.15625,0.00587 0.2461,0.017578 c 0.0898,0.00782 0.18945,0.021491 0.29883,0.041016 l 0.006,1.1074221"
-             style="font-size:12px;fill:#ff00ff"
-             id="path6352"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 246.42239,9.52742 l 1.07813,0 l 0,6.5625 l -1.07813,0 l 0,-6.5625 m 0,-2.5546875 l 1.07813,0 l 0,1.3652344 l -1.07813,0 l 0,-1.3652344"
-             style="font-size:12px;fill:#ff00ff"
-             id="path6354"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 250.79349,13.241815 l 0,3.018027 l -1.08399,0 l 0,-7.855 l 1.08399,0 l 0,0.8637453 c 0.22656,-0.3387183 0.51171,-0.5893738 0.85547,-0.7519665 c 0.34765,-0.1659688 0.76171,-0.248956 1.24218,-0.2489618 c 0.79687,5.8e-6 1.44336,0.2743717 1.93946,0.8230986 c 0.49999,0.5487361 0.74999,1.2702174 0.75,2.1644434 c -1e-5,0.894232 -0.25001,1.615713 -0.75,2.164443 c -0.4961,0.548733 -1.14259,0.823099 -1.93946,0.823099 c -0.48047,0 -0.89453,-0.08129 -1.24218,-0.243881 c -0.34376,-0.165974 -0.62891,-0.418323 -0.85547,-0.757047 m 3.66797,-1.986614 c -10e-6,-0.687605 -0.16407,-1.226175 -0.49219,-1.6157117 c -0.32422,-0.3929141 -0.77149,-0.5893742 -1.3418,-0.5893786 c -0.57031,4.4e-6 -1.01953,0.1964645 -1.34765,0.5893786 c -0.32423,0.3895367 -0.48633,0.9281067 -0.48633,1.6157117 c 0,0.687611 0.1621,1.227875 0.48633,1.620792 c 0.32812,0.389533 0.77734,0.584299 1.34765,0.584298 c 0.57031,1e-6 1.01758,-0.194765 1.3418,-0.584298 c 0.32812,-0.392917 0.49218,-0.933181 0.49219,-1.620792"
-             style="font-size:12px;fill:#ff00ff"
-             id="path6356"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 258.43411,7.6641388 l 0,1.8632812 l 2.22071,0 l 0,0.837891 l -2.22071,0 l 0,3.5625 c 0,0.535158 0.0723,0.878907 0.2168,1.03125 c 0.14843,0.152344 0.44726,0.228516 0.89648,0.228515 l 1.10743,0 l 0,0.902344 l -1.10743,0 c -0.83203,0 -1.40625,-0.154297 -1.72265,-0.462891 c -0.31641,-0.312499 -0.47461,-0.878904 -0.47461,-1.699218 l 0,-3.5625 l -0.79102,0 l 0,-0.837891 l 0.79102,0 l 0,-1.8632812 l 1.08398,0"
-             style="font-size:12px;fill:#ff00ff"
-             id="path6358"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 262.07864,9.52742 l 1.07813,0 l 0,6.5625 l -1.07813,0 l 0,-6.5625 m 0,-2.5546875 l 1.07813,0 l 0,1.3652344 l -1.07813,0 l 0,-1.3652344"
-             style="font-size:12px;fill:#ff00ff"
-             id="path6360"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 267.94974,10.283279 c -0.57813,6e-6 -1.03516,0.226568 -1.3711,0.679688 c -0.33594,0.449223 -0.5039,1.06641 -0.5039,1.851562 c 0,0.785159 0.16601,1.404299 0.49804,1.857422 c 0.33594,0.44922 0.79492,0.673829 1.37696,0.673828 c 0.57421,10e-7 1.02929,-0.226561 1.36523,-0.679687 c 0.33593,-0.453123 0.5039,-1.07031 0.50391,-1.851563 c -10e-6,-0.777339 -0.16798,-1.392573 -0.50391,-1.845703 c -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 c 0.53515,0.609381 0.80273,1.45313 0.80274,2.53125 c -10e-6,1.074221 -0.26759,1.917971 -0.80274,2.53125 c -0.53516,0.609376 -1.27149,0.914063 -2.20898,0.914063 c -0.94141,0 -1.67969,-0.304687 -2.21485,-0.914063 c -0.53125,-0.613279 -0.79687,-1.457029 -0.79687,-2.53125 c 0,-1.07812 0.26562,-1.921869 0.79687,-2.53125 c 0.53516,-0.6093682 1.27344,-0.9140554 2.21485,-0.9140621"
-             style="font-size:12px;fill:#ff00ff"
-             id="path6362"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 278.19778,12.128983 l 0,3.960937 l -1.07812,0 l 0,-3.925781 c -1e-5,-0.621089 -0.1211,-1.085933 -0.36328,-1.394531 c -0.24219,-0.308589 -0.60548,-0.462885 -1.08985,-0.462891 c -0.58203,6e-6 -1.04101,0.185552 -1.37695,0.556641 c -0.33594,0.371098 -0.50391,0.876957 -0.5039,1.517578 l 0,3.708984 l -1.08399,0 l 0,-6.5625 l 1.08399,0 l 0,1.019531 c 0.25781,-0.394525 0.56054,-0.6894466 0.9082,-0.8847653 c 0.35156,-0.1953059 0.75585,-0.2929621 1.21289,-0.2929688 c 0.7539,6.7e-6 1.32421,0.2343815 1.71094,0.7031251 c 0.38671,0.464849 0.58007,1.150395 0.58007,2.056641"
-             style="font-size:12px;fill:#ff00ff"
-             id="path6364"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="matrix(1.1609977,0,0,1.1609977,-116.51603,5.3196393)"
+           transform="matrix(1.1609977,0,0,1.1609977,-114.51603,5.3196393)"
            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
@@ -2929,7 +2879,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 a 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 c -50.26377,0 -91.01061,-40.74684 -91.01061,-91.01061 c 0,-50.26377 40.74684,-91.01061 91.01061,-91.01061 c 50.26377,0 91.01061,40.74684 91.01061,91.01061 z"
            sodipodi:ry="91.010612"
            sodipodi:rx="91.010612"
            sodipodi:cy="370"
@@ -4694,7 +4644,7 @@
            sodipodi:cy="205"
            sodipodi:rx="46.352551"
            sodipodi:ry="75"
-           d="m 582.79539,230.65151 a 46.352551,75 0 0 1 0,-51.30302"
+           d="m 582.79539,230.65151 c -3.7272,-16.56932 -3.7272,-34.7337 0,-51.30302"
            transform="matrix(6.4484046,0,0,3.9853333,-3146.0425,-599.99333)"
            sodipodi:start="2.7925268"
            sodipodi:end="3.4906585"
@@ -4902,7 +4852,8 @@
      inkscape:groupmode="layer"
      id="layer67"
      inkscape:label="warnings"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <g
        inkscape:groupmode="layer"
        id="layer68"
@@ -5401,7 +5352,8 @@
      id="layer13"
      inkscape:label="pfd-window"
      style="display:none"
-     transform="translate(0,-4)">
+     transform="translate(0,-4)"
+     sodipodi:insensitive="true">
     <rect
        style="fill:none;stroke:none;display:inline"
        id="pfd-window"