[QGIS Commit] r9536 - in trunk/qgis: python/core python/gui src/app
src/app/legend src/core src/gui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Oct 24 17:47:48 EDT 2008
Author: timlinux
Date: 2008-10-24 17:47:48 -0400 (Fri, 24 Oct 2008)
New Revision: 9536
Modified:
trunk/qgis/python/core/qgsmaprenderer.sip
trunk/qgis/python/gui/qgsmapcanvas.sip
trunk/qgis/src/app/legend/qgslegend.cpp
trunk/qgis/src/app/legend/qgslegend.h
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/app/qgisapp.h
trunk/qgis/src/app/qgsmeasuredialog.cpp
trunk/qgis/src/app/qgsmeasuretool.cpp
trunk/qgis/src/core/qgsmaprenderer.h
trunk/qgis/src/core/qgsproject.cpp
trunk/qgis/src/core/qgsproject.h
trunk/qgis/src/gui/qgsmapcanvas.cpp
trunk/qgis/src/gui/qgsmapcanvas.h
trunk/qgis/src/gui/qgsmapoverviewcanvas.cpp
Log:
API cleanups to qgis project and maprenderer classes
Modified: trunk/qgis/python/core/qgsmaprenderer.sip
===================================================================
--- trunk/qgis/python/core/qgsmaprenderer.sip 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/python/core/qgsmaprenderer.sip 2008-10-24 21:47:48 UTC (rev 9536)
@@ -44,7 +44,7 @@
void setMapUnits(QGis::UnitType u);
//! sets whether map image will be for overview
- void setOverview(bool isOverview = true);
+ void enableOverviewMode(bool isOverview = true);
void setOutputSize(QSize size, int dpi);
Modified: trunk/qgis/python/gui/qgsmapcanvas.sip
===================================================================
--- trunk/qgis/python/gui/qgsmapcanvas.sip 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/python/gui/qgsmapcanvas.sip 2008-10-24 21:47:48 UTC (rev 9536)
@@ -58,7 +58,7 @@
void updateOverview();
- void setOverview(QgsMapOverviewCanvas* overview);
+ void enableOverviewMode(QgsMapOverviewCanvas* overview);
QgsMapCanvasMap* map();
Modified: trunk/qgis/src/app/legend/qgslegend.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegend.cpp 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/src/app/legend/qgslegend.cpp 2008-10-24 21:47:48 UTC (rev 9536)
@@ -1399,7 +1399,7 @@
mMapCanvas->updateOverview();
}
-void QgsLegend::setOverviewAllLayers( bool isInOverview )
+void QgsLegend::enableOverviewModeAllLayers( bool isInOverview )
{
QTreeWidgetItem* theItem = firstItem();
while ( theItem )
Modified: trunk/qgis/src/app/legend/qgslegend.h
===================================================================
--- trunk/qgis/src/app/legend/qgslegend.h 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/src/app/legend/qgslegend.h 2008-10-24 21:47:48 UTC (rev 9536)
@@ -154,7 +154,7 @@
void updateOverview();
/**Show/remove all layer in/from overview*/
- void setOverviewAllLayers( bool isInOverview );
+ void enableOverviewModeAllLayers( bool isInOverview );
/**Adds an entry to mPixmapWidthValues*/
void addPixmapWidthValue( int width );
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/src/app/qgisapp.cpp 2008-10-24 21:47:48 UTC (rev 9536)
@@ -1506,8 +1506,8 @@
connect( mStopRenderButton, SIGNAL( clicked() ), this, SLOT( stopRendering() ) );
// Connect warning dialog from project reading
- connect( QgsProject::instance(), SIGNAL( warnOlderProjectVersion( QString ) ),
- this, SLOT( warnOlderProjectVersion( QString ) ) );
+ connect( QgsProject::instance(), SIGNAL( oldProjectVersionWarning( QString ) ),
+ this, SLOT( oldProjectVersionWarning( QString ) ) );
}
void QgisApp::createCanvas()
@@ -1580,7 +1580,7 @@
// add to the Panel submenu
mPanelMenu->addAction( mOverviewDock->toggleViewAction() );
- mMapCanvas->setOverview( overviewCanvas );
+ mMapCanvas->enableOverviewMode( overviewCanvas );
// moved here to set anti aliasing to both map canvas and overview
QSettings mySettings;
@@ -3469,7 +3469,7 @@
{
if ( mMapLegend )
{
- mMapLegend->setOverviewAllLayers( true );
+ mMapLegend->enableOverviewModeAllLayers( true );
}
// notify the project we've made a change
@@ -3481,7 +3481,7 @@
{
if ( mMapLegend )
{
- mMapLegend->setOverviewAllLayers( false );
+ mMapLegend->enableOverviewModeAllLayers( false );
}
// notify the project we've made a change
@@ -5627,7 +5627,7 @@
// Slot that gets called when the project file was saved with an older
// version of QGIS
-void QgisApp::warnOlderProjectVersion( QString oldVersion )
+void QgisApp::oldProjectVersionWarning( QString oldVersion )
{
QSettings settings;
Modified: trunk/qgis/src/app/qgisapp.h
===================================================================
--- trunk/qgis/src/app/qgisapp.h 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/src/app/qgisapp.h 2008-10-24 21:47:48 UTC (rev 9536)
@@ -548,7 +548,7 @@
void showPythonDialog();
//! Shows a warning when an old project file is read.
- void warnOlderProjectVersion( QString );
+ void oldProjectVersionWarning( QString );
//! Toggle map tips on/off
void toggleMapTips();
Modified: trunk/qgis/src/app/qgsmeasuredialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsmeasuredialog.cpp 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/src/app/qgsmeasuredialog.cpp 2008-10-24 21:47:48 UTC (rev 9536)
@@ -88,14 +88,14 @@
{
QList<QgsPoint> tmpPoints = mTool->points();
tmpPoints.append( point );
- double area = mTool->canvas()->mapRenderer()->distArea()->measurePolygon( tmpPoints );
+ double area = mTool->canvas()->mapRenderer()->distanceArea()->measurePolygon( tmpPoints );
editTotal->setText( formatArea( area ) );
}
else if ( !mMeasureArea && mTool->points().size() > 0 )
{
QgsPoint p1( mTool->points().last() ), p2( point );
- double d = mTool->canvas()->mapRenderer()->distArea()->measureLine( p1, p2 );
+ double d = mTool->canvas()->mapRenderer()->distanceArea()->measureLine( p1, p2 );
QTreeWidgetItem *item = mTable->topLevelItem( mTable->topLevelItemCount() - 1 );
item->setText( 0, QLocale::system().toString( d, 'f', 2 ) );
editTotal->setText( formatDistance( mTotal + d ) );
@@ -107,7 +107,7 @@
int numPoints = mTool->points().size();
if ( mMeasureArea && numPoints > 2 )
{
- double area = mTool->canvas()->mapRenderer()->distArea()->measurePolygon( mTool->points() );
+ double area = mTool->canvas()->mapRenderer()->distanceArea()->measurePolygon( mTool->points() );
editTotal->setText( formatArea( area ) );
}
else if ( !mMeasureArea && numPoints > 1 )
@@ -116,7 +116,7 @@
QgsPoint p1 = mTool->points()[last], p2 = mTool->points()[last+1];
- double d = mTool->canvas()->mapRenderer()->distArea()->measureLine( p1, p2 );
+ double d = mTool->canvas()->mapRenderer()->distanceArea()->measureLine( p1, p2 );
mTotal += d;
editTotal->setText( formatDistance( mTotal ) );
Modified: trunk/qgis/src/app/qgsmeasuretool.cpp
===================================================================
--- trunk/qgis/src/app/qgsmeasuretool.cpp 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/src/app/qgsmeasuretool.cpp 2008-10-24 21:47:48 UTC (rev 9536)
@@ -67,7 +67,7 @@
// If we suspect that they have data that is projected, yet the
// map CRS is set to a geographic one, warn them.
- if ( mCanvas->mapRenderer()->distArea()->geographic() &&
+ if ( mCanvas->mapRenderer()->distanceArea()->geographic() &&
( mCanvas->extent().height() > 360 ||
mCanvas->extent().width() > 720 ) )
{
Modified: trunk/qgis/src/core/qgsmaprenderer.h
===================================================================
--- trunk/qgis/src/core/qgsmaprenderer.h 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/src/core/qgsmaprenderer.h 2008-10-24 21:47:48 UTC (rev 9536)
@@ -82,12 +82,12 @@
void updateScale();
//! Return the measuring object
- QgsDistanceArea* distArea() { return mDistArea; }
+ QgsDistanceArea* distanceArea() { return mDistArea; }
QGis::UnitType mapUnits() const;
void setMapUnits( QGis::UnitType u );
//! sets whether map image will be for overview
- void setOverview( bool isOverview = true ) { mOverview = isOverview; }
+ void enableOverviewMode( bool isOverview = true ) { mOverview = isOverview; }
void setOutputSize( QSize size, int dpi );
Modified: trunk/qgis/src/core/qgsproject.cpp
===================================================================
--- trunk/qgis/src/core/qgsproject.cpp 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/src/core/qgsproject.cpp 2008-10-24 21:47:48 UTC (rev 9536)
@@ -797,8 +797,8 @@
QgsProjectFileTransform projectFile( *doc, fileVersion );
//! Shows a warning when an old project file is read.
- emit warnOlderProjectVersion( fileVersion.text() );
- QgsDebugMsg( "Emitting warnOlderProjectVersion(oldVersion)." );
+ emit oldProjectVersionWarning( fileVersion.text() );
+ QgsDebugMsg( "Emitting oldProjectVersionWarning(oldVersion)." );
projectFile.dump();
Modified: trunk/qgis/src/core/qgsproject.h
===================================================================
--- trunk/qgis/src/core/qgsproject.h 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/src/core/qgsproject.h 2008-10-24 21:47:48 UTC (rev 9536)
@@ -264,7 +264,7 @@
void writeProject( QDomDocument & );
//! emitted when an old project file is read.
- void warnOlderProjectVersion( QString );
+ void oldProjectVersionWarning( QString );
private:
Modified: trunk/qgis/src/gui/qgsmapcanvas.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.cpp 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/src/gui/qgsmapcanvas.cpp 2008-10-24 21:47:48 UTC (rev 9536)
@@ -306,7 +306,7 @@
} // addLayer
-void QgsMapCanvas::setOverview( QgsMapOverviewCanvas* overview )
+void QgsMapCanvas::enableOverviewMode( QgsMapOverviewCanvas* overview )
{
if ( mMapOverview )
{
Modified: trunk/qgis/src/gui/qgsmapcanvas.h
===================================================================
--- trunk/qgis/src/gui/qgsmapcanvas.h 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/src/gui/qgsmapcanvas.h 2008-10-24 21:47:48 UTC (rev 9536)
@@ -110,7 +110,7 @@
void updateOverview();
- void setOverview( QgsMapOverviewCanvas* overview );
+ void enableOverviewMode( QgsMapOverviewCanvas* overview );
QgsMapCanvasMap* map();
Modified: trunk/qgis/src/gui/qgsmapoverviewcanvas.cpp
===================================================================
--- trunk/qgis/src/gui/qgsmapoverviewcanvas.cpp 2008-10-24 21:20:16 UTC (rev 9535)
+++ trunk/qgis/src/gui/qgsmapoverviewcanvas.cpp 2008-10-24 21:47:48 UTC (rev 9536)
@@ -72,7 +72,7 @@
mPanningWidget = new QgsPanningWidget( this );
mMapRenderer = new QgsMapRenderer;
- mMapRenderer->setOverview();
+ mMapRenderer->enableOverviewMode();
setBackgroundColor( palette().window().color() );
}
More information about the QGIS-commit
mailing list