Skip to content
Permalink
Browse files

Removed tool QgsMapToolEmitPoint - it's not used anymore.

(this map tool was only temporary)


git-svn-id: http://svn.osgeo.org/qgis/trunk@5170 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Apr 5, 2006
1 parent 0fe2e11 commit bc6710156a1e073178dd17d031f2f21175c1aa5d
@@ -106,7 +106,6 @@ libqgis_guiHEADERS = \
qgsmapserverexport.h \
qgsmaptool.h \
qgsmaptoolcapture.h \
qgsmaptoolemitpoint.h \
qgsmaptoolidentify.h \
qgsmaptoolpan.h \
qgsmaptoolselect.h \
@@ -236,7 +235,6 @@ libqgis_gui_la_SOURCES = \
qgsmapserverexport.cpp \
qgsmaptool.cpp \
qgsmaptoolcapture.cpp \
qgsmaptoolemitpoint.cpp \
qgsmaptoolidentify.cpp \
qgsmaptoolpan.cpp \
qgsmaptoolselect.cpp \
@@ -126,7 +126,6 @@
// Map tools
//
#include "qgsmaptoolcapture.h"
#include "qgsmaptoolemitpoint.h"
#include "qgsmaptoolidentify.h"
#include "qgsmaptoolselect.h"
#include "qgsmaptoolpan.h"
@@ -984,7 +983,6 @@ void QgisApp::setupConnections()
//signal when mouse moved over window (coords display in status bar)
connect(mMapCanvas, SIGNAL(xyCoordinates(QgsPoint &)), this, SLOT(showMouseCoordinate(QgsPoint &)));
//signal when mouse in capturePoint mode and mouse clicked on canvas
connect(mMapCanvas, SIGNAL(xyClickCoordinates(QgsPoint &)), this, SLOT(showCapturePointCoordinate(QgsPoint &)));
connect(mMapCanvas->mapRender(), SIGNAL(setProgress(int,int)), this, SLOT(showProgress(int,int)));
connect(mMapCanvas, SIGNAL(extentsChanged(QgsRect )),this,SLOT(showExtents(QgsRect )));
connect(mMapCanvas, SIGNAL(scaleChanged(QString)), this, SLOT(showScale(QString)));
@@ -3349,6 +3347,9 @@ void QgisApp::capturePoint()
QgsMapTool* t = new QgsMapToolCapture(mMapCanvas, QgsMapToolCapture::CapturePoint);
t->setAction(mActionCapturePoint);
mMapCanvas->setMapTool(t);

// FIXME: is this still actual or something old that's not used anymore?
//connect(t, SIGNAL(xyClickCoordinates(QgsPoint &)), this, SLOT(showCapturePointCoordinate(QgsPoint &)));
}

void QgisApp::captureLine()
@@ -1054,13 +1054,6 @@ void QgsMapCanvas::moveCanvasContents(bool reset)
}


void QgsMapCanvas::emitPointEvent(QgsPoint& point, Qt::ButtonState state)
{
emit xyClickCoordinates(point);
emit xyClickCoordinates(point,state);
}


void QgsMapCanvas::updateMap()
{
// XXX updating is not possible since we're already in paint loop
@@ -185,9 +185,6 @@ class QgsMapCanvas : public Q3CanvasView
//! used to determine if anti-aliasing is enabled or not
void enableAntiAliasing(bool theFlag);

//! called from QgsMapToolEmitPoint to emit appopriate signal (temporary, should be sorted out)
void emitPointEvent(QgsPoint& point, Qt::ButtonState state);

// following 2 methods should be moved elsewhere or changed to private
// currently used by pan map tool
//! Ends pan action and redraws the canvas.
@@ -231,9 +228,6 @@ class QgsMapCanvas : public Q3CanvasView
void setProgress(int,int);
/** emits current mouse position */
void xyCoordinates(QgsPoint & p);
/** emits mouse position when the canvas is clicked */
void xyClickCoordinates(QgsPoint &p);
void xyClickCoordinates(QgsPoint &p, Qt::ButtonState button);

//! Emitted when the scale of the map changes
void scaleChanged(QString);
@@ -98,7 +98,8 @@ void QgsMapToolCapture::canvasReleaseEvent(QMouseEvent * e)

QgsPoint idPoint = toMapCoords(e->pos());

// why emit a signal? [MD]
// emit signal - QgisApp can catch it and save point position to clipboard
// FIXME: is this still actual or something old that's not used anymore?
//emit xyClickCoordinates(idPoint);

//only do the rest for provider with feature addition support
@@ -57,6 +57,13 @@ class QgsMapToolCapture : public QgsMapTool


virtual void deactivate();

/*
// FIXME: is this still actual or something old that's not used anymore?
signals:
//! emits mouse position when the canvas is clicked
void xyClickCoordinates(QgsPoint &p);
*/

protected:

This file was deleted.

This file was deleted.

@@ -19,7 +19,6 @@
#include "qgsimagewarper.h"
#include "qgsgeorefwarpoptionsdialog.h"
#include "qgsmaplayerregistry.h"
#include "qgsmaptoolemitpoint.h"
#include "qgsmaptoolzoom.h"
#include "qgsmaptoolpan.h"
#include "qgsgeorefdatapoint.h"
@@ -47,7 +47,6 @@
#include "qgsapplication.h"
#include "qgsmapcanvas.h"
#include "qgsmaplayer.h"
#include "qgsmaptoolemitpoint.h"
#include "qgsvectorlayer.h"
#include "qgsdataprovider.h"
#include "qgsmaptopixel.h"
@@ -50,7 +50,7 @@
#include "qgsvectorlayer.h"
#include "qgisiface.h"
#include "qgsmapcanvas.h"
#include "qgsmaptoolemitpoint.h"
#include "qgsmaptool.h"
#include "qgsmaptopixel.h"
#include "qgspoint.h"

0 comments on commit bc67101

Please sign in to comment.
You can’t perform that action at this time.