[API] add read/writeXML methods to QgsRasterInterface

qgis · Mar 14, 2013 · 21c7b55 · 21c7b55
1 parent 1145bd2
commit 21c7b55
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/src/core/raster/qgsbrightnesscontrastfilter.h b/src/core/raster/qgsbrightnesscontrastfilter.h
@@ -51,7 +51,7 @@ class CORE_EXPORT QgsBrightnessContrastFilter : public QgsRasterInterface
     void writeXML( QDomDocument& doc, QDomElement& parentElem );
 
     /**Sets base class members from xml. Usually called from create() methods of subclasses*/
-    void readXML( const QDomElement& resamplefilterElem );
+    void readXML( const QDomElement& filterElem );
 
   private:
     /**Current brightness coefficient value. Default: 0. Range: -255...255*/

diff --git a/src/core/raster/qgsrasterinterface.h b/src/core/raster/qgsrasterinterface.h
@@ -260,6 +260,11 @@ class CORE_EXPORT QgsRasterInterface
      * returned. */
     //double time( bool cumulative = false );
 
+    /** Write base class members to xml. */
+    virtual void writeXML( QDomDocument& doc, QDomElement& parentElem ) { Q_UNUSED( doc ); Q_UNUSED( parentElem ); };
+    /** Sets base class members from xml. Usually called from create() methods of subclasses */
+    virtual void readXML( const QDomElement& filterElem ) { Q_UNUSED( filterElem ); };
+
   protected:
     // QgsRasterInterface used as input
     QgsRasterInterface* mInput;

diff --git a/src/core/raster/qgsrasterrenderer.h b/src/core/raster/qgsrasterrenderer.h
@@ -98,7 +98,6 @@ class CORE_EXPORT QgsRasterRenderer : public QgsRasterInterface
     /**Get symbology items if provided by renderer*/
     virtual void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const { Q_UNUSED( symbolItems ); }
 
-    virtual void writeXML( QDomDocument&, QDomElement& ) const {}
     /**Sets base class members from xml. Usually called from create() methods of subclasses*/
     void readXML( const QDomElement& rendererElem );
 

diff --git a/src/core/raster/qgsrasterresamplefilter.cpp b/src/core/raster/qgsrasterresamplefilter.cpp
@@ -241,16 +241,16 @@ void QgsRasterResampleFilter::writeXML( QDomDocument& doc, QDomElement& parentEl
   parentElem.appendChild( rasterRendererElem );
 }
 
-void QgsRasterResampleFilter::readXML( const QDomElement& rendererElem )
+void QgsRasterResampleFilter::readXML( const QDomElement& filterElem )
 {
-  if ( rendererElem.isNull() )
+  if ( filterElem.isNull() )
   {
     return;
   }
 
-  mMaxOversampling = rendererElem.attribute( "maxOversampling", "2.0" ).toDouble();
+  mMaxOversampling = filterElem.attribute( "maxOversampling", "2.0" ).toDouble();
 
-  QString zoomedInResamplerType = rendererElem.attribute( "zoomedInResampler" );
+  QString zoomedInResamplerType = filterElem.attribute( "zoomedInResampler" );
   if ( zoomedInResamplerType == "bilinear" )
   {
     mZoomedInResampler = new QgsBilinearRasterResampler();
@@ -260,7 +260,7 @@ void QgsRasterResampleFilter::readXML( const QDomElement& rendererElem )
     mZoomedInResampler = new QgsCubicRasterResampler();
   }
 
-  QString zoomedOutResamplerType = rendererElem.attribute( "zoomedOutResampler" );
+  QString zoomedOutResamplerType = filterElem.attribute( "zoomedOutResampler" );
   if ( zoomedOutResamplerType == "bilinear" )
   {
     mZoomedOutResampler = new QgsBilinearRasterResampler();

diff --git a/src/core/raster/qgsrasterresamplefilter.h b/src/core/raster/qgsrasterresamplefilter.h
@@ -58,7 +58,7 @@ class CORE_EXPORT QgsRasterResampleFilter : public QgsRasterInterface
     void writeXML( QDomDocument& doc, QDomElement& parentElem );
 
     /**Sets base class members from xml. Usually called from create() methods of subclasses*/
-    void readXML( const QDomElement& resamplefilterElem );
+    void readXML( const QDomElement& filterElem );
 
   protected:
     /**Resampler used if screen resolution is higher than raster resolution (zoomed in). 0 means no resampling (nearest neighbour)*/