Skip to content

Commit 26d7235

Browse files
authoredSep 13, 2016
Merge pull request #3480 from nyalldawson/symbol
Remove deprecated members from symbology
2 parents 9215fca + ffa10a1 commit 26d7235

File tree

63 files changed

+159
-1567
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+159
-1567
lines changed
 

‎doc/api_break.dox

Lines changed: 75 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,11 @@ variant instead.</li>
304304
<li>GenericDataSourceURI has been renamed to GenericDataSourceUri</li>
305305
</ul>
306306

307+
\subsection qgis_api_break_3_0_QgsCategorizedSymbolRendererWidget QgsCategorizedSymbolRendererWidget
308+
<ul>
309+
<li>sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.</li>
310+
</ul>
311+
307312
\subsection qgis_api_break_3_0_QgsClipper QgsClipper
308313

309314
<ul>
@@ -552,7 +557,17 @@ None will need to be modified, as the method will return an empty geometry if th
552557
\subsection qgis_api_break_3_0_QgsFeatureRendererV2 QgsFeatureRendererV2
553558

554559
<ul>
555-
<li>The method capabilities() returns QgsFeatureRendererV2::Capabilities flags instead of an integer. The two are binary compatible.
560+
<li>The method capabilities() returns QgsFeatureRendererV2::Capabilities flags instead of an integer. The two are binary compatible.</li>
561+
<li>symbolForFeature( QgsFeature& feature ) has been removed. The symbolForFeature( QgsFeature& feature, QgsRenderContext& context ) method should be used instead (previously available as symbolForFeature2 in PyQGIS bindings). symbolForFeature has been made pure virtual.</li>
562+
<li>originalSymbolForFeature( QgsFeature& feature ) has been removed. The symbolForFeature( QgsFeature& feature, QgsRenderContext& context ) method should be used instead (previously available as originalSymbolForFeature2 in PyQGIS bindings).</li>
563+
<li>startRender( QgsRenderContext& context, const QgsVectorLayer *vlayer ) was removed. This function has had no effect since QGIS 2.4</li>
564+
<li>symbols() has been removed. The symbols( QgsRenderContext& context ) method should be used instead (previously available as symbols2 in PyQGIS bindings).</li>
565+
<li>writeSld( QDomDocument& doc, const QgsVectorLayer &layer ) was removed. writeSld( QDomDocument& doc, const QgsVectorLayer &layer ) should be used instead.</li>
566+
<li>rotationField() and setRotationField() were removed. Data defined properties for QgsSymbolLayer should be used instead.</li>
567+
<li>willRenderFeature( QgsFeature& feat ) has been removed. The willRenderFeature( QgsFeature& feat, QgsRenderContext& context ) method should be used instead (previously available as willRenderFeature2 in PyQGIS bindings).</li>
568+
<li>symbolsForFeature( QgsFeature& feat ) has been removed. The symbolsForFeature( QgsFeature& feat, QgsRenderContext& context ) method should be used instead (previously available as symbolsForFeature2 in PyQGIS bindings).</li>
569+
<li>originalSymbolsForFeature( QgsFeature& feat ) has been removed. The originalSymbolsForFeature( QgsFeature& feat, QgsRenderContext& context ) method should be used instead (previously available as originalSymbolsForFeature2 in PyQGIS bindings).</li>
570+
<li>copyPaintEffect() was removed. copyRendererData() should be used instead.</li>
556571
</ul>
557572

558573
\subsection qgis_api_break_3_0_QgsFields QgsFields
@@ -609,6 +624,18 @@ and the new ramp can be retrieved after executing the dialog by calling ramp().<
609624
<li>Some internal methods which were previously public or protected were made private.</li>
610625
</ul>
611626

627+
\subsection qgis_api_break_3_0_QgsGraduatedSymbolRenderer QgsGraduatedSymbolRenderer
628+
629+
<ul>
630+
<li>getDataValues() has been removed - use QgsVectorLayer::getDoubleValues() instead</li>
631+
</ul>
632+
633+
\subsection qgis_api_break_3_0_QgsGraduatedSymbolRendererWidget QgsGraduatedSymbolRenderer
634+
<ul>
635+
<li>sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.</li>
636+
</ul>
637+
638+
612639
\subsection qgis_api_break_3_0_QgsGraphBuilderInterface QgsGraphBuilderInterface
613640

614641
<ul>
@@ -883,27 +910,58 @@ be returned instead of a null pointer if no transformation is required.</li>
883910
<li>QgsRubberBand( QgsMapCanvas* mapCanvas, bool isPolygon ) constructor and reset( bool isPolygon) have been removed, use constructor and function with Qgis::GeometryType as argument instead.</li>
884911
</ul>
885912

913+
\subsection qgis_api_break_3_0_QgsRuleBasedRenderer QgsRuleBasedRenderer
914+
915+
<ul>
916+
<li>QgsRuleBasedRenderer.Rule checkState() and setCheckState() were removed. Use active() and setActive() instead.</li>
917+
<li>startRender( QgsRenderContext& context, const QgsFields& fields ) was removed. Use startRender( QgsRenderContext& context, const QgsFields& fields, QString& filter ) instead.</li>
918+
</ul>
919+
920+
\subsection qgis_api_break_3_0_QgsSimpleMarkerSymbolLayer QgsSimpleMarkerSymbolLayer
921+
922+
<ul>
923+
<li>The constructor variant with a string for the shape name has been removed. Use the variant which accepts a QgsSimpleMarkerSymbolLayerBase.Shape enum instead.</li>
924+
<li>name() and setName() have been removed. Use shape() and setShape() instead.</li>
925+
<li>prepareShape() and preparePath() were removed. Calling these methods manually should no longer be required.</li>
926+
</ul>
927+
928+
\subsection qgis_api_break_3_0_QgsSingleSymbolRendererWidget QgsSingleSymbolRendererWidget
929+
<ul>
930+
<li>sizeScaleFieldChanged() and scaleMethodChanged() were removed. These settings are no longer exposed in the widget's GUI.</li>
931+
</ul>
886932

887933
\subsection qgis_api_break_3_0_QgsSnapper QgsSnapper
888934

889935
<ul>
890936
<li>Constructor variant with QgsMapRenderer has been removed. Use the variant with QgsMapSettings.</li>
891937
</ul>
892938

939+
\subsection qgis_api_break_3_0_QgsSvgCache QgsSvgCache
940+
941+
<ul>
942+
<li>containsParamsV2() was removed. Use containsParamsV3() instead.</li>
943+
</ul>
944+
893945
\subsection qgis_api_break_3_0_QgsSymbol QgsSymbol (renamed from QgsSymbolV2)
894946

895947
<ul>
896948
<li>The OutputUnit enum, including QgsSymbol::MM, QgsSymbol::MapUnit, QgsSymbol::Mixed, QgsSymbol::Pixel and QgsSymbol::Percentage has been moved to QgsUnitTypes
897949
and renamed to RenderUnit. QgsSymbol::OutputUnitList was renamed to QgsUnitTypes::RenderUnitList. All methods which previously accepted QgsSymbol::OutputUnit
898950
parameters or QgsSymbol::OutputUnitList parameters now take QgsUnitTypes::RenderUnit or QgsUnitTypes::RenderUnitList parameters respectively.</li>
899951
<li>startRender() now accepts a QgsFields reference, not a pointer.</li>
952+
<li>isSymbolLayerCompatible() was removed. Use QgsSymbolLayer::isCompatibleWithSymbol() instead.</li>
953+
<li>The DataDefinedSizeScale flag has been removed. This is no longer used and data defined scaling on a symbol layer level should be used instead.</li>
900954
</ul>
901955

902956
\subsection qgis_api_break_3_0_QgsSymbolLayer QgsSymbolLayer (renamed from QgsSymbolLayerV2)
903957

904958
<ul>
905959
<li>The deprecated prepareExpressions( const QgsFields* fields, double scale = -1.0 ) method has been removed. Use
906960
the variant which takes QgsSymbolRenderContext instead.</li>
961+
<li>The deprecated methods dataDefinedProperty( const QString& property ) and dataDefinedPropertyString() were removed. Use getDataDefinedProperty() instead.</li>
962+
<li>setDataDefinedProperty( const QString& property, const QString& expressionString ) was removed. Use setDataDefinedProperty( const QString& property, QgsDataDefined* dataDefined ) instead.</li>
963+
<li>evaluateDataDefinedProperty( const QString& property, const QgsFeature* feature ) was removed. Use the variant which takes QgsSymbolRenderContext instead.</li>
964+
<li>expression() was removed. Use getDataDefinedProperty or evaluateDataDefinedProperty instead.</li>
907965
</ul>
908966

909967
\subsection qgis_api_break_3_0_QgsSymbolRenderContext QgsSymbolRenderContext (renamed from QgsSymbolV2RenderContext)
@@ -917,6 +975,19 @@ the variant which takes QgsSymbolRenderContext instead.</li>
917975

918976
<ul>
919977
<li>encodeOutputUnit() and decodeOutputUnit() were removed. QgsUnitTypes::encodeUnit() and QgsUnitTypes::decodeRenderUnit() should be used instead.</li>
978+
<li>The signatures for wellKnownMarkerToSld() and wellKnownMarkerFromSld() were changed.</li>
979+
</ul>
980+
981+
\subsection qgis_api_break_3_0_QgsSymbolSelectorDialog QgsSymbolSelectorDialog
982+
983+
<ul>
984+
<li>saveSymbol() was removed.</li>
985+
</ul>
986+
987+
\subsection qgis_api_break_3_0_QgsSymbolSelectorWidget QgsSymbolSelectorWidget
988+
989+
<ul>
990+
<li>saveSymbol() was removed.</li>
920991
</ul>
921992

922993
\subsection qgis_api_break_3_0_QgsTolerance QgsTolerance
@@ -1053,7 +1124,9 @@ in code which previously passed a null pointer to QgsVectorFileWriter.</li>
10531124
<ul>
10541125
<li>New virtual method <code>bool writeSld( QDomNode& node, QDomDocument& doc, QString& errorMessage, QgsStringMap props = QgsStringMap() )</code> accepts an
10551126
optional property map passing down layer level properties to the SLD encoders. If scale based visibility is enabled, it will contain the
1056-
<code>scaleMinDenom</code> and <code>scaleMaxDenom</code> properties.
1127+
<code>scaleMinDenom</code> and <code>scaleMaxDenom</code> properties.</li>
1128+
<li>The RotationField capabitity was removed. This is now handled using data defined rotation at a symbol layer level</li>
1129+
<li>setScaleMethodToSymbol was removed. This is now handled using data defined scaling at a symbol layer level</li>
10571130
</ul>
10581131

10591132

‎python/core/symbology-ng/qgscategorizedsymbolrenderer.sip

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ class QgsCategorizedSymbolRenderer : QgsFeatureRenderer
5050
virtual ~QgsCategorizedSymbolRenderer();
5151

5252
//! @note available in python as symbolForFeature2
53-
virtual QgsSymbol* symbolForFeature( QgsFeature& feature, QgsRenderContext& context ) /PyName=symbolForFeature2/;
53+
virtual QgsSymbol* symbolForFeature( QgsFeature& feature, QgsRenderContext& context );
5454

5555
//! @note available in python as originalSymbolForFeature2
56-
virtual QgsSymbol* originalSymbolForFeature( QgsFeature& feature, QgsRenderContext& context ) /PyName=originalSymbolForFeature2/;
56+
virtual QgsSymbol* originalSymbolForFeature( QgsFeature& feature, QgsRenderContext& context );
5757

5858
virtual void startRender( QgsRenderContext& context, const QgsFields& fields );
5959

@@ -73,7 +73,7 @@ class QgsCategorizedSymbolRenderer : QgsFeatureRenderer
7373
virtual QString filter( const QgsFields& fields = QgsFields() );
7474

7575
//! @note available in python as symbols2
76-
virtual QgsSymbolList symbols( QgsRenderContext& context ) /PyName=symbols2/;
76+
virtual QgsSymbolList symbols( QgsRenderContext& context );
7777

7878
/** Update all the symbols but leave categories and colors. This method also sets the source
7979
* symbol for the renderer.
@@ -168,15 +168,6 @@ class QgsCategorizedSymbolRenderer : QgsFeatureRenderer
168168
*/
169169
void updateColorRamp( QgsColorRamp* ramp /Transfer/, bool inverted = false );
170170

171-
void setRotationField( const QString& fieldOrExpression ) /Deprecated/;
172-
QString rotationField() const /Deprecated/;
173-
174-
void setSizeScaleField( const QString& fieldOrExpression );
175-
QString sizeScaleField() const;
176-
177-
void setScaleMethod( QgsSymbol::ScaleMethod scaleMethod );
178-
QgsSymbol::ScaleMethod scaleMethod() const;
179-
180171
//! items of symbology items in legend should be checkable
181172
//! @note added in 2.5
182173
virtual bool legendSymbolItemsCheckable() const;

0 commit comments

Comments
 (0)