Skip to content
Permalink
Browse files
Drop composer
It's been a great journey, but your time has come...
  • Loading branch information
nyalldawson committed Jan 23, 2018
1 parent 4096896 commit 88808615a83264da272ccc2c95d06a3c63ef7d0a
Show file tree
Hide file tree
Showing 109 changed files with 132 additions and 35,609 deletions.
@@ -245,7 +245,7 @@ If ``ignoreLocked`` is set to true any locked items will be ignored.

QgsLayoutItem *layoutItemAt( QPointF position, const QgsLayoutItem *belowItem, const bool ignoreLocked = false ) const;
%Docstring
Returns the topmost composer item at a specified ``position`` which is below a specified ``item``. Ignores paper items.
Returns the topmost layout item at a specified ``position`` which is below a specified ``item``. Ignores paper items.
If ``ignoreLocked`` is set to true any locked items will be ignored.
%End

@@ -288,7 +288,7 @@ Returns true if the map contains a WMS layer.

void setMapRotation( double rotation );
%Docstring
Sets the ``rotation`` for the map - this does not affect the composer item shape, only the
Sets the ``rotation`` for the map - this does not affect the layout item shape, only the
way the map is drawn within the item. Rotation is in degrees, clockwise.

.. seealso:: :py:func:`mapRotation`
@@ -298,7 +298,7 @@ way the map is drawn within the item. Rotation is in degrees, clockwise.

double mapRotation( QgsLayoutObject::PropertyValueType valueType = QgsLayoutObject::EvaluatedValue ) const;
%Docstring
Returns the rotation used for drawing the map within the composer item, in degrees clockwise.
Returns the rotation used for drawing the map within the layout item, in degrees clockwise.

:param valueType: controls whether the returned value is the user specified rotation,
or the current evaluated rotation (which may be affected by data driven rotation
@@ -311,14 +311,14 @@ settings).

void setDrawAnnotations( bool draw );
%Docstring
Sets whether annotations are drawn within the composer map.
Sets whether annotations are drawn within the map.

.. seealso:: :py:func:`drawAnnotations`
%End

bool drawAnnotations() const;
%Docstring
Returns whether annotations are drawn within the composer map.
Returns whether annotations are drawn within the map.

.. seealso:: :py:func:`setDrawAnnotations`
%End
@@ -926,7 +926,6 @@ Updates a symbol scope related to a QgsSymbol to an expression context.
.. versionadded:: 2.14
%End


static QgsExpressionContextScope *layoutScope( const QgsLayout *layout ) /Factory/;
%Docstring
Creates a new scope which contains variables and functions relating to a :py:class:`QgsLayout` ``layout``.
@@ -966,7 +965,6 @@ with the variables specified.
.. versionadded:: 3.0
%End


static QgsExpressionContextScope *atlasScope( QgsLayoutAtlas *atlas ) /Factory/;
%Docstring
Creates a new scope which contains variables and functions relating to a :py:class:`QgsLayoutAtlas`.
@@ -975,7 +973,6 @@ For instance, current page name and number.
:param atlas: source atlas. If null, a set of default atlas variables will be added to the scope.
%End


static QgsExpressionContextScope *layoutItemScope( const QgsLayoutItem *item ) /Factory/;
%Docstring
Creates a new scope which contains variables and functions relating to a :py:class:`QgsLayoutItem`.
@@ -1013,8 +1010,6 @@ with the ``variables`` specified.
.. versionadded:: 3.0
%End



static QgsExpressionContext createFeatureBasedContext( const QgsFeature &feature, const QgsFields &fields );
%Docstring
Helper function for creating an expression context which contains just a feature and fields
@@ -52,7 +52,7 @@ QgsExpressionContext QgsDiagramProperties::createExpressionContext() const
QgsExpressionContext expContext;
expContext << QgsExpressionContextUtils::globalScope()
<< QgsExpressionContextUtils::projectScope( QgsProject::instance() )
<< QgsExpressionContextUtils::compositionAtlasScope( nullptr )
<< QgsExpressionContextUtils::atlasScope( nullptr )
<< QgsExpressionContextUtils::mapSettingsScope( mMapCanvas->mapSettings() )
<< QgsExpressionContextUtils::layerScope( mLayer );

@@ -931,7 +931,7 @@ QString QgsDiagramProperties::showExpressionBuilder( const QString &initialExpre
QgsExpressionContext context;
context << QgsExpressionContextUtils::globalScope()
<< QgsExpressionContextUtils::projectScope( QgsProject::instance() )
<< QgsExpressionContextUtils::compositionAtlasScope( nullptr )
<< QgsExpressionContextUtils::atlasScope( nullptr )
<< QgsExpressionContextUtils::mapSettingsScope( mMapCanvas->mapSettings() )
<< QgsExpressionContextUtils::layerScope( mLayer );

@@ -29,7 +29,7 @@ QgsExpressionContext QgsLabelingGui::createExpressionContext() const
QgsExpressionContext expContext;
expContext << QgsExpressionContextUtils::globalScope()
<< QgsExpressionContextUtils::projectScope( QgsProject::instance() )
<< QgsExpressionContextUtils::compositionAtlasScope( nullptr )
<< QgsExpressionContextUtils::atlasScope( nullptr )
<< QgsExpressionContextUtils::mapSettingsScope( QgisApp::instance()->mapCanvas()->mapSettings() );

if ( mLayer )
@@ -255,7 +255,7 @@ void QgsLabelPropertyDialog::setDataDefinedValues( QgsVectorLayer *vlayer )
QgsExpressionContext context;
context << QgsExpressionContextUtils::globalScope()
<< QgsExpressionContextUtils::projectScope( QgsProject::instance() )
<< QgsExpressionContextUtils::compositionAtlasScope( nullptr )
<< QgsExpressionContextUtils::atlasScope( nullptr )
<< QgsExpressionContextUtils::mapSettingsScope( QgisApp::instance()->mapCanvas()->mapSettings() )
<< QgsExpressionContextUtils::layerScope( vlayer );
context.setFeature( mCurLabelFeat );
@@ -33,7 +33,7 @@ QgsRenderContext QgsPointMarkerItem::renderContext( QPainter *painter )
QgsExpressionContext context;
context << QgsExpressionContextUtils::globalScope()
<< QgsExpressionContextUtils::projectScope( QgsProject::instance() )
<< QgsExpressionContextUtils::compositionAtlasScope( nullptr );
<< QgsExpressionContextUtils::atlasScope( nullptr );
if ( mMapCanvas )
{
context << QgsExpressionContextUtils::mapSettingsScope( mMapCanvas->mapSettings() )
@@ -35,7 +35,7 @@ static QList<QgsExpressionContextScope *> _globalProjectAtlasMapLayerScopes( Qgs
QList<QgsExpressionContextScope *> scopes;
scopes << QgsExpressionContextUtils::globalScope()
<< QgsExpressionContextUtils::projectScope( QgsProject::instance() )
<< QgsExpressionContextUtils::compositionAtlasScope( nullptr );
<< QgsExpressionContextUtils::atlasScope( nullptr );
if ( mapCanvas )
{
scopes << QgsExpressionContextUtils::mapSettingsScope( mapCanvas->mapSettings() )
@@ -140,7 +140,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(

mContext << QgsExpressionContextUtils::globalScope()
<< QgsExpressionContextUtils::projectScope( QgsProject::instance() )
<< QgsExpressionContextUtils::compositionAtlasScope( nullptr )
<< QgsExpressionContextUtils::atlasScope( nullptr )
<< QgsExpressionContextUtils::mapSettingsScope( QgisApp::instance()->mapCanvas()->mapSettings() )
<< QgsExpressionContextUtils::layerScope( mLayer );

@@ -323,43 +323,6 @@ SET(QGIS_CORE_SRCS
qgstestutils.cpp
qgsziputils.cpp

composer/qgsaddremoveitemcommand.cpp
composer/qgsaddremovemultiframecommand.cpp
composer/qgsatlascomposition.cpp
composer/qgscomposerarrow.cpp
composer/qgscomposerattributetablemodelv2.cpp
composer/qgscomposerattributetablev2.cpp
composer/qgscomposereffect.cpp
composer/qgscomposerframe.cpp
composer/qgscomposerhtml.cpp
composer/qgscomposeritem.cpp
composer/qgscomposeritemcommand.cpp
composer/qgscomposeritemgroup.cpp
composer/qgscomposerlabel.cpp
composer/qgscomposerlegend.cpp
composer/qgscomposermap.cpp
composer/qgscomposermapgrid.cpp
composer/qgscomposermapitem.cpp
composer/qgscomposermapoverview.cpp
composer/qgscomposermodel.cpp
composer/qgscomposermousehandles.cpp
composer/qgscomposermultiframe.cpp
composer/qgscomposermultiframecommand.cpp
composer/qgscomposerobject.cpp
composer/qgscomposerpicture.cpp
composer/qgscomposerscalebar.cpp
composer/qgscomposershape.cpp
composer/qgscomposernodesitem.cpp
composer/qgscomposerpolygon.cpp
composer/qgscomposerpolyline.cpp
composer/qgscomposertablecolumn.cpp
composer/qgscomposertablev2.cpp
composer/qgscomposertexttable.cpp
composer/qgscomposerutils.cpp
composer/qgscomposition.cpp
composer/qgsgroupungroupitemscommand.cpp
composer/qgspaperitem.cpp

dxf/qgsdxfexport.cpp
dxf/qgsdxfpaintdevice.cpp
dxf/qgsdxfpaintengine.cpp
@@ -686,39 +649,6 @@ SET(QGIS_CORE_MOC_HDRS
auth/qgsauthmanager.h
auth/qgsauthmethod.h

composer/qgsaddremoveitemcommand.h
composer/qgsatlascomposition.h
composer/qgscomposerarrow.h
composer/qgscomposerattributetablemodelv2.h
composer/qgscomposerattributetablev2.h
composer/qgscomposereffect.h
composer/qgscomposerframe.h
composer/qgscomposerhtml.h
composer/qgscomposeritemgroup.h
composer/qgscomposeritem.h
composer/qgscomposerlabel.h
composer/qgscomposerlegend.h
composer/qgscomposermapgrid.h
composer/qgscomposermap.h
composer/qgscomposermapitem.h
composer/qgscomposermapoverview.h
composer/qgscomposermodel.h
composer/qgscomposermousehandles.h
composer/qgscomposermultiframe.h
composer/qgscomposerobject.h
composer/qgscomposerpicture.h
composer/qgscomposerscalebar.h
composer/qgscomposershape.h
composer/qgscomposernodesitem.h
composer/qgscomposerpolygon.h
composer/qgscomposerpolyline.h
composer/qgscomposertablecolumn.h
composer/qgscomposertablev2.h
composer/qgscomposertexttable.h
composer/qgscomposition.h
composer/qgsgroupungroupitemscommand.h
composer/qgspaperitem.h

locator/qgslocator.h
locator/qgslocatorfilter.h
locator/qgslocatormodel.h
@@ -1029,14 +959,6 @@ SET(QGIS_CORE_HDRS
effects/qgstransformeffect.h
effects/qgscoloreffect.h

composer/qgsaddremovemultiframecommand.h
composer/qgscomposerarrow.h
composer/qgscomposerframe.h
composer/qgscomposeritemcommand.h
composer/qgscomposermultiframecommand.h
composer/qgscomposertexttable.h
composer/qgspaperitem.h

layout/qgsabstractlayoutiterator.h
layout/qgsabstractreportsection.h
layout/qgsmasterlayoutinterface.h
@@ -1216,7 +1138,6 @@ INCLUDE_DIRECTORIES(
3d
annotations
auth
composer
dxf
effects
${CMAKE_SOURCE_DIR}/src/core/expression
@@ -63,7 +63,7 @@ void QgsTextAnnotation::renderAnnotation( QgsRenderContext &context, QSizeF size
{
//QTextDocument::drawContents will draw text outside of the painter's clip region
//when it is passed a clip rectangle. So, we need to intersect it with the
//painter's clip region to prevent text drawn outside clipped region (e.g., outside composer maps, see #10400)
//painter's clip region to prevent text drawn outside clipped region (e.g., outside layout maps, see #10400)
clipRect = clipRect.intersected( painter->clipRegion().boundingRect() );
}
//draw text document

This file was deleted.

0 comments on commit 8880861

Please sign in to comment.