Skip to content

Commit db90627

Browse files
committedJan 8, 2018
Drop all composer classes from Python bindings
1 parent e2ce85f commit db90627

File tree

91 files changed

+210
-12538
lines changed

Some content is hidden

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

91 files changed

+210
-12538
lines changed
 

‎doc/api_break.dox

Lines changed: 8 additions & 237 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
7575
<tr><td>QgsCentroidFillSymbolLayerV2Widget<td>QgsCentroidFillSymbolLayerWidget
7676
<tr><td>QgsCircularStringV2<td>QgsCircularString
7777
<tr><td>QgsColorButtonV2<td>QgsColorButton
78-
<tr><td>QgsComposerLegendStyle<td>QgsLegendStyle
79-
<tr><td>QgsComposerSymbolV2Item<td>QgsComposerSymbolItem
80-
<tr><td>QgsComposerTableAvailableSortProxyModelV2<td>QgsComposerTableAvailableSortProxyModel
8178
<tr><td>QgsCompoundCurveV2<td>QgsCompoundCurve
8279
<tr><td>QgsCoordinateSequenceV2<td>QgsCoordinateSequence
8380
<tr><td>QgsCptCityColorRampV2<td>QgsCptCityColorRamp
@@ -227,7 +224,6 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
227224
<tr><td>QgsAnnotation<td>mapPositionFixed<td>hasFixedMapPosition
228225
<tr><td>QgsApplication<td>defaultStyleV2Path<td>defaultStylePath
229226
<tr><td>QgsApplication<td>userStyleV2Path<td>userStylePath
230-
<tr><td>QgsComposerShape<td>setUseSymbolV2<td>setUseSymbol
231227
<tr><td>QgsIFeatureSelectionManager<td>selectedFeaturesIds<td>selectedFeatureIds
232228
<tr><td>QgsMapLayer<td>capitaliseLayerName<td>capitalizeLayerName <!--#spellok-->
233229
<tr><td>QgsSymbolLayerUtils<td>createSymbolLayerV2ListFromSld<td>createSymbolLayerListFromSld
@@ -238,7 +234,6 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
238234
<tr><td>QgsVectorLayer<td>rendererV2<td>renderer
239235
<tr><td>QgsVectorLayer<td>selectedFeaturesIds<td>selectedFeatureIds
240236
<tr><td>QgsVectorLayerEditUtils<td>deleteVertexV2<td>deleteVertex
241-
<tr><td>QgsComposerSymbolItem<td>symbolV2<td>symbol
242237
<tr><td>QgsServerInterface<td>capabiblitiesCache<td>capabilitiesCache
243238
<tr><td>QgsGraphEdge<td>property<td>cost
244239
<tr><td>QgsGraphEdge<td>properties<td>strategies
@@ -267,12 +262,6 @@ Removed Classes {#qgis_api_break_3_0_removed_classes}
267262
- QgsColorDialog was removed, and QgsColorDialogV2 was renamed to QgsColorDialog. Hence, QgsColorButtonV2 does not exist anymore.
268263
All the functionality from the old QgsColorDialog has been moved to the new class.
269264
- QgsColorRampComboBox was removed, replaced by QgsColorRampButton
270-
- QgsComposerAttributeTable and associated classes (eg QgsComposerAttributeTableCompare,
271-
QgsComposerAttributeTableColumnModel, QgsComposerTableSortColumnsProxyModel) were removed.
272-
Use QgsComposerAttributeTableV2 instead.
273-
- QgsComposerLegendItem and subclasses were removed (QgsComposerSymbolItem, QgsComposerRasterSymbolItem, QgsComposerLayerItem, QgsComposerGroupItem, QgsComposerStyleItem).
274-
- QgsComposerTable was removed. Use QgsComposerAttributeTableV2 instead.
275-
- ComposerTextTable was removed. Use ComposerTextTableV2 instead.
276265
- QgsCRSCache was removed. QgsCoordinateReferenceSystem now internally uses a cache for CRS creation,
277266
so there is no longer a need for the separate cache class. Code which previously called QgsCRSCache::updateCRSCache()
278267
should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinateTransformCache::instance()->invalidateCrs( authid ).
@@ -355,6 +344,14 @@ General changes {#qgis_api_break_3_0_global}
355344
- Network analysis library has been merged into analysis library
356345

357346

347+
Composer {#qgis_api_break_3_0_Composer}
348+
--------
349+
350+
All composer related methods have been removed from the public API and Python bindings. These classes
351+
have been replaced with the new layouts engine, based on QgsLayout, QgsLayoutItem, and the other
352+
related classes.
353+
354+
358355
Labeling {#qgis_api_break_3_0_Labeling}
359356
--------
360357

@@ -427,14 +424,6 @@ QgisInterface {#qgis_api_break_3_0_QgisInterface}
427424
- fileMenu() has been removed, use projectMenu() instead.
428425
- actionRemoveLayer was removed as it no longer exists.
429426
- actionTouch was removed, as the corresponding action no longer exists (see notes on QgsMapToolTouch)
430-
- activeComposers(), createNewComposer(), duplicateComposer(), deleteComposer(), composerAdded(),
431-
composerWillBeRemoved(), composerRemoved() were all removed. Composer windows are now only created
432-
on demand, and destroyed when the window is closed. The new interface methods openComposers(),
433-
openComposer(), closeComposer(), composerOpened(), composerWillBeClosed() and composerClosed()
434-
are similar, but only apply to composer windows when they exist. To access all compositions
435-
from a project, the new QgsProject.instance().layoutManager() class should be used instead.
436-
Additionally, the new interface methods work with QgsComposerInterface objects instead
437-
of QgsComposerView objects.
438427
- interaction with the main window status bar should no longer use the native Qt statusBar() method.
439428
Instead iface.statusBarIface() should be used.
440429

@@ -511,22 +500,6 @@ QgsApplication {#qgis_api_break_3_0_QgsApplication}
511500
- createDB() was renamed to createDatabase()
512501

513502

514-
QgsAtlasComposition {#qgis_api_break_3_0_QgsAtlasComposition}
515-
-------------------
516-
517-
- readXMLMapSettings() was removed. QGIS no longer supports upgrading pre 2.2 compositions and if this is a
518-
requirement the projects should first be upgraded by opening and saving in 2.18.
519-
- composerMap() and setComposerMap() were removed. Use QgsComposerMap::atlasDriven() and setAtlasDriven()
520-
instead
521-
- fixedScale() and setFixedScale() were removed. Use QgsComposerMap::atlasScalingMode() and setAtlasScalingMode()
522-
instead
523-
- margin() and setMargin() were removed. Use QgsComposerMap::atlasMargin() and setAtlasMargin()
524-
instead
525-
- setSortKeyAttributeIndex() and sortKeyAttributeIndex() were removed. Use sortKeyAttributeName()
526-
and setSortKeyAttributeName() instead.
527-
- currentFeature() was removed. Use feature() instead.
528-
529-
530503
QgsAttributeDialog {#qgis_api_break_3_0_QgsAttributeDialog}
531504
------------------
532505

@@ -680,208 +653,6 @@ QgsColorSchemeRegistry {#qgis_api_break_3_0_QgsColorSchemeRegistry}
680653
- This class is no longer a singleton and instance() has been removed. Instead use QgsApplication::colorSchemeRegistry() to access an application-wide registry.
681654

682655

683-
QgsComposerArrow {#qgis_api_break_3_0_QgsComposerArrow}
684-
----------------
685-
686-
- setOutlineWidth(), outlineWidth(), arrowColor() and setArrowColor() were removed.
687-
Use setArrowHeadOutlineWidth(), arrowHeadOutlineWidth(), arrowHeadOutlineColor(),
688-
setArrowHeadOutlineColor(), arrowHeadFillColor(), setArrowHeadFillColor(),
689-
setLineSymbol() or lineSymbol() instead.
690-
691-
692-
QgsComposerAttributeTableV2 {#qgis_api_break_3_0_QgsComposerAttributeTableV2}
693-
---------------------------
694-
695-
- setDisplayAttributes() was removed. Use setDisplayedFields() instead.
696-
697-
698-
QgsComposerItem {#qgis_api_break_3_0_QgsComposerItem}
699-
---------------
700-
701-
- zoomContent( int delta, double x, double y ) was removed. Use zoomContent( double, QPointF, ZoomMode )
702-
instead.
703-
- drawText(), textWidthMillimeters(), fontHeightCharacterMM(), fontAscentMillimeters(),
704-
fontDescentMillimeters(), fontHeightMillimeters(), pixelFontSize(), scaledFontPixelSize(),
705-
drawArrowHead(), angle(), largestRotatedRectWithinBounds(), and rotate() were removed.
706-
Use the corresponding methods in QgsComposerUtils instead.
707-
- rotation() and setRotation() were removed. Use itemRotation() and setItemRotation()
708-
instead.
709-
- lockSymbolSize(), imageSizeConsideringRotation(), cornerPointOnRotatedAndScaledRect(),
710-
sizeChangedByRotation() were removed. No replacement is offered for these methods.
711-
- transparency() and setTransparency() were removed. Use itemOpacity() and setItemOpacity() instead.
712-
713-
QgsComposerItemCommand {#qgis_api_break_3_0_QgsComposerItemCommand}
714-
----------------------
715-
716-
- ItemTransparency was removed. Use ItemOpacity instead.
717-
718-
719-
QgsComposerLabel {#qgis_api_break_3_0_QgsComposerLabel}
720-
----------------
721-
722-
- setExpressionContext() has been removed. Setup the composition using an atlas and with
723-
expression variables in the composer label item instead.
724-
- setSubstitutions has been removed. Use expression context variables in the composer
725-
label item instead.
726-
- margin() was removed. Use marginX() and marginY() instead.
727-
728-
729-
QgsComposerLegend {#qgis_api_break_3_0_QgsComposerLegend}
730-
-----------------
731-
732-
- model() now returns the new QgsLegendModel (previously QgsLegendModelV2, see \ref qgis_api_break_3_0_renamed_classes).
733-
- modelV2() has been renamed to model().
734-
735-
736-
QgsComposerLegendItem {#qgis_api_break_3_0_QgsComposerLegendItem}
737-
---------------------
738-
739-
- writeXMLChildren() has been renamed to writeXmlChildren()
740-
741-
742-
QgsComposerMap {#qgis_api_break_3_0_QgsComposerMap}
743-
--------------
744-
745-
- layerSet() and setLayerSet() have been replaced by layers() and setLayers() which work with list of layers instead of layer IDs
746-
- containsWMSLayer() has been renamed to containsWmsLayer()
747-
- mapRenderer() has been removed. Use mapSettings() instead.
748-
- All grid style and format enums were moved to QgsComposerMapGrid.
749-
- All grid property getters and setters were moved to QgsComposerMapGrid,
750-
and should be accessed using QgsComposerMap::grid() or QgsComposerMap::grids().
751-
- All overview property getters and setters were moved to QgsComposerMapOverview,
752-
and should be accessed using QgsComposerMap::overview() or QgsComposerMap::overviews().
753-
- overviewExtentChanged() was moved to QgsComposerMapOverview.
754-
- toggleAtlasPreview(), connectMapOverviewSignals() were no longer required and are removed.
755-
- setRotation() and rotation() were removed. Use setMapRotation() and mapRotation()
756-
instead.
757-
- atlasFixedScale() and setAtlasFixedScale() were removed. Use atlasScalingMode()
758-
and setAtlasScalingMode() instead.
759-
- storeCurrentLayerSet() was removed. Use setLayers() instead.
760-
- The layersChanged() slot was removed.
761-
- setMapCanvas() was removed. This is no longer required to draw map annotations, which are instead retrieved from the composition's
762-
associated project's annotationManager()
763-
- setDrawCanvasItems() and drawCanvasItems() were renamed to setDrawAnnotations() and drawAnnotations()
764-
- setCacheUpdated(), updateCachedImage(), renderModeUpdateCachedImage() and cache() were removed. Use invalidateCache() instead.
765-
- The PreviewMode mode enums were removed. These are no longer used.
766-
- previewMode() and setPreviewMode() were removed. These are no longer required.
767-
768-
769-
QgsComposerMapGrid {#qgis_api_break_3_0_QgsComposerMapGrid}
770-
------------------
771-
772-
- The annotation position Disabled was removed. QgsComposerMapGrid::HideAll
773-
should be used instead.
774-
775-
776-
QgsComposerMultiFrame {#qgis_api_break_3_0_QgsComposerMultiFrame}
777-
---------------------
778-
779-
- render( QPainter* p, const QRectF& renderExtent ) was removed. Use
780-
render( QPainter* painter, const QRectF& renderExtent, const int frameIndex )
781-
instead.
782-
- render( QPainter* painter, const QRectF& renderExtent, const int frameIndex )
783-
was made pure virtual.
784-
785-
786-
QgsComposerNodesItem {#qgis_api_break_3_0_QgsComposerNodesItem}
787-
--------------------
788-
789-
- _readXMLStyle() has been renamed to _readXmlStyle()
790-
- _writeXMLStyle() has been renamed to _writeXMLStyle()
791-
- unselectNode() has been renamed to deselectNode() <!--#spellok-->
792-
793-
QgsComposerObject {#qgis_api_break_3_0_QgsComposerObject}
794-
-----------------
795-
796-
- dataDefinedProperty() and setDataDefinedProperty() no longer use QgsDataDefined objects.
797-
Instead these methods have been ported to the QgsProperty framework.
798-
- dataDefinedEvaluate() was removed. Use the QgsProperty evaluation methods instead.
799-
800-
801-
QgsComposerPicture {#qgis_api_break_3_0_QgsComposerPicture}
802-
------------------
803-
804-
- setPictureFile() and pictureFile() were removed. Use setPicturePath()
805-
and picturePath() instead.
806-
- rotation() and setRotation() were removed. Use pictureRotation()
807-
and setPictureRotation() instead.
808-
- usePictureExpression() and pictureExpression() were removed. Use
809-
QgsComposerObject::dataDefinedProperty instead.
810-
- setUsePictureExpression() was removed. Use
811-
QgsComposerObject::setDataDefinedProperty() instead.
812-
- updatePictureExpression() was removed.
813-
814-
QgsComposerScaleBar {#qgis_api_break_3_0_QgsComposerScaleBar}
815-
-------------------
816-
817-
- The Alignment and SegmentSizeMode enums were moved to QgsScaleBarSettings
818-
- The ScaleBarUnits enum was removed. Use QgsUnitTypes::DistanceUnit instead.
819-
- setBrush() was removed. Use setFillColor() instead.
820-
- setBrush2() was removed. Use setFillColor2() instead.
821-
- setPen() was removed. Use setLineColor() and setLineWidth() instead.
822-
- segmentMillimeters() and firstLabelString() were removed.
823-
824-
825-
QgsComposerTable {#qgis_api_break_3_0_QgsComposerTable}
826-
----------------
827-
828-
- tableWriteXML() has been renamed to tableWriteXml()
829-
- tableReadXML() has been renamed to tableReadXml()
830-
831-
832-
QgsComposerTableV2 {#qgis_api_break_3_0_QgsComposerTableV2}
833-
------------------
834-
835-
- rowsVisible(), rowRange(), drawHorizontalGridLines() and
836-
drawVerticalGridLines() were removed.
837-
- WrapBehaviour enum and its setter and getter methods has been renamed to WrapBehavior <!--#spellok-->
838-
- EmptyTableBehaviour enum and its setter and getter methods has been renamed to EmptyTableBehavior <!--#spellok-->
839-
840-
841-
QgsComposerView {#qgis_api_break_3_0_QgsComposerView}
842-
--------------------
843-
844-
- unselectNode() has been renamed to deselectNode() <!--#spellok-->
845-
846-
847-
QgsComposerUtils {#qgis_api_break_3_0_QgsComposerUtils}
848-
-----------------
849-
850-
- readDataDefinedPropertyMap() was renamed to readOldDataDefinedPropertyMap() and the signature has changed
851-
to use a QgsPropertyCollection object.
852-
- readDataDefinedProperty() was renamed to readOldDataDefinedProperty() and the signature has changed
853-
to use the QgsProperty framework objects.
854-
- writeDataDefinedPropertyMap() was removed. This is now handled by QgsPropertyCollection::writeXml()
855-
856-
857-
QgsComposition {#qgis_api_break_3_0_QgsComposition}
858-
--------------
859-
860-
- The constructor no longer takes a reference to a QgsMapSettings object. This is no longer
861-
used by compositions. To set the layers to show in composer maps, the QgsComposerMap::setLayers()
862-
method should be used instead.
863-
- constructor requires QgsProject instance
864-
- addItemsFromXML() has been renamed to addItemsFromXml()
865-
- Constructor with QgsMapRenderer parameter has been removed. Use the variant with QgsMapSettings parameter.
866-
- mapRenderer() has been removed. Use mapSettings() instead.
867-
- setSnapGridTolerance(), setAlignmentSnapTolerance(), alignmentSnapTolerance() and snapGridTolerance()
868-
were removed. Use setSnapTolerance() and snapTolerance() instead.
869-
- getComposerHtmlByItem() was removed. Use QgsComposerFrame::multiFrame() instead.
870-
- pixelFontSize(), pointFontSize(), relativeResizeRect(), relativePosition() were removed. Use the corresponding methods in QgsComposerUtils instead.
871-
- sortZList() was removed. Use refreshZList() instead.
872-
- addComposerTable(), composerTableAdded() were removed.
873-
- setAllUnselected() has been renamed to setAllDeselected. <!--#spellok-->
874-
- worldFileMap() and setWorldFileMap() have been renamed to referenceMap() and setReferenceMap()
875-
- dataDefinedProperty() and setDataDefinedProperty() now use the QgsProperty framework instead
876-
of QgsDataDefined objects.
877-
- mapSettings() was removed. Use QgsComposerMap::mapSettings() instead.
878-
- The composerArrowAdded, composerPolygonAdded, composerPolylineAdded, composerHtmlFrameAdded, composerItemGroupAdded,
879-
composerLabelAdded, composerMapAdded, composerScaleBarAdded, composerLegendAdded, composerPictureAdded,
880-
composerShapeAdded, and composerTableFrameAdded were removed. Use the general itemAdded signal instead to catch
881-
all these item added events.
882-
- addComposerMap no longer takes a setDefaultPreviewStyle argument.
883-
- the mapsToRestore parameter has been removed from addItemsFromXml
884-
885656
QgsCompoundColorWidget {#qgis_api_break_3_0_QgsCompoundColorWidget}
886657
----------------------
887658

‎python/core/composer/qgsaddremoveitemcommand.sip

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.