@@ -12,7 +12,7 @@ class QgsSimpleFillSymbolLayerV2 : QgsFillSymbolLayerV2
12
12
double borderWidth = DEFAULT_SIMPLEFILL_BORDERWIDTH,
13
13
Qt::PenJoinStyle penJoinStyle = DEFAULT_SIMPLEFILL_JOINSTYLE
14
14
);
15
-
15
+
16
16
// static stuff
17
17
18
18
static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() ) /Factory/;
@@ -61,7 +61,7 @@ class QgsSimpleFillSymbolLayerV2 : QgsFillSymbolLayerV2
61
61
62
62
double borderWidth() const;
63
63
void setBorderWidth( double borderWidth );
64
-
64
+
65
65
Qt::PenJoinStyle penJoinStyle() const;
66
66
void setPenJoinStyle( Qt::PenJoinStyle style );
67
67
@@ -70,20 +70,20 @@ class QgsSimpleFillSymbolLayerV2 : QgsFillSymbolLayerV2
70
70
71
71
void setBorderWidthUnit( QgsSymbolV2::OutputUnit unit );
72
72
QgsSymbolV2::OutputUnit borderWidthUnit() const;
73
-
73
+
74
74
void setBorderWidthMapUnitScale( const QgsMapUnitScale& scale);
75
75
const QgsMapUnitScale& borderWidthMapUnitScale() const;
76
76
77
77
void setOffsetUnit( QgsSymbolV2::OutputUnit unit );
78
78
QgsSymbolV2::OutputUnit offsetUnit() const;
79
-
79
+
80
80
void setOffsetMapUnitScale( const QgsMapUnitScale& scale);
81
81
const QgsMapUnitScale& offsetMapUnitScale() const;
82
82
83
83
void setOutputUnit( QgsSymbolV2::OutputUnit unit );
84
84
QgsSymbolV2::OutputUnit outputUnit() const;
85
-
86
- void setMapUnitScale(const QgsMapUnitScale &scale);
85
+
86
+ void setMapUnitScale( const QgsMapUnitScale &scale );
87
87
QgsMapUnitScale mapUnitScale() const;
88
88
89
89
double estimateMaxBleed() const;
@@ -208,14 +208,14 @@ class QgsGradientFillSymbolLayerV2 : QgsFillSymbolLayerV2
208
208
/**Units for gradient fill offset*/
209
209
void setOffsetUnit( QgsSymbolV2::OutputUnit unit );
210
210
QgsSymbolV2::OutputUnit offsetUnit() const;
211
-
211
+
212
212
void setOffsetMapUnitScale( const QgsMapUnitScale& scale);
213
213
const QgsMapUnitScale& offsetMapUnitScale() const;
214
-
215
- void setOutputUnit(QgsSymbolV2::OutputUnit unit);
214
+
215
+ void setOutputUnit( QgsSymbolV2::OutputUnit unit );
216
216
QgsSymbolV2::OutputUnit outputUnit() const;
217
217
218
- void setMapUnitScale(const QgsMapUnitScale &scale);
218
+ void setMapUnitScale( const QgsMapUnitScale &scale );
219
219
QgsMapUnitScale mapUnitScale() const;
220
220
221
221
};
@@ -234,12 +234,9 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
234
234
ColorRamp
235
235
};
236
236
237
- QgsShapeburstFillSymbolLayerV2( QColor color = DEFAULT_SIMPLEFILL_COLOR,
238
- QColor color2 = Qt::white,
237
+ QgsShapeburstFillSymbolLayerV2( QColor color = DEFAULT_SIMPLEFILL_COLOR, QColor color2 = Qt::white,
239
238
ShapeburstColorType colorType = SimpleTwoColor,
240
- int blurRadius = 0,
241
- bool useWholeShape = true,
242
- double maxDistance = 5 );
239
+ int blurRadius = 0, bool useWholeShape = true, double maxDistance = 5 );
243
240
244
241
virtual ~QgsShapeburstFillSymbolLayerV2();
245
242
@@ -324,6 +321,9 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
324
321
*/
325
322
QgsSymbolV2::OutputUnit distanceUnit() const;
326
323
324
+ void setDistanceMapUnitScale( const QgsMapUnitScale& scale );
325
+ const QgsMapUnitScale& distanceMapUnitScale() const;
326
+
327
327
/**Sets the color mode to use for the shapeburst fill. Shapeburst can either be drawn using a QgsVectorColorRampV2 color ramp
328
328
* or by simply specificing a start and end color. setColorType is used to specify which mode to use for the fill.
329
329
* @param colorType color type to use for shapeburst fill
@@ -374,7 +374,7 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
374
374
* @see colorType
375
375
*/
376
376
QColor color2() const;
377
-
377
+
378
378
/**Sets whether the shapeburst fill should ignore polygon rings when calculating
379
379
* the buffered shading.
380
380
* @param ignoreRings Set to true if buffers should ignore interior rings for polygons.
@@ -387,7 +387,7 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
387
387
* @note added in 2.3
388
388
* @see setIgnoreRings
389
389
*/
390
- double ignoreRings() const;
390
+ double ignoreRings() const;
391
391
392
392
/**Sets the offset for the shapeburst fill.
393
393
* @param offset QPointF indicating the horizontal/vertical offset amount
@@ -418,10 +418,15 @@ class QgsShapeburstFillSymbolLayerV2 : QgsFillSymbolLayerV2
418
418
* @see setOffsetUnit
419
419
*/
420
420
QgsSymbolV2::OutputUnit offsetUnit() const;
421
-
421
+
422
422
void setOffsetMapUnitScale( const QgsMapUnitScale& scale);
423
423
const QgsMapUnitScale& offsetMapUnitScale() const;
424
424
425
+ void setOutputUnit( QgsSymbolV2::OutputUnit unit );
426
+ QgsSymbolV2::OutputUnit outputUnit() const;
427
+
428
+ void setMapUnitScale( const QgsMapUnitScale &scale );
429
+ QgsMapUnitScale mapUnitScale() const;
425
430
};
426
431
427
432
/**Base class for polygon renderers generating texture images*/
@@ -441,14 +446,14 @@ class QgsImageFillSymbolLayer: QgsFillSymbolLayerV2
441
446
442
447
void setOutlineWidthUnit( QgsSymbolV2::OutputUnit unit );
443
448
QgsSymbolV2::OutputUnit outlineWidthUnit() const;
444
-
449
+
445
450
void setOutlineWidthMapUnitScale( const QgsMapUnitScale& scale);
446
451
const QgsMapUnitScale& outlineWidthMapUnitScale() const;
447
-
448
- void setOutputUnit(QgsSymbolV2::OutputUnit unit);
452
+
453
+ void setOutputUnit( QgsSymbolV2::OutputUnit unit );
449
454
QgsSymbolV2::OutputUnit outputUnit() const;
450
455
451
- void setMapUnitScale(const QgsMapUnitScale & scale);
456
+ void setMapUnitScale( const QgsMapUnitScale& scale );
452
457
QgsMapUnitScale mapUnitScale() const;
453
458
454
459
virtual double estimateMaxBleed() const;
@@ -502,19 +507,22 @@ class QgsSVGFillSymbolLayer: QgsImageFillSymbolLayer
502
507
503
508
void setPatternWidthUnit( QgsSymbolV2::OutputUnit unit );
504
509
QgsSymbolV2::OutputUnit patternWidthUnit() const;
505
-
510
+
506
511
void setPatternWidthMapUnitScale( const QgsMapUnitScale& scale);
507
512
const QgsMapUnitScale& patternWidthMapUnitScale() const;
508
513
509
514
void setSvgOutlineWidthUnit( QgsSymbolV2::OutputUnit unit );
510
515
QgsSymbolV2::OutputUnit svgOutlineWidthUnit() const;
511
-
516
+
512
517
void setSvgOutlineWidthMapUnitScale( const QgsMapUnitScale& scale);
513
518
const QgsMapUnitScale& svgOutlineWidthMapUnitScale() const;
514
519
515
520
void setOutputUnit( QgsSymbolV2::OutputUnit unit );
516
521
QgsSymbolV2::OutputUnit outputUnit() const;
517
522
523
+ void setMapUnitScale( const QgsMapUnitScale &scale );
524
+ QgsMapUnitScale mapUnitScale() const;
525
+
518
526
protected:
519
527
void applyDataDefinedSettings( const QgsSymbolV2RenderContext& context );
520
528
};
@@ -561,26 +569,26 @@ class QgsLinePatternFillSymbolLayer: QgsImageFillSymbolLayer
561
569
562
570
void setDistanceUnit( QgsSymbolV2::OutputUnit unit );
563
571
QgsSymbolV2::OutputUnit distanceUnit() const;
564
-
572
+
565
573
void setDistanceMapUnitScale( const QgsMapUnitScale& scale);
566
574
const QgsMapUnitScale& distanceMapUnitScale() const;
567
575
568
576
void setLineWidthUnit( QgsSymbolV2::OutputUnit unit );
569
577
QgsSymbolV2::OutputUnit lineWidthUnit() const;
570
-
578
+
571
579
void setLineWidthMapUnitScale( const QgsMapUnitScale& scale);
572
580
const QgsMapUnitScale& lineWidthMapUnitScale() const;
573
581
574
582
void setOffsetUnit( QgsSymbolV2::OutputUnit unit );
575
583
QgsSymbolV2::OutputUnit offsetUnit() const;
576
-
584
+
577
585
void setOffsetMapUnitScale( const QgsMapUnitScale& scale);
578
586
const QgsMapUnitScale& offsetMapUnitScale() const;
579
587
580
588
void setOutputUnit( QgsSymbolV2::OutputUnit unit );
581
589
QgsSymbolV2::OutputUnit outputUnit() const;
582
-
583
- void setMapUnitScale( const QgsMapUnitScale& scale);
590
+
591
+ void setMapUnitScale( const QgsMapUnitScale& scale );
584
592
QgsMapUnitScale mapUnitScale() const;
585
593
586
594
bool setSubSymbol( QgsSymbolV2* symbol );
@@ -632,32 +640,32 @@ class QgsPointPatternFillSymbolLayer : QgsImageFillSymbolLayer
632
640
633
641
void setDistanceXUnit( QgsSymbolV2::OutputUnit unit );
634
642
QgsSymbolV2::OutputUnit distanceXUnit() const;
635
-
643
+
636
644
void setDistanceXMapUnitScale( const QgsMapUnitScale& scale);
637
645
const QgsMapUnitScale& distanceXMapUnitScale() const;
638
646
639
647
void setDistanceYUnit( QgsSymbolV2::OutputUnit unit );
640
648
QgsSymbolV2::OutputUnit distanceYUnit() const;
641
-
649
+
642
650
void setDistanceYMapUnitScale( const QgsMapUnitScale& scale);
643
651
const QgsMapUnitScale& distanceYMapUnitScale() const;
644
652
645
653
void setDisplacementXUnit( QgsSymbolV2::OutputUnit unit );
646
654
QgsSymbolV2::OutputUnit displacementXUnit() const;
647
-
655
+
648
656
void setDisplacementXMapUnitScale( const QgsMapUnitScale& scale);
649
657
const QgsMapUnitScale& displacementXMapUnitScale() const;
650
658
651
659
void setDisplacementYUnit( QgsSymbolV2::OutputUnit unit );
652
660
QgsSymbolV2::OutputUnit displacementYUnit() const;
653
-
661
+
654
662
void setDisplacementYMapUnitScale( const QgsMapUnitScale& scale);
655
663
const QgsMapUnitScale& displacementYMapUnitScale() const;
656
664
657
665
void setOutputUnit( QgsSymbolV2::OutputUnit unit );
658
666
QgsSymbolV2::OutputUnit outputUnit() const;
659
-
660
- void setMapUnitScale(const QgsMapUnitScale &scale);
667
+
668
+ void setMapUnitScale( const QgsMapUnitScale &scale );
661
669
QgsMapUnitScale mapUnitScale() const;
662
670
663
671
virtual QSet<QString> usedAttributes() const;
@@ -704,11 +712,9 @@ class QgsCentroidFillSymbolLayerV2 : QgsFillSymbolLayerV2
704
712
705
713
void setOutputUnit( QgsSymbolV2::OutputUnit unit );
706
714
QgsSymbolV2::OutputUnit outputUnit() const;
707
-
715
+
708
716
void setMapUnitScale(const QgsMapUnitScale &scale);
709
717
QgsMapUnitScale mapUnitScale() const;
710
718
711
719
virtual QSet<QString> usedAttributes() const;
712
720
};
713
-
714
-
0 commit comments