From 791997dbad956e3ebfa4dcfb63fd8add21f52d35 Mon Sep 17 00:00:00 2001 From: pip Date: Thu, 17 Jun 2010 18:54:12 +0000 Subject: [PATCH] Default zoom level for new map change from 10 to 2, plus a minor new map user control changes. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@805 ebee16cc-31ac-478f-84a7-5cbb03baadba --- .../src/plugins/opmap/opmap_controlpanel.ui | 716 +++++++++--------- .../opmap/opmapgadgetconfiguration.cpp | 2 +- .../src/plugins/opmap/opmapgadgetwidget.cpp | 27 +- ground/src/plugins/opmap/opmapgadgetwidget.h | 1 + 4 files changed, 390 insertions(+), 356 deletions(-) diff --git a/ground/src/plugins/opmap/opmap_controlpanel.ui b/ground/src/plugins/opmap/opmap_controlpanel.ui index c859b4580..1a0bcf05c 100644 --- a/ground/src/plugins/opmap/opmap_controlpanel.ui +++ b/ground/src/plugins/opmap/opmap_controlpanel.ui @@ -6,12 +6,12 @@ 0 0 - 426 + 350 702 - + 0 0 @@ -33,18 +33,22 @@ 7 + + Qt::DefaultContextMenu + OPMap Control Panel - 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)); + 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)); + 0 10 - 416 + 346 691 @@ -79,9 +83,9 @@ - 7 + 8 50 - true + false false @@ -89,7 +93,7 @@ background-color: rgba(255, 255, 255, 0); - Map Type + Map Type Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -138,9 +142,9 @@ - 7 + 8 50 - true + false false @@ -148,7 +152,7 @@ background-color: rgba(255, 255, 255, 0); - Find Place + Find Place Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -195,7 +199,7 @@ - 8 + 7 50 false false @@ -219,16 +223,16 @@ - + 0 0 - 7 + 8 50 - true + false false @@ -236,7 +240,7 @@ background-color: rgba(255, 255, 255, 0); - Home Geo Fence Distance + Home Geo Fence Distance Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -247,7 +251,7 @@ - 9 + 8 75 true @@ -262,7 +266,7 @@ QAbstractSpinBox::NoButtons - 50 + 10 2000 @@ -278,13 +282,14 @@ - + 0 0 + 8 50 false @@ -361,310 +366,298 @@ - - - - 7 - 75 - true - - - - Map - - - Qt::AlignCenter - - - true - - - - 0 - - - 5 - - - 0 - - - 5 - - - - - - - - - - 50 - false - - - - OpenHandCursor - - - Rotate Anticlockwise - - - - - - - :/core/images/undo.png:/core/images/undo.png - - - - 12 - 12 - - - - true - - - - - - - - 50 - false - - - - OpenHandCursor - - - Reset Rotation - - - - - - - :/core/images/clear.png:/core/images/clear.png - - - - 12 - 12 - - - - true - - - - - - - - 50 - false - - - - OpenHandCursor - - - Rotate Clockwise - - - - - - - :/core/images/redo.png:/core/images/redo.png - - - - 12 - 12 - - - - true - - - - - - - - 75 - false - true - - - - OpenHandCursor - - - 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)); - - - Reload - - - true - - - - - - - - - - - - 0 - 0 - - - - - 50 - true - false - - - - background-color: rgba(255, 255, 255, 0); - - - Zoom Increment - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 9 - 75 - false - true - - - - ArrowCursor - - - false - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - QAbstractSpinBox::UpDownArrows - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - - 8 - 75 - true - - - - background-color: rgba(255, 255, 255, 0); - - - Zoom= - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 50 - false - - - - OpenHandCursor - - - - - - - :/core/images/minus.png:/core/images/minus.png - - - - 12 - 12 - - - - true - - - - - - - - 50 - false - - - - OpenHandCursor - - - - - - - :/core/images/plus.png:/core/images/plus.png - - - - 12 - 12 - - - - true - - - - - - - - - - - - - - Qt::Horizontal - - + + + + + + 0 + 0 + + + + + 8 + 50 + false + false + + + + background-color: rgba(255, 255, 255, 0); + + + Rotate + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 50 + false + + + + OpenHandCursor + + + Rotate Anticlockwise + + + + + + + :/core/images/undo.png:/core/images/undo.png + + + + 12 + 12 + + + + true + + + + + + + + 0 + 0 + + + + + 50 + false + + + + OpenHandCursor + + + Reset Rotation + + + + + + + :/core/images/clear.png:/core/images/clear.png + + + + 12 + 12 + + + + true + + + + + + + + 0 + 0 + + + + + 50 + false + + + + OpenHandCursor + + + Rotate Clockwise + + + + + + + :/core/images/redo.png:/core/images/redo.png + + + + 12 + 12 + + + + true + + + + + + + + 0 + 0 + + + + + 75 + false + true + + + + OpenHandCursor + + + 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)); + + + Reload + + + + 12 + 12 + + + + true + + + + + + + + 0 + 0 + + + + + 8 + 50 + false + false + + + + background-color: rgba(255, 255, 255, 0); + + + Zoom + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 8 + 75 + true + + + + background-color: rgba(255, 255, 255, 0); + + + Zoom + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 50 + false + + + + OpenHandCursor + + + + + + + :/core/images/minus.png:/core/images/minus.png + + + + 12 + 12 + + + + true + + + + + + + + 50 + false + + + + OpenHandCursor + + + + + + + :/core/images/plus.png:/core/images/plus.png + + + + 12 + 12 + + + + true + + + + @@ -747,39 +740,26 @@ - - - - 50 - false - + + + Qt::Horizontal - - OpenHandCursor - - - Add a new Way Point - - - - - - - :/core/images/plus.png:/core/images/plus.png - - + - 12 - 12 + 40 + 20 - - true - - + + + + 0 + 0 + + 50 @@ -810,6 +790,44 @@ + + + + + 0 + 0 + + + + + 50 + false + + + + OpenHandCursor + + + Add a new Way Point + + + + + + + :/core/images/plus.png:/core/images/plus.png + + + + 12 + 12 + + + + true + + + @@ -836,7 +854,7 @@ - + 0 0 diff --git a/ground/src/plugins/opmap/opmapgadgetconfiguration.cpp b/ground/src/plugins/opmap/opmapgadgetconfiguration.cpp index cd1f47657..bf83dab0d 100644 --- a/ground/src/plugins/opmap/opmapgadgetconfiguration.cpp +++ b/ground/src/plugins/opmap/opmapgadgetconfiguration.cpp @@ -31,7 +31,7 @@ OPMapGadgetConfiguration::OPMapGadgetConfiguration(QString classId, const QByteArray &state, QObject *parent) : IUAVGadgetConfiguration(classId, parent), m_mapProvider("OpenStreetMap"), - m_defaultZoom(10), + m_defaultZoom(2), m_defaultLatitude(0), m_defaultLongitude(0) { diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/src/plugins/opmap/opmapgadgetwidget.cpp index 9e7f705a7..295035568 100644 --- a/ground/src/plugins/opmap/opmapgadgetwidget.cpp +++ b/ground/src/plugins/opmap/opmapgadgetwidget.cpp @@ -60,7 +60,7 @@ OPMapGadgetWidget::OPMapGadgetWidget(QWidget *parent) : QWidget(parent) // create the map display map = new mapcontrol::OPMapWidget(); -// map->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + map->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); 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()); // get current position data @@ -205,7 +208,7 @@ void OPMapGadgetWidget::keyPressEvent(QKeyEvent* event) 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) @@ -230,6 +233,12 @@ void OPMapGadgetWidget::on_pushButtonGO_clicked() } } +void OPMapGadgetWidget::on_pushButtonReload_clicked() +{ + if (map) + map->ReloadMap(); +} + void OPMapGadgetWidget::on_pushButtonRL_clicked() { if (map) @@ -252,16 +261,22 @@ void OPMapGadgetWidget::on_pushButtonZoomP_clicked() { if (map) { -// double x = map->Zoom(); -// double y = controlpanel_ui->doubleSpinBox->value(); - 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_pushButtonZoomM_clicked() { 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) diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.h b/ground/src/plugins/opmap/opmapgadgetwidget.h index 89f30ecff..0e992a252 100644 --- a/ground/src/plugins/opmap/opmapgadgetwidget.h +++ b/ground/src/plugins/opmap/opmapgadgetwidget.h @@ -63,6 +63,7 @@ private slots: void on_checkBox_clicked(bool checked); void on_comboBox_currentIndexChanged(QString ); void on_pushButtonGO_clicked(); + void on_pushButtonReload_clicked(); void on_pushButtonRR_clicked(); void on_pushButtonRC_clicked(); void on_pushButtonRL_clicked();