Skip to content

Commit 5e17403

Browse files
nyalldawsonnyalldawson
authoredJan 24, 2017
Merge pull request #4043 from nyalldawson/layer_composer_bridge
Bridge map canvas layers to composer map layers
·
ltr-3_40final-3_0_0
2 parents 5e1339e + a188d14 commit 5e17403

Some content is hidden

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

51 files changed

+209
-261
lines changed
 

‎doc/api_break.dox

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,10 @@ to use the QgsProperty framework objects.
660660
QgsComposition {#qgis_api_break_3_0_QgsComposition}
661661
--------------
662662

663-
- constructor requires QgsProject instance as the second argument
663+
- The constructor no longer takes a reference to a QgsMapSettings object. This is no longer
664+
used by compositions. To set the layers to show in composer maps, the QgsComposerMap::setLayers()
665+
method should be used instead.
666+
- constructor requires QgsProject instance
664667
- addItemsFromXML() has been renamed to addItemsFromXml()
665668
- Constructor with QgsMapRenderer parameter has been removed. Use the variant with QgsMapSettings parameter.
666669
- mapRenderer() has been removed. Use mapSettings() instead.
@@ -674,6 +677,7 @@ were removed. Use setSnapTolerance() and snapTolerance() instead.
674677
- worldFileMap() and setWorldFileMap() have been renamed to referenceMap() and setReferenceMap()
675678
- dataDefinedProperty() and setDataDefinedProperty() now use the QgsProperty framework instead
676679
of QgsDataDefined objects.
680+
- mapSettings() was removed. Use QgsComposerMap::mapSettings() instead.
677681

678682

679683
QgsCoordinateReferenceSystem {#qgis_api_break_3_0_QgsCoordinateReferenceSystem}

‎python/core/composer/qgscomposition.sip

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class QgsComposition : QGraphicsScene, QgsExpressionContextGenerator
4040
Landscape
4141
};
4242

43-
explicit QgsComposition( const QgsMapSettings& mapSettings, QgsProject* project );
43+
explicit QgsComposition( QgsProject* project );
4444

4545
/** Composition atlas modes*/
4646
enum AtlasMode
@@ -366,10 +366,6 @@ class QgsComposition : QGraphicsScene, QgsExpressionContextGenerator
366366
/** Used to enable or disable advanced effects such as blend modes in a composition */
367367
void setUseAdvancedEffects( const bool effectsEnabled );
368368

369-
//! Return setting of QGIS map canvas
370-
//! @note added in 2.4
371-
const QgsMapSettings& mapSettings() const;
372-
373369
QgsComposition::PlotStyle plotStyle() const;
374370
void setPlotStyle( const QgsComposition::PlotStyle style );
375371

0 commit comments

Comments
 (0)
Please sign in to comment.