[QGIS Commit] r9483 - in trunk/qgis: . python/core src/app
src/app/legend src/core src/core/composer src/core/raster
src/plugins/geoprocessing src/plugins/gps_importer
src/plugins/grass src/providers/wms tools/mapserver_export
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Oct 16 16:44:22 EDT 2008
Author: timlinux
Date: 2008-10-16 16:44:22 -0400 (Thu, 16 Oct 2008)
New Revision: 9483
Modified:
trunk/qgis/ChangeLog
trunk/qgis/python/core/qgsmaplayer.sip
trunk/qgis/src/app/legend/qgslegend.cpp
trunk/qgis/src/app/legend/qgslegendlayer.cpp
trunk/qgis/src/app/legend/qgslegendlayerfile.cpp
trunk/qgis/src/app/qgisapp.cpp
trunk/qgis/src/app/qgsmapserverexport.cpp
trunk/qgis/src/app/qgsmaptoolidentify.cpp
trunk/qgis/src/core/composer/qgslegendmodel.cpp
trunk/qgis/src/core/qgsmaplayer.cpp
trunk/qgis/src/core/qgsmaplayer.h
trunk/qgis/src/core/qgsmaprenderer.cpp
trunk/qgis/src/core/qgsvectorlayer.cpp
trunk/qgis/src/core/raster/qgsrasterlayer.cpp
trunk/qgis/src/plugins/geoprocessing/qgspggeoprocessing.cpp
trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
trunk/qgis/src/plugins/grass/qgsgrassedit.cpp
trunk/qgis/src/plugins/grass/qgsgrassmapcalc.cpp
trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
trunk/qgis/src/providers/wms/qgswmsprovider.cpp
trunk/qgis/tools/mapserver_export/qgsmapserverexport.cpp
Log:
Use enum properly for qgsmaplayer type and refactored 'LAYERS' to LayerType
Modified: trunk/qgis/ChangeLog
===================================================================
--- trunk/qgis/ChangeLog 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/ChangeLog 2008-10-16 20:44:22 UTC (rev 9483)
@@ -798,7 +798,7 @@
conventions (prefixed with m).
-** Import Note *** ONLY THE MAPLAYER REGISTRY SHOULD DELETE LAYERS NOW ***
+** Import Note *** ONLY THE MAPLAYER REGISTRY SHOULD DELETE QgsMapLayer::LayerType NOW ***
2004-06-03 [ts] 0.3.0devel14
** Added getPaletteAsPixmap function to raster and display on raster props
Modified: trunk/qgis/python/core/qgsmaplayer.sip
===================================================================
--- trunk/qgis/python/core/qgsmaplayer.sip 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/python/core/qgsmaplayer.sip 2008-10-16 20:44:22 UTC (rev 9483)
@@ -11,11 +11,11 @@
%ConvertToSubClassCode
- if (sipCpp->type() == QgsMapLayer::VECTOR)
+ if (sipCpp->type() == QgsMapLayer::VectorLayer)
{
sipClass = sipClass_QgsVectorLayer;
}
- else if (sipCpp->type() == QgsMapLayer::RASTER)
+ else if (sipCpp->type() == QgsMapLayer::RasterLayer)
{
sipClass = sipClass_QgsRasterLayer;
}
@@ -27,20 +27,26 @@
%End
public:
+ /** Layers enum defining the types of layers that can be added to a map */
+ enum LayerType
+ {
+ VectorLayer,
+ RasterLayer
+ };
/** Constructor
- * @param type Type of layer as defined in LAYERS enum
+ * @param type Type of layer as defined in QgsMapLayer::LayerType enum
* @param lyrname Display Name of the layer
*/
- QgsMapLayer(int type = 0, QString lyrname = QString::null, QString source = QString::null);
+ QgsMapLayer(QgsMapLayer::LayerType type = QgsMapLayer::VectorLayer, QString lyrname = QString::null, QString source = QString::null);
/** Destructor */
virtual ~QgsMapLayer();
/** Get the type of the layer
- * @return Integer matching a value in the LAYERS enum
+ * @return Integer matching a value in the QgsMapLayer::LayerType enum
*/
- int type() const;
+ QgsMapLayer::LayerType type() const;
/** Get this layer's unique ID, this ID is used to access this layer from map layer registry */
QString getLayerID() const;
@@ -97,12 +103,6 @@
/** Set the visibility of the given sublayer name */
virtual void setSubLayerVisibility(QString name, bool vis);
- /** Layers enum defining the types of layers that can be added to a map */
- enum LAYERS
- {
- VECTOR,
- RASTER
- };
/** True if the layer can be edited */
virtual bool isEditable() const = 0;
Modified: trunk/qgis/src/app/legend/qgslegend.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegend.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/app/legend/qgslegend.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -678,7 +678,7 @@
a separate copy of the dialog pointer needs to be stored with each layer.
*/
- if ( ml->type() == QgsMapLayer::RASTER )
+ if ( ml->type() == QgsMapLayer::RasterLayer )
{
QgsRasterLayerProperties *rlp = NULL; // See note above about reusing this
if ( rlp )
Modified: trunk/qgis/src/app/legend/qgslegendlayer.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegendlayer.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/app/legend/qgslegendlayer.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -268,7 +268,7 @@
return;
}
- if ( theMapLayer->type() == QgsMapLayer::VECTOR ) // VECTOR
+ if ( theMapLayer->type() == QgsMapLayer::VectorLayer ) // VECTOR
{
QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>( theMapLayer );
vectorLayerSymbology( vlayer, widthScale ); // get and change symbology
@@ -436,7 +436,7 @@
QgsMapLayer* firstLayer = firstMapLayer();
if ( firstLayer )
{
- if ( firstLayer->type() == QgsMapLayer::VECTOR )
+ if ( firstLayer->type() == QgsMapLayer::VectorLayer )
{
QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>( firstLayer );
switch ( vlayer->type() )
@@ -454,7 +454,7 @@
return QgisApp::getThemePixmap( "/mIconLayer.png" );
}
}
- else if ( firstLayer->type() == QgsMapLayer::RASTER )
+ else if ( firstLayer->type() == QgsMapLayer::RasterLayer )
{
QgsRasterLayer* rlayer = dynamic_cast<QgsRasterLayer*>( firstLayer );
QPixmap myPixmap( 32, 32 );
@@ -479,7 +479,7 @@
// zoom to layer extent
theMenu.addAction( QgisApp::getThemeIcon( "/mActionZoomToLayer.png" ),
tr( "&Zoom to layer extent" ), legend(), SLOT( legendLayerZoom() ) );
- if ( firstLayer && firstLayer->type() == QgsMapLayer::RASTER )
+ if ( firstLayer && firstLayer->type() == QgsMapLayer::RasterLayer )
{
theMenu.addAction( tr( "&Zoom to best scale (100%)" ), legend(), SLOT( legendLayerZoomNative() ) );
}
@@ -495,7 +495,7 @@
theMenu.addSeparator();
- if ( firstLayer && firstLayer->type() == QgsMapLayer::VECTOR )
+ if ( firstLayer && firstLayer->type() == QgsMapLayer::VectorLayer )
{
// attribute table
QAction* tableAction = theMenu.addAction( tr( "&Open attribute table" ), this, SLOT( table() ) );
Modified: trunk/qgis/src/app/legend/qgslegendlayerfile.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegendlayerfile.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/app/legend/qgslegendlayerfile.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -229,7 +229,7 @@
{
QgsCoordinateReferenceSystem destCRS;
- if ( mLyr.layer()->type() != QgsMapLayer::VECTOR )
+ if ( mLyr.layer()->type() != QgsMapLayer::VectorLayer )
return;
QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>( mLyr.layer() );
@@ -374,7 +374,7 @@
theMenu.addSeparator();
- if ( lyr->type() == QgsMapLayer::VECTOR )
+ if ( lyr->type() == QgsMapLayer::VectorLayer )
{
QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>( lyr );
@@ -403,7 +403,7 @@
theMenu.addSeparator();
}
- else if ( lyr->type() == QgsMapLayer::RASTER )
+ else if ( lyr->type() == QgsMapLayer::RasterLayer )
{
// TODO: what was this for?
//QgsRasterLayer* rlayer = dynamic_cast<QgsRasterLayer*>(lyr);
Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/app/qgisapp.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -2971,7 +2971,7 @@
QMessageBox::critical( this,
tr( "QGIS Project Read Error" ),
tr( "" ) + "\n" + QString::fromLocal8Bit( e.what() ) );
- QgsDebugMsg( "BAD LAYERS FOUND" );
+ QgsDebugMsg( "BAD QgsMapLayer::LayerType FOUND" );
}
mMapCanvas->freeze( false );
@@ -3040,7 +3040,7 @@
}
catch ( std::exception & e )
{
- QgsDebugMsg( "BAD LAYERS FOUND" );
+ QgsDebugMsg( "BAD QgsMapLayer::LayerType FOUND" );
QMessageBox::critical( this,
tr( "Unable to open project" ), QString::fromLocal8Bit( e.what() ) );
@@ -4943,7 +4943,7 @@
{
//QgsDebugMsg("Current layer for maptip display is: " + mypLayer->source());
// only process vector layers
- if ( mypLayer->type() == QgsMapLayer::VECTOR )
+ if ( mypLayer->type() == QgsMapLayer::VectorLayer )
{
// Show the maptip if the maptips button is depressed
if ( mMapTipsVisible )
@@ -5054,7 +5054,7 @@
mActionAddToOverview->setEnabled( true );
/***********Vector layers****************/
- if ( layer->type() == QgsMapLayer::VECTOR )
+ if ( layer->type() == QgsMapLayer::VectorLayer )
{
mActionSelect->setEnabled( true );
mActionIdentify->setEnabled( true );
@@ -5198,7 +5198,7 @@
}
}
/*************Raster layers*************/
- else if ( layer->type() == QgsMapLayer::RASTER )
+ else if ( layer->type() == QgsMapLayer::RasterLayer )
{
mActionSelect->setEnabled( false );
mActionZoomActualSize->setEnabled( true );
Modified: trunk/qgis/src/app/qgsmapserverexport.cpp
===================================================================
--- trunk/qgis/src/app/qgsmapserverexport.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/app/qgsmapserverexport.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -205,7 +205,7 @@
// feature type
QgsDebugMsg( "\tMapsrver Export checking feature type" );
mapFile << " TYPE ";
- if ( lyr->type() == QgsMapLayer::VECTOR )
+ if ( lyr->type() == QgsMapLayer::VectorLayer )
{
QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>( lyr );
switch ( vlayer->geometryType() )
@@ -227,7 +227,7 @@
}
}
- if ( lyr->type() == QgsMapLayer::RASTER )
+ if ( lyr->type() == QgsMapLayer::RasterLayer )
{
mapFile << "RASTER";
}
@@ -252,7 +252,7 @@
QgsDebugMsg( "\tMapsrver Export checking layer type" );
switch ( lyr->type() )
{
- case QgsMapLayer::VECTOR:
+ case QgsMapLayer::VectorLayer:
// get the provider type
{
QgsVectorLayer* vlyr = dynamic_cast<QgsVectorLayer*>( lyr );
@@ -286,7 +286,7 @@
}
}
break;
- case QgsMapLayer::RASTER:
+ case QgsMapLayer::RasterLayer:
mapFile << " DATA " << lyr->source().toLocal8Bit().data() << std::endl;
break;
Modified: trunk/qgis/src/app/qgsmaptoolidentify.cpp
===================================================================
--- trunk/qgis/src/app/qgsmaptoolidentify.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/app/qgsmaptoolidentify.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -87,7 +87,7 @@
// coordinates are sent back to the server as pixel coordinates
// not the layer's native CRS. So identify on screen coordinates!
if (
- ( mLayer->type() == QgsMapLayer::RASTER )
+ ( mLayer->type() == QgsMapLayer::RasterLayer )
&&
( dynamic_cast<QgsRasterLayer*>( mLayer )->providerKey() == "wms" )
)
@@ -99,11 +99,11 @@
// convert screen coordinates to map coordinates
QgsPoint idPoint = mCanvas->getCoordinateTransform()->toMapCoordinates( e->x(), e->y() );
- if ( mLayer->type() == QgsMapLayer::VECTOR )
+ if ( mLayer->type() == QgsMapLayer::VectorLayer )
{
identifyVectorLayer( idPoint );
}
- else if ( mLayer->type() == QgsMapLayer::RASTER )
+ else if ( mLayer->type() == QgsMapLayer::RasterLayer )
{
identifyRasterLayer( idPoint );
}
Modified: trunk/qgis/src/core/composer/qgslegendmodel.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgslegendmodel.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/core/composer/qgslegendmodel.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -66,10 +66,10 @@
switch ( currentLayer->type() )
{
- case QgsMapLayer::VECTOR:
+ case QgsMapLayer::VectorLayer:
addVectorLayerItems( layerItem, currentLayer );
break;
- case QgsMapLayer::RASTER:
+ case QgsMapLayer::RasterLayer:
addRasterLayerItem( layerItem, currentLayer );
break;
default:
@@ -246,10 +246,10 @@
//and add the new ones...
switch ( mapLayer->type() )
{
- case QgsMapLayer::VECTOR:
+ case QgsMapLayer::VectorLayer:
addVectorLayerItems( layerItem, mapLayer );
break;
- case QgsMapLayer::RASTER:
+ case QgsMapLayer::RasterLayer:
addRasterLayerItem( layerItem, mapLayer );
break;
default:
@@ -408,10 +408,10 @@
//and child items of layer
switch ( theMapLayer->type() )
{
- case QgsMapLayer::VECTOR:
+ case QgsMapLayer::VectorLayer:
addVectorLayerItems( layerItem, theMapLayer );
break;
- case QgsMapLayer::RASTER:
+ case QgsMapLayer::RasterLayer:
addRasterLayerItem( layerItem, theMapLayer );
break;
default:
Modified: trunk/qgis/src/core/qgsmaplayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaplayer.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/core/qgsmaplayer.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -40,7 +40,7 @@
#include "qgsproject.h"
#include "qgslogger.h"
-QgsMapLayer::QgsMapLayer( int type,
+QgsMapLayer::QgsMapLayer( QgsMapLayer::LayerType type,
QString lyrname,
QString source ) :
mTransparencyLevel( 255 ), // 0 is completely transparent
@@ -82,7 +82,7 @@
delete mCRS;
}
-int QgsMapLayer::type() const
+QgsMapLayer::LayerType QgsMapLayer::type() const
{
return mLayerType;
}
Modified: trunk/qgis/src/core/qgsmaplayer.h
===================================================================
--- trunk/qgis/src/core/qgsmaplayer.h 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/core/qgsmaplayer.h 2008-10-16 20:44:22 UTC (rev 9483)
@@ -43,20 +43,26 @@
Q_OBJECT
public:
+ /** Layers enum defining the types of layers that can be added to a map */
+ enum LayerType
+ {
+ VectorLayer,
+ RasterLayer
+ };
/** Constructor
- * @param type Type of layer as defined in LAYERS enum
+ * @param type Type of layer as defined in QgsMapLayer::LayerType enum
* @param lyrname Display Name of the layer
*/
- QgsMapLayer( int type = 0, QString lyrname = QString::null, QString source = QString::null );
+ QgsMapLayer( QgsMapLayer::LayerType type = VectorLayer, QString lyrname = QString::null, QString source = QString::null );
/** Destructor */
virtual ~QgsMapLayer();
/** Get the type of the layer
- * @return Integer matching a value in the LAYERS enum
+ * @return Integer matching a value in the QgsMapLayer::LayerType enum
*/
- int type() const;
+ QgsMapLayer::LayerType type() const;
/** Get this layer's unique ID, this ID is used to access this layer from map layer registry */
QString getLayerID() const;
@@ -111,12 +117,6 @@
/** Set the visibility of the given sublayer name */
virtual void setSubLayerVisibility( QString name, bool vis );
- /** Layers enum defining the types of layers that can be added to a map */
- enum LAYERS
- {
- VECTOR,
- RASTER
- };
/** True if the layer can be edited */
virtual bool isEditable() const = 0;
@@ -344,7 +344,7 @@
QString mID;
/** Type of the layer (eg. vector, raster) */
- int mLayerType;
+ QgsMapLayer::LayerType mLayerType;
/** Tag for embedding additional information */
QString mTag;
Modified: trunk/qgis/src/core/qgsmaprenderer.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaprenderer.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/core/qgsmaprenderer.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -321,7 +321,7 @@
QgsMapToPixel rasterMapToPixel;
QgsMapToPixel bk_mapToPixel;
- if ( ml->type() == QgsMapLayer::RASTER && fabs( rasterScaleFactor - 1.0 ) > 0.000001 )
+ if ( ml->type() == QgsMapLayer::RasterLayer && fabs( rasterScaleFactor - 1.0 ) > 0.000001 )
{
scaleRaster = true;
}
@@ -386,7 +386,7 @@
// TODO: emit drawingProgress((myRenderCounter++),zOrder.size());
QgsMapLayer *ml = QgsMapLayerRegistry::instance()->mapLayer( layerId );
- if ( ml && ( ml->type() != QgsMapLayer::RASTER ) )
+ if ( ml && ( ml->type() != QgsMapLayer::RasterLayer ) )
{
// only make labels if the layer is visible
// after scale dep viewing settings are checked
Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -89,7 +89,7 @@
QString baseName,
QString providerKey,
bool loadDefaultStyleFlag )
- : QgsMapLayer( VECTOR, baseName, vectorLayerPath ),
+ : QgsMapLayer( VectorLayer, baseName, vectorLayerPath ),
mUpdateThreshold( 0 ), // XXX better default value?
mDataProvider( NULL ),
mProviderKey( providerKey ),
Modified: trunk/qgis/src/core/raster/qgsrasterlayer.cpp
===================================================================
--- trunk/qgis/src/core/raster/qgsrasterlayer.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/core/raster/qgsrasterlayer.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -304,7 +304,7 @@
QString const & path,
QString const & baseName,
bool loadDefaultStyleFlag )
- : QgsMapLayer( RASTER, baseName, path ),
+ : QgsMapLayer( RasterLayer, baseName, path ),
// Constant that signals property not used.
QSTRING_NOT_SET( "Not Set" ),
TRSTRING_NOT_SET( tr( "Not Set" ) ),
@@ -4572,7 +4572,7 @@
QStringList const & styles,
QString const & format,
QString const & crs )
- : QgsMapLayer( RASTER, baseName, rasterLayerPath ),
+ : QgsMapLayer( RasterLayer, baseName, rasterLayerPath ),
mRasterXDim( std::numeric_limits<int>::max() ),
mRasterYDim( std::numeric_limits<int>::max() ),
mInvertPixelsFlag( false ),
Modified: trunk/qgis/src/plugins/geoprocessing/qgspggeoprocessing.cpp
===================================================================
--- trunk/qgis/src/plugins/geoprocessing/qgspggeoprocessing.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/plugins/geoprocessing/qgspggeoprocessing.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -94,7 +94,7 @@
{
QgsVectorLayer *lyr = ( QgsVectorLayer* )layer;
// check the layer to see if its a postgres layer
- if ( layer->type() != QgsMapLayer::RASTER &&
+ if ( layer->type() != QgsMapLayer::RasterLayer &&
lyr->providerType() == "postgres" )
{
Modified: trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/plugins/gps_importer/qgsgpsplugin.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -116,7 +116,7 @@
for ( iter = registry->mapLayers().begin();
iter != registry->mapLayers().end(); ++iter )
{
- if ( iter.value()->type() == QgsMapLayer::VECTOR )
+ if ( iter.value()->type() == QgsMapLayer::VectorLayer )
{
QgsVectorLayer* vLayer = dynamic_cast<QgsVectorLayer*>( iter.value() );
if ( vLayer->providerType() == "gpx" )
Modified: trunk/qgis/src/plugins/grass/qgsgrassedit.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassedit.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/plugins/grass/qgsgrassedit.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -186,7 +186,7 @@
QgsDebugMsg( "layer name: " + layer->name() );
- if ( layer->type() != QgsMapLayer::VECTOR )
+ if ( layer->type() != QgsMapLayer::VectorLayer )
{
QgsDebugMsg( "The selected layer is not vector." );
return false;
Modified: trunk/qgis/src/plugins/grass/qgsgrassmapcalc.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmapcalc.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/plugins/grass/qgsgrassmapcalc.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -847,7 +847,7 @@
{
QgsMapLayer *layer = canvas->layer( i );
- if ( layer->type() != QgsMapLayer::RASTER ) continue;
+ if ( layer->type() != QgsMapLayer::RasterLayer ) continue;
// Check if it is GRASS raster
QString source = QDir::cleanPath( layer->source() );
Modified: trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/plugins/grass/qgsgrassmodule.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -601,7 +601,7 @@
{
QgsMapLayer *layer = mCanvas->layer( i );
- if ( layer->type() != QgsMapLayer::VECTOR ) continue;
+ if ( layer->type() != QgsMapLayer::VectorLayer ) continue;
QgsVectorLayer *vector = ( QgsVectorLayer* )layer;
if ( vector->providerType() != "grass" ) continue;
@@ -673,7 +673,7 @@
{
QgsMapLayer *layer = mCanvas->layer( i );
- if ( layer->type() != QgsMapLayer::VECTOR ) continue;
+ if ( layer->type() != QgsMapLayer::VectorLayer ) continue;
QgsVectorLayer *vector = ( QgsVectorLayer* )layer;
if ( vector->providerType() != "grass" ) continue;
@@ -2262,7 +2262,7 @@
QgsDebugMsg( "layer->type() = " + QString::number( layer->type() ) );
- if ( mType == Vector && layer->type() == QgsMapLayer::VECTOR )
+ if ( mType == Vector && layer->type() == QgsMapLayer::VectorLayer )
{
QgsVectorLayer *vector = ( QgsVectorLayer* )layer;
QgsDebugMsg( "vector->providerType() = " + vector->providerType() );
@@ -2363,7 +2363,7 @@
fields.push_back( it.value() );
mVectorFields.push_back( fields );
}
- else if ( mType == Raster && layer->type() == QgsMapLayer::RASTER )
+ else if ( mType == Raster && layer->type() == QgsMapLayer::RasterLayer )
{
// Check if it is GRASS raster
QString source = QDir::cleanPath( layer->source() );
@@ -2673,7 +2673,7 @@
{
QgsMapLayer *layer = canvas->layer( i );
- if ( mType == Ogr && layer->type() == QgsMapLayer::VECTOR )
+ if ( mType == Ogr && layer->type() == QgsMapLayer::VectorLayer )
{
QgsVectorLayer *vector = ( QgsVectorLayer* )layer;
if ( vector->providerType() != "ogr"
@@ -2715,7 +2715,7 @@
mOgrLayers.push_back( ogrLayer );
mOgrWheres.push_back( ogrWhere );
}
- else if ( mType == Gdal && layer->type() == QgsMapLayer::RASTER )
+ else if ( mType == Gdal && layer->type() == QgsMapLayer::RasterLayer )
{
QString uri = layer->source();
mLayerComboBox->addItem( layer->name() );
Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -395,7 +395,7 @@
url += "&";
url += "HEIGHT=" + height;
url += "&";
- url += "LAYERS=" + layers;
+ url += "QgsMapLayer::LayerType=" + layers;
url += "&";
url += "STYLES=" + styles;
url += "&";
@@ -424,7 +424,7 @@
mGetFeatureInfoUrlBase += "&";
mGetFeatureInfoUrlBase += "HEIGHT=" + height;
mGetFeatureInfoUrlBase += "&";
- mGetFeatureInfoUrlBase += "LAYERS=" + layers;
+ mGetFeatureInfoUrlBase += "QgsMapLayer::LayerType=" + layers;
mGetFeatureInfoUrlBase += "&";
mGetFeatureInfoUrlBase += "STYLES=" + styles;
mGetFeatureInfoUrlBase += "&";
@@ -2152,7 +2152,7 @@
QString layer = QUrl::toPercentEncoding( *it );
requestUrl += "&";
- requestUrl += "QUERY_LAYERS=" + layer ;
+ requestUrl += "QUERY_QgsMapLayer::LayerType=" + layer ;
requestUrl += "&";
//! \todo Need to tie this into the options provided by GetCapabilities
requestUrl += "INFO_FORMAT=text/plain";
Modified: trunk/qgis/tools/mapserver_export/qgsmapserverexport.cpp
===================================================================
--- trunk/qgis/tools/mapserver_export/qgsmapserverexport.cpp 2008-10-16 19:35:30 UTC (rev 9482)
+++ trunk/qgis/tools/mapserver_export/qgsmapserverexport.cpp 2008-10-16 20:44:22 UTC (rev 9483)
@@ -357,7 +357,7 @@
break;
}
- if(lyr->type() == QgsMapLayer::RASTER)
+ if(lyr->type() == QgsMapLayer::RasterLayer)
{
mapFile << "RASTER";
}
@@ -384,7 +384,7 @@
#endif
switch (lyr->type())
{
- case QgsMapLayer::VECTOR:
+ case QgsMapLayer::VectorLayer:
// get the provider type
{
QString providerType =
@@ -419,7 +419,7 @@
}
}
break;
- case QgsMapLayer::RASTER:
+ case QgsMapLayer::RasterLayer:
mapFile << " DATA " << lyr->source().toLocal8Bit().data() << std::endl;
break;
More information about the QGIS-commit
mailing list