Support for reading/writing additional styles for layers

wonder-sk · wonder-sk · commit 43d60424fecb · 2015-01-07T19:15:07.000+07:00
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
@@ -704,6 +704,28 @@ void QgsMapLayer::writeCustomProperties( QDomNode &layerNode, QDomDocument &doc
   mCustomProperties.writeXml( layerNode, doc );
 }
 
+void QgsMapLayer::readStyleManager( const QDomNode& layerNode )
+{
+  QDomElement styleMgrElem = layerNode.firstChildElement( "map-layer-style-manager" );
+  if ( !styleMgrElem.isNull() )
+  {
+    enableStyleManager();
+    styleManager()->readXml( styleMgrElem );
+  }
+  else
+    enableStyleManager( false );
+}
+
+void QgsMapLayer::writeStyleManager( QDomNode& layerNode, QDomDocument& doc ) const
+{
+  if ( mStyleManager )
+  {
+    QDomElement styleMgrElem = doc.createElement( "map-layer-style-manager" );
+    mStyleManager->writeXml( styleMgrElem );
+    layerNode.appendChild( styleMgrElem );
+  }
+}
+
 
 
 
@@ -1428,7 +1450,7 @@ QgsMapLayerLegend*QgsMapLayer::legend() const
 
 void QgsMapLayer::enableStyleManager( bool enable )
 {
-  if ( ( enable && mStyleManager ) || ( !enable && !mStyleManager ) )
+  if (( enable && mStyleManager ) || ( !enable && !mStyleManager ) )
     return;
 
   if ( enable )
diff --git a/src/core/qgsmaplayer.h b/src/core/qgsmaplayer.h
@@ -549,6 +549,11 @@ class CORE_EXPORT QgsMapLayer : public QObject
     /** Write custom properties to project file. */
     void writeCustomProperties( QDomNode & layerNode, QDomDocument & doc ) const;
 
+    /** Read style manager's configuration (if any). To be called by subclasses. */
+    void readStyleManager( const QDomNode& layerNode );
+    /** Write style manager's configuration (if exists). To be called by subclasses. */
+    void writeStyleManager( QDomNode& layerNode, QDomDocument& doc ) const;
+
     /** debugging member - invoked when a connect() is made to this object */
     void connectNotify( const char * signal );
 
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1328,6 +1328,8 @@ bool QgsVectorLayer::readXml( const QDomNode& layer_node )
     return false;
   }
 
+  readStyleManager( layer_node );
+
   setLegend( QgsMapLayerLegend::defaultVectorLegend( this ) );
 
   return mValid;               // should be true if read successfully
@@ -1478,6 +1480,8 @@ bool QgsVectorLayer::writeXml( QDomNode & layer_node,
   // save expression fields
   mExpressionFieldBuffer->writeXml( layer_node, document );
 
+  writeStyleManager( layer_node, document );
+
   // renderer specific settings
   QString errorMsg;
   return writeSymbology( layer_node, document, errorMsg );
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -1435,6 +1435,8 @@ bool QgsRasterLayer::readXml( const QDomNode& layer_node )
     }
   }
 
+  readStyleManager( layer_node );
+
   return res;
 } // QgsRasterLayer::readXml( QDomNode & layer_node )
 
@@ -1523,6 +1525,8 @@ bool QgsRasterLayer::writeXml( QDomNode & layer_node,
     layer_node.appendChild( noData );
   }
 
+  writeStyleManager( layer_node, document );
+
   //write out the symbology
   QString errorMsg;
   return writeSymbology( layer_node, document, errorMsg );

Original file line number	Diff line number	Diff line change
`@@ -1435,6 +1435,8 @@ bool QgsRasterLayer::readXml( const QDomNode& layer_node )`
`1435`	`1435`	`}`
`1436`	`1436`	`}`
`1437`	`1437`
	`1438`	`+ readStyleManager( layer_node );`
	`1439`	`+`
`1438`	`1440`	`return res;`
`1439`	`1441`	`} // QgsRasterLayer::readXml( QDomNode & layer_node )`
`1440`	`1442`
`@@ -1523,6 +1525,8 @@ bool QgsRasterLayer::writeXml( QDomNode & layer_node,`
`1523`	`1525`	`layer_node.appendChild( noData );`
`1524`	`1526`	`}`
`1525`	`1527`
	`1528`	`+ writeStyleManager( layer_node, document );`
	`1529`	`+`
`1526`	`1530`	`//write out the symbology`
`1527`	`1531`	`QString errorMsg;`
`1528`	`1532`	`return writeSymbology( layer_node, document, errorMsg );`