Skip to content
GitLab
Commit faea3168 authored by Don Gagne's avatar Don Gagne
Browse files

Merge pull request #2602 from DonLakeFlyer/AirframeIcons 

Use new Airframe Icons + Naming
parents 935fd3ea adbb50e2
Expand all Hide whitespace changes
Inline Side-by-side
qgcresources.qrc
View file @ faea3168
<RCC> <RCC>
<qresource prefix="/qmlimages"> <qresource prefix="/qmlimages">
<file alias="AirframeComponentIcon.png">src/AutoPilotPlugins/PX4/Images/AirframeComponentIcon.png</file> <file alias="AirframeComponentIcon.png">src/AutoPilotPlugins/Common/Images/AirframeComponentIcon.png</file>
<file alias="AirframeFlyingWing.png">src/AutoPilotPlugins/PX4/Images/AirframeFlyingWing.png</file>
<file alias="AirframeHexaRotorPlus.png">src/AutoPilotPlugins/PX4/Images/AirframeHexaRotorPlus.png</file> <!-- These are here for back compat with previous airframe meta data -->
<file alias="AirframeHexaRotorX.png">src/AutoPilotPlugins/PX4/Images/AirframeHexaRotorX.png</file> <file alias="AirframeFlyingWing.png">src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
<file alias="AirframeOctoRotorPlus.png">src/AutoPilotPlugins/PX4/Images/AirframeOctoRotorPlus.png</file> <file alias="AirframeHexaRotorPlus.png">src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
<file alias="AirframeOctoRotorX.png">src/AutoPilotPlugins/PX4/Images/AirframeOctoRotorX.png</file> <file alias="AirframeHexaRotorX.png">src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
<file alias="AirframeQuadRotorH.png">src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorH.png</file> <file alias="AirframeOctoRotorPlus.png">src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
<file alias="AirframeQuadRotorPlus.png">src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorPlus.png</file> <file alias="AirframeOctoRotorX.png">src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
<file alias="AirframeQuadRotorX.png">src/AutoPilotPlugins/PX4/Images/AirframeQuadRotorX.png</file> <file alias="AirframeQuadRotorH.png">src/AutoPilotPlugins/Common/Images/QuadRotorH.png</file>
<file alias="AirframeSimulation.png">src/AutoPilotPlugins/PX4/Images/AirframeSimulation.png</file> <file alias="AirframeQuadRotorPlus.png">src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
<file alias="AirframeStandardPlane.png">src/AutoPilotPlugins/PX4/Images/AirframeStandardPlane.png</file> <file alias="AirframeQuadRotorX.png">src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
<file alias="AirframeSimulation.png">src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
<file alias="AirframeStandardPlane.png">src/AutoPilotPlugins/Common/Images/Plane.svg</file>
<!-- Aiframe images supported by airfame meta data ml image tag -->
<file alias="Airframe/AirframeSimulation">src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg</file>
<file alias="Airframe/AirframeUnknown">src/AutoPilotPlugins/Common/Images/AirframeUnknown.svg</file>
<file alias="Airframe/Boat">src/AutoPilotPlugins/Common/Images/Boat.svg</file>
<file alias="Airframe/FlyingWing">src/AutoPilotPlugins/Common/Images/FlyingWing.svg</file>
<file alias="Airframe/Helicopter">src/AutoPilotPlugins/Common/Images/Helicopter.png</file>
<file alias="Airframe/HelicopterCoaxial">src/AutoPilotPlugins/Common/Images/HelicopterCoaxial.png</file>
<file alias="Airframe/HexaRotorPlus">src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg</file>
<file alias="Airframe/HexaRotorX">src/AutoPilotPlugins/Common/Images/HexaRotorX.svg</file>
<file alias="Airframe/OctoRotorPlus">src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg</file>
<file alias="Airframe/OctoRotorPlusCoaxial">src/AutoPilotPlugins/Common/Images/OctoRotorPlusCoaxial.svg</file>
<file alias="Airframe/OctoRotorX">src/AutoPilotPlugins/Common/Images/OctoRotorX.svg</file>
<file alias="Airframe/OctoRotorXCoaxial">src/AutoPilotPlugins/Common/Images/OctoRotorXCoaxial.svg</file>
<file alias="Airframe/Plane">src/AutoPilotPlugins/Common/Images/Plane.svg</file>
<file alias="Airframe/PlaneATail">src/AutoPilotPlugins/Common/Images/PlaneATail.svg</file>
<file alias="Airframe/QuadRotorATail">src/AutoPilotPlugins/Common/Images/QuadRotorATail.png</file>
<file alias="Airframe/QuadRotorH">src/AutoPilotPlugins/Common/Images/QuadRotorH.png</file>
<file alias="Airframe/QuadRotorPlus">src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg</file>
<file alias="Airframe/QuadRotorVTail">src/AutoPilotPlugins/Common/Images/QuadRotorVTail.png</file>
<file alias="Airframe/QuadRotorWide">src/AutoPilotPlugins/Common/Images/QuadRotorWide.svg</file>
<file alias="Airframe/QuadRotorX">src/AutoPilotPlugins/Common/Images/QuadRotorX.svg</file>
<file alias="Airframe/Rover">src/AutoPilotPlugins/Common/Images/Rover.svg</file>
<file alias="Airframe/VTOLDuoRotorTailSitter">src/AutoPilotPlugins/Common/Images/VTOLDuoRotorTailSitter.svg</file>
<file alias="Airframe/VTOLPlane">src/AutoPilotPlugins/Common/Images/VTOLPlane.svg</file>
<file alias="Airframe/VTOLQuadRotorTailSitter">src/AutoPilotPlugins/Common/Images/VTOLQuadRotorTailSitter.svg</file>
<file alias="Airframe/VTOLTiltRotor">src/AutoPilotPlugins/Common/Images/VTOLTiltRotor.svg</file>
<file alias="Airframe/Y6A">src/AutoPilotPlugins/Common/Images/Y6A.png</file>
<file alias="Airframe/Y6B">src/AutoPilotPlugins/Common/Images/Y6B.png</file>
<file alias="Airframe/YMinus">src/AutoPilotPlugins/Common/Images/YMinus.svg</file>
<file alias="Airframe/YPlus">src/AutoPilotPlugins/Common/Images/YPlus.svg</file>
<file alias="arrow-down.png">src/QmlControls/arrow-down.png</file> <file alias="arrow-down.png">src/QmlControls/arrow-down.png</file>
<file alias="FirmwareUpgradeIcon.png">src/VehicleSetup/FirmwareUpgradeIcon.png</file> <file alias="FirmwareUpgradeIcon.png">src/VehicleSetup/FirmwareUpgradeIcon.png</file>
<file alias="FlightModesComponentIcon.png">src/AutoPilotPlugins/PX4/Images/FlightModesComponentIcon.png</file> <file alias="FlightModesComponentIcon.png">src/AutoPilotPlugins/PX4/Images/FlightModesComponentIcon.png</file>
......
src/AutoPilotPlugins/Common/Images/AirframeSimulation.svg 0 → 100644
View file @ faea3168
<svg id="proposal" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 292.04 291.78"><defs><style>.cls-1{fill:none;stroke:#aaa;}.cls-1,.cls-3{stroke-miterlimit:10;}.cls-2{fill:#fff;}.cls-3{font-size:81.95px;fill:#ff442b;stroke:#000;font-family:Open Sans;font-weight:700;}</style></defs><title>AirframeUnknown</title><path class="cls-1" d="M519.57,666.42a50.8,50.8,0,0,0-33.68,12.84l-27-26.81a9.86,9.86,0,0,0,.66-3.52V597.74a9.86,9.86,0,0,0-.83-4l27.14-27a51,51,0,1,0-4.52-4.54l-27,26.79a9.86,9.86,0,0,0-4.75-1.21H398.5a9.87,9.87,0,0,0-3.21.54L369,562.25a51,51,0,1,0-4.52,4.54l25.71,25.56a9.85,9.85,0,0,0-1.61,5.4v51.19a9.85,9.85,0,0,0,1.36,5l-25.47,25.32a51,51,0,1,0,4.52,4.54l25.81-25.66a9.87,9.87,0,0,0,3.68.71h51.19a9.84,9.84,0,0,0,5.13-1.45l26.55,26.41A51,51,0,1,0,519.57,666.42Z" transform="translate(-279.18 -477.13)"/><path class="cls-1" d="M519.73,517.41a11.21,11.21,0,1,0,11.2,11.26A11.18,11.18,0,0,0,519.73,517.41Z" transform="translate(-279.18 -477.13)"/><path class="cls-1" d="M330.66,517.41a11.21,11.21,0,1,1-11.2,11.26A11.18,11.18,0,0,1,330.66,517.41Z" transform="translate(-279.18 -477.13)"/><path class="cls-1" d="M330.66,728.62a11.21,11.21,0,1,0-11.2-11.26A11.18,11.18,0,0,0,330.66,728.62Z" transform="translate(-279.18 -477.13)"/><path class="cls-1" d="M519.73,728.62a11.21,11.21,0,1,1,11.2-11.26A11.18,11.18,0,0,1,519.73,728.62Z" transform="translate(-279.18 -477.13)"/><path class="cls-2" d="M425.2,672a48.49,48.49,0,0,1-.13-97h0.13a48.49,48.49,0,0,1,.13,97H425.2Z" transform="translate(-279.18 -477.13)"/><path d="M425.2,575.48a48,48,0,0,1,.13,96H425.2a48,48,0,0,1-.13-96h0.13m0-1h-0.14a49,49,0,0,0,.14,98h0.14a49,49,0,0,0-.14-98h0Z" transform="translate(-279.18 -477.13)"/><text class="cls-3" transform="translate(126.59 177.65)">?</text></svg>
\ No newline at end of file
src/AutoPilotPlugins/Common/Images/AirframeUnknown.svg 0 → 100644
View file @ faea3168
<svg id="proposal" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 292.04 291.78"><defs><style>.cls-1{fill:none;stroke:#aaa;}.cls-1,.cls-3{stroke-miterlimit:10;}.cls-2{fill:#fff;}.cls-3{font-size:81.95px;fill:#ff442b;stroke:#000;font-family:Open Sans;font-weight:700;}</style></defs><title>AirframeUnknown</title><path class="cls-1" d="M519.57,666.42a50.8,50.8,0,0,0-33.68,12.84l-27-26.81a9.86,9.86,0,0,0,.66-3.52V597.74a9.86,9.86,0,0,0-.83-4l27.14-27a51,51,0,1,0-4.52-4.54l-27,26.79a9.86,9.86,0,0,0-4.75-1.21H398.5a9.87,9.87,0,0,0-3.21.54L369,562.25a51,51,0,1,0-4.52,4.54l25.71,25.56a9.85,9.85,0,0,0-1.61,5.4v51.19a9.85,9.85,0,0,0,1.36,5l-25.47,25.32a51,51,0,1,0,4.52,4.54l25.81-25.66a9.87,9.87,0,0,0,3.68.71h51.19a9.84,9.84,0,0,0,5.13-1.45l26.55,26.41A51,51,0,1,0,519.57,666.42Z" transform="translate(-279.18 -477.13)"/><path class="cls-1" d="M519.73,517.41a11.21,11.21,0,1,0,11.2,11.26A11.18,11.18,0,0,0,519.73,517.41Z" transform="translate(-279.18 -477.13)"/><path class="cls-1" d="M330.66,517.41a11.21,11.21,0,1,1-11.2,11.26A11.18,11.18,0,0,1,330.66,517.41Z" transform="translate(-279.18 -477.13)"/><path class="cls-1" d="M330.66,728.62a11.21,11.21,0,1,0-11.2-11.26A11.18,11.18,0,0,0,330.66,728.62Z" transform="translate(-279.18 -477.13)"/><path class="cls-1" d="M519.73,728.62a11.21,11.21,0,1,1,11.2-11.26A11.18,11.18,0,0,1,519.73,728.62Z" transform="translate(-279.18 -477.13)"/><path class="cls-2" d="M425.2,672a48.49,48.49,0,0,1-.13-97h0.13a48.49,48.49,0,0,1,.13,97H425.2Z" transform="translate(-279.18 -477.13)"/><path d="M425.2,575.48a48,48,0,0,1,.13,96H425.2a48,48,0,0,1-.13-96h0.13m0-1h-0.14a49,49,0,0,0,.14,98h0.14a49,49,0,0,0-.14-98h0Z" transform="translate(-279.18 -477.13)"/><text class="cls-3" transform="translate(126.59 177.65)">?</text></svg>
\ No newline at end of file
src/AutoPilotPlugins/Common/Images/Boat.svg 0 → 100644
View file @ faea3168
<svg id="proposal" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 110 343.95"><defs><style>.cls-1{fill:#4ec3e8;}.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-2{fill:#fff;}.cls-3{fill:#159e1f;}</style></defs><title>AirframeBoat</title><path class="cls-1" d="M2073.56,2105.13s3.35,0.53,13.77,19.42,35.31,61.45,37.78,140.92,4.24,177.29,1.77,180.12-53,2.47-53,2.47h-0.68s-50.5.35-53-2.47-0.71-100.66,1.77-180.12,27.37-122,37.78-140.92,13.77-19.42,13.77-19.42h0Z" transform="translate(-2018.57 -2104.63)"/><path class="cls-1" d="M2110.3,2287.37c-11.3-39.2-36-35.49-36-35.49s-24.72-3.71-36,35.49-1.06,143.39,1.06,160.34c6.94,0,25.05.16,36,.27v0.09l3.61-.05,5.22,0.05v-0.12c7.81-.1,18.89-0.23,25.08-0.23C2111.36,2430.76,2121.6,2326.57,2110.3,2287.37Z" transform="translate(-2018.57 -2104.63)"/><path class="cls-2" d="M2074.28,2294.78c18.78,0,34.82,19.64,41.23,47.34-0.1-21.69-1.48-41.79-5.22-54.76-11.3-39.2-36-35.49-36-35.49s-24.72-3.71-36,35.49c-3.74,13-5.12,33.07-5.22,54.76C2039.46,2314.43,2055.5,2294.78,2074.28,2294.78Z" transform="translate(-2018.57 -2104.63)"/><polygon class="cls-3" points="55.72 308.01 11.62 316.39 11.62 330.71 55.72 330.84 55.72 330.85 99.81 330.72 99.81 316.4 55.72 308.01"/></svg>
\ No newline at end of file
src/AutoPilotPlugins/Common/Images/FlyingWing.svg 0 → 100644
View file @ faea3168
<svg id="proposal" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 427.04 151.02"><defs><style>.cls-1{fill:#4ec3e8;}.cls-1,.cls-2{stroke:#000;stroke-miterlimit:10;}.cls-2{fill:#159e1f;}</style></defs><title>AirframeFlyingWing</title><polygon class="cls-1" points="0.5 103.86 0.5 150.39 195.88 106.01 233.75 106.01 426.55 150.39 426.55 103.86 214.48 0.56 0.5 103.86"/><polygon class="cls-2" points="169.83 88.82 20.5 127.47 20.5 145.85 169.83 111.93 169.83 88.82"/><polygon class="cls-2" points="260.76 89.11 410.09 127.76 410.09 146.6 260.76 112.22 260.76 89.11"/></svg>
\ No newline at end of file
src/AutoPilotPlugins/Common/Images/HexaRotorPlus.svg 0 → 100644
View file @ faea3168
This source diff could not be displayed because it is too large. You can view the blob instead.
src/AutoPilotPlugins/Common/Images/HexaRotorX.svg 0 → 100644
View file @ faea3168
This source diff could not be displayed because it is too large. You can view the blob instead.
src/AutoPilotPlugins/Common/Images/OctoRotorPlus.svg 0 → 100644
View file @ faea3168
This source diff could not be displayed because it is too large. You can view the blob instead.
src/AutoPilotPlugins/Common/Images/OctoRotorPlusCoaxial.svg 0 → 100644
View file @ faea3168
This diff is collapsed.
src/AutoPilotPlugins/Common/Images/OctoRotorX.svg 0 → 100644
View file @ faea3168
This diff is collapsed.
src/AutoPilotPlugins/Common/Images/OctoRotorXCoaxial.svg 0 → 100644
View file @ faea3168
This diff is collapsed.
src/AutoPilotPlugins/Common/Images/Plane.svg 0 → 100644
View file @ faea3168
<svg id="proposal" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 387.57 271.67"><defs><style>.cls-1{fill:#4ec3e8;}.cls-1,.cls-2{stroke:#000;stroke-miterlimit:10;}.cls-2{fill:#159e1f;}</style></defs><title>AirframeStandardPlane</title><path class="cls-1" d="M2076.12,1311.33h59.05c-12.67-25.33-28.33-26-28.33-26h-23l5.33-124.67s143-6.17,180-7.33c-17-42.17-70.67-43.83-70.67-43.83H2093.67v-37.33s0.66-31.68-15.17-31.5h-4.78c-15.81.24-15.17,31.5-15.17,31.5v37.33H1953.73s-53.67,1.67-70.67,43.83c37,1.17,180,7.33,180,7.33l5.33,124.67h-23s-15.67.67-28.33,26h59.05" transform="translate(-1882.33 -1040.17)"/><path class="cls-2" d="M1933.49,1155.24c38.73,1.56,86.71,3.59,112,4.67l0.24-11.26-112-5S1933.58,1150.79,1933.49,1155.24Z" transform="translate(-1882.33 -1040.17)"/><path class="cls-2" d="M2218.67,1155.35c-38.73,1.56-86.71,3.59-112,4.67l-0.24-11.26,112-5S2218.57,1150.9,2218.67,1155.35Z" transform="translate(-1882.33 -1040.17)"/><polygon class="cls-2" points="154.73 271.17 154.73 258.15 232.84 258.15 232.84 271.15 154.73 271.17"/><polygon class="cls-2" points="196.23 270.99 191.4 270.99 189.4 245.32 198.23 245.32 196.23 270.99"/></svg>
\ No newline at end of file
src/AutoPilotPlugins/Common/Images/PlaneATail.svg 0 → 100644
View file @ faea3168
<svg id="proposal" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 420 229.82"><defs><style>.cls-1,.cls-3{fill:#4ec3e8;}.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-2{fill:#159e1f;}.cls-3{opacity:0.8;}</style></defs><title>AirframeInvertedVTail</title><path class="cls-1" d="M1168.4,1668.19c-16.29-1.16-182.26,3.95-182.26,3.95s4.66-31.33-5.35-46.65c-5.75-8.8-7.24-10.94-7.67-11.16a0.91,0.91,0,0,0-1,0c-0.39.14-1.81,2.16-7.7,11.17-10,15.32-5.35,46.65-5.35,46.65s-166-5.11-182.26-3.95-13.5,21.12-13.5,21.12l201.11,22.75s4-.7,4,5.8,4.25,15.55,4.25,15.55,4.25-9.05,4.25-15.55,4-5.8,4-5.8l201.11-22.75S1184.7,1669.35,1168.4,1668.19Z" transform="translate(-762.59 -1613.65)"/><polygon class="cls-1" points="252.41 94.3 252.41 198.91 210 212.13 167.59 198.91 167.59 94.64 165.48 94.3 165.48 223.28 210 229.31 254.52 223.28 254.52 94.3 252.41 94.3"/><polygon class="cls-2" points="387.89 79.21 387.89 73.69 284.54 81 284.54 90.9 387.89 79.21"/><polygon class="cls-2" points="277.45 91.7 277.45 81.23 219.95 86.47 219.95 98.21 277.45 91.7"/><path class="cls-2" d="M975.82,1842.52v-8.78l38.37-8.88v12.46Z" transform="translate(-762.59 -1613.65)"/><polygon class="cls-2" points="32.19 79.21 32.19 73.69 135.53 81 135.53 90.9 32.19 79.21"/><polygon class="cls-2" points="142.63 91.7 142.63 81.23 200.12 86.47 200.12 98.21 142.63 91.7"/><polygon class="cls-2" points="206.84 228.88 206.84 220.09 168.47 211.21 168.47 223.67 206.84 228.88"/><ellipse class="cls-3" cx="209.87" cy="118.37" rx="25.25" ry="6.07"/></svg>
\ No newline at end of file
src/AutoPilotPlugins/Common/Images/QuadRotorPlus.svg 0 → 100644
View file @ faea3168
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment