1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00

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

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

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>
<copyright>(C) 2010 OpenPilot Project</copyright>
<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>
<dependencyList>
<dependency name="Core" version="1.0.0"/>

View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

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

View File

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

View File

@ -1,11 +1,11 @@
/**
******************************************************************************
*
* @file map2plugin.cpp
* @file opmapplugin.cpp
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "map2plugin.h"
//#include "map2gadgetfactory.h"
#include "opmapplugin.h"
//#include "opmapgadgetfactory.h"
#include <QtPlugin>
#include <QStringList>
#include <extensionsystem/pluginmanager.h>
Map2Plugin::Map2Plugin()
OPMapPlugin::OPMapPlugin()
{
// Do nothing
}
Map2Plugin::~Map2Plugin()
OPMapPlugin::~OPMapPlugin()
{
// Do nothing
}
bool Map2Plugin::initialize(const QStringList& args, QString *errMsg)
bool OPMapPlugin::initialize(const QStringList& args, QString *errMsg)
{
Q_UNUSED(args);
Q_UNUSED(errMsg);
// mf = new Map2GadgetFactory(this);
// mf = new OPMapGadgetFactory(this);
// addAutoReleasedObject(mf);
return true;
}
void Map2Plugin::extensionsInitialized()
void OPMapPlugin::extensionsInitialized()
{
// Do nothing
}
void Map2Plugin::shutdown()
void OPMapPlugin::shutdown()
{
// Do nothing
}
Q_EXPORT_PLUGIN(Map2Plugin)
Q_EXPORT_PLUGIN(OPMapPlugin)

View File

@ -1,11 +1,11 @@
/**
******************************************************************************
*
* @file map2plugin.h
* @file opmapplugin.h
* @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
* @brief
* @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
*/
#ifndef MAP2_PLUGIN_H_
#define MAP2_PLUGIN_H_
#ifndef OPMAP_PLUGIN_H_
#define OPMAP_PLUGIN_H_
#include <extensionsystem/iplugin.h>
//class Map2GadgetFactory;
//class OPMapGadgetFactory;
class Map2Plugin : public ExtensionSystem::IPlugin
class OPMapPlugin : public ExtensionSystem::IPlugin
{
public:
Map2Plugin();
~Map2Plugin();
OPMapPlugin();
~OPMapPlugin();
void extensionsInitialized();
bool initialize(const QStringList & arguments, QString * errorString);
void shutdown();
private:
// Map2GadgetFactory *mf;
// OPMapGadgetFactory *mf;
};
#endif /* MAP2_PLUGIN_H_ */
#endif /* OPMAP_PLUGIN_H_ */

View File

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