rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-21 13:28:58 +01:00
Code Issues Releases Activity

OP-1222 Added svg for gps shapes. Fixed some spelling errors.

Browse Source
This commit is contained in:
m_thread 2014-09-03 00:05:47 +02:00
parent 14574832b9
commit a36943c616
8 changed files with 125 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.cpp
View File

@ -35,9 +35,9 @@ AirSpeedPage::AirSpeedPage(SetupWizard *wizard, QWidget *parent) :
AirSpeedPage::~AirSpeedPage()
{}
bool AirSpeedPage::validatePage(SelectionItem *seletedItem)
bool AirSpeedPage::validatePage(SelectionItem *selectedItem)
{
getWizard()->setAirspeedType((SetupWizard::AIRSPEED_TYPE)seletedItem->id());
getWizard()->setAirspeedType((SetupWizard::AIRSPEED_TYPE)selectedItem->id());
return true;
}

8
ground/openpilotgcs/src/plugins/setupwizard/pages/airspeedpage.h
View File

@ -1,11 +1,11 @@
/**
******************************************************************************
*
* @file fixedwingpage.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* @file airspeedpage.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2014.
* @addtogroup
* @{
* @addtogroup FixedWingPage
* @addtogroup AirSpeedPage
* @{
* @brief
*****************************************************************************/
@ -38,7 +38,7 @@ public:
~AirSpeedPage();
public:
bool validatePage(SelectionItem *seletedItem);
bool validatePage(SelectionItem *selectedItem);
void setupSelection(Selection *selection);
};

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

@ -35,9 +35,9 @@ FixedWingPage::FixedWingPage(SetupWizard *wizard, QWidget *parent) :
FixedWingPage::~FixedWingPage()
{}
bool FixedWingPage::validatePage(SelectionItem *seletedItem)
bool FixedWingPage::validatePage(SelectionItem *selectedItem)
{
getWizard()->setVehicleSubType((SetupWizard::VEHICLE_SUB_TYPE)seletedItem->id());
getWizard()->setVehicleSubType((SetupWizard::VEHICLE_SUB_TYPE)selectedItem->id());
return true;
}

2
ground/openpilotgcs/src/plugins/setupwizard/pages/fixedwingpage.h
View File

@ -38,7 +38,7 @@ public:
~FixedWingPage();
public:
bool validatePage(SelectionItem *seletedItem);
bool validatePage(SelectionItem *selectedItem);
void setupSelection(Selection *selection);
};

6
ground/openpilotgcs/src/plugins/setupwizard/pages/gpspage.cpp
View File

@ -29,15 +29,15 @@
#include "setupwizard.h"
GpsPage::GpsPage(SetupWizard *wizard, QWidget *parent) :
SelectionPage(wizard, QString(":/setupwizard/resources/airspeed-shapes.svg"), parent)
SelectionPage(wizard, QString(":/setupwizard/resources/gps-shapes.svg"), parent)
{}
GpsPage::~GpsPage()
{}
bool GpsPage::validatePage(SelectionItem *seletedItem)
bool GpsPage::validatePage(SelectionItem *selectedItem)
{
getWizard()->setGpsType((SetupWizard::GPS_TYPE)seletedItem->id());
getWizard()->setGpsType((SetupWizard::GPS_TYPE)selectedItem->id());
return true;
}

8
ground/openpilotgcs/src/plugins/setupwizard/pages/gpspage.h
View File

@ -1,11 +1,11 @@
/**
******************************************************************************
*
* @file fixedwingpage.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* @file gpspage.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2014.
* @addtogroup
* @{
* @addtogroup FixedWingPage
* @addtogroup GpsPage
* @{
* @brief
*****************************************************************************/
@ -38,7 +38,7 @@ public:
~GpsPage();
public:
bool validatePage(SelectionItem *seletedItem);
bool validatePage(SelectionItem *selectedItem);
void setupSelection(Selection *selection);
};

108
ground/openpilotgcs/src/plugins/setupwizard/resources/gps-shapes.svg Normal file
View File

@ -0,0 +1,108 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="744.09448819"
height="1052.3622047"
id="svg2"
version="1.1"
inkscape:version="0.48.5 r10040"
sodipodi:docname="airspeed-shapes.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="375"
inkscape:cy="520"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1075"
inkscape:window-height="423"
inkscape:window-x="104"
inkscape:window-y="104"
inkscape:window-maximized="0" />
<metadata
id="metadata7">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1">
<flowRoot
xml:space="preserve"
id="flowRoot2985"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"><flowRegion
id="flowRegion2987"><rect
id="rect2989"
width="148.57143"
height="54.285713"
x="137.14285"
y="120.93361" /></flowRegion><flowPara
id="flowPara2991">OpenPilo</flowPara></flowRoot> <g
id="eagletree">
<text
sodipodi:linespacing="125%"
id="text2997"
y="286.64789"
x="208.57143"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
xml:space="preserve"><tspan
y="286.64789"
x="208.57143"
id="tspan2999"
sodipodi:role="line">Eagletree</tspan></text>
</g>
<g
id="ms4525">
<text
sodipodi:linespacing="125%"
id="text3001"
y="403.79074"
x="208.57143"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
xml:space="preserve"><tspan
y="403.79074"
x="208.57143"
id="tspan3003"
sodipodi:role="line">MS4525</tspan></text>
</g>
<g
id="estimated"
inkscape:label="#estimated">
<text
sodipodi:linespacing="125%"
id="text3009"
y="140.93361"
x="205.71429"
style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
xml:space="preserve"><tspan
y="140.93361"
x="205.71429"
id="tspan3011"
sodipodi:role="line">OpenPilot</tspan></text>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

2
ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
View File

@ -38,7 +38,6 @@
<file>resources/fixedwing-shapes-wizard.svg</file>
<file>resources/fixedwing-shapes-wizard-no-numbers.svg</file>
<file>resources/airspeed-shapes.svg</file>
<!-- these are different from the files in /config/images -->
<file>resources/bttn-illustration-down.png</file>
<file>resources/bttn-illustration-up.png</file>
<file>resources/bttn-save-down.png</file>
@ -47,5 +46,6 @@
<file>resources/bttn-flash-up.png</file>
<file>resources/bttn-upgrade-down.png</file>
<file>resources/bttn-upgrade-up.png</file>
<file>resources/gps-shapes.svg</file>
</qresource>
</RCC>