[FEATURE] add QgsVectorLayer::fieldNameIndex()

jef · jef · commit 24c20e825b20 · 2009-12-06T22:26:00.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12344 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -329,7 +329,7 @@ void QgsVectorLayer::drawLabels( QgsRenderContext& rendererContext )
     {
       foreach( QString attrName, mRendererV2->usedAttributes() )
       {
-        int attrNum = QgsFeatureRendererV2::fieldNameIndex( pendingFields(), attrName );
+        int attrNum = fieldNameIndex( attrName );
         attributes.append( attrNum );
       }
       // make sure the renderer is ready for classification ("symbolForFeature")
@@ -831,7 +831,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
     QgsAttributeList attributes;
     foreach( QString attrName, mRendererV2->usedAttributes() )
     {
-      int attrNum = QgsFeatureRendererV2::fieldNameIndex( pendingFields(), attrName );
+      int attrNum = fieldNameIndex( attrName );
       attributes.append( attrNum );
       QgsDebugMsg( "attrs: " + attrName + " - " + QString::number( attrNum ) );
     }
@@ -4468,3 +4468,17 @@ QPair<QString, QString> QgsVectorLayer::checkedState( int idx )
   else
     return QPair<QString, QString>( "1", "0" );
 }
+
+int QgsVectorLayer::fieldNameIndex( const QString& fieldName ) const
+{
+  const QgsFieldMap &theFields = pendingFields();
+
+  for ( QgsFieldMap::const_iterator it = theFields.constBegin(); it != theFields.constEnd(); ++it )
+  {
+    if ( it->name() == fieldName )
+    {
+      return it.key();
+    }
+  }
+  return -1;
+}
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -528,6 +528,11 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /** Execute redo operation. To be called only from QgsVectorLayerUndoCommand. */
     void redoEditCommand( QgsUndoCommand* cmd );
 
+    /** Returns the index of a field name or -1 if the field does not exist
+      @note this method was added in version 1.4
+     */
+    int fieldNameIndex( const QString& fieldName ) const;
+
   public slots:
     /** Select feature by its ID, optionally emit signal selectionChanged() */
     void select( int featureId, bool emitSignal = TRUE );
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -267,7 +267,7 @@ QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::createRenderer(
 {
   QgsVectorDataProvider* provider = vlayer->dataProvider();
 
-  int attrNum = fieldNameIndex( vlayer->pendingFields(), attrName );
+  int attrNum = vlayer->fieldNameIndex( attrName );
 
   double minimum = provider->minimumValue( attrNum ).toDouble();
   double maximum = provider->maximumValue( attrNum ).toDouble();
diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
@@ -242,7 +242,7 @@ static void _createCategories( QgsCategoryList& cats, QList<QVariant>& values, Q
 void QgsCategorizedSymbolRendererV2Widget::addCategories()
 {
   QString attrName = cboCategorizedColumn->currentText();
-  int idx = QgsFeatureRendererV2::fieldNameIndex( mLayer->pendingFields(), attrName );
+  int idx = mLayer->fieldNameIndex( attrName );
   QList<QVariant> unique_vals;
   mLayer->dataProvider()->uniqueValues( idx, unique_vals );
 

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ void QgsVectorLayer::drawLabels( QgsRenderContext& rendererContext )`
`329`	`329`	`{`
`330`	`330`	`foreach( QString attrName, mRendererV2->usedAttributes() )`
`331`	`331`	`{`
`332`		`- int attrNum = QgsFeatureRendererV2::fieldNameIndex( pendingFields(), attrName );`
	`332`	`+ int attrNum = fieldNameIndex( attrName );`
`333`	`333`	`attributes.append( attrNum );`
`334`	`334`	`}`
`335`	`335`	`// make sure the renderer is ready for classification ("symbolForFeature")`
`@@ -831,7 +831,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )`
`831`	`831`	`QgsAttributeList attributes;`
`832`	`832`	`foreach( QString attrName, mRendererV2->usedAttributes() )`
`833`	`833`	`{`
`834`		`- int attrNum = QgsFeatureRendererV2::fieldNameIndex( pendingFields(), attrName );`
	`834`	`+ int attrNum = fieldNameIndex( attrName );`
`835`	`835`	`attributes.append( attrNum );`
`836`	`836`	`QgsDebugMsg( "attrs: " + attrName + " - " + QString::number( attrNum ) );`
`837`	`837`	`}`
`@@ -4468,3 +4468,17 @@ QPair<QString, QString> QgsVectorLayer::checkedState( int idx )`
`4468`	`4468`	`else`
`4469`	`4469`	`return QPair<QString, QString>( "1", "0" );`
`4470`	`4470`	`}`
	`4471`	`+`
	`4472`	`+int QgsVectorLayer::fieldNameIndex( const QString& fieldName ) const`
	`4473`	`+{`
	`4474`	`+ const QgsFieldMap &theFields = pendingFields();`
	`4475`	`+`
	`4476`	`+ for ( QgsFieldMap::const_iterator it = theFields.constBegin(); it != theFields.constEnd(); ++it )`
	`4477`	`+ {`
	`4478`	`+ if ( it->name() == fieldName )`
	`4479`	`+ {`
	`4480`	`+ return it.key();`
	`4481`	`+ }`
	`4482`	`+ }`
	`4483`	`+ return -1;`
	`4484`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ QgsGraduatedSymbolRendererV2* QgsGraduatedSymbolRendererV2::createRenderer(`
`267`	`267`	`{`
`268`	`268`	`QgsVectorDataProvider* provider = vlayer->dataProvider();`
`269`	`269`
`270`		`- int attrNum = fieldNameIndex( vlayer->pendingFields(), attrName );`
	`270`	`+ int attrNum = vlayer->fieldNameIndex( attrName );`
`271`	`271`
`272`	`272`	`double minimum = provider->minimumValue( attrNum ).toDouble();`
`273`	`273`	`double maximum = provider->maximumValue( attrNum ).toDouble();`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ static void _createCategories( QgsCategoryList& cats, QList<QVariant>& values, Q`
`242`	`242`	`void QgsCategorizedSymbolRendererV2Widget::addCategories()`
`243`	`243`	`{`
`244`	`244`	`QString attrName = cboCategorizedColumn->currentText();`
`245`		`- int idx = QgsFeatureRendererV2::fieldNameIndex( mLayer->pendingFields(), attrName );`
	`245`	`+ int idx = mLayer->fieldNameIndex( attrName );`
`246`	`246`	`QList<QVariant> unique_vals;`
`247`	`247`	`mLayer->dataProvider()->uniqueValues( idx, unique_vals );`
`248`	`248`