Merge pull request #368 from tecoholic/6897

NathanW2 · NathanW2 · commit be3157462aab · 2012-12-27T14:29:02.000-08:00
Fixes #6897. Handle import of old symbols.
diff --git a/.gitignore b/.gitignore
@@ -48,3 +48,4 @@ i18n/*.qm
 .idea
 /python/plugins/sextante/resources_rc.py
 /python/plugins/sextante/about/ui_aboutdialogbase.py
+scripts/qgisstyle
diff --git a/src/core/symbology-ng/qgsstylev2.cpp b/src/core/symbology-ng/qgsstylev2.cpp
@@ -33,7 +33,7 @@
 
 #include <sqlite3.h>
 
-#define STYLE_CURRENT_VERSION  "0"
+#define STYLE_CURRENT_VERSION  "1"
 
 QgsStyleV2 *QgsStyleV2::mDefaultStyle = 0;
 
@@ -1343,30 +1343,47 @@ bool QgsStyleV2::importXML( QString filename )
   }
 
   QString version = docEl.attribute( "version" );
-  if ( version != STYLE_CURRENT_VERSION )
+  if ( version != STYLE_CURRENT_VERSION && version != "0" )
   {
     mErrorString = "Unknown style file version: " + version;
     return false;
   }
 
-  // load symbols
+  QgsSymbolV2Map symbols;
+
   QDomElement symbolsElement = docEl.firstChildElement( "symbols" );
   QDomElement e = symbolsElement.firstChildElement();
-  while ( !e.isNull() )
+
+  if ( version == STYLE_CURRENT_VERSION )
   {
-    if ( e.tagName() == "symbol" )
+    // For the new style, load symbols individualy
+    while ( !e.isNull() )
     {
-      QgsSymbolV2* symbol = QgsSymbolLayerV2Utils::loadSymbol( e );
-      if ( symbol )
+      if ( e.tagName() == "symbol" )
       {
-        addSymbol( e.attribute( "name" ), symbol );
+        QgsSymbolV2* symbol = QgsSymbolLayerV2Utils::loadSymbol( e );
+        if ( symbol )
+        {
+          symbols.insert( e.attribute( "name" ), symbol );
+        }
       }
+      else
+      {
+        QgsDebugMsg( "unknown tag: " + e.tagName() );
+      }
+      e = e.nextSiblingElement();
     }
-    else
-    {
-      QgsDebugMsg( "unknown tag: " + e.tagName() );
-    }
-    e = e.nextSiblingElement();
+  }
+  else
+  {
+    // for the old version, use the utility function to solve @symbol@layer subsymbols
+    symbols = QgsSymbolLayerV2Utils::loadSymbols( symbolsElement );
+  }
+
+  // save the symbols with proper name
+  for ( QMap<QString, QgsSymbolV2*>::iterator it = symbols.begin(); it != symbols.end(); it++ )
+  {
+    addSymbol( it.key(), it.value() );
   }
 
   // load color ramps
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -2305,7 +2305,6 @@ void QgsSymbolLayerV2Utils::saveProperties( QgsStringMap props, QDomDocument& do
   }
 }
 
-// XXX Not used by QgStyleV2 anymore, But renderers use it still
 QgsSymbolV2Map QgsSymbolLayerV2Utils::loadSymbols( QDomElement& element )
 {
   // go through symbols one-by-one and load them

Original file line number	Diff line number	Diff line change
`@@ -2305,7 +2305,6 @@ void QgsSymbolLayerV2Utils::saveProperties( QgsStringMap props, QDomDocument& do`
`2305`	`2305`	`}`
`2306`	`2306`	`}`
`2307`	`2307`
`2308`		`-// XXX Not used by QgStyleV2 anymore, But renderers use it still`
`2309`	`2308`	`QgsSymbolV2Map QgsSymbolLayerV2Utils::loadSymbols( QDomElement& element )`
`2310`	`2309`	`{`
`2311`	`2310`	`// go through symbols one-by-one and load them`