sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add some missing type conversions to python bindings

Browse Source
This commit is contained in:
Nyall Dawson 2015-01-20 22:36:36 +11:00
parent c6a77f6201
commit 6a080bada1
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
python/core/composer/qgscomposermultiframe.sip
View File

@ -1,3 +1,9 @@
%ModuleHeaderCode
// fix to allow compilation with sip 4.7
#include <qgscomposerhtml.h>
#include <qgscomposertablev2.h>
#include <qgscomposerattributetablev2.h>
%End
/** /**
* \ingroup composer * \ingroup composer
@ -9,7 +15,20 @@
class QgsComposerMultiFrame: QgsComposerObject class QgsComposerMultiFrame: QgsComposerObject
{ {
%TypeHeaderCode %TypeHeaderCode
#include "qgscomposermultiframe.h" #include <qgscomposermultiframe.h>
%End
%ConvertToSubClassCode
if (dynamic_cast<QgsComposerHtml*>(sipCpp) != NULL)
sipClass = sipClass_QgsComposerHtml;
else if (dynamic_cast<QgsComposerAttributeTableV2*>(sipCpp) != NULL)
sipClass = sipClass_QgsComposerAttributeTableV2;
else if (dynamic_cast<QgsComposerTableV2*>(sipCpp) != NULL)
sipClass = sipClass_QgsComposerTableV2;
else if (dynamic_cast<QgsComposerMultiFrame*>(sipCpp) != NULL)
sipClass = sipClass_QgsComposerMultiFrame;
else
sipClass = NULL;
%End %End
public: public:

6
python/core/symbology-ng/qgsrendererv2.sip
View File

@ -42,6 +42,12 @@ class QgsFeatureRendererV2
sipClass = sipClass_QgsGraduatedSymbolRendererV2; sipClass = sipClass_QgsGraduatedSymbolRendererV2;
else if (sipCpp->type() == "RuleRenderer") else if (sipCpp->type() == "RuleRenderer")
sipClass = sipClass_QgsRuleBasedRendererV2; sipClass = sipClass_QgsRuleBasedRendererV2;
else if (sipCpp->type() == "heatmapRenderer")
sipClass = sipClass_QgsHeatmapRenderer;
else if (sipCpp->type() == "invertedPolygonRenderer")
sipClass = sipClass_QgsInvertedPolygonRenderer;
else if (sipCpp->type() == "pointDisplacement")
sipClass = sipClass_QgsPointDisplacementRenderer;
else else
sipClass = 0; sipClass = 0;
%End %End

6
python/core/symbology-ng/qgssymbollayerv2.sip
View File

@ -43,11 +43,17 @@ class QgsSymbolLayerV2
sipClass = sipClass_QgsPointPatternFillSymbolLayer; sipClass = sipClass_QgsPointPatternFillSymbolLayer;
else if (dynamic_cast<QgsSVGFillSymbolLayer*>(sipCpp) != NULL) else if (dynamic_cast<QgsSVGFillSymbolLayer*>(sipCpp) != NULL)
sipClass = sipClass_QgsSVGFillSymbolLayer; sipClass = sipClass_QgsSVGFillSymbolLayer;
else if (dynamic_cast<QgsRasterFillSymbolLayer*>(sipCpp) != NULL)
sipClass = sipClass_QgsRasterFillSymbolLayer;
else else
sipClass = sipClass_QgsImageFillSymbolLayer; sipClass = sipClass_QgsImageFillSymbolLayer;
} }
else if (dynamic_cast<QgsCentroidFillSymbolLayerV2*>(sipCpp) != NULL) else if (dynamic_cast<QgsCentroidFillSymbolLayerV2*>(sipCpp) != NULL)
sipClass = sipClass_QgsCentroidFillSymbolLayerV2; sipClass = sipClass_QgsCentroidFillSymbolLayerV2;
else if (dynamic_cast<QgsGradientFillSymbolLayerV2*>(sipCpp) != NULL)
sipClass = sipClass_QgsGradientFillSymbolLayerV2;
else if (dynamic_cast<QgsShapeburstFillSymbolLayerV2*>(sipCpp) != NULL)
sipClass = sipClass_QgsShapeburstFillSymbolLayerV2;
else else
sipClass = sipClass_QgsFillSymbolLayerV2; sipClass = sipClass_QgsFillSymbolLayerV2;
break; break;