Skip to content

Commit e71e743

Browse files
nyalldawsonnyalldawson
authoredAug 25, 2016
Merge pull request #3432 from nyalldawson/ramps
Color ramp API improvements, fixes + some style dock inlining
·
ltr-3_40final-3_0_0
2 parents 1387695 + 5ac5035 commit e71e743

File tree

83 files changed

+1730
-1183
lines changed

Some content is hidden

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

83 files changed

+1730
-1183
lines changed
 

‎doc/api_break.dox

Lines changed: 43 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ This page tries to maintain a list with incompatible changes that happened in pr
7272
<tr><td>QgsMultiLineStringV2<td>QgsMultiLineString
7373
<tr><td>QgsMultiSurfaceV2<td>QgsMultiSurface
7474
<tr><td>QgsPointSequenceV2<td>QgsPointSequence
75-
<tr><td>QgsRandomColorsV2<td>QgsRandomColors
75+
<tr><td>QgsRandomColorsV2<td>QgsRandomColorRamp
7676
<tr><td>QgsRendererCategoryV2<td>QgsRendererCategory
7777
<tr><td>QgsRendererRangeV2<td>QgsRendererRange
7878
<tr><td>QgsRendererRangeV2LabelFomat<td>QgsRendererRangeLabelFomat
@@ -125,19 +125,19 @@ This page tries to maintain a list with incompatible changes that happened in pr
125125
<tr><td>QgsSymbolV2SelectorDialog<td>QgsSymbolSelectorDialog
126126
<tr><td>QgsSymbolV2SelectorWidget<td>QgsSymbolSelectorWidget
127127
<tr><td>QgsSymbologyV2Conversion<td>QgsSymbologyConversion
128-
<tr><td>QgsVectorColorBrewerColorRampV2<td>QgsVectorColorBrewerColorRamp
129-
<tr><td>QgsVectorColorBrewerColorRampV2Dialog<td>QgsVectorColorBrewerColorRampDialog
130-
<tr><td>QgsVectorColorBrewerColorRampV2DialogBase<td>QgsVectorColorBrewerColorRampDialogBase
131-
<tr><td>QgsVectorColorRampV2<td>QgsVectorColorRamp
128+
<tr><td>QgsVectorColorBrewerColorRampV2<td>QgsColorBrewerColorRamp
129+
<tr><td>QgsVectorColorBrewerColorRampV2Dialog<td>QgsColorBrewerColorRampDialog
130+
<tr><td>QgsVectorColorBrewerColorRampV2DialogBase<td>QgsColorBrewerColorRampDialogBase
131+
<tr><td>QgsVectorColorRampV2<td>QgsColorRamp
132132
<tr><td>QgsVectorColorRampV2Map<td>QgsVectorColorRampMap
133-
<tr><td>QgsVectorGradientColorRampV2<td>QgsVectorGradientColorRamp
134-
<tr><td>QgsVectorGradientColorRampV2Dialog<td>QgsVectorGradientColorRampDialog
135-
<tr><td>QgsVectorGradientColorRampV2DialogBase<td>QgsVectorGradientColorRampDialogBase
133+
<tr><td>QgsVectorGradientColorRampV2<td>QgsGradientColorRamp
134+
<tr><td>QgsVectorGradientColorRampV2Dialog<td>QgsGradientColorRampDialog
135+
<tr><td>QgsVectorGradientColorRampV2DialogBase<td>QgsGradientColorRampDialogBase
136136
<tr><td>QgsVectorGradientRampV2<td>QgsVectorGradientRamp
137137
<tr><td>QgsVectorLayersetRendererV2<td>QgsVectorLayersetRenderer
138-
<tr><td>QgsVectorRandomColorRampV2<td>QgsVectorRandomColorRamp
139-
<tr><td>QgsVectorRandomColorRampV2Dialog<td>QgsVectorRandomColorRampDialog
140-
<tr><td>QgsVectorRandomColorRampV2DialogBase<td>QgsVectorRandomColorRampDialogBase
138+
<tr><td>QgsVectorRandomColorRampV2<td>QgsLimitedRandomColorRamp
139+
<tr><td>QgsVectorRandomColorRampV2Dialog<td>QgsLimitedRandomColorRampDialog
140+
<tr><td>QgsVectorRandomColorRampV2DialogBase<td>QgsLimitedRandomColorRampDialogBase
141141
<tr><th>QgsSymbolV2<th>QgsSymbol
142142
</table>
143143

@@ -295,6 +295,14 @@ variant instead.</li>
295295
<li>GenericDataSourceURI has been renamed to GenericDataSourceUri</li>
296296
</ul>
297297

298+
\subsection qgis_api_break_3_0_QgsColorBrewerColorRampDialog QgsColorBrewerColorRampDialog
299+
300+
<ul>
301+
<li>The dialog no longer edits a color ramp in place. Instead, a copy of the ramp is edited
302+
and the new ramp can be retrieved after executing the dialog by calling ramp().</li>
303+
<li>Some internal methods which were previously public or protected were made private.</li>
304+
</ul>
305+
298306
\subsection qgis_api_break_3_0_QgsComposerLabel QgsComposerLabel
299307

300308
<ul>
@@ -389,6 +397,14 @@ plugins calling these methods will need to be updated.</li>
389397
be returned in place of a null pointer.</li>
390398
</ul>
391399

400+
\subsection qgis_api_break_3_0_QgsCptCityColorRampDialog QgsCptCityColorRampDialog
401+
402+
<ul>
403+
<li>The dialog no longer edits a color ramp in place. Instead, a copy of the ramp is edited
404+
and the new ramp can be retrieved after executing the dialog by calling ramp().</li>
405+
<li>Some internal methods which were previously public or protected were made private.</li>
406+
</ul>
407+
392408
\subsection qgis_api_break_3_0_QgsCptCitySelectionItem QgsCptCitySelectionItem
393409

394410
<ul>
@@ -559,6 +575,14 @@ method to determine if a geometry is valid.</li>
559575
a QgsGeometry value rather than a pointer.</li>
560576
</ul>
561577

578+
\subsection qgis_api_break_3_0_QgsGradientColorRampDialog QgsGradientColorRampDialog
579+
580+
<ul>
581+
<li>The dialog no longer edits a color ramp in place. Instead, a copy of the ramp is edited
582+
and the new ramp can be retrieved after executing the dialog by calling ramp().</li>
583+
<li>Some internal methods which were previously public or protected were made private.</li>
584+
</ul>
585+
562586
\subsection qgis_api_break_3_0_QgsGraphBuilderInterface QgsGraphBuilderInterface
563587

564588
<ul>
@@ -604,6 +628,14 @@ plugins calling this method will need to be updated.</li>
604628
<li>writeCommonXML() has been renamed to writeCommonXml()</li>
605629
</ul>
606630

631+
\subsection qgis_api_break_3_0_QgsLimitedRandomRampDialog QgsLimitedRandomColorRampDialog
632+
633+
<ul>
634+
<li>The dialog no longer edits a color ramp in place. Instead, a copy of the ramp is edited
635+
and the new ramp can be retrieved after executing the dialog by calling ramp().</li>
636+
<li>Some internal methods which were previously public or protected were made private.</li>
637+
</ul>
638+
607639
\subsection qgis_api_break_3_0_QgsMapCanvas QgsMapCanvas
608640

609641
<ul>

‎python/core/core.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
%Include qgsattributeeditorelement.sip
2828
%Include qgsbrowsermodel.sip
2929
%Include qgsclipper.sip
30+
%Include qgscolorramp.sip
3031
%Include qgscolorscheme.sip
3132
%Include qgscolorschemeregistry.sip
3233
%Include qgsconditionalstyle.sip
@@ -290,7 +291,6 @@
290291
%Include symbology-ng/qgsstyle.sip
291292
%Include symbology-ng/qgssvgcache.sip
292293
%Include symbology-ng/qgssymbol.sip
293-
%Include symbology-ng/qgsvectorcolorramp.sip
294294

295295
%Include symbology-ng/qgs25drenderer.sip
296296
%Include symbology-ng/qgscategorizedsymbolrenderer.sip

0 commit comments

Comments
 (0)
Please sign in to comment.