From 7a49f1354064bb9bf12a70f0489f52fbf068302b Mon Sep 17 00:00:00 2001 From: peabody124 Date: Thu, 23 Sep 2010 23:23:47 +0000 Subject: [PATCH] Ground/OPMap: Fix compile error that PT made: http://img93.imageshack.us/img93/8520/angrymonkey3uv.gif Also I'm not sure ZoomReal is correct, this just gets things running. There are some quirks with the OPMap scroll bar now that need to be addressed. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1731 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/src/plugins/opmap/opmapgadgetwidget.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ground/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/src/plugins/opmap/opmapgadgetwidget.cpp index 4f2a829a1..20a3b6558 100644 --- a/ground/src/plugins/opmap/opmapgadgetwidget.cpp +++ b/ground/src/plugins/opmap/opmapgadgetwidget.cpp @@ -424,7 +424,7 @@ void OPMapGadgetWidget::contextMenuEvent(QContextMenuEvent *event) menu.addAction(zoomInAct); menu.addAction(zoomOutAct); - QMenu zoomSubMenu(tr("&Zoom ") + "(" + QString::number(m_map->Zoom()) + ")", this); + QMenu zoomSubMenu(tr("&Zoom ") + "(" + QString::number(m_map->ZoomReal()) + ")", this); for (int i = 0; i < zoomAct.count(); i++) zoomSubMenu.addAction(zoomAct.at(i)); menu.addMenu(&zoomSubMenu); @@ -819,13 +819,13 @@ void OPMapGadgetWidget::on_treeViewWaypoints_clicked(QModelIndex index) void OPMapGadgetWidget::zoomIn() { if (m_map) - m_map->SetZoom(m_map->Zoom() + 1); + m_map->SetZoom(m_map->ZoomReal() + 1); } void OPMapGadgetWidget::zoomOut() { if (m_map) - m_map->SetZoom(m_map->Zoom() - 1); + m_map->SetZoom(m_map->ZoomReal() - 1); } void OPMapGadgetWidget::setZoom(int value) @@ -1148,13 +1148,13 @@ void OPMapGadgetWidget::onShowUAVAct_toggled(bool show) void OPMapGadgetWidget::onGoZoomInAct_triggered() { if (m_map) - setZoom(m_map->Zoom() + 1); + setZoom(m_map->ZoomReal() + 1); } void OPMapGadgetWidget::onGoZoomOutAct_triggered() { if (m_map) - setZoom(m_map->Zoom() - 1); + setZoom(m_map->ZoomReal() - 1); } void OPMapGadgetWidget::onZoomActGroup_triggered(QAction *action)