Skip to content

Commit b40bc0c

Browse files
nyalldawsonnyalldawson
committedApr 26, 2017
Refactor scale bar rendering
Move all scalebar rendering code out of composer and ensure that all scalebar rendering is done independant of QgsComposerScaleBar This allows scalebar rendering code to be reused by plugins and by non-composer code. Also rename QgsScaleBarStyle -> QgsScaleBarRenderer, (and all subclasses too). This name better reflects what these classes do.
·
ltr-3_40final-3_0_0
1 parent 13b4472 commit b40bc0c

Some content is hidden

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

43 files changed

+2189
-1226
lines changed
 

‎doc/CMakeLists.txt

100644100755
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ IF(WITH_APIDOC)
6666
${CMAKE_SOURCE_DIR}/src/core/pal
6767
${CMAKE_SOURCE_DIR}/src/core/processing
6868
${CMAKE_SOURCE_DIR}/src/core/raster
69+
${CMAKE_SOURCE_DIR}/src/core/scalebar
6970
${CMAKE_SOURCE_DIR}/src/core/symbology-ng
7071
${CMAKE_SOURCE_DIR}/src/gui
7172
${CMAKE_SOURCE_DIR}/src/gui/auth

‎doc/api_break.dox

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
8585
<tr><td>QgsCurveV2<td>QgsCurve
8686
<tr><td>QgsDbFilterProxyModel<td>QgsDatabaseFilterProxyModel
8787
<tr><td>QgsDiagramRendererV2<td>QgsDiagramRenderer
88+
<tr><td>QgsDoubleBoxBarStyle<td>QgsDoubleBoxScaleBarRenderer
8889
<tr><td>QgsEditorWidgetV2<td>QgsEditorWidget
8990
<tr><td>QgsEllipseSymbolLayerV2<td>QgsEllipseSymbolLayer
9091
<tr><td>QgsEllipseSymbolLayerV2Widget<td>QgsEllipseSymbolLayerWidget
@@ -115,6 +116,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
115116
<tr><td>QgsMultiCurveV2<td>QgsMultiCurve
116117
<tr><td>QgsMultiLineStringV2<td>QgsMultiLineString
117118
<tr><td>QgsMultiSurfaceV2<td>QgsMultiSurface
119+
<tr><td>QgsNumericScaleBarStyle<td>QgsNumericScaleBarRenderer
118120
<tr><td>QgsPointSequenceV2<td>QgsPointSequence
119121
<tr><td>QgsProperty<td>QgsProjectProperty
120122
<tr><td>QgsPropertyKey<td>QgsProjectPropertyKey
@@ -140,6 +142,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
140142
<tr><td>QgsRuleBasedRendererV2Count<td>QgsRuleBasedRendererCount
141143
<tr><td>QgsRuleBasedRendererV2Model<td>QgsRuleBasedRendererModel
142144
<tr><td>QgsRuleBasedRendererV2Widget<td>QgsRuleBasedRendererWidget
145+
<tr><td>QgsScaleBarStyle<td>QgsScaleBarRenderer
143146
<tr><td>QgsShapeburstFillSymbolLayerV2<td>QgsShapeburstFillSymbolLayer
144147
<tr><td>QgsShapeburstFillSymbolLayerV2Widget<td>QgsShapeburstFillSymbolLayerWidget
145148
<tr><td>QgsSimpleFillSymbolLayerV2<td>QgsSimpleFillSymbolLayer
@@ -148,6 +151,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
148151
<tr><td>QgsSimpleLineSymbolLayerV2Widget<td>QgsSimpleLineSymbolLayerWidget
149152
<tr><td>QgsSimpleMarkerSymbolLayerV2<td>QgsSimpleMarkerSymbolLayer
150153
<tr><td>QgsSimpleMarkerSymbolLayerV2Widget<td>QgsSimpleMarkerSymbolLayerWidget
154+
<tr><td>QgsSingleBoxScaleBarStyle<td>QgsSingleBoxScaleBarRenderer
151155
<tr><td>QgsSingleSymbolRendererV2<td>QgsSingleSymbolRenderer
152156
<tr><td>QgsSingleSymbolRendererV2Widget<td>QgsSingleSymbolRendererWidget
153157
<tr><td>QgsStyleV2<td>QgsStyle
@@ -171,6 +175,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
171175
<tr><td>QgsSymbolV2RenderContext<td>QgsSymbolRenderContext
172176
<tr><td>QgsSymbolV2SelectorDialog<td>QgsSymbolSelectorDialog
173177
<tr><td>QgsSymbolV2SelectorWidget<td>QgsSymbolSelectorWidget
178+
<tr><td>QgsTicksScaleBarStyle<td>QgsTicksScaleBarRenderer
174179
<tr><td>QgsVectorColorBrewerColorRampV2<td>QgsColorBrewerColorRamp
175180
<tr><td>QgsVectorColorBrewerColorRampV2Dialog<td>QgsColorBrewerColorRampDialog
176181
<tr><td>QgsVectorColorBrewerColorRampV2DialogBase<td>QgsColorBrewerColorRampDialogBase
@@ -684,9 +689,12 @@ QgsComposerObject::setDataDefinedProperty() instead.
684689
QgsComposerScaleBar {#qgis_api_break_3_0_QgsComposerScaleBar}
685690
-------------------
686691

692+
- The Alignment and SegmentSizeMode enums were moved to QgsScaleBarSettings
693+
- The ScaleBarUnits enum was removed. Use QgsUnitTypes::DistanceUnit instead.
687694
- setBrush() was removed. Use setFillColor() instead.
688695
- setBrush2() was removed. Use setFillColor2() instead.
689696
- setPen() was removed. Use setLineColor() and setLineWidth() instead.
697+
- segmentMillimeters() and firstLabelString() were removed.
690698

691699

692700
QgsComposerTable {#qgis_api_break_3_0_QgsComposerTable}
@@ -1837,6 +1845,11 @@ QgsRuntimeProfiler {#qgis_api_break_3_0_QgsRuntimeProfiler}
18371845

18381846
- This class is no longer a singleton and instance() has been removed. Instead use QgsApplication::profiler() to access an application-wide profiler.
18391847

1848+
QgsScaleBarStyle {#qgis_api_break_3_0_QgsScaleBarStyle}
1849+
----------------
1850+
1851+
- The interface for QgsScaleBarStyle has been completely rewritten - any code using QgsScaleBarStyle or subclasses will need to update
1852+
to the new draw() and calculateBoxSize() methods.
18401853

18411854
QgsServer {#qgis_api_break_3_0_QgsServer}
18421855
----------

0 commit comments

Comments
 (0)
Please sign in to comment.