Skip to content

Commit a8daacf

Browse files
author
timlinux
committedOct 18, 2008
Cleanup for type accessors on maplayer and subclasses
git-svn-id: http://svn.osgeo.org/qgis/trunk@9493 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent f6a690f commit a8daacf

17 files changed

+63
-63
lines changed
 

‎python/core/qgsvectorlayer.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ public:
9595
void setRenderer(QgsRenderer * r /Transfer/);
9696

9797
/** Returns point, line or polygon */
98-
QGis::GeometryType type() const;
98+
QGis::GeometryType geometryType() const;
9999

100100
/**Returns the WKBType or WKBUnknown in case of error*/
101-
QGis::WkbType geometryType() const;
101+
QGis::WkbType wkbType() const;
102102

103103
/** Return the provider type for this layer */
104104
QString providerType() const;

‎src/app/qgisapp.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5100,7 +5100,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
51005100
}
51015101

51025102

5103-
if ( vlayer->type() == QGis::Point )
5103+
if ( vlayer->geometryType() == QGis::Point )
51045104
{
51055105
if ( vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::AddFeatures )
51065106
{
@@ -5123,15 +5123,15 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
51235123
if ( vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::ChangeGeometries )
51245124
{
51255125
//don't enable vertex move for single point
5126-
if ( vlayer->geometryType() != QGis::WKBPoint && vlayer->geometryType() != QGis::WKBPoint25D )
5126+
if ( vlayer->wkbType() != QGis::WKBPoint && vlayer->wkbType() != QGis::WKBPoint25D )
51275127
{
51285128
mActionMoveVertex->setEnabled( true );
51295129
}
51305130
mActionMoveFeature->setEnabled( true );
51315131
}
51325132
return;
51335133
}
5134-
else if ( vlayer->type() == QGis::Line )
5134+
else if ( vlayer->geometryType() == QGis::Line )
51355135
{
51365136
if ( vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::AddFeatures )
51375137
{
@@ -5150,7 +5150,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
51505150
mActionAddRing->setEnabled( false );
51515151
mActionAddIsland->setEnabled( false );
51525152
}
5153-
else if ( vlayer->type() == QGis::Polygon )
5153+
else if ( vlayer->geometryType() == QGis::Polygon )
51545154
{
51555155
if ( vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::AddFeatures )
51565156
{
@@ -5179,7 +5179,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
51795179
mActionMoveVertex->setEnabled( true );
51805180
mActionDeleteVertex->setEnabled( true );
51815181
mActionMoveFeature->setEnabled( true );
5182-
if ( vlayer->type() == QGis::Polygon )
5182+
if ( vlayer->geometryType() == QGis::Polygon )
51835183
{
51845184
mActionAddRing->setEnabled( true );
51855185
//some polygon layers contain also multipolygon features.

‎src/app/qgscontinuouscolordialog.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ QgsContinuousColorDialog::QgsContinuousColorDialog( QgsVectorLayer * layer )
9191
const QgsSymbol* minsymbol = renderer->minimumSymbol();
9292
const QgsSymbol* maxsymbol = renderer->maximumSymbol();
9393

94-
if ( mVectorLayer->type() == QGis::Line || mVectorLayer->type() == QGis::Point )
94+
if ( mVectorLayer->geometryType() == QGis::Line || mVectorLayer->geometryType() == QGis::Point )
9595
{
9696
btnMinValue->setColor( minsymbol->pen().color() );
9797
btnMaxValue->setColor( maxsymbol->pen().color() );
@@ -114,7 +114,7 @@ QgsContinuousColorDialog::QgsContinuousColorDialog( QgsVectorLayer * layer )
114114
cb_polygonOutline->setCheckState( Qt::Unchecked );
115115
}
116116

117-
if ( mVectorLayer->type() != QGis::Polygon )
117+
if ( mVectorLayer->geometryType() != QGis::Polygon )
118118
{
119119
cb_polygonOutline->setVisible( false );
120120
}
@@ -123,7 +123,7 @@ QgsContinuousColorDialog::QgsContinuousColorDialog( QgsVectorLayer * layer )
123123
{
124124
cb_polygonOutline->setCheckState( Qt::Checked );
125125
outlinewidthspinbox->setValue( 0.4 );
126-
if ( mVectorLayer->type() != QGis::Polygon )
126+
if ( mVectorLayer->geometryType() != QGis::Polygon )
127127
cb_polygonOutline->setVisible( false );
128128

129129
btnMinValue->setColor( Qt::black );
@@ -179,11 +179,11 @@ void QgsContinuousColorDialog::apply()
179179

180180

181181
//create the render items for minimum and maximum value
182-
QgsSymbol* minsymbol = new QgsSymbol( mVectorLayer->type(), QString::number( minimum, 'f' ), "", "" );
182+
QgsSymbol* minsymbol = new QgsSymbol( mVectorLayer->geometryType(), QString::number( minimum, 'f' ), "", "" );
183183
QPen minPen;
184184
minPen.setColor( btnMinValue->color() );
185185
minPen.setWidthF( outlinewidthspinbox->value() );
186-
if ( mVectorLayer->type() == QGis::Line || mVectorLayer->type() == QGis::Point )
186+
if ( mVectorLayer->geometryType() == QGis::Line || mVectorLayer->geometryType() == QGis::Point )
187187
{
188188
minsymbol->setPen( minPen );
189189
}
@@ -193,11 +193,11 @@ void QgsContinuousColorDialog::apply()
193193
minsymbol->setPen( minPen );
194194
}
195195

196-
QgsSymbol* maxsymbol = new QgsSymbol( mVectorLayer->type(), QString::number( maximum, 'f' ), "", "" );
196+
QgsSymbol* maxsymbol = new QgsSymbol( mVectorLayer->geometryType(), QString::number( maximum, 'f' ), "", "" );
197197
QPen maxPen;
198198
maxPen.setColor( btnMaxValue->color() );
199199
maxPen.setWidthF( outlinewidthspinbox->value() );
200-
if ( mVectorLayer->type() == QGis::Line || mVectorLayer->type() == QGis::Point )
200+
if ( mVectorLayer->geometryType() == QGis::Line || mVectorLayer->geometryType() == QGis::Point )
201201
{
202202
maxsymbol->setPen( maxPen );
203203
}
@@ -207,7 +207,7 @@ void QgsContinuousColorDialog::apply()
207207
maxsymbol->setPen( maxPen );
208208
}
209209

210-
QgsContinuousColorRenderer* renderer = new QgsContinuousColorRenderer( mVectorLayer->type() );
210+
QgsContinuousColorRenderer* renderer = new QgsContinuousColorRenderer( mVectorLayer->geometryType() );
211211
mVectorLayer->setRenderer( renderer );
212212

213213
renderer->setMinimumSymbol( minsymbol );

‎src/app/qgsgraduatedsymboldialog.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ QgsGraduatedSymbolDialog::QgsGraduatedSymbolDialog( QgsVectorLayer * layer ): QD
114114
{
115115
//todo: make an assignment operator and a copy constructor for QgsSymbol
116116
QString classbreak = ( *it )->lowerValue() + " - " + ( *it )->upperValue();
117-
QgsSymbol* sym = new QgsSymbol( mVectorLayer->type(), ( *it )->lowerValue(), ( *it )->upperValue(), ( *it )->label() );
117+
QgsSymbol* sym = new QgsSymbol( mVectorLayer->geometryType(), ( *it )->lowerValue(), ( *it )->upperValue(), ( *it )->label() );
118118
sym->setPen(( *it )->pen() );
119119
sym->setCustomTexture(( *it )->customTexture() );
120120
sym->setBrush(( *it )->brush() );
@@ -175,7 +175,7 @@ void QgsGraduatedSymbolDialog::apply()
175175
return;
176176
}
177177

178-
QgsGraduatedSymbolRenderer* renderer = new QgsGraduatedSymbolRenderer( mVectorLayer->type() );
178+
QgsGraduatedSymbolRenderer* renderer = new QgsGraduatedSymbolRenderer( mVectorLayer->geometryType() );
179179

180180
//
181181
// First the mode
@@ -208,21 +208,21 @@ void QgsGraduatedSymbolDialog::apply()
208208
QString upper_bound = it->second->upperValue();
209209
QString label = it->second->label();
210210

211-
QgsSymbol* sy = new QgsSymbol( mVectorLayer->type(), lower_bound, upper_bound, label );
211+
QgsSymbol* sy = new QgsSymbol( mVectorLayer->geometryType(), lower_bound, upper_bound, label );
212212

213213
sy->setColor( it->second->pen().color() );
214214
sy->setLineStyle( it->second->pen().style() );
215215
sy->setLineWidth( it->second->pen().widthF() );
216216

217-
if ( mVectorLayer->type() == QGis::Point )
217+
if ( mVectorLayer->geometryType() == QGis::Point )
218218
{
219219
sy->setNamedPointSymbol( it->second->pointSymbolName() );
220220
sy->setPointSize( it->second->pointSize() );
221221
sy->setScaleClassificationField( it->second->scaleClassificationField() );
222222
sy->setRotationClassificationField( it->second->rotationClassificationField() );
223223
}
224224

225-
if ( mVectorLayer->type() != QGis::Line )
225+
if ( mVectorLayer->geometryType() != QGis::Line )
226226
{
227227
sy->setFillColor( it->second->brush().color() );
228228
sy->setCustomTexture( it->second->customTexture() );//necessary?
@@ -270,7 +270,7 @@ void QgsGraduatedSymbolDialog::apply()
270270
void QgsGraduatedSymbolDialog::adjustClassification()
271271
{
272272
mClassListWidget->clear();
273-
QGis::GeometryType m_type = mVectorLayer->type();
273+
QGis::GeometryType m_type = mVectorLayer->geometryType();
274274
QgsVectorDataProvider *provider = dynamic_cast<QgsVectorDataProvider *>( mVectorLayer->dataProvider() );
275275
double minimum = 0;
276276
double maximum = 0;
@@ -586,7 +586,7 @@ QColor QgsGraduatedSymbolDialog::getColorFromRamp( QString ramp, int step, int t
586586
void QgsGraduatedSymbolDialog::updateEntryIcon( QgsSymbol * thepSymbol,
587587
QListWidgetItem * thepItem )
588588
{
589-
QGis::GeometryType myType = mVectorLayer->type();
589+
QGis::GeometryType myType = mVectorLayer->geometryType();
590590
switch ( myType )
591591
{
592592
case QGis::Point:

‎src/app/qgsmapserverexport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ void QgsMapserverExport::writeMapFile()
208208
if ( lyr->type() == QgsMapLayer::VectorLayer )
209209
{
210210
QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>( lyr );
211-
switch ( vlayer->geometryType() )
211+
switch ( vlayer->wkbType() )
212212
{
213213
case QGis::WKBPoint:
214214
case QGis::WKBMultiPoint:

‎src/app/qgsmaptooladdfeature.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
5050
return;
5151
}
5252

53-
QGis::WkbType layerWKBType = vlayer->geometryType();
53+
QGis::WkbType layerWKBType = vlayer->wkbType();
5454

5555
//no support for adding features to 2.5D types yet
5656
if ( layerWKBType == QGis::WKBLineString25D || layerWKBType == QGis::WKBPolygon25D ||
@@ -86,7 +86,7 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
8686
if ( mTool == CapturePoint )
8787
{
8888
//check we only use this tool for point/multipoint layers
89-
if ( vlayer->type() != QGis::Point )
89+
if ( vlayer->geometryType() != QGis::Point )
9090
{
9191
QMessageBox::information( 0, QObject::tr( "Wrong editing tool" ),
9292
QObject::tr( "Cannot apply the 'capture point' tool on this vector layer" ) );
@@ -194,15 +194,15 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
194194
else if ( mTool == CaptureLine || mTool == CapturePolygon )
195195
{
196196
//check we only use the line tool for line/multiline layers
197-
if ( mTool == CaptureLine && vlayer->type() != QGis::Line )
197+
if ( mTool == CaptureLine && vlayer->geometryType() != QGis::Line )
198198
{
199199
QMessageBox::information( 0, QObject::tr( "Wrong editing tool" ),
200200
QObject::tr( "Cannot apply the 'capture line' tool on this vector layer" ) );
201201
return;
202202
}
203203

204204
//check we only use the polygon tool for polygon/multipolygon layers
205-
if ( mTool == CapturePolygon && vlayer->type() != QGis::Polygon )
205+
if ( mTool == CapturePolygon && vlayer->geometryType() != QGis::Polygon )
206206
{
207207
QMessageBox::information( 0, QObject::tr( "Wrong editing tool" ),
208208
QObject::tr( "Cannot apply the 'capture polygon' tool on this vector layer" ) );

‎src/app/qgsmaptoolidentify.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ void QgsMapToolIdentify::identifyVectorLayer( const QgsPoint& point )
339339

340340
// Calculate derived attributes and insert:
341341
// measure distance or area depending on geometry type
342-
if ( layer->type() == QGis::Line )
342+
if ( layer->geometryType() == QGis::Line )
343343
{
344344
double dist = calc.measure( f_it->geometry() );
345345
QString str = calc.textUnit( dist, 3, mCanvas->mapUnits(), false );
@@ -357,13 +357,13 @@ void QgsMapToolIdentify::identifyVectorLayer( const QgsPoint& point )
357357
mResults->addDerivedAttribute( featureNode, "endY", str );
358358
}
359359
}
360-
else if ( layer->type() == QGis::Polygon )
360+
else if ( layer->geometryType() == QGis::Polygon )
361361
{
362362
double area = calc.measure( f_it->geometry() );
363363
QString str = calc.textUnit( area, 3, mCanvas->mapUnits(), true );
364364
mResults->addDerivedAttribute( featureNode, QObject::tr( "Area" ), str );
365365
}
366-
else if ( layer->type() == QGis::Point )
366+
else if ( layer->geometryType() == QGis::Point )
367367
{
368368
// Include the x and y coordinates of the point as a derived attribute
369369
QString str;

‎src/app/qgsmaptoolselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ void QgsMapToolSelect::canvasReleaseEvent( QMouseEvent * e )
8181
if ( !mDragging )
8282
{
8383
int boxSize = 0;
84-
if ( vlayer->type() != QGis::Polygon )
84+
if ( vlayer->geometryType() != QGis::Polygon )
8585
{
8686
//if point or line use an artificial bounding box of 10x10 pixels
8787
//to aid the user to click on a feature accurately

‎src/app/qgssinglesymboldialog.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog( QgsVectorLayer * layer, bool disab
7575
mypItem->setText( "" );
7676
//store the symbol offset in the UserData role for later retrieval
7777
mypItem->setData( Qt::UserRole, *it );
78-
if ( layer->type() != QGis::Point )
78+
if ( layer->geometryType() != QGis::Point )
7979
{
8080
break;
8181
}
@@ -138,7 +138,7 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog( QgsVectorLayer * layer, bool disab
138138
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "NoBrush" ) ), tr( "No Brush" ), "NoBrush" );
139139
cboFillStyle->addItem( QIcon( QgsSymbologyUtils::char2PatternPixmap( "TexturePattern" ) ), tr( "Texture" ), "TexturePattern" );
140140

141-
if ( mVectorLayer && mVectorLayer->type() != QGis::Point )
141+
if ( mVectorLayer && layer->geometryType() != QGis::Point )
142142
{
143143
mGroupPoint->setVisible( false );
144144
mGroupPoint->setEnabled( false );
@@ -162,7 +162,7 @@ QgsSingleSymbolDialog::QgsSingleSymbolDialog( QgsVectorLayer * layer, bool disab
162162
else
163163
{
164164
// Take values from an example instance
165-
QgsSingleSymbolRenderer exampleRenderer = QgsSingleSymbolRenderer( mVectorLayer->type() );
165+
QgsSingleSymbolRenderer exampleRenderer = QgsSingleSymbolRenderer( mVectorLayer->geometryType() );
166166
set( exampleRenderer.symbols().first() );
167167
}
168168
}
@@ -307,10 +307,10 @@ void QgsSingleSymbolDialog::apply( QgsSymbol *sy )
307307

308308
void QgsSingleSymbolDialog::apply()
309309
{
310-
QgsSymbol* sy = new QgsSymbol( mVectorLayer->type() );
310+
QgsSymbol* sy = new QgsSymbol( mVectorLayer->geometryType() );
311311
apply( sy );
312312

313-
QgsSingleSymbolRenderer *renderer = new QgsSingleSymbolRenderer( mVectorLayer->type() );
313+
QgsSingleSymbolRenderer *renderer = new QgsSingleSymbolRenderer( mVectorLayer->geometryType() );
314314
renderer->addSymbol( sy );
315315
renderer->updateSymbolAttributes();
316316

@@ -423,7 +423,7 @@ void QgsSingleSymbolDialog::set( const QgsSymbol *sy )
423423
btnOutlineColor->setEnabled( true );
424424
cboOutlineStyle->setEnabled( true );
425425

426-
if ( mVectorLayer && mVectorLayer->type() != QGis::Line )
426+
if ( mVectorLayer && mVectorLayer->geometryType() != QGis::Line )
427427
{
428428
btnFillColor->setEnabled( true );
429429
cboFillStyle->setEnabled( true );

‎src/app/qgsuniquevaluedialog.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ QgsUniqueValueDialog::QgsUniqueValueDialog( QgsVectorLayer* vl ): QDialog(), mVe
7676
{
7777
QgsSymbol* symbol = ( *iter );
7878
QString symbolvalue = symbol->lowerValue();
79-
QgsSymbol* sym = new QgsSymbol( mVectorLayer->type(), symbol->lowerValue(), symbol->upperValue(), symbol->label() );
79+
QgsSymbol* sym = new QgsSymbol( mVectorLayer->geometryType(), symbol->lowerValue(), symbol->upperValue(), symbol->label() );
8080
sym->setPen( symbol->pen() );
8181
sym->setCustomTexture( symbol->customTexture() );
8282
sym->setBrush( symbol->brush() );
@@ -128,13 +128,13 @@ QgsUniqueValueDialog::~QgsUniqueValueDialog()
128128
void QgsUniqueValueDialog::apply()
129129
{
130130
QgsDebugMsg( "called." );
131-
QgsUniqueValueRenderer *renderer = new QgsUniqueValueRenderer( mVectorLayer->type() );
131+
QgsUniqueValueRenderer *renderer = new QgsUniqueValueRenderer( mVectorLayer->geometryType() );
132132

133133
//go through mValues and add the entries to the renderer
134134
for ( QMap<QString, QgsSymbol*>::iterator it = mValues.begin();it != mValues.end();++it )
135135
{
136136
QgsSymbol* symbol = it.value();
137-
QgsSymbol* newsymbol = new QgsSymbol( mVectorLayer->type(), symbol->lowerValue(), symbol->upperValue(), symbol->label() );
137+
QgsSymbol* newsymbol = new QgsSymbol( mVectorLayer->geometryType(), symbol->lowerValue(), symbol->upperValue(), symbol->label() );
138138
newsymbol->setPen( symbol->pen() );
139139
newsymbol->setCustomTexture( symbol->customTexture() );
140140
newsymbol->setBrush( symbol->brush() );
@@ -179,7 +179,7 @@ void QgsUniqueValueDialog::setSymbolColor( QgsSymbol *symbol, QColor thecolor )
179179
{
180180
QPen pen;
181181
QBrush brush;
182-
if ( mVectorLayer->type() == QGis::Line )
182+
if ( mVectorLayer->geometryType() == QGis::Line )
183183
{
184184
pen.setColor( thecolor );
185185
pen.setStyle( Qt::SolidLine );
@@ -208,7 +208,7 @@ void QgsUniqueValueDialog::addClass( QString value )
208208
value += QString::number( i );
209209
}
210210

211-
QgsSymbol *symbol = new QgsSymbol( mVectorLayer->type(), value );
211+
QgsSymbol *symbol = new QgsSymbol( mVectorLayer->geometryType(), value );
212212
mValues.insert( value, symbol );
213213

214214
QListWidgetItem *item = new QListWidgetItem( value );
@@ -434,7 +434,7 @@ void QgsUniqueValueDialog::applySymbologyChanges()
434434
void QgsUniqueValueDialog::updateEntryIcon( QgsSymbol * thepSymbol,
435435
QListWidgetItem * thepItem )
436436
{
437-
QGis::GeometryType myType = mVectorLayer->type();
437+
QGis::GeometryType myType = mVectorLayer->geometryType();
438438
switch ( myType )
439439
{
440440
case QGis::Point:

‎src/app/qgsvectorlayerproperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,15 +689,15 @@ QString QgsVectorLayerProperties::getMetadata()
689689

690690
//geom type
691691

692-
QGis::GeometryType type = layer->type();
692+
QGis::GeometryType type = layer->geometryType();
693693

694694
if ( type < 0 || type > QGis::Polygon )
695695
{
696696
QgsDebugMsg( "Invalid vector type" );
697697
}
698698
else
699699
{
700-
QString typeString( QGis::qgisVectorGeometryType[layer->type()] );
700+
QString typeString( QGis::qgisVectorGeometryType[layer->geometryType()] );
701701

702702
myMetadata += "<tr><td>";
703703
myMetadata += tr( "Geometry type of the features in this layer : " ) +

0 commit comments

Comments
 (0)
Please sign in to comment.