[QGIS Commit] r9539 - in trunk/qgis: python/core src/app src/core
src/core/raster src/providers/wms
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Oct 24 18:31:31 EDT 2008
Author: timlinux
Date: 2008-10-24 18:31:31 -0400 (Fri, 24 Oct 2008)
New Revision: 9539
Modified:
trunk/qgis/python/core/qgsrasterdataprovider.sip
trunk/qgis/python/core/qgsrasterlayer.sip
trunk/qgis/src/app/qgsrasterlayerproperties.cpp
trunk/qgis/src/app/qgsvectorlayerproperties.cpp
trunk/qgis/src/app/qgsvectorlayerproperties.h
trunk/qgis/src/core/qgsrasterdataprovider.h
trunk/qgis/src/core/raster/qgsrasterlayer.cpp
trunk/qgis/src/core/raster/qgsrasterlayer.h
trunk/qgis/src/providers/wms/qgswmsprovider.cpp
trunk/qgis/src/providers/wms/qgswmsprovider.h
Log:
API cleanup for raster data provider
Modified: trunk/qgis/python/core/qgsrasterdataprovider.sip
===================================================================
--- trunk/qgis/python/core/qgsrasterdataprovider.sip 2008-10-24 22:12:40 UTC (rev 9538)
+++ trunk/qgis/python/core/qgsrasterdataprovider.sip 2008-10-24 22:31:31 UTC (rev 9539)
@@ -81,7 +81,7 @@
* Get metadata in a format suitable for feeding directly
* into a subset of the GUI raster properties "Metadata" tab.
*/
- virtual QString getMetadata() = 0;
+ virtual QString metadata() = 0;
/**
* \brief Identify details from a server (e.g. WMS) from the last screen update
Modified: trunk/qgis/python/core/qgsrasterlayer.sip
===================================================================
--- trunk/qgis/python/core/qgsrasterlayer.sip 2008-10-24 22:12:40 UTC (rev 9538)
+++ trunk/qgis/python/core/qgsrasterlayer.sip 2008-10-24 22:31:31 UTC (rev 9539)
@@ -381,7 +381,7 @@
/** \brief Emit a signal asking for a repaint. (inherited from maplayer) */
void triggerRepaint();
/** \brief Obtain GDAL Metadata for this layer */
- QString getMetadata();
+ QString metadata();
/** \brief Accessor for ths raster layers pyramid list. A pyramid list defines the
* POTENTIAL pyramids that can be in a raster. To know which of the pyramid layers
* ACTUALLY exists you need to look at the existsFlag member in each struct stored in the
Modified: trunk/qgis/src/app/qgsrasterlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2008-10-24 22:12:40 UTC (rev 9538)
+++ trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2008-10-24 22:31:31 UTC (rev 9539)
@@ -833,7 +833,7 @@
//populate the metadata tab's text browser widget with gdal metadata info
QString myStyle = QgsApplication::reportStyleSheet();
txtbMetadata->document()->setDefaultStyleSheet( myStyle );
- txtbMetadata->setHtml( mRasterLayer->getMetadata() );
+ txtbMetadata->setHtml( mRasterLayer->metadata() );
} // QgsRasterLayerProperties::sync()
@@ -1629,7 +1629,7 @@
pixmapLegend->repaint();
//populate the metadata tab's text browser widget with gdal metadata info
QString myStyle = QgsApplication::reportStyleSheet();
- txtbMetadata->setHtml( mRasterLayer->getMetadata() );
+ txtbMetadata->setHtml( mRasterLayer->metadata() );
txtbMetadata->document()->setDefaultStyleSheet( myStyle );
}
Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp 2008-10-24 22:12:40 UTC (rev 9538)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp 2008-10-24 22:31:31 UTC (rev 9539)
@@ -441,7 +441,7 @@
QString myStyle = QgsApplication::reportStyleSheet();
teMetadata->clear();
teMetadata->document()->setDefaultStyleSheet( myStyle );
- teMetadata->setHtml( getMetadata() );
+ teMetadata->setHtml( metadata() );
actionDialog->init();
labelDialog->init();
labelCheckBox->setChecked( layer->hasLabelsEnabled() );
@@ -478,7 +478,7 @@
QString myStyle = QgsApplication::reportStyleSheet();
teMetadata->clear();
teMetadata->document()->setDefaultStyleSheet( myStyle );
- teMetadata->setHtml( getMetadata() );
+ teMetadata->setHtml( metadata() );
// update the extents of the layer (fetched from the provider)
layer->updateExtents();
}
@@ -655,7 +655,7 @@
}
}
-QString QgsVectorLayerProperties::getMetadata()
+QString QgsVectorLayerProperties::metadata()
{
QString myMetadata = "<html><body>";
myMetadata += "<table width=\"100%\">";
Modified: trunk/qgis/src/app/qgsvectorlayerproperties.h
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.h 2008-10-24 22:12:40 UTC (rev 9538)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.h 2008-10-24 22:31:31 UTC (rev 9539)
@@ -66,7 +66,7 @@
void reset();
/** Get metadata about the layer in nice formatted html */
- QString getMetadata();
+ QString metadata();
/** Set transparency based on slider position */
void sliderTransparency_valueChanged( int theValue );
Modified: trunk/qgis/src/core/qgsrasterdataprovider.h
===================================================================
--- trunk/qgis/src/core/qgsrasterdataprovider.h 2008-10-24 22:12:40 UTC (rev 9538)
+++ trunk/qgis/src/core/qgsrasterdataprovider.h 2008-10-24 22:31:31 UTC (rev 9539)
@@ -113,7 +113,7 @@
* Get metadata in a format suitable for feeding directly
* into a subset of the GUI raster properties "Metadata" tab.
*/
- virtual QString getMetadata() = 0;
+ virtual QString metadata() = 0;
/**
* \brief Identify details from a server (e.g. WMS) from the last screen update
Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp 2008-10-24 22:12:40 UTC (rev 9538)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp 2008-10-24 22:31:31 UTC (rev 9539)
@@ -441,7 +441,7 @@
// Get the layer's projection info and set up the
// QgsCoordinateTransform for this layer
- // NOTE: we must do this before getMetadata is called
+ // NOTE: we must do this before metadata is called
QString mySourceWkt = getProjectionWkt();
@@ -462,7 +462,7 @@
//that they match the coordinate system of this layer
QgsDebugMsg( "Layer registry has " + QString::number( QgsMapLayerRegistry::instance()->count() ) + "layers" );
- getMetadata();
+ metadata();
// Use the affine transform to get geo coordinates for
// the corners of the raster
@@ -3010,7 +3010,7 @@
-// convenience function for building getMetadata() HTML table cells
+// convenience function for building metadata() HTML table cells
static
QString
makeTableCell_( QString const & value )
@@ -3020,7 +3020,7 @@
-// convenience function for building getMetadata() HTML table cells
+// convenience function for building metadata() HTML table cells
static
QString
makeTableCells_( QStringList const & values )
@@ -3061,7 +3061,7 @@
-QString QgsRasterLayer::getMetadata()
+QString QgsRasterLayer::metadata()
{
QString myMetadata ;
myMetadata += "<p class=\"glossy\">" + tr( "Driver:" ) + "</p>\n";
@@ -3081,7 +3081,7 @@
if ( !mProviderKey.isEmpty() )
{
// Insert provider-specific (e.g. WMS-specific) metadata
- myMetadata += mDataProvider->getMetadata();
+ myMetadata += mDataProvider->metadata();
}
else
{
Modified: trunk/qgis/src/core/raster/qgsrasterlayer.h
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.h 2008-10-24 22:12:40 UTC (rev 9538)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.h 2008-10-24 22:31:31 UTC (rev 9539)
@@ -710,7 +710,7 @@
/** \brief Emit a signal asking for a repaint. (inherited from maplayer) */
void triggerRepaint();
/** \brief Obtain GDAL Metadata for this layer */
- QString getMetadata();
+ QString metadata();
/** \brief Accessor for ths raster layers pyramid list. A pyramid list defines the
* POTENTIAL pyramids that can be in a raster. To know which of the pyramid layers
* ACTUALLY exists you need to look at the existsFlag member in each struct stored in the
Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp 2008-10-24 22:12:40 UTC (rev 9538)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp 2008-10-24 22:31:31 UTC (rev 9539)
@@ -1823,7 +1823,7 @@
}
-QString QgsWmsProvider::getMetadata()
+QString QgsWmsProvider::metadata()
{
QString myMetadataQString = "";
Modified: trunk/qgis/src/providers/wms/qgswmsprovider.h
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.h 2008-10-24 22:12:40 UTC (rev 9538)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.h 2008-10-24 22:31:31 UTC (rev 9539)
@@ -496,7 +496,7 @@
* Get metadata in a format suitable for feeding directly
* into a subset of the GUI raster properties "Metadata" tab.
*/
- QString getMetadata();
+ QString metadata();
/**
More information about the QGIS-commit
mailing list