eessppeelllloo/mapmap
1
0
Fork 0
mirror of https://github.com/mapmapteam/mapmap.git synced 2026-06-16 12:33:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-zoom-control' into develop

Browse Source
This commit is contained in:
baydam
2016-02-03 00:41:01 +00:00
parent 1180c310a2 39ccd56eef
commit e9a64540df
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MM.h
+2
View File
@@ -47,6 +47,8 @@ public:
static const int DEFAULT_WINDOW_HEIGHT = 480;
static const int TOP_TOOLBAR_ICON_SIZE = 48;
static const int BOTTOM_TOOLBAR_ICON_SIZE = 32;
static const int ZOOM_TOOLBAR_ICON_SIZE = 22;
static const int ZOOM_TOOLBAR_BUTTON_SIZE = 32;
// Style.
static const QColor WHITE;
MainWindow.cpp
+4
View File
@@ -2522,6 +2522,10 @@ void MainWindow::updateCanvases()
sourceCanvas->update();
destinationCanvas->update();
outputWindow->getCanvas()->update();
// Update position of zoom toolbar
sourceCanvas->moveZoomToolbar(canvasSplitter->widget(0)->rect());
destinationCanvas->moveZoomToolbar(canvasSplitter->widget(1)->rect());
}
MapperGLCanvas.cpp
+15 -8
View File
@@ -133,33 +133,33 @@ void MapperGLCanvas::createZoomToolsLayout()
// Zoom In button
_zoomInButton = new QPushButton;
_zoomInButton->setIcon(QIcon(":/zoom-in"));
_zoomInButton->setIconSize(QSize(22, 22));
_zoomInButton->setIconSize(QSize(MM::ZOOM_TOOLBAR_ICON_SIZE, MM::ZOOM_TOOLBAR_ICON_SIZE));
_zoomInButton->setToolTip(tr("Enlarge the shape"));
_zoomInButton->setFixedSize(32, 32);
_zoomInButton->setFixedSize(MM::ZOOM_TOOLBAR_BUTTON_SIZE, MM::ZOOM_TOOLBAR_BUTTON_SIZE);
_zoomInButton->setObjectName("zoom-in");
connect(_zoomInButton, SIGNAL(clicked()), this, SLOT(increaseZoomLevel()));
// Zoom Out button
_zoomOutButton = new QPushButton;
_zoomOutButton->setIcon(QIcon(":/zoom-out"));
_zoomOutButton->setIconSize(QSize(22, 22));
_zoomOutButton->setIconSize(QSize(MM::ZOOM_TOOLBAR_ICON_SIZE, MM::ZOOM_TOOLBAR_ICON_SIZE));
_zoomOutButton->setToolTip(tr("Shrink the shape"));
_zoomOutButton->setFixedSize(32, 32);
_zoomOutButton->setFixedSize(MM::ZOOM_TOOLBAR_BUTTON_SIZE, MM::ZOOM_TOOLBAR_BUTTON_SIZE);
_zoomOutButton->setObjectName("zoom-out");
connect(_zoomOutButton, SIGNAL(clicked()), this, SLOT(decreaseZoomLevel()));
// Reset to normal size button.
_resetZoomButton = new QPushButton;
_resetZoomButton->setIcon(QIcon(":/reset-zoom"));
_resetZoomButton->setIconSize(QSize(22, 22));
_resetZoomButton->setIconSize(QSize(MM::ZOOM_TOOLBAR_ICON_SIZE, MM::ZOOM_TOOLBAR_ICON_SIZE));
_resetZoomButton->setToolTip(tr("Reset the shape to the normal size"));
_resetZoomButton->setFixedSize(32, 32);
_resetZoomButton->setFixedSize(MM::ZOOM_TOOLBAR_BUTTON_SIZE, MM::ZOOM_TOOLBAR_BUTTON_SIZE);
_resetZoomButton->setObjectName("reset-zoom");
connect(_resetZoomButton, SIGNAL(clicked()), this, SLOT(resetZoomLevel()));
// Fit to view button
_fitToViewButton = new QPushButton;
_fitToViewButton->setIcon(QIcon(":/zoom-fit"));
_fitToViewButton->setIconSize(QSize(22, 22));
_fitToViewButton->setIconSize(QSize(MM::ZOOM_TOOLBAR_ICON_SIZE, MM::ZOOM_TOOLBAR_ICON_SIZE));
_fitToViewButton->setToolTip(tr("Fit the shape to content view"));
_fitToViewButton->setFixedSize(32, 32);
_fitToViewButton->setFixedSize(MM::ZOOM_TOOLBAR_BUTTON_SIZE, MM::ZOOM_TOOLBAR_BUTTON_SIZE);
_fitToViewButton->setObjectName("zoom-fit");
connect(_fitToViewButton, SIGNAL(clicked()), this, SLOT(fitShapeInView()));
@@ -189,6 +189,13 @@ void MapperGLCanvas::createZoomToolsLayout()
_zoomToolBar->setLayout(buttonsLayout);
}
void MapperGLCanvas::moveZoomToolbar(const QRect &rect)
{
_zoomToolBar->move(rect.width() - _zoomToolBar->width(),
rect.height() - _zoomToolBar->height());
}
//
void MapperGLCanvas::mousePressEvent(QMouseEvent* event)
MapperGLCanvas.h
+2
View File
@@ -96,6 +96,8 @@ public:
// Apply zoom to view
void applyZoomToView();
// Set the zoom toolbar position
void moveZoomToolbar(const QRect &rect);
protected:
// void initializeGL();