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

Default zoom level for new map change from 10 to 2, plus a minor new map user control changes.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@805 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2010-06-17 18:54:12 +00:00 committed by pip
parent 072745ec83
commit 791997dbad
4 changed files with 390 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

264
ground/src/plugins/opmap/opmap_controlpanel.ui
View File

@ -6,12 +6,12 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>426</width> <width>350</width>
<height>702</height> <height>702</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -33,18 +33,22 @@
<pointsize>7</pointsize> <pointsize>7</pointsize>
</font> </font>
</property> </property>
<property name="contextMenuPolicy">
<enum>Qt::DefaultContextMenu</enum>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>OPMap Control Panel</string> <string>OPMap Control Panel</string>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(215, 215, 215, 255), stop:1 rgba(190, 190, 190, 255));</string> <string notr="true">background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(215, 215, 215, 255), stop:1 rgba(190, 190, 190, 255));
</string>
</property> </property>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>10</y> <y>10</y>
<width>416</width> <width>346</width>
<height>691</height> <height>691</height>
</rect> </rect>
</property> </property>
@ -79,9 +83,9 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>8</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>true</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -138,9 +142,9 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>8</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>true</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -195,7 +199,7 @@
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="font"> <property name="font">
<font> <font>
<pointsize>8</pointsize> <pointsize>7</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
@ -219,16 +223,16 @@
<item> <item>
<widget class="QLabel" name="label_13"> <widget class="QLabel" name="label_13">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>8</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>true</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -236,7 +240,7 @@
<string notr="true">background-color: rgba(255, 255, 255, 0);</string> <string notr="true">background-color: rgba(255, 255, 255, 0);</string>
</property> </property>
<property name="text"> <property name="text">
<string>Home Geo Fence Distance </string> <string>Home Geo Fence Distance</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
@ -247,7 +251,7 @@
<widget class="QSpinBox" name="spinBoxGeoFenceDistance"> <widget class="QSpinBox" name="spinBoxGeoFenceDistance">
<property name="font"> <property name="font">
<font> <font>
<pointsize>9</pointsize> <pointsize>8</pointsize>
<weight>75</weight> <weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
@ -262,7 +266,7 @@
<enum>QAbstractSpinBox::NoButtons</enum> <enum>QAbstractSpinBox::NoButtons</enum>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>50</number> <number>10</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>2000</number> <number>2000</number>
@ -278,13 +282,14 @@
<item> <item>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>8</pointsize>
<weight>50</weight> <weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -361,42 +366,42 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>7</pointsize> <pointsize>8</pointsize>
<weight>75</weight> <weight>50</weight>
<bold>true</bold> <italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="title"> <property name="styleSheet">
<string>Map</string> <string notr="true">background-color: rgba(255, 255, 255, 0);</string>
</property>
<property name="text">
<string>Rotate</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="flat"> </widget>
<bool>true</bool> </item>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>5</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>5</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_17">
<item> <item>
<widget class="QPushButton" name="pushButtonRL"> <widget class="QPushButton" name="pushButtonRL">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font"> <property name="font">
<font> <font>
<weight>50</weight> <weight>50</weight>
@ -429,6 +434,12 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButtonRC"> <widget class="QPushButton" name="pushButtonRC">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font"> <property name="font">
<font> <font>
<weight>50</weight> <weight>50</weight>
@ -461,6 +472,12 @@
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButtonRR"> <widget class="QPushButton" name="pushButtonRR">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font"> <property name="font">
<font> <font>
<weight>50</weight> <weight>50</weight>
@ -492,7 +509,13 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButton"> <widget class="QPushButton" name="pushButtonReload">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font"> <property name="font">
<font> <font>
<weight>75</weight> <weight>75</weight>
@ -503,33 +526,39 @@
<property name="cursor"> <property name="cursor">
<cursorShape>OpenHandCursor</cursorShape> <cursorShape>OpenHandCursor</cursorShape>
</property> </property>
<property name="mouseTracking">
<bool>true</bool>
</property>
<property name="styleSheet"> <property name="styleSheet">
<string notr="true">background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(160, 160, 160, 255), stop:1 rgba(180, 180, 180, 255));</string> <string notr="true">background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(160, 160, 160, 255), stop:1 rgba(180, 180, 180, 255));</string>
</property> </property>
<property name="text"> <property name="text">
<string>Reload</string> <string>Reload</string>
</property> </property>
<property name="iconSize">
<size>
<width>12</width>
<height>12</height>
</size>
</property>
<property name="flat"> <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <widget class="QLabel" name="label_8">
<item>
<widget class="QLabel" name="label_4">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<pointsize>8</pointsize>
<weight>50</weight> <weight>50</weight>
<italic>true</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -537,45 +566,21 @@
<string notr="true">background-color: rgba(255, 255, 255, 0);</string> <string notr="true">background-color: rgba(255, 255, 255, 0);</string>
</property> </property>
<property name="text"> <property name="text">
<string>Zoom Increment </string> <string>Zoom</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QDoubleSpinBox" name="doubleSpinBox"> <widget class="QLabel" name="labelZoom">
<property name="font"> <property name="sizePolicy">
<font> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<pointsize>9</pointsize> <horstretch>0</horstretch>
<weight>75</weight> <verstretch>0</verstretch>
<italic>false</italic> </sizepolicy>
<bold>true</bold>
</font>
</property> </property>
<property name="cursor">
<cursorShape>ArrowCursor</cursorShape>
</property>
<property name="frame">
<bool>false</bool>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::UpDownArrows</enum>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_5">
<property name="font"> <property name="font">
<font> <font>
<pointsize>8</pointsize> <pointsize>8</pointsize>
@ -587,7 +592,7 @@
<string notr="true">background-color: rgba(255, 255, 255, 0);</string> <string notr="true">background-color: rgba(255, 255, 255, 0);</string>
</property> </property>
<property name="text"> <property name="text">
<string>Zoom=</string> <string>Zoom</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@ -654,18 +659,6 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>
@ -747,39 +740,26 @@
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_6"> <layout class="QHBoxLayout" name="horizontalLayout_6">
<item> <item>
<widget class="QPushButton" name="pushButtonAddWayPoint"> <spacer name="horizontalSpacer_2">
<property name="font"> <property name="orientation">
<font> <enum>Qt::Horizontal</enum>
<weight>50</weight>
<bold>false</bold>
</font>
</property> </property>
<property name="cursor"> <property name="sizeHint" stdset="0">
<cursorShape>OpenHandCursor</cursorShape>
</property>
<property name="toolTip">
<string>Add a new Way Point</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/plus.png</normaloff>:/core/images/plus.png</iconset>
</property>
<property name="iconSize">
<size> <size>
<width>12</width> <width>40</width>
<height>12</height> <height>20</height>
</size> </size>
</property> </property>
<property name="flat"> </spacer>
<bool>true</bool>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pushButtonDeleteWayPoint"> <widget class="QPushButton" name="pushButtonDeleteWayPoint">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font"> <property name="font">
<font> <font>
<weight>50</weight> <weight>50</weight>
@ -810,6 +790,44 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QPushButton" name="pushButtonAddWayPoint">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="cursor">
<cursorShape>OpenHandCursor</cursorShape>
</property>
<property name="toolTip">
<string>Add a new Way Point</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../coreplugin/core.qrc">
<normaloff>:/core/images/plus.png</normaloff>:/core/images/plus.png</iconset>
</property>
<property name="iconSize">
<size>
<width>12</width>
<height>12</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -836,7 +854,7 @@
<item> <item>
<widget class="QLabel" name="label_14"> <widget class="QLabel" name="label_14">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>

2
ground/src/plugins/opmap/opmapgadgetconfiguration.cpp
View File

@ -31,7 +31,7 @@
OPMapGadgetConfiguration::OPMapGadgetConfiguration(QString classId, const QByteArray &state, QObject *parent) : OPMapGadgetConfiguration::OPMapGadgetConfiguration(QString classId, const QByteArray &state, QObject *parent) :
IUAVGadgetConfiguration(classId, parent), IUAVGadgetConfiguration(classId, parent),
m_mapProvider("OpenStreetMap"), m_mapProvider("OpenStreetMap"),
m_defaultZoom(10), m_defaultZoom(2),
m_defaultLatitude(0), m_defaultLatitude(0),
m_defaultLongitude(0) m_defaultLongitude(0)
{ {

27
ground/src/plugins/opmap/opmapgadgetwidget.cpp
View File

@ -60,7 +60,7 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
// create the map display // create the map display
map = new mapcontrol::OPMapWidget(); map = new mapcontrol::OPMapWidget();
// map->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); map->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
map->setMinimumSize(64, 64); map->setMinimumSize(64, 64);
// ************** // **************
@ -71,6 +71,9 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent)
// ************** // **************
// receive map zoom changes
connect(map, SIGNAL(zoomChanged(double)), this, SLOT(zoomChanged(double)));
map->SetShowTileGridLines(controlpanel_ui->checkBox->isChecked()); map->SetShowTileGridLines(controlpanel_ui->checkBox->isChecked());
// get current position data // get current position data
@ -205,7 +208,7 @@ void OPMapGadgetWidget::keyPressEvent(QKeyEvent* event)
void OPMapGadgetWidget::zoomChanged(double zoom) void OPMapGadgetWidget::zoomChanged(double zoom)
{ {
controlpanel_ui->label_5->setText("CurrentZoom=" + QString::number(zoom)); controlpanel_ui->labelZoom->setText(" " + QString::number(zoom));
} }
void OPMapGadgetWidget::on_checkBox_clicked(bool checked) void OPMapGadgetWidget::on_checkBox_clicked(bool checked)
@ -230,6 +233,12 @@ void OPMapGadgetWidget::on_pushButtonGO_clicked()
} }
} }
void OPMapGadgetWidget::on_pushButtonReload_clicked()
{
if (map)
map->ReloadMap();
}
void OPMapGadgetWidget::on_pushButtonRL_clicked() void OPMapGadgetWidget::on_pushButtonRL_clicked()
{ {
if (map) if (map)
@ -252,16 +261,22 @@ void OPMapGadgetWidget::on_pushButtonZoomP_clicked()
{ {
if (map) if (map)
{ {
// double x = map->Zoom(); double zoom = map->Zoom();
// double y = controlpanel_ui->doubleSpinBox->value(); // double zoom_step = controlpanel_ui->doubleSpinBox->value();
map->SetZoom(map->Zoom() + controlpanel_ui->doubleSpinBox->value()); double zoom_step = 1;
map->SetZoom(zoom + zoom_step);
} }
} }
void OPMapGadgetWidget::on_pushButtonZoomM_clicked() void OPMapGadgetWidget::on_pushButtonZoomM_clicked()
{ {
if (map) if (map)
map->SetZoom(map->Zoom() - controlpanel_ui->doubleSpinBox->value()); {
double zoom = map->Zoom();
// double zoom_step = controlpanel_ui->doubleSpinBox->value();
double zoom_step = 1;
map->SetZoom(zoom - zoom_step);
}
} }
void OPMapGadgetWidget::on_checkBox_2_clicked(bool checked) void OPMapGadgetWidget::on_checkBox_2_clicked(bool checked)

1
ground/src/plugins/opmap/opmapgadgetwidget.h
View File

@ -63,6 +63,7 @@ private slots:
void on_checkBox_clicked(bool checked); void on_checkBox_clicked(bool checked);
void on_comboBox_currentIndexChanged(QString ); void on_comboBox_currentIndexChanged(QString );
void on_pushButtonGO_clicked(); void on_pushButtonGO_clicked();
void on_pushButtonReload_clicked();
void on_pushButtonRR_clicked(); void on_pushButtonRR_clicked();
void on_pushButtonRC_clicked(); void on_pushButtonRC_clicked();
void on_pushButtonRL_clicked(); void on_pushButtonRL_clicked();