rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-20 10:54:14 +01:00
Code Issues Releases Activity

OP-37 GCS/MapPlugin testproject dropdown box for map provider choice.

Browse Source 
New map widget is able to display maps from: GoogleMap,GoogleSatellite,GoogleLabels,GoogleTerrain,GoogleHybrid,GoogleMapChina,GoogleSatelliteChina,GoogleLabelsChina,GoogleTerrainChina,GoogleHybridChina, OpenStreetMap,OpenStreetOsm,OpenStreetMapSurfer,OpenStreetMapSurferTerrain,YahooMap,YahooSatellite,YahooLabels,YahooHybrid,BingMap,BingSatellite,BingHybrid, ArcGIS_Map,ArcGIS_Satellite,ArcGIS_ShadedRelief,ArcGIS_Terrain,ArcGIS_MapsLT_Map,
ArcGIS_MapsLT_OrtoFoto,ArcGIS_MapsLT_Map_Labels,ArcGIS_MapsLT_Map_Hybrid, PergoTurkeyMap,SigPacSpainMap,GoogleMapKorea,GoogleSatelliteKorea, GoogleLabelsKorea,GoogleHybridKorea,YandexMapRu

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@753 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
GoogleMap,GoogleSatellite,GoogleLabels,GoogleTerrain,GoogleHybrid,GoogleMapChina,GoogleSatelliteChina,GoogleLabelsChina,GoogleTerrainChina,GoogleHybridChina, OpenStreetMap,OpenStreetOsm,OpenStreetMapSurfer,OpenStreetMapSurferTerrain,YahooMap,YahooSatellite,YahooLabels,YahooHybrid,BingMap,BingSatellite,BingHybrid, ArcGIS_Map,ArcGIS_Satellite,ArcGIS_ShadedRelief,ArcGIS_Terrain,ArcGIS_MapsLT_Map 2010-06-12 22:21:24 +00:00 committed by zedamota
parent 5f78ee2f1c
commit 8efae87949
8 changed files with 99 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ground/src/experimental/OPMapWidget/core/maptype.h
View File

@ -27,11 +27,16 @@
*/
#ifndef MAPTYPE_H
#define MAPTYPE_H
#include <QMetaObject>
#include <QMetaEnum>
#include <QStringList>
namespace core {
struct MapType
class MapType:public QObject
{
Q_OBJECT
Q_ENUMS(Types)
public:
enum Types
{
GoogleMap=1,
@ -94,6 +99,32 @@ struct MapType
YandexMapRu = 5000,
};
static QString StrByType(Types const& value)
{
QMetaObject metaObject = MapType().staticMetaObject;
QMetaEnum metaEnum= metaObject.enumerator( metaObject.indexOfEnumerator("Types"));
QString s=metaEnum.valueToKey(value);
return s;
}
static Types TypeByStr(QString const& value)
{
QMetaObject metaObject = MapType().staticMetaObject;
QMetaEnum metaEnum= metaObject.enumerator( metaObject.indexOfEnumerator("Types"));
Types s=(Types)metaEnum.keyToValue(value.toLatin1());
return s;
}
static QStringList TypesList()
{
QStringList ret;
QMetaObject metaObject = MapType().staticMetaObject;
QMetaEnum metaEnum= metaObject.enumerator( metaObject.indexOfEnumerator("Types"));
for(int x=0;x<metaEnum.keyCount();++x)
{
ret.append(metaEnum.key(x));
}
return ret;
}
};
}
#endif // MAPTYPE_H

12
ground/src/experimental/OPMapWidget/finaltest/mainwindow.cpp
View File

@ -6,8 +6,10 @@ MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindow)
{
ui->setupUi(this);
map=new mapcontrol::OPMapWidget();
ui->setupUi(this);
ui->comboBox->addItems(map->MapTypes());
ui->comboBox->setCurrentIndex(map->MapTypes().indexOf("GoogleHybrid"));
QHBoxLayout *layout=new QHBoxLayout(parent);
layout->addWidget(map);
layout->addWidget(ui->widget);
@ -78,7 +80,7 @@ void MainWindow::on_pushButton_clicked()
void MainWindow::on_pushButtonGO_clicked()
{
core::GeoCoderStatusCode::Types x=map->SetCurrentPositionByKeywords(ui->lineEdit->text());
ui->label->setText( map->geodecoderstatus.StrByType(x));
ui->label->setText( map->StrFromGeoCoderStatusCode(x));
}
@ -86,3 +88,9 @@ void MainWindow::on_checkBox_2_clicked(bool checked)
{
map->SetUseOpenGL(checked);
}
void MainWindow::on_comboBox_currentIndexChanged(QString value)
{
if (map->isStarted())
map->SetMapType(map->MapTypeFromString(value));
}

1
ground/src/experimental/OPMapWidget/finaltest/mainwindow.h
View File

@ -21,6 +21,7 @@ private:
mapcontrol::OPMapWidget *map;
private slots:
void on_comboBox_currentIndexChanged(QString );
void on_checkBox_2_clicked(bool checked);
void on_pushButtonGO_clicked();
void on_pushButton_clicked();

12
ground/src/experimental/OPMapWidget/finaltest/mainwindow.ui
View File

@ -44,6 +44,18 @@
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>MapType</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<widget class="QComboBox" name="comboBox"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">

21
ground/src/experimental/OPMapWidget/finaltest/ui_mainwindow.h
View File

@ -1,7 +1,7 @@
/********************************************************************************
** Form generated from reading UI file 'mainwindow.ui'
**
** Created: Sat 12. Jun 21:18:37 2010
** Created: Sat 12. Jun 23:14:21 2010
** by: Qt User Interface Compiler version 4.6.2
**
** WARNING! All changes made in this file will be lost when recompiling UI file!
@ -15,6 +15,7 @@
#include <QtGui/QApplication>
#include <QtGui/QButtonGroup>
#include <QtGui/QCheckBox>
#include <QtGui/QComboBox>
#include <QtGui/QDoubleSpinBox>
#include <QtGui/QGroupBox>
#include <QtGui/QHBoxLayout>
@ -38,6 +39,9 @@ public:
QWidget *widget;
QVBoxLayout *verticalLayout_4;
QVBoxLayout *verticalLayout_3;
QGroupBox *groupBox_5;
QVBoxLayout *verticalLayout_8;
QComboBox *comboBox;
QGroupBox *groupBox;
QVBoxLayout *verticalLayout_6;
QVBoxLayout *verticalLayout_5;
@ -90,6 +94,20 @@ public:
verticalLayout_3 = new QVBoxLayout();
verticalLayout_3->setSpacing(6);
verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
groupBox_5 = new QGroupBox(widget);
groupBox_5->setObjectName(QString::fromUtf8("groupBox_5"));
verticalLayout_8 = new QVBoxLayout(groupBox_5);
verticalLayout_8->setSpacing(6);
verticalLayout_8->setContentsMargins(11, 11, 11, 11);
verticalLayout_8->setObjectName(QString::fromUtf8("verticalLayout_8"));
comboBox = new QComboBox(groupBox_5);
comboBox->setObjectName(QString::fromUtf8("comboBox"));
verticalLayout_8->addWidget(comboBox);
verticalLayout_3->addWidget(groupBox_5);
groupBox = new QGroupBox(widget);
groupBox->setObjectName(QString::fromUtf8("groupBox"));
verticalLayout_6 = new QVBoxLayout(groupBox);
@ -242,6 +260,7 @@ public:
void retranslateUi(QMainWindow *MainWindow)
{
MainWindow->setWindowTitle(QApplication::translate("MainWindow", "MainWindow", 0, QApplication::UnicodeUTF8));
groupBox_5->setTitle(QApplication::translate("MainWindow", "MapType", 0, QApplication::UnicodeUTF8));
groupBox->setTitle(QApplication::translate("MainWindow", "Goto Place", 0, QApplication::UnicodeUTF8));
pushButtonGO->setText(QApplication::translate("MainWindow", "GO", 0, QApplication::UnicodeUTF8));
label->setText(QApplication::translate("MainWindow", "GeoCoderStatusCode", 0, QApplication::UnicodeUTF8));

7
ground/src/experimental/OPMapWidget/internals/core.h
View File

@ -62,13 +62,10 @@ namespace mapcontrol
namespace internals {
class MouseWheelZoomType;
class Core:public QObject,public QRunnable
{
Q_OBJECT
Q_ENUMS(core::GeoCoderStatusCode::Types);
Q_ENUMS(MouseWheelZoomType::Types);
friend class mapcontrol::OPMapControl;
friend class mapcontrol::MapGraphicItem;
public:
@ -189,6 +186,8 @@ public:
TileMatrix Matrix;
bool isStarted(){return started;}
signals:
void OnCurrentPositionChanged(PointLatLng point);

3
ground/src/experimental/OPMapWidget/mapwidget/mapgraphicitem.h
View File

@ -77,6 +77,9 @@ private:
void start();
void ReloadMap(){core->ReloadMap();}
GeoCoderStatusCode::Types SetCurrentPositionByKeywords(QString const& keys){return core->SetCurrentPositionByKeywords(keys);}
MapType::Types GetMapType(){return core->GetMapType();}
void SetMapType(MapType::Types const& value){core->SetMapType(value);}
private slots:
void Core_OnNeedInvalidation();
public slots:

18
ground/src/experimental/OPMapWidget/mapwidget/opmapwidget.h
View File

@ -3,10 +3,17 @@
#include "../mapwidget/mapgraphicitem.h"
#include "../core/geodecoderstatus.h"
#include "../core/maptype.h"
#include <QObject>
#include <QGLWidget>
namespace mapcontrol
{
class Helper
{
};
class OPMapWidget:public QGraphicsView
{
Q_OBJECT
@ -21,7 +28,13 @@ namespace mapcontrol
Q_ENUMS(internals::MouseWheelZoomType::Types)
Q_ENUMS(internals::GeoCoderStatusCode::Types)
public:
GeoCoderStatusCode geodecoderstatus;
GeoCoderStatusCode x;
MapType y;
MapType::Types MapTypeFromString(QString const& value){return MapType::TypeByStr(value);}
QString StrFromMapType(MapType::Types const& value){return MapType::StrByType(value);}
QStringList MapTypes(){return MapType::TypesList();}
GeoCoderStatusCode::Types GeoCoderStatusCodeFromString(QString const& value){return GeoCoderStatusCode::TypeByStr(value);}
QString StrFromGeoCoderStatusCode(GeoCoderStatusCode::Types const& value){return GeoCoderStatusCode::StrByType(value);}
QSize sizeHint() const;
OPMapWidget(QWidget *parent=0);
~OPMapWidget();
@ -49,6 +62,9 @@ namespace mapcontrol
GeoCoderStatusCode::Types SetCurrentPositionByKeywords(QString const& keys){return map->SetCurrentPositionByKeywords(keys);}
bool UseOpenGL(){return useOpenGL;}
void SetUseOpenGL(bool const& value);
MapType::Types GetMapType(){return map->core->GetMapType();}
void SetMapType(MapType::Types const& value){map->core->SetMapType(value);}
bool isStarted(){return map->core->isStarted();}
private:
Core *core;
MapGraphicItem *map;