[QGIS Commit] r10395 - trunk/qgis/src/plugins/coordinate_capture
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Mar 21 19:44:22 EDT 2009
Author: timlinux
Date: 2009-03-21 19:44:22 -0400 (Sat, 21 Mar 2009)
New Revision: 10395
Modified:
trunk/qgis/src/plugins/coordinate_capture/coordinatecapture.cpp
trunk/qgis/src/plugins/coordinate_capture/coordinatecapture.h
Log:
Gui cleanups for coordinate capture - dont use a toolbar icon, rather use a button in the dock.
Also use less precision for dd maps.
Modified: trunk/qgis/src/plugins/coordinate_capture/coordinatecapture.cpp
===================================================================
--- trunk/qgis/src/plugins/coordinate_capture/coordinatecapture.cpp 2009-03-21 22:52:06 UTC (rev 10394)
+++ trunk/qgis/src/plugins/coordinate_capture/coordinatecapture.cpp 2009-03-21 23:44:22 UTC (rev 10395)
@@ -87,7 +87,7 @@
setSourceCrs(); //set up the source CRS
mTransform.setDestCRS( mCrs ); // set the CRS in the transform
- mUserCrsDisplayPrecision = ( mCrs.mapUnits() == QGis::Degrees ) ? 8 : 3; // precision depends on CRS units
+ mUserCrsDisplayPrecision = ( mCrs.mapUnits() == QGis::Degrees ) ? 3 : 5; // precision depends on CRS units
// Create the action for tool
mQActionPointer = new QAction( QIcon( ":/coordinatecapture/coordinate_capture.png" ), tr( "Coordinate Capture" ), this );
@@ -95,8 +95,6 @@
mQActionPointer->setWhatsThis( tr( "Click on the map to view coordinates and capture to clipboard." ) );
// Connect the action to the run
connect( mQActionPointer, SIGNAL( triggered() ), this, SLOT( run() ) );
- // Add the icon to the toolbar
- mQGisIface->addToolBarIcon( mQActionPointer );
mQGisIface->addPluginToMenu( tr( "&Coordinate Capture" ), mQActionPointer );
// create our map tool
@@ -138,12 +136,21 @@
mpTrackMouseButton->setChecked( false );
mpTrackMouseButton->setIcon( QIcon( ":/coordinatecapture/tracking.png" ) );
+ // Create the action for tool
+ mpCaptureButton = new QPushButton( mypWidget );
+ mpCaptureButton->setText( tr( "Start capture" ) );
+ mpCaptureButton->setToolTip( tr( "Click to enable coordinate capture" ) );
+ mpCaptureButton->setIcon( QIcon( ":/coordinatecapture/coordinatecapture/coordinate_capture.png" ));
+ mpCaptureButton->setWhatsThis( tr( "Click on the map to view coordinates and capture to clipboard." ) );
+ connect( mpCaptureButton, SIGNAL( clicked() ), this, SLOT( run() ) );
+
mypLayout->addWidget( mypUserCrsToolButton, 0, 0 );
mypLayout->addWidget( mpUserCrsEdit, 0, 1 );
mypLayout->addWidget( mypCRSLabel, 1, 0 );
mypLayout->addWidget( mpCanvasEdit, 1, 1 );
mypLayout->addWidget( mpTrackMouseButton, 2, 0 );
mypLayout->addWidget( mypCopyButton, 2, 1 );
+ mypLayout->addWidget( mpCaptureButton, 3, 1 );
//create the dock widget
@@ -171,14 +178,14 @@
{
mCrs.createFromSrsId( mySelector.selectedCrsId() );
mTransform.setDestCRS( mCrs );
- mUserCrsDisplayPrecision = ( mCrs.mapUnits() == QGis::Degrees ) ? 8 : 3; //precision depends on CRS units
+ mUserCrsDisplayPrecision = ( mCrs.mapUnits() == QGis::Degrees ) ? 3 : 5; //precision depends on CRS units
}
}
void CoordinateCapture::setSourceCrs()
{
mTransform.setSourceCrs( mQGisIface->mapCanvas()->mapRenderer()->destinationSrs() );
- mCanvasDisplayPrecision = ( mQGisIface->mapCanvas()->mapRenderer()->destinationSrs().mapUnits() == QGis::Degrees ) ? 8 : 3; // for the map canvas coordinate display
+ mCanvasDisplayPrecision = ( mQGisIface->mapCanvas()->mapRenderer()->destinationSrs().mapUnits() == QGis::Degrees ) ? 3 : 5; // for the map canvas coordinate display
}
void CoordinateCapture::mouseClicked( QgsPoint thePoint )
@@ -245,7 +252,7 @@
{
// remove the GUI
mQGisIface->removePluginMenu( "&Coordinate Capture", mQActionPointer );
- mQGisIface->removeToolBarIcon( mQActionPointer );
+ //mQGisIface->removeToolBarIcon( mQActionPointer );
mpMapTool->deactivate();
delete mpMapTool;
delete mpDockWidget;
Modified: trunk/qgis/src/plugins/coordinate_capture/coordinatecapture.h
===================================================================
--- trunk/qgis/src/plugins/coordinate_capture/coordinatecapture.h 2009-03-21 22:52:06 UTC (rev 10394)
+++ trunk/qgis/src/plugins/coordinate_capture/coordinatecapture.h 2009-03-21 23:44:22 UTC (rev 10395)
@@ -50,6 +50,7 @@
class QAction;
class QToolBar;
class QToolButton;
+class QPushButton;
class QDockWidget;
class QLineEdit;
@@ -121,6 +122,7 @@
//!A toolbutton to keep track whether mouse tracking is enabled
QToolButton * mpTrackMouseButton;
+ QPushButton * mpCaptureButton;
//! transform object
QgsCoordinateTransform mTransform;
More information about the QGIS-commit
mailing list