rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-03 11:24:10 +01:00
Code Issues Releases Activity

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@781 ebee16cc-31ac-478f-84a7-5cbb03baadba

Browse Source
This commit is contained in:
pip 2010-06-16 08:35:32 +00:00 committed by pip
parent b6492fc96f
commit 092c22f542
10 changed files with 164 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/src/plugins/map2/Map2Gadget.pluginspec → ground/src/plugins/opmap/OPMapGadget.pluginspec
View File

@ -1,8 +1,8 @@
<plugin name="Map2Gadget" version="1.0.0" compatVersion="1.0.0"> <plugin name="OPMapGadget" version="1.0.0" compatVersion="1.0.0">
<vendor>The OpenPilot Project</vendor> <vendor>The OpenPilot Project</vendor>
<copyright>(C) 2010 OpenPilot Project</copyright> <copyright>(C) 2010 OpenPilot Project</copyright>
<license>The GNU Public License (GPL) Version 3</license> <license>The GNU Public License (GPL) Version 3</license>
<description>A new map gadget!</description> <description>OPMap gadget!</description>
<url>http://www.openpilot.org</url> <url>http://www.openpilot.org</url>
<dependencyList> <dependencyList>
<dependency name="Core" version="1.0.0"/> <dependency name="Core" version="1.0.0"/>

0
ground/src/plugins/map2/images/gcs.png → ground/src/plugins/opmap/images/gcs.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
ground/src/plugins/map2/images/uav.png → ground/src/plugins/opmap/images/uav.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
ground/src/plugins/map2/images/waypoint.png → ground/src/plugins/opmap/images/waypoint.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

12
ground/src/plugins/map2/map2.pro → ground/src/plugins/opmap/opmap.pro
View File

@ -1,11 +1,11 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = Map2Gadget TARGET = OPMapGadget
include(../../openpilotgcsplugin.pri) include(../../openpilotgcsplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/coreplugin/coreplugin.pri)
include(../../libs/opmapcontrol/opmapcontrol.pri) include(../../libs/opmapcontrol/opmapcontrol.pri)
include(../../plugins/uavobjects/uavobjects.pri) include(../../plugins/uavobjects/uavobjects.pri)
HEADERS += map2plugin.h HEADERS += opmapplugin.h
SOURCES += map2plugin.cpp SOURCES += opmapplugin.cpp
OTHER_FILES += Map2Gadget.pluginspec OTHER_FILES += OPMapGadget.pluginspec
FORMS += map2gadgetoptionspage.ui FORMS += opmapgadgetoptionspage.ui
RESOURCES += map2.qrc RESOURCES += opmap.qrc

0
ground/src/plugins/map2/map2.qrc → ground/src/plugins/opmap/opmap.qrc
View File

260
ground/src/plugins/map2/map2gadgetoptionspage.ui → ground/src/plugins/opmap/opmapgadgetoptionspage.ui
View File

@ -1,130 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>MapGadgetOptionsPage</class> <class>Map2GadgetOptionsPage</class>
<widget class="QWidget" name="MapGadgetOptionsPage"> <widget class="QWidget" name="Map2GadgetOptionsPage">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>400</width>
<height>300</height> <height>300</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Map provider:</string> <string>Map provider:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="providerComboBox"> <widget class="QComboBox" name="providerComboBox">
<item> <item>
<property name="text"> <property name="text">
<string>OpenStreetMap</string> <string>OpenStreetMap</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Google</string> <string>Google</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Google Sat</string> <string>Google Sat</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Default zoom:</string> <string>Default zoom:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSpinBox" name="zoomSpinBox"> <widget class="QSpinBox" name="zoomSpinBox">
<property name="maximum"> <property name="maximum">
<number>18</number> <number>18</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_3"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Default latitude:</string> <string>Default latitude:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QDoubleSpinBox" name="latitudeSpinBox"> <widget class="QDoubleSpinBox" name="latitudeSpinBox">
<property name="decimals"> <property name="decimals">
<number>8</number> <number>8</number>
</property> </property>
<property name="minimum"> <property name="minimum">
<double>-90.000000000000000</double> <double>-90.000000000000000</double>
</property> </property>
<property name="maximum"> <property name="maximum">
<double>90.000000000000000</double> <double>90.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>Default longitude:</string> <string>Default longitude:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QDoubleSpinBox" name="longitudeSpinBox"> <widget class="QDoubleSpinBox" name="longitudeSpinBox">
<property name="decimals"> <property name="decimals">
<number>8</number> <number>8</number>
</property> </property>
<property name="minimum"> <property name="minimum">
<double>-180.000000000000000</double> <double>-180.000000000000000</double>
</property> </property>
<property name="maximum"> <property name="maximum">
<double>180.000000000000000</double> <double>180.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="3" column="2"> <item row="3" column="2">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

22
ground/src/plugins/map2/map2plugin.cpp → ground/src/plugins/opmap/opmapplugin.cpp
View File

@ -1,11 +1,11 @@
/** /**
****************************************************************************** ******************************************************************************
* *
* @file map2plugin.cpp * @file opmapplugin.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief * @brief
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* @defgroup map2 * @defgroup opmap
* @{ * @{
* *
*****************************************************************************/ *****************************************************************************/
@ -24,40 +24,40 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "map2plugin.h" #include "opmapplugin.h"
//#include "map2gadgetfactory.h" //#include "opmapgadgetfactory.h"
#include <QtPlugin> #include <QtPlugin>
#include <QStringList> #include <QStringList>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
Map2Plugin::Map2Plugin() OPMapPlugin::OPMapPlugin()
{ {
// Do nothing // Do nothing
} }
Map2Plugin::~Map2Plugin() OPMapPlugin::~OPMapPlugin()
{ {
// Do nothing // Do nothing
} }
bool Map2Plugin::initialize(const QStringList& args, QString *errMsg) bool OPMapPlugin::initialize(const QStringList& args, QString *errMsg)
{ {
Q_UNUSED(args); Q_UNUSED(args);
Q_UNUSED(errMsg); Q_UNUSED(errMsg);
// mf = new Map2GadgetFactory(this); // mf = new OPMapGadgetFactory(this);
// addAutoReleasedObject(mf); // addAutoReleasedObject(mf);
return true; return true;
} }
void Map2Plugin::extensionsInitialized() void OPMapPlugin::extensionsInitialized()
{ {
// Do nothing // Do nothing
} }
void Map2Plugin::shutdown() void OPMapPlugin::shutdown()
{ {
// Do nothing // Do nothing
} }
Q_EXPORT_PLUGIN(Map2Plugin) Q_EXPORT_PLUGIN(OPMapPlugin)

20
ground/src/plugins/map2/map2plugin.h → ground/src/plugins/opmap/opmapplugin.h
View File

@ -1,11 +1,11 @@
/** /**
****************************************************************************** ******************************************************************************
* *
* @file map2plugin.h * @file opmapplugin.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010. * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief * @brief
* @see The GNU Public License (GPL) Version 3 * @see The GNU Public License (GPL) Version 3
* @defgroup map2 * @defgroup opmap
* @{ * @{
* *
*****************************************************************************/ *****************************************************************************/
@ -25,23 +25,23 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef MAP2_PLUGIN_H_ #ifndef OPMAP_PLUGIN_H_
#define MAP2_PLUGIN_H_ #define OPMAP_PLUGIN_H_
#include <extensionsystem/iplugin.h> #include <extensionsystem/iplugin.h>
//class Map2GadgetFactory; //class OPMapGadgetFactory;
class Map2Plugin : public ExtensionSystem::IPlugin class OPMapPlugin : public ExtensionSystem::IPlugin
{ {
public: public:
Map2Plugin(); OPMapPlugin();
~Map2Plugin(); ~OPMapPlugin();
void extensionsInitialized(); void extensionsInitialized();
bool initialize(const QStringList & arguments, QString * errorString); bool initialize(const QStringList & arguments, QString * errorString);
void shutdown(); void shutdown();
private: private:
// Map2GadgetFactory *mf; // OPMapGadgetFactory *mf;
}; };
#endif /* MAP2_PLUGIN_H_ */ #endif /* OPMAP_PLUGIN_H_ */

10
ground/src/plugins/plugins.pro
View File

@ -50,11 +50,11 @@ plugin_map.depends = plugin_coreplugin
plugin_map.depends = plugin_uavobjects plugin_map.depends = plugin_uavobjects
SUBDIRS += plugin_map SUBDIRS += plugin_map
# Map2 UAVGadget # OPMap UAVGadget
plugin_map2.subdir = map2 plugin_opmap.subdir = opmap
plugin_map2.depends = plugin_coreplugin plugin_opmap.depends = plugin_coreplugin
plugin_map2.depends = plugin_uavobjects plugin_opmap.depends = plugin_uavobjects
SUBDIRS += plugin_map2 SUBDIRS += plugin_opmap
# Scope UAVGadget # Scope UAVGadget
plugin_scope.subdir = scope plugin_scope.subdir = scope