From 3d10d33ac3fd02bbc026dcfc7071a8f673150814 Mon Sep 17 00:00:00 2001
From: Laurent Lalanne <f5soh@free.fr>
Date: Thu, 19 Feb 2015 17:44:55 +0100
Subject: [PATCH] OP-1734 Rename elements for FW single servo to
 'aileronsingle'

---
 .../pages/outputcalibrationpage.cpp           |  2 +-
 .../resources/fixedwing-shapes-wizard.svg     | 28 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
index fb4775aa9..c66ae4dc4 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
@@ -205,7 +205,7 @@ void OutputCalibrationPage::setupVehicle()
     case SetupWizard::FIXED_WING_AILERON:
         loadSVGFile(FIXEDWING_SVG_FILE);
         m_wizardIndexes << 0 << 1 << 2 << 2 << 2;
-        m_vehicleElementIds << "aileron-single" << "ail2-frame" << "ail2-motor" << "ail2-aileron" << "ail2-elevator" << "ail2-rudder";
+        m_vehicleElementIds << "singleaileron" << "singleaileron-frame" << "singleaileron-motor" << "singleaileron-aileron" << "singleaileron-elevator" << "singleaileron-rudder";
         m_vehicleHighlightElementIndexes << 0 << 1 << 2 << 3 << 4;
         m_channelIndex << 0 << 2 << 0 << 1 << 3;
 
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes-wizard.svg b/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes-wizard.svg
index c75382518..fead94710 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes-wizard.svg
+++ b/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes-wizard.svg
@@ -23,7 +23,7 @@
    sodipodi:docname="fixedwing-shapes-wizard.svg"><metadata
      id="metadata4103"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs4101"><linearGradient
        gradientTransform="matrix(-1,0,0,1,384.8662,397)"
        y2="254.2417"
@@ -966,13 +966,13 @@
      inkscape:window-height="928"
      id="namedview4099"
      showgrid="false"
-     inkscape:zoom="6.6234143"
-     inkscape:cx="294.48102"
-     inkscape:cy="421.89869"
+     inkscape:zoom="0.78353186"
+     inkscape:cx="318.51398"
+     inkscape:cy="1031.7134"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="vtail-motor"
+     inkscape:current-layer="Layer_1"
      showborder="true"
      inkscape:showpageshadow="false"
      showguides="false"
@@ -3110,10 +3110,10 @@
          inkscape:connector-curvature="0"
          d="M 386.01238,1048.3013 L 388.32238,1047.9932 C 388.58738,1049.3022 389.03938,1050.2463 389.67638,1050.8203 C 390.31338,1051.3983 391.09238,1051.6872 392.00838,1051.6872 C 393.09538,1051.6872 394.01338,1051.3102 394.76138,1050.5583 C 395.51038,1049.8043 395.88338,1048.8723 395.88338,1047.7593 C 395.88338,1046.6962 395.53538,1045.8213 394.84538,1045.1343 C 394.15238,1044.4463 393.27038,1044.1012 392.19939,1044.1012 C 391.76138,1044.1012 391.22039,1044.1872 390.56938,1044.3593 L 390.82539,1042.3322 C 390.97938,1042.3502 391.10438,1042.3562 391.19838,1042.3562 C 392.18239,1042.3562 393.06939,1042.0992 393.85638,1041.5852 C 394.64338,1041.0691 395.03639,1040.2782 395.03639,1039.2112 C 395.03639,1038.3632 394.75138,1037.6632 394.17938,1037.1072 C 393.60538,1036.5512 392.86638,1036.2732 391.95638,1036.2732 C 391.05938,1036.2732 390.31038,1036.5552 389.71038,1037.1222 C 389.11138,1037.6852 388.72638,1038.5322 388.55438,1039.6632 L 386.24439,1039.2522 C 386.52638,1037.7032 387.16738,1036.5042 388.16938,1035.6502 C 389.16939,1034.7982 390.41538,1034.3752 391.90438,1034.3752 C 392.92938,1034.3752 393.87738,1034.5962 394.74038,1035.0372 C 395.60438,1035.4752 396.26438,1036.0772 396.72338,1036.8402 C 397.18038,1037.6022 397.40938,1038.4092 397.40938,1039.2662 C 397.40938,1040.0792 397.19038,1040.8191 396.75539,1041.4872 C 396.31938,1042.1531 395.67338,1042.6842 394.81838,1043.0812 C 395.92838,1043.3372 396.79438,1043.8682 397.40938,1044.6792 C 398.02638,1045.4872 398.33338,1046.4992 398.33338,1047.7142 C 398.33338,1049.3572 397.73538,1050.7492 396.53838,1051.8922 C 395.33938,1053.0341 393.82438,1053.6051 391.99339,1053.6051 C 390.34238,1053.6051 388.97139,1053.1131 387.88038,1052.1292 C 386.78838,1051.1432 386.16538,1049.8681 386.01238,1048.3012 z"
          id="path3977-3-3-9" /></g></g><g
-     id="aileron-single"><g
+     id="singleaileron"><g
        transform="translate(-67.999261,-57.002699)"
        inkscape:label="#ail2-frame"
-       id="ail2-frame"><line
+       id="singleaileron-frame"><line
          id="aileron-ground-1"
          y2="1870.9263"
          x2="521.97577"
@@ -3204,7 +3204,7 @@
            id="path2613_1_-7"
            d="M 411.702,1616.701 V 1618.021 H 413.044 V 1616.701 H 411.702 z M 413.979,1616.701 V 1622.724 V 1622.736 C 413.979,1623.082 414.043,1623.404 414.17,1623.703 C 414.295,1624.002 414.471,1624.264 414.699,1624.484 C 414.926,1624.713 415.189,1624.886 415.488,1625.023 C 415.787,1625.148 416.101,1625.211 416.443,1625.211 H 416.714 V 1623.947 L 416.466,1623.937 C 416.153,1623.914 415.878,1623.785 415.652,1623.556 C 415.548,1623.447 415.466,1623.324 415.404,1623.179 C 415.347,1623.038 415.326,1622.886 415.326,1622.72 V 1616.698 L 413.979,1616.699 L 413.979,1616.699 z M 427.073,1617.373 V 1618.873 H 426.469 V 1620.144 H 427.073 V 1622.749 C 427.073,1623.095 427.135,1623.417 427.261,1623.716 C 427.394,1624.005 427.572,1624.265 427.79,1624.491 C 428.019,1624.72 428.282,1624.893 428.581,1625.021 C 428.88,1625.146 429.202,1625.209 429.548,1625.209 H 430.515 V 1623.938 H 429.56 C 429.232,1623.915 428.96,1623.786 428.749,1623.557 C 428.645,1623.448 428.56,1623.325 428.497,1623.18 C 428.442,1623.039 428.417,1622.887 428.417,1622.733 V 1620.139 H 430.515 V 1619.869 V 1618.867 H 428.417 V 1617.367 H 427.072 L 427.073,1617.377 L 427.073,1617.377 z M 395.865,1619.129 C 395.519,1619.129 395.197,1619.199 394.898,1619.332 C 394.607,1619.459 394.349,1619.635 394.121,1619.863 C 393.893,1620.09 393.712,1620.353 393.587,1620.652 C 393.461,1620.943 393.401,1621.257 393.401,1621.605 V 1625.21 H 394.743 V 1621.616 C 394.743,1621.278 394.861,1620.991 395.097,1620.755 C 395.207,1620.648 395.335,1620.558 395.476,1620.495 C 395.625,1620.432 395.779,1620.403 395.944,1620.403 H 399.057 C 399.221,1620.403 399.378,1620.43 399.52,1620.495 C 399.669,1620.557 399.799,1620.645 399.911,1620.755 C 400.145,1620.991 400.265,1621.278 400.265,1621.616 V 1625.21 H 400.65 H 401.607 H 402.544 V 1627.636 H 403.892 V 1625.21 H 405.021 H 407.802 H 408.296 C 408.634,1625.21 408.956,1625.147 409.255,1625.022 C 409.552,1624.895 409.812,1624.717 410.04,1624.491 C 410.268,1624.263 410.448,1624.005 410.573,1623.716 C 410.7,1623.417 410.759,1623.095 410.759,1622.749 V 1621.618 C 410.759,1621.272 410.7,1620.95 410.573,1620.651 C 410.448,1620.352 410.266,1620.088 410.04,1619.862 C 409.811,1619.633 409.552,1619.458 409.255,1619.331 C 408.956,1619.206 408.634,1619.142 408.296,1619.142 H 405.021 C 404.675,1619.142 404.353,1619.206 404.054,1619.331 C 403.763,1619.458 403.505,1619.634 403.279,1619.862 C 403.05,1620.089 402.871,1620.352 402.736,1620.651 C 402.611,1620.95 402.547,1621.272 402.547,1621.618 V 1623.94 H 401.611 V 1621.618 V 1621.604 C 401.611,1621.256 401.547,1620.942 401.422,1620.651 C 401.297,1620.352 401.119,1620.088 400.893,1619.862 C 400.665,1619.633 400.404,1619.458 400.103,1619.331 C 399.812,1619.198 399.498,1619.128 399.151,1619.128 H 395.865 L 395.865,1619.129 z M 411.702,1619.129 V 1625.213 H 413.044 V 1619.129 H 411.702 z M 368.386,1619.143 C 368.04,1619.143 367.718,1619.207 367.42,1619.332 C 367.121,1619.459 366.863,1619.635 366.643,1619.863 C 366.415,1620.09 366.234,1620.353 366.1,1620.652 C 365.975,1620.951 365.915,1621.273 365.915,1621.619 V 1622.75 C 365.915,1623.096 365.975,1623.418 366.1,1623.717 C 366.234,1624.006 366.415,1624.266 366.643,1624.492 C 366.863,1624.721 367.122,1624.896 367.42,1625.023 C 367.718,1625.148 368.041,1625.211 368.386,1625.211 H 370.841 H 371.653 H 375.074 V 1627.637 H 376.421 V 1625.211 H 377.551 H 377.992 H 380.826 C 381.164,1625.211 381.485,1625.148 381.784,1625.023 C 382.083,1624.896 382.346,1624.718 382.574,1624.492 C 382.802,1624.263 382.978,1624.006 383.104,1623.717 C 383.229,1623.418 383.293,1623.096 383.294,1622.75 V 1621.619 C 383.294,1621.273 383.23,1620.951 383.104,1620.652 C 382.978,1620.353 382.802,1620.089 382.574,1619.863 C 382.346,1619.634 382.083,1619.459 381.784,1619.332 C 381.485,1619.207 381.164,1619.143 380.826,1619.143 H 377.551 C 377.205,1619.143 376.883,1619.207 376.584,1619.332 C 376.293,1619.459 376.035,1619.635 375.807,1619.863 C 375.579,1620.09 375.398,1620.353 375.264,1620.652 C 375.139,1620.951 375.075,1621.273 375.074,1621.619 V 1623.941 H 373.825 C 373.866,1623.867 373.906,1623.793 373.94,1623.714 C 374.066,1623.415 374.13,1623.093 374.13,1622.747 V 1621.616 C 374.13,1621.27 374.066,1620.948 373.94,1620.649 C 373.814,1620.35 373.638,1620.086 373.41,1619.86 C 373.182,1619.631 372.919,1619.456 372.62,1619.329 C 372.321,1619.204 371.999,1619.141 371.653,1619.141 H 368.386 L 368.386,1619.141 z M 386.714,1619.143 C 386.368,1619.143 386.046,1619.207 385.747,1619.332 C 385.449,1619.459 385.19,1619.635 384.97,1619.863 C 384.742,1620.09 384.56,1620.353 384.427,1620.652 C 384.301,1620.943 384.237,1621.257 384.237,1621.605 V 1622.736 C 384.237,1623.082 384.301,1623.404 384.427,1623.703 C 384.56,1624.002 384.742,1624.265 384.97,1624.492 C 385.19,1624.721 385.449,1624.896 385.747,1625.023 C 386.046,1625.148 386.368,1625.211 386.714,1625.211 H 391.711 V 1623.94 H 386.794 C 386.456,1623.94 386.173,1623.823 385.938,1623.586 C 385.852,1623.492 385.775,1623.387 385.713,1623.269 C 385.65,1623.153 385.609,1623.024 385.594,1622.889 H 392.453 V 1621.606 C 392.453,1621.258 392.389,1620.944 392.264,1620.653 C 392.138,1620.353 391.962,1620.09 391.734,1619.864 C 391.506,1619.635 391.242,1619.46 390.944,1619.333 C 390.645,1619.208 390.323,1619.144 389.977,1619.144 H 386.714 L 386.714,1619.143 z M 420.138,1619.143 C 419.792,1619.143 419.47,1619.207 419.171,1619.332 C 418.872,1619.459 418.614,1619.635 418.398,1619.863 C 418.169,1620.09 417.988,1620.353 417.853,1620.652 C 417.726,1620.951 417.667,1621.273 417.667,1621.619 V 1622.75 C 417.667,1623.096 417.726,1623.418 417.853,1623.717 C 417.988,1624.006 418.167,1624.266 418.398,1624.492 C 418.617,1624.721 418.875,1624.896 419.171,1625.023 C 419.47,1625.148 419.792,1625.211 420.138,1625.211 H 423.408 C 423.754,1625.211 424.076,1625.148 424.373,1625.023 C 424.672,1624.896 424.935,1624.718 425.164,1624.492 C 425.393,1624.263 425.568,1624.006 425.693,1623.717 C 425.82,1623.418 425.881,1623.096 425.881,1622.75 V 1621.619 C 425.881,1621.273 425.819,1620.951 425.693,1620.652 C 425.568,1620.353 425.39,1620.089 425.164,1619.863 C 424.935,1619.634 424.672,1619.459 424.373,1619.332 C 424.076,1619.207 423.754,1619.143 423.408,1619.143 H 420.138 z M 368.47,1620.414 H 371.569 C 371.907,1620.414 372.194,1620.531 372.429,1620.768 C 372.539,1620.877 372.627,1621.012 372.69,1621.163 C 372.753,1621.304 372.783,1621.458 372.783,1621.632 V 1622.739 C 372.783,1622.903 372.753,1623.059 372.69,1623.212 C 372.627,1623.353 372.54,1623.483 372.429,1623.591 C 372.194,1623.827 371.907,1623.945 371.569,1623.945 H 371.185 H 368.47 C 368.132,1623.945 367.845,1623.828 367.609,1623.591 C 367.499,1623.484 367.412,1623.355 367.349,1623.212 C 367.286,1623.062 367.256,1622.903 367.256,1622.739 V 1621.632 C 367.256,1621.458 367.286,1621.304 367.349,1621.163 C 367.412,1621.015 367.499,1620.88 367.609,1620.768 C 367.845,1620.531 368.132,1620.414 368.47,1620.414 z M 377.634,1620.414 H 380.733 C 381.071,1620.414 381.358,1620.531 381.594,1620.768 C 381.83,1621.005 381.947,1621.291 381.947,1621.629 V 1622.736 C 381.947,1623.082 381.83,1623.367 381.594,1623.588 C 381.358,1623.824 381.071,1623.942 380.733,1623.942 H 378.416 H 376.421 V 1622.737 V 1622.106 V 1621.627 C 376.421,1621.453 376.451,1621.299 376.514,1621.158 C 376.585,1621.01 376.678,1620.875 376.787,1620.763 C 377.006,1620.531 377.288,1620.414 377.634,1620.414 z M 386.793,1620.414 H 389.896 C 390.234,1620.414 390.521,1620.531 390.757,1620.768 C 390.867,1620.877 390.95,1621.012 391.013,1621.163 C 391.076,1621.304 391.11,1621.458 391.11,1621.622 H 385.579 C 385.579,1621.458 385.613,1621.304 385.676,1621.163 C 385.739,1621.015 385.827,1620.88 385.937,1620.768 C 386.173,1620.531 386.456,1620.414 386.793,1620.414 z M 405.099,1620.414 H 408.201 C 408.539,1620.414 408.826,1620.531 409.058,1620.768 C 409.294,1621.004 409.412,1621.291 409.412,1621.629 V 1622.736 C 409.412,1623.082 409.295,1623.367 409.058,1623.588 C 408.829,1623.818 408.548,1623.936 408.22,1623.942 H 403.886 V 1622.737 V 1622.106 V 1621.627 C 403.886,1621.453 403.915,1621.299 403.978,1621.158 C 404.048,1621.01 404.138,1620.875 404.249,1620.763 C 404.468,1620.531 404.753,1620.414 405.099,1620.414 z M 420.222,1620.414 H 423.324 C 423.662,1620.414 423.949,1620.531 424.181,1620.768 C 424.292,1620.877 424.378,1621.012 424.445,1621.163 C 424.507,1621.304 424.537,1621.458 424.537,1621.632 V 1622.739 C 424.537,1622.903 424.508,1623.059 424.445,1623.212 C 424.381,1623.353 424.295,1623.483 424.181,1623.591 C 423.949,1623.827 423.66,1623.945 423.324,1623.945 H 420.222 C 419.884,1623.945 419.597,1623.828 419.363,1623.591 C 419.254,1623.484 419.166,1623.355 419.101,1623.212 C 419.039,1623.062 419.009,1622.903 419.009,1622.739 V 1621.632 C 419.009,1621.458 419.038,1621.304 419.101,1621.163 C 419.164,1621.015 419.251,1620.88 419.363,1620.768 C 419.597,1620.531 419.884,1620.414 420.222,1620.414 z" /></g></g><g
        transform="translate(-67.999261,-57.002699)"
-       id="ail2-elevator"><rect
+       id="singleaileron-elevator"><rect
          style="fill:url(#linearGradient5658);fill-opacity:1;stroke:#010101;stroke-width:0.69120002;stroke-linecap:round;stroke-linejoin:round"
          x="304.30276"
          y="2318.906"
@@ -3459,7 +3459,7 @@
                r="2.75"
                id="circle3915-5" /><polygon
                style="fill:#ffffff"
-               points="410.22,716.418 409.938,716.137 408.685,717.391 407.431,716.137 407.149,716.418 408.403,717.672 407.149,718.926 407.431,719.207 408.685,717.953 409.938,719.207 410.22,718.926 408.966,717.672 "
+               points="407.149,718.926 407.431,719.207 408.685,717.953 409.938,719.207 410.22,718.926 408.966,717.672 410.22,716.418 409.938,716.137 408.685,717.391 407.431,716.137 407.149,716.418 408.403,717.672 "
                id="polygon3917-2" /></g></g></g><rect
          style="fill:#414042"
          x="378.33176"
@@ -3508,7 +3508,7 @@
            inkscape:connector-curvature="0"
            style="fill:#ffffff" /></g></g><g
        transform="translate(-67.999261,-57.002699)"
-       id="ail2-motor"><g
+       id="singleaileron-motor"><g
          transform="matrix(0.88309625,0,0,0.88309625,100.8884,1741.6122)"
          style="opacity:0.72250001"
          id="g4071-8-6"><path
@@ -3550,7 +3550,7 @@
            inkscape:connector-curvature="0"
            style="opacity:0.72250001;fill:#ffffff" /></g></g><g
        transform="translate(-67.999261,-57.002699)"
-       id="ail2-aileron"><g
+       id="singleaileron-aileron"><g
          transform="translate(-12.266231,1452.4651)"
          id="aileron-right-raster-1"><path
            d="M 661.634,640.438 V 661.66"
@@ -4072,7 +4072,7 @@
              r="2.75"
              id="circle3853-4" /><polygon
              style="fill:#ffffff"
-             points="215.59,612.367 214.336,613.621 215.59,614.875 215.309,615.156 214.055,613.901 212.801,615.156 212.52,614.875 213.773,613.621 212.52,612.367 212.801,612.086 214.055,613.34 215.309,612.086 "
+             points="212.52,614.875 213.773,613.621 212.52,612.367 212.801,612.086 214.055,613.34 215.309,612.086 215.59,612.367 214.336,613.621 215.59,614.875 215.309,615.156 214.055,613.901 212.801,615.156 "
              id="polygon3855-2" /></g></g><g
          transform="matrix(0,0.58777664,-8.288065,0,17650.068,1958.4359)"
          id="g6056-3"><g
@@ -4140,7 +4140,7 @@
            height="36.404999"
            id="rect3816-4" /></g></g><g
        transform="translate(-67.999261,-57.002699)"
-       id="ail2-rudder"><g
+       id="singleaileron-rudder"><g
          id="g3933-4"
          transform="translate(-12.266231,1452.465)"><g
            id="g3935-8"><rect
@@ -4205,7 +4205,7 @@
                r="2.75"
                id="circle3889-7" /><polygon
                style="fill:#ffffff"
-               points="383.697,687.172 382.443,688.426 382.162,688.145 383.416,686.891 382.162,685.637 382.443,685.355 383.697,686.609 384.951,685.355 385.232,685.637 383.978,686.891 385.232,688.145 384.951,688.426 "
+               points="383.697,686.609 384.951,685.355 385.232,685.637 383.978,686.891 385.232,688.145 384.951,688.426 383.697,687.172 382.443,688.426 382.162,688.145 383.416,686.891 382.162,685.637 382.443,685.355 "
                id="polygon3891-7" /></g></g></g><g
          style="opacity:0.85"
          id="g5219-4-5-5"