qi-hardware
/
nanomap
mirror of git://projects.qi-hardware.com/nanomap.git
1
0
Fork 0
Code

remove unused funktion triggerAction() from layers

This commit is contained in:
Niels 2011-02-19 13:34:01 +01:00
parent 88bbfbef29
commit 8d77601115
6 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
abstractlayer.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2010 Niels Kummerfeldt <niels.kummerfeldt@tu-harburg.de>
* Copyright 2010-2011 Niels Kummerfeldt <niels.kummerfeldt@tu-harburg.de>
*
* 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
@ -43,10 +43,6 @@ void AbstractLayer::pan(const QPoint &move)
Q_UNUSED(move)
}
void AbstractLayer::triggerAction()
{
}
void AbstractLayer::keyPressed(QKeyEvent *event)
{
Q_UNUSED(event)

3
abstractlayer.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2010 Niels Kummerfeldt <niels.kummerfeldt@tu-harburg.de>
* Copyright 2010-2011 Niels Kummerfeldt <niels.kummerfeldt@tu-harburg.de>
*
* 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
@ -35,7 +35,6 @@ public:
virtual void load(const QString &filename);
virtual void zoom(int level);
virtual void pan(const QPoint &move);
virtual void triggerAction();
virtual void keyPressed(QKeyEvent *event);
void paintLayer(QPainter *painter);

13
gpslayer.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2010 Niels Kummerfeldt <niels.kummerfeldt@tu-harburg.de>
* Copyright 2010-2011 Niels Kummerfeldt <niels.kummerfeldt@tu-harburg.de>
*
* 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
@ -44,18 +44,13 @@ GpsLayer::GpsLayer(MapWidget *map) :
m_gps->connectGps();
}
void GpsLayer::triggerAction()
{
if (isVisible()) {
map()->centerOnGeoPos(m_pos.x(), m_pos.y());
}
}
void GpsLayer::keyPressed(QKeyEvent *event)
{
if (event->modifiers() == Qt::NoModifier &&
event->key() == Qt::Key_G) {
triggerAction();
if (isVisible()) {
map()->centerOnGeoPos(m_pos.x(), m_pos.y());
}
}
}

3
gpslayer.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2010 Niels Kummerfeldt <niels.kummerfeldt@tu-harburg.de>
* Copyright 2010-2011 Niels Kummerfeldt <niels.kummerfeldt@tu-harburg.de>
*
* 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
@ -32,7 +32,6 @@ class GpsLayer : public AbstractLayer
public:
GpsLayer(MapWidget *map);
virtual void triggerAction();
virtual void keyPressed(QKeyEvent *event);
protected:

25
markerlayer.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2010 Niels Kummerfeldt <niels.kummerfeldt@tu-harburg.de>
* Copyright 2010-2011 Niels Kummerfeldt <niels.kummerfeldt@tu-harburg.de>
*
* 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
@ -60,24 +60,19 @@ void MarkerLayer::load(const QString &filename)
set.endGroup();
}
void MarkerLayer::triggerAction()
{
int n = 0;
if (!m_markerName.isEmpty()) {
n = m_markerName.last().toInt();
}
QString newName = QString::number(n+1);
m_markerPos << map()->geoPos();
m_markerName << newName;
emit markerAdded(newName);
}
void MarkerLayer::keyPressed(QKeyEvent *event)
{
if (event->key() == Qt::Key_M) {
if (event->modifiers() == Qt::NoModifier) {
triggerAction();
int n = 0;
if (!m_markerName.isEmpty()) {
n = m_markerName.last().toInt();
}
QString newName = QString::number(n+1);
m_markerPos << map()->geoPos();
m_markerName << newName;
emit markerAdded(newName);
} else if (event->modifiers() == Qt::AltModifier) {
toggleVisibility();
}

3
markerlayer.h
View File

@ -1,5 +1,5 @@
/*
* Copyright 2010 Niels Kummerfeldt <niels.kummerfeldt@tu-harburg.de>
* Copyright 2010-2011 Niels Kummerfeldt <niels.kummerfeldt@tu-harburg.de>
*
* 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
@ -32,7 +32,6 @@ public:
~MarkerLayer();
virtual void load(const QString &filename);
virtual void triggerAction();
virtual void keyPressed(QKeyEvent *event);
protected: