refresh field names after all layers loaded and encoding change (fix #6840)

minorua · minorua · commit ab55325083e1 · 2013-03-27T09:34:34.000+09:00
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -451,7 +451,7 @@ void QgsVectorLayerProperties::apply()
   {
     if ( layer->dataProvider()->capabilities() & QgsVectorDataProvider::SetEncoding )
     {
-      layer->dataProvider()->setEncoding( cboProviderEncoding->currentText() );
+      layer->setProviderEncoding( cboProviderEncoding->currentText() );
     }
   }
 
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -707,6 +707,7 @@ QPair< bool, QList<QDomNode> > QgsProject::_getMapLayers( QDomDocument const &do
   for ( ; vIt != vLayerList.end(); ++vIt )
   {
     vIt->first->createJoinCaches();
+    vIt->first->updateFields();
     //for old symbology, it is necessary to read the symbology again after having the complete field map
     if ( !vIt->first->isUsingRendererV2() )
     {
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1321,6 +1321,7 @@ void QgsVectorLayer::setProviderEncoding( const QString& encoding )
   if ( mDataProvider )
   {
     mDataProvider->setEncoding( encoding );
+    updateFields();
   }
 }
 
@@ -3816,7 +3817,7 @@ void QgsVectorLayer::updateFields()
     mEditBuffer->updateFields( mUpdatedFields );
 
   // joined fields
-  if ( mJoinBuffer->containsJoins() )
+  if ( mJoinBuffer && mJoinBuffer->containsJoins() )
     mJoinBuffer->updateFields( mUpdatedFields );
 }
 
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -813,6 +813,10 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
       @note public and static from version 1.4 */
     static void drawVertexMarker( double x, double y, QPainter& p, QgsVectorLayer::VertexMarkerType type, int vertexSize );
 
+    /** Assembles mUpdatedFields considering provider fields, joined fields and added fields
+     @note added in 1.7 */
+    void updateFields();
+
     /** Caches joined attributes if required (and not already done)
       @note added in 1.7 */
     void createJoinCaches();
@@ -955,10 +959,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /** Stop version 2 renderer and selected renderer (if required) */
     void stopRendererV2( QgsRenderContext& rendererContext, QgsSingleSymbolRendererV2* selRenderer );
 
-    /** Assembles mUpdatedFields considering provider fields, joined fields and added fields
-     @note added in 1.7 */
-    void updateFields();
-
     /**Registers label and diagram layer
       @param rendererContext render context
       @param attributes attributes needed for labeling and diagrams will be added to the list

Original file line number	Diff line number	Diff line change
`@@ -451,7 +451,7 @@ void QgsVectorLayerProperties::apply()`
`451`	`451`	`{`
`452`	`452`	`if ( layer->dataProvider()->capabilities() & QgsVectorDataProvider::SetEncoding )`
`453`	`453`	`{`
`454`		`- layer->dataProvider()->setEncoding( cboProviderEncoding->currentText() );`
	`454`	`+ layer->setProviderEncoding( cboProviderEncoding->currentText() );`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`
Original file line number	Diff line number	Diff line change
`@@ -707,6 +707,7 @@ QPair< bool, QList<QDomNode> > QgsProject::_getMapLayers( QDomDocument const &do`
`707`	`707`	`for ( ; vIt != vLayerList.end(); ++vIt )`
`708`	`708`	`{`
`709`	`709`	`vIt->first->createJoinCaches();`
	`710`	`+ vIt->first->updateFields();`
`710`	`711`	`//for old symbology, it is necessary to read the symbology again after having the complete field map`
`711`	`712`	`if ( !vIt->first->isUsingRendererV2() )`
`712`	`713`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1321,6 +1321,7 @@ void QgsVectorLayer::setProviderEncoding( const QString& encoding )`
`1321`	`1321`	`if ( mDataProvider )`
`1322`	`1322`	`{`
`1323`	`1323`	`mDataProvider->setEncoding( encoding );`
	`1324`	`+ updateFields();`
`1324`	`1325`	`}`
`1325`	`1326`	`}`
`1326`	`1327`
`@@ -3816,7 +3817,7 @@ void QgsVectorLayer::updateFields()`
`3816`	`3817`	`mEditBuffer->updateFields( mUpdatedFields );`
`3817`	`3818`
`3818`	`3819`	`// joined fields`
`3819`		`- if ( mJoinBuffer->containsJoins() )`
	`3820`	`+ if ( mJoinBuffer && mJoinBuffer->containsJoins() )`
`3820`	`3821`	`mJoinBuffer->updateFields( mUpdatedFields );`
`3821`	`3822`	`}`
`3822`	`3823`