rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Code Issues Releases Activity

Revert "Fix minor cosmetic issue where vtail model was not rendering in the Configuration screen. Edit the Inkscape Object Properties."

Browse Source 
This reverts commit 11fa414e1a9efd6c32f52d43ca04bd5fef5e5048.

Conflicts:
	ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg
	ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp
This commit is contained in:
Kevin Finisterre 2014-06-08 00:00:43 -04:00
parent 28246cccbe
commit 7558509720
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg
View File

@ -19,7 +19,7 @@
viewBox="0 0 792 2016"
enable-background="new 0 0 792 1008"
xml:space="preserve"
inkscape:version="0.48.2 r9819"
inkscape:version="0.48.4 r9939"
sodipodi:docname="fixedwing-shapes.svg"><metadata
id="metadata4103"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
@ -282,14 +282,14 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="964"
inkscape:window-height="1176"
id="namedview4099"
showgrid="false"
inkscape:zoom="0.70710678"
inkscape:cx="289.6012"
inkscape:cy="1191.4073"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-x="1600"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1"
showborder="true"
@ -414,7 +414,7 @@
display="none"
transform="matrix(0.72518345,0,0,0.84952662,17.091168,368.5798)" /><g
id="aileron"
inkscape:label="#aileron"
inkscape:label="#g9600"
transform="translate(3.366856,-372.28452)"><g
inkscape:label="#g9956"
id="aileron-frame"><g
@ -1100,7 +1100,11 @@
id="path8516_1_"
inkscape:connector-curvature="0"
style="fill:none;stroke:#010101;stroke-width:0.69520003;stroke-linecap:round;stroke-linejoin:round" /></g></g></g><g
<<<<<<< HEAD
id="elevon"
=======
id="v-tail"
>>>>>>> parent of 11fa414... Fix minor cosmetic issue where vtail model was not rendering in the Configuration screen. Edit the Inkscape Object Properties.
transform="matrix(0.8,0,0,0.8,78.355285,170.6871)"><path
style="stroke:#000000;stroke-width:0.75538152;stroke-miterlimit:10"
inkscape:connector-curvature="0"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 95 KiB

After

Width:  |  Height:  |  Size: 95 KiB

5
ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.cpp
View File

@ -105,8 +105,13 @@ void FixedWingPage::updateImageAndDescription()
case SetupWizard::FIXED_WING_AILERON:
elementId = "aileron";
break;
<<<<<<< HEAD
case SetupWizard::FIXED_WING_ELEVON:
elementId = "elevon";
=======
case SetupWizard::FIXED_WING_VTAIL:
elementId = "v-tail";
>>>>>>> parent of 11fa414... Fix minor cosmetic issue where vtail model was not rendering in the Configuration screen. Edit the Inkscape Object Properties.
break;
default:
elementId = "";