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
Showing with 132 additions and 35,609 deletions.
  1. +1 −1 python/core/layout/qgslayout.sip.in
  2. +4 −4 python/core/layout/qgslayoutitemmap.sip.in
  3. +0 −5 python/core/qgsexpressioncontext.sip.in
  4. +2 −2 src/app/qgsdiagramproperties.cpp
  5. +1 −1 src/app/qgslabelinggui.cpp
  6. +1 −1 src/app/qgslabelpropertydialog.cpp
  7. +1 −1 src/app/qgspointmarkeritem.cpp
  8. +1 −1 src/app/qgsrulebasedlabelingwidget.cpp
  9. +1 −1 src/app/qgsvectorlayerproperties.cpp
  10. +0 −79 src/core/CMakeLists.txt
  11. +1 −1 src/core/annotations/qgstextannotation.cpp
  12. +0 −84 src/core/composer/qgsaddremoveitemcommand.cpp
  13. +0 −70 src/core/composer/qgsaddremoveitemcommand.h
  14. +0 −87 src/core/composer/qgsaddremovemultiframecommand.cpp
  15. +0 −66 src/core/composer/qgsaddremovemultiframecommand.h
  16. +0 −822 src/core/composer/qgsatlascomposition.cpp
  17. +0 −422 src/core/composer/qgsatlascomposition.h
  18. +0 −576 src/core/composer/qgscomposerarrow.cpp
  19. +0 −296 src/core/composer/qgscomposerarrow.h
  20. +0 −630 src/core/composer/qgscomposerattributetablemodelv2.cpp
  21. +0 −230 src/core/composer/qgscomposerattributetablemodelv2.h
  22. +0 −786 src/core/composer/qgscomposerattributetablev2.cpp
  23. +0 −406 src/core/composer/qgscomposerattributetablev2.h
  24. +0 −63 src/core/composer/qgscomposereffect.cpp
  25. +0 −57 src/core/composer/qgscomposereffect.h
  26. +0 −216 src/core/composer/qgscomposerframe.cpp
  27. +0 −131 src/core/composer/qgscomposerframe.h
  28. +0 −583 src/core/composer/qgscomposerhtml.cpp
  29. +0 −299 src/core/composer/qgscomposerhtml.h
  30. +0 −1,256 src/core/composer/qgscomposeritem.cpp
  31. +0 −845 src/core/composer/qgscomposeritem.h
  32. +0 −147 src/core/composer/qgscomposeritemcommand.cpp
  33. +0 −180 src/core/composer/qgscomposeritemcommand.h
  34. +0 −227 src/core/composer/qgscomposeritemgroup.cpp
  35. +0 −92 src/core/composer/qgscomposeritemgroup.h
  36. +0 −622 src/core/composer/qgscomposerlabel.cpp
  37. +0 −230 src/core/composer/qgscomposerlabel.h
  38. +0 −742 src/core/composer/qgscomposerlegend.cpp
  39. +0 −357 src/core/composer/qgscomposerlegend.h
  40. +0 −1,962 src/core/composer/qgscomposermap.cpp
  41. +0 −694 src/core/composer/qgscomposermap.h
  42. +0 −2,410 src/core/composer/qgscomposermapgrid.cpp
  43. +0 −1,146 src/core/composer/qgscomposermapgrid.h
  44. +0 −249 src/core/composer/qgscomposermapitem.cpp
  45. +0 −294 src/core/composer/qgscomposermapitem.h
  46. +0 −405 src/core/composer/qgscomposermapoverview.cpp
  47. +0 −308 src/core/composer/qgscomposermapoverview.h
  48. +0 −1,019 src/core/composer/qgscomposermodel.cpp
  49. +0 −397 src/core/composer/qgscomposermodel.h
  50. +0 −1,414 src/core/composer/qgscomposermousehandles.cpp
  51. +0 −211 src/core/composer/qgscomposermousehandles.h
  52. +0 −387 src/core/composer/qgscomposermultiframe.cpp
  53. +0 −354 src/core/composer/qgscomposermultiframe.h
  54. +0 −111 src/core/composer/qgscomposermultiframecommand.cpp
  55. +0 −107 src/core/composer/qgscomposermultiframecommand.h
  56. +0 −375 src/core/composer/qgscomposernodesitem.cpp
  57. +0 −188 src/core/composer/qgscomposernodesitem.h
  58. +0 −210 src/core/composer/qgscomposerobject.cpp
  59. +0 −267 src/core/composer/qgscomposerobject.h
  60. +0 −900 src/core/composer/qgscomposerpicture.cpp
  61. +0 −394 src/core/composer/qgscomposerpicture.h
  62. +0 −141 src/core/composer/qgscomposerpolygon.cpp
  63. +0 −94 src/core/composer/qgscomposerpolygon.h
  64. +0 −145 src/core/composer/qgscomposerpolyline.cpp
  65. +0 −94 src/core/composer/qgscomposerpolyline.h
  66. +0 −923 src/core/composer/qgscomposerscalebar.cpp
  67. +0 −384 src/core/composer/qgscomposerscalebar.h
  68. +0 −471 src/core/composer/qgscomposershape.cpp
  69. +0 −160 src/core/composer/qgscomposershape.h
  70. +0 −91 src/core/composer/qgscomposertablecolumn.cpp
  71. +0 −233 src/core/composer/qgscomposertablecolumn.h
  72. +0 −1,302 src/core/composer/qgscomposertablev2.cpp
  73. +0 −738 src/core/composer/qgscomposertablev2.h
  74. +0 −84 src/core/composer/qgscomposertexttable.cpp
  75. +0 −69 src/core/composer/qgscomposertexttable.h
  76. +0 −533 src/core/composer/qgscomposerutils.cpp
  77. +0 −298 src/core/composer/qgscomposerutils.h
  78. +0 −3,297 src/core/composer/qgscomposition.cpp
  79. +0 −1,175 src/core/composer/qgscomposition.h
  80. +0 −96 src/core/composer/qgsgroupungroupitemscommand.cpp
  81. +0 −85 src/core/composer/qgsgroupungroupitemscommand.h
  82. +0 −259 src/core/composer/qgspaperitem.cpp
  83. +0 −93 src/core/composer/qgspaperitem.h
  84. +8 −8 src/core/expression/qgsexpression.cpp
  85. +1 −9 src/core/layout/qgslayout.cpp
  86. +2 −2 src/core/layout/qgslayout.h
  87. +1 −1 src/core/layout/qgslayoutatlas.cpp
  88. +1 −1 src/core/layout/qgslayoutexporter.cpp
  89. +1 −1 src/core/layout/qgslayoutguidecollection.cpp
  90. +3 −2 src/core/layout/qgslayoutitem.cpp
  91. +10 −11 src/core/layout/qgslayoutitemlabel.cpp
  92. +31 −31 src/core/layout/qgslayoutitemlegend.cpp
  93. +19 −23 src/core/layout/qgslayoutitemmap.cpp
  94. +4 −4 src/core/layout/qgslayoutitemmap.h
  95. +1 −1 src/core/layout/qgslayoutitemmapgrid.cpp
  96. +7 −220 src/core/qgsexpressioncontext.cpp
  97. +0 −79 src/core/qgsexpressioncontext.h
  98. +2 −2 src/core/scalebar/qgsdoubleboxscalebarrenderer.cpp
  99. +4 −4 src/core/scalebar/qgsnumericscalebarrenderer.cpp
  100. +12 −12 src/core/scalebar/qgsscalebarrenderer.cpp
  101. +2 −2 src/core/scalebar/qgssingleboxscalebarrenderer.cpp
  102. +2 −2 src/core/scalebar/qgsticksscalebarrenderer.cpp
  103. +2 −2 src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp
  104. +1 −1 src/gui/symbology/qgsdatadefinedsizelegendwidget.cpp
  105. +1 −1 src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp
  106. +1 −1 src/gui/symbology/qgsheatmaprendererwidget.cpp
  107. +1 −1 src/gui/symbology/qgslayerpropertieswidget.cpp
  108. +1 −1 src/gui/symbology/qgsrendererwidget.cpp
  109. +1 −1 src/gui/symbology/qgssymbolwidgetcontext.cpp
@@ -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.
You can’t perform that action at this time.