File tree Expand file tree Collapse file tree 3 files changed +32
-1
lines changed Expand file tree Collapse file tree 3 files changed +32
-1
lines changed Original file line number Diff line number Diff line change
1
+ %ModuleHeaderCode
2
+ // fix to allow compilation with sip 4.7
3
+ #include <qgscomposerhtml.h>
4
+ #include <qgscomposertablev2.h>
5
+ #include <qgscomposerattributetablev2.h>
6
+ %End
1
7
2
8
/**
3
9
* \ingroup composer
9
15
class QgsComposerMultiFrame: QgsComposerObject
10
16
{
11
17
%TypeHeaderCode
12
- #include "qgscomposermultiframe.h"
18
+ #include <qgscomposermultiframe.h>
19
+ %End
20
+
21
+ %ConvertToSubClassCode
22
+ if (dynamic_cast<QgsComposerHtml*>(sipCpp) != NULL)
23
+ sipClass = sipClass_QgsComposerHtml;
24
+ else if (dynamic_cast<QgsComposerAttributeTableV2*>(sipCpp) != NULL)
25
+ sipClass = sipClass_QgsComposerAttributeTableV2;
26
+ else if (dynamic_cast<QgsComposerTableV2*>(sipCpp) != NULL)
27
+ sipClass = sipClass_QgsComposerTableV2;
28
+ else if (dynamic_cast<QgsComposerMultiFrame*>(sipCpp) != NULL)
29
+ sipClass = sipClass_QgsComposerMultiFrame;
30
+ else
31
+ sipClass = NULL;
13
32
%End
14
33
15
34
public:
Original file line number Diff line number Diff line change @@ -42,6 +42,12 @@ class QgsFeatureRendererV2
42
42
sipClass = sipClass_QgsGraduatedSymbolRendererV2;
43
43
else if (sipCpp->type() == "RuleRenderer")
44
44
sipClass = sipClass_QgsRuleBasedRendererV2;
45
+ else if (sipCpp->type() == "heatmapRenderer")
46
+ sipClass = sipClass_QgsHeatmapRenderer;
47
+ else if (sipCpp->type() == "invertedPolygonRenderer")
48
+ sipClass = sipClass_QgsInvertedPolygonRenderer;
49
+ else if (sipCpp->type() == "pointDisplacement")
50
+ sipClass = sipClass_QgsPointDisplacementRenderer;
45
51
else
46
52
sipClass = 0;
47
53
%End
Original file line number Diff line number Diff line change @@ -43,11 +43,17 @@ class QgsSymbolLayerV2
43
43
sipClass = sipClass_QgsPointPatternFillSymbolLayer;
44
44
else if (dynamic_cast<QgsSVGFillSymbolLayer*>(sipCpp) != NULL)
45
45
sipClass = sipClass_QgsSVGFillSymbolLayer;
46
+ else if (dynamic_cast<QgsRasterFillSymbolLayer*>(sipCpp) != NULL)
47
+ sipClass = sipClass_QgsRasterFillSymbolLayer;
46
48
else
47
49
sipClass = sipClass_QgsImageFillSymbolLayer;
48
50
}
49
51
else if (dynamic_cast<QgsCentroidFillSymbolLayerV2*>(sipCpp) != NULL)
50
52
sipClass = sipClass_QgsCentroidFillSymbolLayerV2;
53
+ else if (dynamic_cast<QgsGradientFillSymbolLayerV2*>(sipCpp) != NULL)
54
+ sipClass = sipClass_QgsGradientFillSymbolLayerV2;
55
+ else if (dynamic_cast<QgsShapeburstFillSymbolLayerV2*>(sipCpp) != NULL)
56
+ sipClass = sipClass_QgsShapeburstFillSymbolLayerV2;
51
57
else
52
58
sipClass = sipClass_QgsFillSymbolLayerV2;
53
59
break;
You can’t perform that action at this time.
0 commit comments