Skip to content

Commit

Permalink
Remove unused include, add proper header, and put string in translati…
Browse files Browse the repository at this point in the history 
…on function.
  • Loading branch information
@ismailsunni
ismailsunni committed Jun 6, 2019
1 parent 2b11eb5 commit 8af152a
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 16 deletions.
1 change: 0 additions & 1 deletion src/app/3d/qgs3dmapcanvas.cpp
View file
Expand Up @@ -19,7 +19,6 @@
#include <Qt3DExtras/Qt3DWindow>
#include <Qt3DRender/QRenderCapture>
#include <QMouseEvent>
#include <QPushButton>

#include "qgscameracontroller.h"
#include "qgs3dmapsettings.h"
Expand Down
3 changes: 3 additions & 0 deletions src/app/3d/qgs3dmapcanvas.h
View file
Expand Up @@ -73,6 +73,9 @@ class Qgs3DMapCanvas : public QWidget
*/
Qgs3DMapTool *mapTool() const { return mMapTool; }

/**
* Set the visibility of on-screen navigation widget.
*/
void setOnScreenNavigationVisibility(bool visibility);

signals:
Expand Down
35 changes: 24 additions & 11 deletions src/app/3d/qgs3dnavigationwidget.cpp
View file
@@ -1,8 +1,21 @@
/***************************************************************************
qgs3dnavigationwidget.cpp
--------------------------------------
Date : June 2019
Copyright : (C) 2019 by Ismail Sunni
Email : imajimatika at gmail dot com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/

#include <QGridLayout>
#include <QToolButton>
#include <QDial>
#include <QObject>
#include <QDebug>

#include "qwt_compass.h"
#include "qwt_dial_needle.h"
Expand All @@ -18,7 +31,7 @@ Qgs3DNavigationWidget::Qgs3DNavigationWidget(Qgs3DMapCanvas *parent) : QWidget(p
mParent3DMapCanvas = parent;
// Zoom in button
mZoomInButton = new QToolButton(this);
mZoomInButton->setToolTip(QStringLiteral("Zoom In"));
mZoomInButton->setToolTip(tr("Zoom In"));
mZoomInButton->setAutoRepeat(true);
mZoomInButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionZoomIn.svg" ) ) );
mZoomInButton->setAutoRaise(true);
Expand All @@ -34,7 +47,7 @@ Qgs3DNavigationWidget::Qgs3DNavigationWidget(Qgs3DMapCanvas *parent) : QWidget(p

// Zoom out button
mZoomOutButton = new QToolButton(this);
mZoomOutButton->setToolTip(QStringLiteral("Zoom Out"));
mZoomOutButton->setToolTip(tr("Zoom Out"));
mZoomOutButton->setAutoRepeat(true);
mZoomOutButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionZoomOut.svg" ) ) );
mZoomOutButton->setAutoRaise(true);
Expand All @@ -50,7 +63,7 @@ Qgs3DNavigationWidget::Qgs3DNavigationWidget(Qgs3DMapCanvas *parent) : QWidget(p

// Tilt up button
mTiltUpButton = new QToolButton(this);
mTiltUpButton->setToolTip(QStringLiteral("Tilt Up"));
mTiltUpButton->setToolTip(tr("Tilt Up"));
mTiltUpButton->setAutoRepeat(true);
mTiltUpButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionTiltUp.svg" ) ) );
mTiltUpButton->setAutoRaise(true);
Expand All @@ -66,7 +79,7 @@ Qgs3DNavigationWidget::Qgs3DNavigationWidget(Qgs3DMapCanvas *parent) : QWidget(p

// Tilt down button
mTiltDownButton = new QToolButton(this);
mTiltDownButton->setToolTip(QStringLiteral("Tilt Down"));
mTiltDownButton->setToolTip(tr("Tilt Down"));
mTiltDownButton->setAutoRepeat(true);
mTiltDownButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionTiltDown.svg" ) ) );
mTiltDownButton->setAutoRaise(true);
Expand All @@ -83,7 +96,7 @@ Qgs3DNavigationWidget::Qgs3DNavigationWidget(Qgs3DMapCanvas *parent) : QWidget(p
// Compas
QwtCompassMagnetNeedle *compasNeedle = new QwtCompassMagnetNeedle();
mCompas = new QwtCompass(this);
mCompas->setToolTip(QStringLiteral("Rotate view"));
mCompas->setToolTip(tr("Rotate view"));
mCompas->setWrapping(true);
mCompas->setNeedle(compasNeedle);

Expand All @@ -98,7 +111,7 @@ Qgs3DNavigationWidget::Qgs3DNavigationWidget(Qgs3DMapCanvas *parent) : QWidget(p

// Move up button
mMoveUpButton = new QToolButton(this);
mMoveUpButton->setToolTip(QStringLiteral("Move up"));
mMoveUpButton->setToolTip(tr("Move up"));
mMoveUpButton->setAutoRepeat(true);
mMoveUpButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionArrowUp.svg" ) ) );
mMoveUpButton->setAutoRaise(true);
Expand All @@ -114,7 +127,7 @@ Qgs3DNavigationWidget::Qgs3DNavigationWidget(Qgs3DMapCanvas *parent) : QWidget(p

// Move right button
mMoveRightButton = new QToolButton(this);
mMoveRightButton->setToolTip(QStringLiteral("Move right"));
mMoveRightButton->setToolTip(tr("Move right"));
mMoveRightButton->setAutoRepeat(true);
mMoveRightButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionArrowRight.svg" ) ) );
mMoveRightButton->setAutoRaise(true);
Expand All @@ -130,7 +143,7 @@ Qgs3DNavigationWidget::Qgs3DNavigationWidget(Qgs3DMapCanvas *parent) : QWidget(p

// Move down button
mMoveDownButton = new QToolButton(this);
mMoveDownButton->setToolTip(QStringLiteral("Move down"));
mMoveDownButton->setToolTip(tr("Move down"));
mMoveDownButton->setAutoRepeat(true);
mMoveDownButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionArrowDown.svg" ) ) );
mMoveDownButton->setAutoRaise(true);
Expand All @@ -146,7 +159,7 @@ Qgs3DNavigationWidget::Qgs3DNavigationWidget(Qgs3DMapCanvas *parent) : QWidget(p

// Move left button
mMoveLeftButton = new QToolButton(this);
mMoveLeftButton->setToolTip(QStringLiteral("Move left"));
mMoveLeftButton->setToolTip(tr("Move left"));
mMoveLeftButton->setAutoRepeat(true);
mMoveLeftButton->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionArrowLeft.svg" ) ) );
mMoveLeftButton->setAutoRaise(true);
Expand Down
12 changes: 8 additions & 4 deletions src/app/3d/qgs3dnavigationwidget.h
View file
@@ -1,9 +1,9 @@
/***************************************************************************
qgs3dnavigationwidget.h
--------------------------------------
Date : July 2017
Copyright : (C) 2017 by Martin Dobias
Email : wonder dot sk at gmail dot com
Date : June 2019
Copyright : (C) 2019 by Ismail Sunni
Email : imajimatika at gmail dot com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
Expand All @@ -17,9 +17,9 @@
#define QGS3DNAVIGATIONWIDGET_H

#include <QWidget>
#include <QDial>
#include <QGridLayout>
#include <QToolButton>

#include "qwt_compass.h"

#include "qgs3dmapcanvas.h"
Expand All @@ -31,6 +31,10 @@ class Qgs3DNavigationWidget : public QWidget
public:
Qgs3DNavigationWidget(Qgs3DMapCanvas *parent = nullptr);
~Qgs3DNavigationWidget();

/**
* Update the state of navigation widget from camera's state
*/
void updateFromCamera();

signals:
Expand Down

0 comments on commit 8af152a

Please sign in to comment.