Skip to content

Commit df3fdf5

Browse files
authoredJan 18, 2017
Merge pull request #4005 from nyalldawson/comp_mapsettings
Remove some more QgsComposition::mapSettings use, also support different CRS in composer map items
2 parents 433d04b + 710a12c commit df3fdf5

Some content is hidden

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

41 files changed

+412
-128
lines changed
 

‎python/core/composer/qgscomposermap.sip

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ class QgsComposerMap : QgsComposerItem
127127
//! @note not available in python bindings
128128
// QgsRectangle* currentMapExtent();
129129

130+
QgsCoordinateReferenceSystem crs() const;
131+
QgsCoordinateReferenceSystem presetCrs() const;
132+
void setCrs( const QgsCoordinateReferenceSystem& crs );
133+
130134
PreviewMode previewMode() const;
131135
void setPreviewMode( PreviewMode m );
132136

‎python/core/composer/qgscomposerutils.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,5 +249,5 @@ class QgsComposerUtils
249249
* QgsComposition::referenceMap().
250250
* @note added in QGIS 3.0
251251
*/
252-
static QgsRenderContext createRenderContext( QgsComposition* composition, QPainter& painter );
252+
static QgsRenderContext createRenderContext( QgsComposition* composition, QPainter* painter );
253253
};

0 commit comments

Comments
 (0)
Please sign in to comment.