From 9e93c7ded5c4ab13789cbc93711e0caa6816010f Mon Sep 17 00:00:00 2001 From: Fredrik Larson Date: Mon, 25 Aug 2014 03:21:20 +1000 Subject: [PATCH 1/2] Rename wizard svg file, avoids confusion. TODO: Other duplicate files like this that are shared with config and wizards --- .../pages/outputcalibrationpage.cpp | 2 +- ...shapes.svg => fixedwing-shapes-wizard.svg} | 8182 ++++++++--------- .../plugins/setupwizard/wizardResources.qrc | 2 +- 3 files changed, 4093 insertions(+), 4093 deletions(-) rename ground/openpilotgcs/src/plugins/setupwizard/resources/{fixedwing-shapes.svg => fixedwing-shapes-wizard.svg} (98%) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp index 969d88472..066b7f942 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp @@ -31,7 +31,7 @@ #include "uavobjectmanager.h" const QString OutputCalibrationPage::MULTI_SVG_FILE = QString(":/setupwizard/resources/multirotor-shapes.svg"); -const QString OutputCalibrationPage::FIXEDWING_SVG_FILE = QString(":/setupwizard/resources/fixedwing-shapes.svg"); +const QString OutputCalibrationPage::FIXEDWING_SVG_FILE = QString(":/setupwizard/resources/fixedwing-shapes-wizard.svg"); OutputCalibrationPage::OutputCalibrationPage(SetupWizard *wizard, QWidget *parent) : AbstractWizardPage(wizard, parent), ui(new Ui::OutputCalibrationPage), m_vehicleBoundsItem(0), diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes.svg b/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes-wizard.svg similarity index 98% rename from ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes.svg rename to ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes-wizard.svg index 07d7fe2d0..5c6ab8e1b 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes.svg +++ b/ground/openpilotgcs/src/plugins/setupwizard/resources/fixedwing-shapes-wizard.svg @@ -1,4092 +1,4092 @@ - - - -image/svg+xml6 - - - - -4 - - - - -4 - + + +image/svg+xml6 + + + + +4 + + + + +4 + \ No newline at end of file diff --git a/ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc b/ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc index 2603c99a1..56bf63139 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc +++ b/ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc @@ -35,8 +35,8 @@ resources/bttn-servo-standard-up.png resources/wizard.png resources/multirotor-shapes.svg + resources/fixedwing-shapes-wizard.svg - resources/fixedwing-shapes.svg resources/bttn-illustration-down.png resources/bttn-illustration-up.png resources/bttn-save-down.png From 6bcc6f32ed48db619beb5399da5c7dcab0bd3008 Mon Sep 17 00:00:00 2001 From: Fredrik Larson Date: Mon, 25 Aug 2014 03:43:59 +1000 Subject: [PATCH 2/2] Add servos, more informative for end users --- .../config/images/fixedwing-shapes.svg | 1049 ++++++++++------- 1 file changed, 596 insertions(+), 453 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg b/ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg index d808e7b14..7b1c32e7b 100644 --- a/ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg +++ b/ground/openpilotgcs/src/plugins/config/images/fixedwing-shapes.svg @@ -354,13 +354,13 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1920" - inkscape:window-height="1017" + inkscape:window-height="1057" id="namedview4099" showgrid="false" - inkscape:zoom="1" - inkscape:cx="400.12565" - inkscape:cy="1481.1007" - inkscape:window-x="-8" + inkscape:zoom="2" + inkscape:cx="413.32337" + inkscape:cy="1763.192" + inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:current-layer="Layer_1" @@ -485,453 +485,6 @@ id="Layer_1_1_" display="none" transform="matrix(0.72518345,0,0,0.84952662,17.091168,368.5798)" /> \ No newline at end of file + style="fill:none;stroke:#414042;stroke-width:0.73697907;stroke-miterlimit:10" /> \ No newline at end of file