Fix loading of joined layers with old symbology, #121

mhugent · mhugent · commit 489e34bc7059 · 2011-03-12T15:45:52.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15450 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -675,7 +675,10 @@ QPair< bool, QList<QDomNode> > QgsProject::_getMapLayers( QDomDocument const &do
   bool returnStatus = true;
 
   emit layerLoaded( 0, nl.count() );
-  QList<QgsVectorLayer*> vLayerList; //collect
+
+  //Collect vector layers with joins.
+  //They need to refresh join caches and symbology infos after all layers are loaded
+  QList< QPair< QgsVectorLayer*, QDomElement > > vLayerList;
 
   for ( int i = 0; i < nl.count(); i++ )
   {
@@ -716,9 +719,9 @@ QPair< bool, QList<QDomNode> > QgsProject::_getMapLayers( QDomDocument const &do
     {
       mapLayer = QgsMapLayerRegistry::instance()->addMapLayer( mapLayer );
       QgsVectorLayer* vLayer = qobject_cast<QgsVectorLayer*>( mapLayer );
-      if ( vLayer )
+      if ( vLayer && vLayer->vectorJoins().size() > 0 )
       {
-        vLayerList.push_back( vLayer );
+        vLayerList.push_back( qMakePair( vLayer, element ) );
       }
     }
     else
@@ -736,11 +739,17 @@ QPair< bool, QList<QDomNode> > QgsProject::_getMapLayers( QDomDocument const &do
 
   //Update field map of layers with joins and create join caches if necessary
   //Needs to be done here once all dependent layers are loaded
-  QList<QgsVectorLayer*>::iterator vIt = vLayerList.begin();
+  QString errorMessage;
+  QList< QPair< QgsVectorLayer*, QDomElement > >::iterator vIt = vLayerList.begin();
   for ( ; vIt != vLayerList.end(); ++vIt )
   {
-    ( *vIt )->createJoinCaches();
-    ( *vIt )->updateFieldMap();
+    vIt->first->createJoinCaches();
+    vIt->first->updateFieldMap();
+    //for old symbology, it is necessary to read the symbology again after having the complete field map
+    if( !vIt->first->isUsingRendererV2() )
+    {
+      vIt->first->readSymbology( vIt->second, errorMessage );
+    }
   }
 
   return qMakePair( returnStatus, brokenNodes );
diff --git a/src/core/renderer/qgscontinuouscolorrenderer.cpp b/src/core/renderer/qgscontinuouscolorrenderer.cpp
@@ -205,7 +205,7 @@ int QgsContinuousColorRenderer::readXML( const QDomNode& rnode, QgsVectorLayer&
   int classificationId = theProvider->fieldNameIndex( classificationField );
   if ( classificationId == -1 )
   {
-    return 2; //@todo: handle gracefully in gui situation where user needs to nominate field
+    //go on. Because with joins, it might be the joined layer is not loaded yet
   }
   setClassificationField( classificationId );
 
diff --git a/src/core/renderer/qgsgraduatedsymbolrenderer.cpp b/src/core/renderer/qgsgraduatedsymbolrenderer.cpp
@@ -268,10 +268,10 @@ int QgsGraduatedSymbolRenderer::readXML( const QDomNode& rnode, QgsVectorLayer&
     mMode = QgsGraduatedSymbolRenderer::EqualInterval;
   }
 
-  int classificationId = theProvider->fieldNameIndex( classificationField );
+  int classificationId = vl.fieldNameIndex( classificationField );
   if ( classificationId == -1 )
   {
-    return 2; //@todo: handle gracefully in gui situation where user needs to nominate field
+    //go on. Because with joins, it might be the joined layer is not loaded yet
   }
   setClassificationField( classificationId );
 
diff --git a/src/core/renderer/qgsuniquevaluerenderer.cpp b/src/core/renderer/qgsuniquevaluerenderer.cpp
@@ -228,7 +228,7 @@ int QgsUniqueValueRenderer::readXML( const QDomNode& rnode, QgsVectorLayer& vl )
   int classificationId = theProvider->fieldNameIndex( classificationField );
   if ( classificationId == -1 )
   {
-    return 2; //@todo: handle gracefully in gui situation where user needs to nominate field
+    //go on. Because with joins, it might be the joined layer is not loaded yet
   }
   setClassificationField( classificationId );
 

Original file line number	Diff line number	Diff line change
`@@ -675,7 +675,10 @@ QPair< bool, QList<QDomNode> > QgsProject::_getMapLayers( QDomDocument const &do`
`675`	`675`	`bool returnStatus = true;`
`676`	`676`
`677`	`677`	`emit layerLoaded( 0, nl.count() );`
`678`		`- QList<QgsVectorLayer*> vLayerList; //collect`
	`678`	`+`
	`679`	`+ //Collect vector layers with joins.`
	`680`	`+ //They need to refresh join caches and symbology infos after all layers are loaded`
	`681`	`+ QList< QPair< QgsVectorLayer*, QDomElement > > vLayerList;`
`679`	`682`
`680`	`683`	`for ( int i = 0; i < nl.count(); i++ )`
`681`	`684`	`{`
`@@ -716,9 +719,9 @@ QPair< bool, QList<QDomNode> > QgsProject::_getMapLayers( QDomDocument const &do`
`716`	`719`	`{`
`717`	`720`	`mapLayer = QgsMapLayerRegistry::instance()->addMapLayer( mapLayer );`
`718`	`721`	`QgsVectorLayer* vLayer = qobject_cast<QgsVectorLayer*>( mapLayer );`
`719`		`- if ( vLayer )`
	`722`	`+ if ( vLayer && vLayer->vectorJoins().size() > 0 )`
`720`	`723`	`{`
`721`		`- vLayerList.push_back( vLayer );`
	`724`	`+ vLayerList.push_back( qMakePair( vLayer, element ) );`
`722`	`725`	`}`
`723`	`726`	`}`
`724`	`727`	`else`
`@@ -736,11 +739,17 @@ QPair< bool, QList<QDomNode> > QgsProject::_getMapLayers( QDomDocument const &do`
`736`	`739`
`737`	`740`	`//Update field map of layers with joins and create join caches if necessary`
`738`	`741`	`//Needs to be done here once all dependent layers are loaded`
`739`		`- QList<QgsVectorLayer*>::iterator vIt = vLayerList.begin();`
	`742`	`+ QString errorMessage;`
	`743`	`+ QList< QPair< QgsVectorLayer*, QDomElement > >::iterator vIt = vLayerList.begin();`
`740`	`744`	`for ( ; vIt != vLayerList.end(); ++vIt )`
`741`	`745`	`{`
`742`		`- ( *vIt )->createJoinCaches();`
`743`		`- ( *vIt )->updateFieldMap();`
	`746`	`+ vIt->first->createJoinCaches();`
	`747`	`+ vIt->first->updateFieldMap();`
	`748`	`+ //for old symbology, it is necessary to read the symbology again after having the complete field map`
	`749`	`+ if( !vIt->first->isUsingRendererV2() )`
	`750`	`+ {`
	`751`	`+ vIt->first->readSymbology( vIt->second, errorMessage );`
	`752`	`+ }`
`744`	`753`	`}`
`745`	`754`
`746`	`755`	`return qMakePair( returnStatus, brokenNodes );`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ int QgsContinuousColorRenderer::readXML( const QDomNode& rnode, QgsVectorLayer&`
`205`	`205`	`int classificationId = theProvider->fieldNameIndex( classificationField );`
`206`	`206`	`if ( classificationId == -1 )`
`207`	`207`	`{`
`208`		`- return 2; //@todo: handle gracefully in gui situation where user needs to nominate field`
	`208`	`+ //go on. Because with joins, it might be the joined layer is not loaded yet`
`209`	`209`	`}`
`210`	`210`	`setClassificationField( classificationId );`
`211`	`211`
Original file line number	Diff line number	Diff line change
`@@ -268,10 +268,10 @@ int QgsGraduatedSymbolRenderer::readXML( const QDomNode& rnode, QgsVectorLayer&`
`268`	`268`	`mMode = QgsGraduatedSymbolRenderer::EqualInterval;`
`269`	`269`	`}`
`270`	`270`
`271`		`- int classificationId = theProvider->fieldNameIndex( classificationField );`
	`271`	`+ int classificationId = vl.fieldNameIndex( classificationField );`
`272`	`272`	`if ( classificationId == -1 )`
`273`	`273`	`{`
`274`		`- return 2; //@todo: handle gracefully in gui situation where user needs to nominate field`
	`274`	`+ //go on. Because with joins, it might be the joined layer is not loaded yet`
`275`	`275`	`}`
`276`	`276`	`setClassificationField( classificationId );`
`277`	`277`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ int QgsUniqueValueRenderer::readXML( const QDomNode& rnode, QgsVectorLayer& vl )`
`228`	`228`	`int classificationId = theProvider->fieldNameIndex( classificationField );`
`229`	`229`	`if ( classificationId == -1 )`
`230`	`230`	`{`
`231`		`- return 2; //@todo: handle gracefully in gui situation where user needs to nominate field`
	`231`	`+ //go on. Because with joins, it might be the joined layer is not loaded yet`
`232`	`232`	`}`
`233`	`233`	`setClassificationField( classificationId );`
`234`	`234`