raster sip fixes

blazek · blazek · commit c6a29fa8a06c · 2012-09-13T13:38:39.000+02:00
diff --git a/python/core/qgsrasterdataprovider.sip b/python/core/qgsrasterdataprovider.sip
@@ -6,7 +6,7 @@
  *         sense for Raster layers.
  */
 
-class QgsRasterDataProvider : QgsDataProvider
+class QgsRasterDataProvider : QgsDataProvider, QgsRasterInterface
 {
 %TypeHeaderCode
 #include <qgsrasterdataprovider.h>
diff --git a/python/core/qgsrasterinterface.sip b/python/core/qgsrasterinterface.sip
@@ -7,7 +7,39 @@ class QgsRasterInterface
 {
 %TypeHeaderCode
 #include <qgsrasterinterface.h>
+#include <qgsrasterresamplefilter.h>
+//#include <qgsrasternuller.h>
+#include <qgsrasterrenderer.h>
+#include <qgsrasterprojector.h>
+#include <qgsrasterdataprovider.h>
+
+// QgsRasterRenderer subclass headers must be here because ConvertToSubClassCode 
+// from QgsRasterRenderer is probably included
+#include <qgspalettedrasterrenderer.h>
+#include <qgsmultibandcolorrenderer.h>
+#include <qgssinglebandpseudocolorrenderer.h>
+#include <qgssinglebandgrayrenderer.h>
+#include <qgssinglebandcolordatarenderer.h>
 %End
+
+%ConvertToSubClassCode
+  if (dynamic_cast<QgsRasterResampleFilter*>(sipCpp) != NULL)
+    sipClass = sipClass_QgsRasterResampleFilter;
+//  if (dynamic_cast<QgsRasterNuller*>(sipCpp) != NULL)
+//    sipClass = sipClass_QgsRasterNuller;
+  if (dynamic_cast<QgsRasterRenderer*>(sipCpp) != NULL)
+    sipClass = sipClass_QgsRasterRenderer;
+  if (dynamic_cast<QgsRasterProjector*>(sipCpp) != NULL)
+    sipClass = sipClass_QgsRasterProjector;
+  if (dynamic_cast<QgsRasterDataProvider*>(sipCpp) != NULL)
+  {
+    sipClass = sipClass_QgsRasterDataProvider;
+    *sipCppRet = static_cast<QgsRasterDataProvider*>(sipCpp);
+  }
+  else
+    sipClass = 0;
+%End
+
   public:
 
     enum DataType
diff --git a/python/core/qgsrasterpipe.sip b/python/core/qgsrasterpipe.sip
@@ -23,11 +23,11 @@ class QgsRasterPipe
 
     ~QgsRasterPipe();
 
-    bool insert( int idx, QgsRasterInterface* theInterface );
+    bool insert( int idx, QgsRasterInterface* theInterface /Transfer/ );
 
-    bool replace( int idx, QgsRasterInterface* theInterface );
+    bool replace( int idx, QgsRasterInterface* theInterface /Transfer/ );
 
-    bool set( QgsRasterInterface * theInterface );
+    bool set( QgsRasterInterface * theInterface /Transfer/ );
 
     bool remove( int idx );
 
diff --git a/python/core/qgsrasterprojector.sip b/python/core/qgsrasterprojector.sip
@@ -1,7 +1,7 @@
 
 /**  Raster projector */
 
-class QgsRasterProjector
+class QgsRasterProjector : QgsRasterInterface
 {
 %TypeHeaderCode
 #include <qgsrasterprojector.h>
diff --git a/python/core/qgsrasterrenderer.sip b/python/core/qgsrasterrenderer.sip
@@ -1,4 +1,4 @@
-class QgsRasterRenderer
+class QgsRasterRenderer : QgsRasterInterface
 {
 %TypeHeaderCode
     #include "qgsrasterrenderer.h"
@@ -7,6 +7,7 @@ class QgsRasterRenderer
     #include "qgssinglebandpseudocolorrenderer.h"
     #include "qgssinglebandgrayrenderer.h"
     #include "qgssinglebandcolordatarenderer.h"
+    #include "qgsrasterinterface.h"
 %End
 
 %ConvertToSubClassCode
@@ -18,8 +19,8 @@ class QgsRasterRenderer
     sipClass = sipClass_QgsSingleBandPseudoColorRenderer;
   else if (dynamic_cast<QgsSingleBandGrayRenderer*>(sipCpp) != NULL)
     sipClass = sipClass_QgsSingleBandGrayRenderer;
-    else if (dynamic_cast<QgsSingleBandGrayRenderer*>(sipCpp) != NULL)
-      sipClass = sipClass_QgsSingleBandGrayRenderer;
+  else if (dynamic_cast<QgsSingleBandGrayRenderer*>(sipCpp) != NULL)
+    sipClass = sipClass_QgsSingleBandGrayRenderer;
   else
     sipClass = 0;
 %End
diff --git a/python/core/qgsrasterresamplefilter.sip b/python/core/qgsrasterresamplefilter.sip
@@ -1,7 +1,7 @@
 
 /**  Raster resample filter */
 
-class QgsRasterResampleFilter
+class QgsRasterResampleFilter : QgsRasterInterface
 {
 %TypeHeaderCode
 #include <qgsrasterresamplefilter.h>
diff --git a/tests/src/python/test_qgsrasterfilewriter.py b/tests/src/python/test_qgsrasterfilewriter.py
@@ -46,7 +46,7 @@ def write(self, theRasterName):
 
         projector = QgsRasterProjector()
         projector.setCRS( provider.crs(), provider.crs() )
-        if not pipe.insert( 2, projector.clone() ):
+        if not pipe.insert( 2, projector ):
             print "Cannot set pipe projector"
             return False
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* sense for Raster layers.`
`7`	`7`	`*/`
`8`	`8`
`9`		`-class QgsRasterDataProvider : QgsDataProvider`
	`9`	`+class QgsRasterDataProvider : QgsDataProvider, QgsRasterInterface`
`10`	`10`	`{`
`11`	`11`	`%TypeHeaderCode`
`12`	`12`	`#include <qgsrasterdataprovider.h>`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`
`2`	`2`	`/** Raster projector */`
`3`	`3`
`4`		`-class QgsRasterProjector`
	`4`	`+class QgsRasterProjector : QgsRasterInterface`
`5`	`5`	`{`
`6`	`6`	`%TypeHeaderCode`
`7`	`7`	`#include <qgsrasterprojector.h>`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`
`2`	`2`	`/** Raster resample filter */`
`3`	`3`
`4`		`-class QgsRasterResampleFilter`
	`4`	`+class QgsRasterResampleFilter : QgsRasterInterface`
`5`	`5`	`{`
`6`	`6`	`%TypeHeaderCode`
`7`	`7`	`#include <qgsrasterresamplefilter.h>`