Merge pull request #2602 from DonLakeFlyer/AirframeIcons

Use new Airframe Icons + Naming

src/AutoPilotPlugins/Common/Images/Rover.svg

+<svg id="proposal" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 163.4 251.75"><defs><style>.cls-1{fill:#159e1f;}.cls-1,.cls-2,.cls-3{stroke:#000;stroke-miterlimit:10;}.cls-2{fill:#4ec3e8;}.cls-3{fill:#fff;}</style></defs><title>AirframeRover</title><path class="cls-1" d="M1593.44,2225.22h-147.1c-3.53,0-6.77-2.43-6.77-5.59s2.94-5.59,6.77-5.59h147.1c3.53,0,6.77,2.43,6.77,5.59S1597,2225.22,1593.44,2225.22Z" transform="translate(-1438.19 -2149.94)"/><path class="cls-1" d="M1593.44,2349h-147.1c-3.53,0-6.77-2.43-6.77-5.59s2.94-5.59,6.77-5.59h147.1c3.53,0,6.77,2.43,6.77,5.59S1597,2349,1593.44,2349Z" transform="translate(-1438.19 -2149.94)"/><path class="cls-1" d="M1519.89,2349c-3.53,0-6.77-2.43-6.77-5.59V2219.63c0-2.92,2.94-5.59,6.77-5.59s6.77,2.43,6.77,5.59v123.83C1526.36,2346.38,1523.42,2349,1519.89,2349Z" transform="translate(-1438.19 -2149.94)"/><ellipse class="cls-1" cx="81.7" cy="69.69" rx="15.59" ry="12.88"/><ellipse class="cls-1" cx="81.7" cy="193.53" rx="15.59" ry="12.88"/><path class="cls-1" d="M1467.52,2247.08h-24.71c-2.06,0-4.12-1.46-4.12-3.4v-48.1c0-1.7,1.77-3.4,4.12-3.4h24.71c2.06,0,4.12,1.46,4.12,3.4v48.1A4.12,4.12,0,0,1,1467.52,2247.08Z" transform="translate(-1438.19 -2149.94)"/><path class="cls-1" d="M1597,2247.08h-24.71c-2.06,0-4.12-1.46-4.12-3.4v-48.1c0-1.7,1.77-3.4,4.12-3.4H1597c2.06,0,4.12,1.46,4.12,3.4v48.1A4.12,4.12,0,0,1,1597,2247.08Z" transform="translate(-1438.19 -2149.94)"/><path class="cls-1" d="M1467.52,2371.89h-24.71c-2.06,0-4.12-1.46-4.12-3.4v-48.1c0-1.7,1.77-3.4,4.12-3.4h24.71c2.06,0,4.12,1.46,4.12,3.4v48.1A4.36,4.36,0,0,1,1467.52,2371.89Z" transform="translate(-1438.19 -2149.94)"/><path class="cls-1" d="M1597,2371.89h-24.71c-2.06,0-4.12-1.46-4.12-3.4v-48.1c0-1.7,1.77-3.4,4.12-3.4H1597c2.06,0,4.12,1.46,4.12,3.4v48.1A4.36,4.36,0,0,1,1597,2371.89Z" transform="translate(-1438.19 -2149.94)"/><path class="cls-2" d="M1569.6,2396.15s3.7-3.25,3.7-6.37V2194.66c0-13.84-5.28-29.61-12.25-34.95-11.63-10.37-40.92-9.25-41.15-9.24s-29.52-1.13-41.15,9.24c-7,5.34-12.25,21.1-12.25,34.95v195.12c0,3.12,3.7,6.37,3.7,6.37v5h99.41v-5Z" transform="translate(-1438.19 -2149.94)"/><path class="cls-3" d="M1479,2168.28c-0.39-2.34,5.85-9.75,19.49-9.75v14.52l-9.75,1.56S1479.36,2170.62,1479,2168.28Z" transform="translate(-1438.19 -2149.94)"/><path class="cls-3" d="M1551.07,2174.61l-9.74-1.56v-14.52c13.65,0,19.88,7.41,19.49,9.75S1551.07,2174.61,1551.07,2174.61Z" transform="translate(-1438.19 -2149.94)"/><rect class="cls-3" x="64.15" y="174.99" width="15.96" height="60.49"/><rect class="cls-3" x="83.29" y="174.99" width="15.96" height="60.49"/><polygon class="cls-3" points="102.44 175 116.91 175 116.78 232.62 102.44 235.23 102.44 175"/><path class="cls-3" d="M1566,2328.83l-3.9,9.1s-4.16-19.23-4.16-25.21-1.3-43.4,1.3-56.66,3.64-17.15,3.64-17.15l2.08,1Z" transform="translate(-1438.19 -2149.94)"/><polygon class="cls-3" points="115.88 101.96 82.09 101.96 81.31 101.96 47.53 101.96 39.74 75.71 58.44 66.61 101.08 66.61 104.96 66.61 123.67 75.71 115.88 101.96"/><path class="cls-3" d="M1474.84,2239.94l2.08-1s1,3.9,3.64,17.15,1.3,50.68,1.3,56.66-4.16,25.21-4.16,25.21l-3.9-9.1Z" transform="translate(-1438.19 -2149.94)"/><polygon class="cls-3" points="46.49 175 60.97 175 60.97 235.23 46.62 232.62 46.49 175"/></svg>
\ No newline at end of file

src/AutoPilotPlugins/PX4/AirframeComponentAirframes.cc

@@ -57,11 +57,20 @@ void AirframeComponentAirframes::insert(QString& group, QString& image, QString&
     if (!rgAirframeTypes.contains(group)) {
         g = new AirframeType_t;
         g->name = group;
+
         if (image.length() > 0) {
-            g->imageResource = QString("qrc:/qmlimages/").append(image);
-        } else {
-            g->imageResource = QString("qrc:/qmlimages/AirframeStandardPlane.png");
+            g->imageResource = QString(":/qmlimages/Airframe/").append(image);
+            if (!QFile::exists(g->imageResource)) {
+                g->imageResource.clear();
+            } else {
+                g->imageResource.prepend(QStringLiteral("qrc"));
+            }
+        }
+
+        if (g->imageResource.isEmpty()) {
+            g->imageResource = QString("qrc:/qmlimages/Airframe/AirframeUnknown");
         }
+
         rgAirframeTypes.insert(group, g);
     } else {
         g = rgAirframeTypes.value(group);

src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml

 <?xml version='1.0' encoding='UTF-8'?>
 <airframes>
   <version>1</version>
-  <airframe_group image="" name="Coaxial Helicopter">
+  <airframe_group image="HelicopterCoaxial" name="Coaxial Helicopter">
     <airframe id="15001" maintainer="Emmanuel Roussel" name="Coaxial Helicopter (such as Esky Lama v4 or Esky Big Lama)">
       <maintainer>Emmanuel Roussel</maintainer>
       <type>Coaxial Helicopter</type>
@@ -11,7 +11,7 @@
       <output name="MAIN4">Lower rotor (CW)</output>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeFlyingWing.png" name="Flying Wing">
+  <airframe_group image="FlyingWing" name="Flying Wing">
     <airframe id="3030" maintainer="Simon Wilks &lt;simon@px4.io&gt;" name="IO Camflyer">
       <maintainer>Simon Wilks &lt;simon@px4.io&gt;</maintainer>
       <type>Flying Wing</type>
@@ -69,7 +69,7 @@
       <type>Flying Wing</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeHexaRotorPlus.png" name="Hexarotor +">
+  <airframe_group image="HexaRotorPlus" name="Hexarotor +">
     <airframe id="7001" maintainer="Anton Babushkin &lt;anton@px4.io&gt;" name="Generic Hexarotor + geometry">
       <maintainer>Anton Babushkin &lt;anton@px4.io&gt;</maintainer>
       <type>Hexarotor +</type>
@@ -78,7 +78,7 @@
       <output name="AUX3">feed-through of RC AUX3 channel</output>
     </airframe>
   </airframe_group>
-  <airframe_group image="" name="Hexarotor Coaxial">
+  <airframe_group image="Y6B" name="Hexarotor Coaxial">
     <airframe id="11001" maintainer="Lorenz Meier &lt;lorenz@px4.io&gt;" name="Generic Hexa coaxial geometry">
       <maintainer>Lorenz Meier &lt;lorenz@px4.io&gt;</maintainer>
       <type>Hexarotor Coaxial</type>
@@ -93,7 +93,7 @@
       <output angle="-60" direction="CCW" name="MAIN6">front left bottom, CCW</output>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeHexaRotorX.png" name="Hexarotor x">
+  <airframe_group image="HexaRotorX" name="Hexarotor x">
     <airframe id="6001" maintainer="Anton Babushkin &lt;anton@px4.io&gt;" name="Generic Hexarotor x geometry">
       <maintainer>Anton Babushkin &lt;anton@px4.io&gt;</maintainer>
       <type>Hexarotor x</type>
@@ -102,7 +102,7 @@
       <output name="AUX3">feed-through of RC AUX3 channel</output>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeOctoRotorPlus.png" name="Octorotor +">
+  <airframe_group image="OctoRotorPlus" name="Octorotor +">
     <airframe id="9001" maintainer="Anton Babushkin &lt;anton@px4.io&gt;" name="Generic Octocopter + geometry">
       <maintainer>Anton Babushkin &lt;anton@px4.io&gt;</maintainer>
       <type>Octorotor +</type>
@@ -111,13 +111,13 @@
       <output name="AUX3">feed-through of RC AUX3 channel</output>
     </airframe>
   </airframe_group>
-  <airframe_group image="" name="Octorotor Coaxial">
+  <airframe_group image="OctoRotorXCoaxial" name="Octorotor Coaxial">
     <airframe id="12001" maintainer="Lorenz Meier &lt;lorenz@px4.io&gt;" name="Generic 10&quot; Octo coaxial geometry">
       <maintainer>Lorenz Meier &lt;lorenz@px4.io&gt;</maintainer>
       <type>Octorotor Coaxial</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeOctoRotorX.png" name="Octorotor x">
+  <airframe_group image="OctoRotorX" name="Octorotor x">
     <airframe id="8001" maintainer="Anton Babushkin &lt;anton@px4.io&gt;" name="Generic Octocopter X geometry">
       <maintainer>Anton Babushkin &lt;anton@px4.io&gt;</maintainer>
       <type>Octorotor x</type>
@@ -126,13 +126,13 @@
       <output name="AUX3">feed-through of RC AUX3 channel</output>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeQuadRotorPlus.png" name="Quadrotor +">
+  <airframe_group image="QuadRotorPlus" name="Quadrotor +">
     <airframe id="5001" maintainer="Anton Babushkin &lt;anton@px4.io&gt;" name="Generic 10&quot; Quad + geometry">
       <maintainer>Anton Babushkin &lt;anton@px4.io&gt;</maintainer>
       <type>Quadrotor +</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeQuadRotorH.png" name="Quadrotor Wide">
+  <airframe_group image="QuadRotorWide" name="Quadrotor Wide">
     <airframe id="10015" maintainer="Anton Babushkin &lt;anton@px4.io&gt;, Simon Wilks &lt;simon@px4.io&gt;" name="Team Blacksheep Discovery">
       <maintainer>Anton Babushkin &lt;anton@px4.io&gt;, Simon Wilks &lt;simon@px4.io&gt;</maintainer>
       <type>Quadrotor Wide</type>
@@ -154,7 +154,7 @@
       <type>Quadrotor Wide</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeQuadRotorX.png" name="Quadrotor x">
+  <airframe_group image="QuadRotorX" name="Quadrotor x">
     <airframe id="10020" maintainer="Lorenz Meier &lt;lorenz@px4.io&gt;" name="3DR DIY Quad">
       <maintainer>Lorenz Meier &lt;lorenz@px4.io&gt;</maintainer>
       <type>Quadrotor x</type>
@@ -199,17 +199,17 @@
       <maintainer>Thomas Gubler &lt;thomas@px4.io&gt;</maintainer>
       <type>Quadrotor x</type>
     </airframe>
-    <airframe id="4030" maintainer="Andreas Antener &lt;andreas@uaventure.com&gt;" name="Generic Quadrotor X config">
+    <airframe id="4030" maintainer="Andreas Antener &lt;andreas@uaventure.com&gt;" name="3DR Solo">
       <maintainer>Andreas Antener &lt;andreas@uaventure.com&gt;</maintainer>
       <type>Quadrotor x</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="" name="Rover">
+  <airframe_group image="Rover" name="Rover">
     <airframe id="50001" maintainer="John Doe &lt;john@example.com&gt;" name="Axial Racing AX10">
       <type>Rover</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeSimulation.png" name="Simulation">
+  <airframe_group image="AirframeSimulation" name="Simulation">
     <airframe id="1000" maintainer="Lorenz Meier &lt;lorenz@px4.io&gt;" name="HILStar (XPlane)">
       <maintainer>Lorenz Meier &lt;lorenz@px4.io&gt;</maintainer>
       <type>Simulation</type>
@@ -235,7 +235,7 @@
       <type>Simulation</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="AirframeStandardPlane.png" name="Standard Plane">
+  <airframe_group image="Plane" name="Standard Plane">
     <airframe id="2100" maintainer="Lorenz Meier &lt;lorenz@px4.io&gt;" name="Multiplex Easystar">
       <maintainer>Lorenz Meier &lt;lorenz@px4.io&gt;</maintainer>
       <type>Standard Plane</type>
@@ -316,7 +316,7 @@
       <output name="MAIN8">flaps left</output>
     </airframe>
   </airframe_group>
-  <airframe_group image="" name="Standard VTOL">
+  <airframe_group image="VTOLPlane" name="Standard VTOL">
     <airframe id="13005" maintainer="Simon Wilks &lt;simon@uaventure.com&gt;" name="Fun Cub Quad VTOL.">
       <maintainer>Simon Wilks &lt;simon@uaventure.com&gt;</maintainer>
       <type>Standard VTOL</type>
@@ -334,19 +334,19 @@
       <type>Standard VTOL</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="" name="Tricopter Y+">
+  <airframe_group image="YPlus" name="Tricopter Y+">
     <airframe id="14001" maintainer="Trent Lukaczyk &lt;aerialhedgehog@gmail.com&gt;" name="Generic Tricopter Y+ Geometry">
       <maintainer>Trent Lukaczyk &lt;aerialhedgehog@gmail.com&gt;</maintainer>
       <type>Tricopter Y+</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="" name="Tricopter Y-">
+  <airframe_group image="YMinus" name="Tricopter Y-">
     <airframe id="14002" maintainer="Trent Lukaczyk &lt;aerialhedgehog@gmail.com&gt;" name="Generic Tricopter Y- Geometry">
       <maintainer>Trent Lukaczyk &lt;aerialhedgehog@gmail.com&gt;</maintainer>
       <type>Tricopter Y-</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="" name="VTOL Tailsitter">
+  <airframe_group image="VTOLDuoRotorTailSitter" name="VTOL Tailsitter">
     <airframe id="13001" maintainer="Roman Bapst &lt;roman@px4.io&gt;" name="Duorotor Tailsitter">
       <maintainer>Roman Bapst &lt;roman@px4.io&gt;</maintainer>
       <type>VTOL Tailsitter</type>
@@ -360,7 +360,7 @@
       <type>VTOL Tailsitter</type>
     </airframe>
   </airframe_group>
-  <airframe_group image="" name="VTOL Tiltrotor">
+  <airframe_group image="VTOLTiltRotor" name="VTOL Tiltrotor">
     <airframe id="13002" maintainer="Roman Bapst &lt;roman@px4.io&gt;" name="BirdsEyeView Aerobotics FireFly6">
       <maintainer>Roman Bapst &lt;roman@px4.io&gt;</maintainer>
       <type>VTOL Tiltrotor</type>