Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge pull request #5966 from nyalldawson/layout_next
[layouts] Atlas and reporting framework
- Loading branch information
Showing
with
14,274 additions
and 1,265 deletions.
- +1 −0 images/images.qrc
- +192 −0 images/themes/default/mActionExport.svg
- +8 −8 python/core/composer/qgslayoutmanager.sip
- +10 −1 python/core/core_auto.sip
- +71 −0 python/core/layout/qgsabstractlayoutiterator.sip
- +394 −0 python/core/layout/qgsabstractreportsection.sip
- +29 −26 python/core/layout/qgslayout.sip
- +409 −0 python/core/layout/qgslayoutatlas.sip
- +113 −3 python/core/layout/qgslayoutexporter.sip
- +3 −0 python/core/layout/qgslayoutitem.sip
- +1 −0 python/core/layout/qgslayoutitemhtml.sip
- +2 −0 python/core/layout/qgslayoutitemlegend.sip
- +3 −1 python/core/layout/qgslayoutitemmap.sip
- +0 −5 python/core/layout/qgslayoutitemregistry.sip
- +1 −0 python/core/layout/qgslayoutpagecollection.sip
- +20 −43 python/core/layout/{qgslayoutcontext.sip → qgslayoutrendercontext.sip}
- +117 −0 python/core/layout/qgslayoutreportcontext.sip
- +92 −0 python/core/layout/qgsmasterlayoutinterface.sip
- +76 −0 python/core/layout/qgsprintlayout.sip
- +76 −0 python/core/layout/qgsreport.sip
- +163 −0 python/core/layout/qgsreportsectionfieldgroup.sip
- +109 −0 python/core/layout/qgsreportsectionlayout.sip
- +17 −1 python/core/qgsexpressioncontext.sip
- +7 −1 python/gui/layout/qgslayoutdesignerinterface.sip
- +16 −1 python/gui/layout/qgslayoutitemwidget.sip
- +0 −1 python/gui/layout/qgslayoutview.sip
- +1 −1 python/gui/qgisinterface.sip
- +12 −0 src/app/CMakeLists.txt
- +1 −1 src/app/layout/qgslayoutaddpagesdialog.cpp
- +373 −0 src/app/layout/qgslayoutatlaswidget.cpp
- +59 −0 src/app/layout/qgslayoutatlaswidget.h
- +19 −21 src/app/layout/qgslayoutattributetablewidget.cpp
- +2 −0 src/app/layout/qgslayoutattributetablewidget.h
- +2,193 −228 src/app/layout/qgslayoutdesignerdialog.cpp
- +102 −0 src/app/layout/qgslayoutdesignerdialog.h
- +2 −5 src/app/layout/qgslayouthtmlwidget.cpp
- +2 −5 src/app/layout/qgslayoutlabelwidget.cpp
- +17 −14 src/app/layout/qgslayoutlegendwidget.cpp
- +1 −0 src/app/layout/qgslayoutlegendwidget.h
- +82 −25 src/app/layout/qgslayoutmanagerdialog.cpp
- +17 −3 src/app/layout/qgslayoutmanagerdialog.h
- +11 −0 src/app/layout/qgslayoutmapgridwidget.cpp
- +36 −50 src/app/layout/qgslayoutmapwidget.cpp
- +2 −0 src/app/layout/qgslayoutmapwidget.h
- +10 −1 src/app/layout/qgslayoutpagepropertieswidget.cpp
- +6 −0 src/app/layout/qgslayoutpagepropertieswidget.h
- +7 −3 src/app/layout/qgslayoutpolygonwidget.cpp
- +6 −3 src/app/layout/qgslayoutpolylinewidget.cpp
- +3 −3 src/app/layout/qgslayoutpropertieswidget.cpp
- +6 −4 src/app/layout/qgslayoutshapewidget.cpp
- +141 −0 src/app/layout/qgsreportfieldgroupsectionwidget.cpp
- +52 −0 src/app/layout/qgsreportfieldgroupsectionwidget.h
- +105 −0 src/app/layout/qgsreportlayoutsectionwidget.cpp
- +49 −0 src/app/layout/qgsreportlayoutsectionwidget.h
- +147 −0 src/app/layout/qgsreportorganizerwidget.cpp
- +58 −0 src/app/layout/qgsreportorganizerwidget.h
- +294 −0 src/app/layout/qgsreportsectionmodel.cpp
- +69 −0 src/app/layout/qgsreportsectionmodel.h
- +84 −0 src/app/layout/qgsreportsectionwidget.cpp
- +47 −0 src/app/layout/qgsreportsectionwidget.h
- +86 −48 src/app/qgisapp.cpp
- +12 −6 src/app/qgisapp.h
- +1 −1 src/app/qgisappinterface.cpp
- +1 −1 src/app/qgisappinterface.h
- +2 −2 src/app/qgsdiagramproperties.cpp
- +1 −1 src/app/qgslabelinggui.cpp
- +1 −1 src/app/qgslabelpropertydialog.cpp
- +1 −1 src/app/qgspointmarkeritem.cpp
- +1 −1 src/app/qgsrulebasedlabelingwidget.cpp
- +1 −1 src/app/qgsvectorlayerproperties.cpp
- +18 −2 src/core/CMakeLists.txt
- +1 −1 src/core/composer/qgsatlascomposition.cpp
- +1 −1 src/core/composer/qgscomposition.cpp
- +68 −31 src/core/composer/qgslayoutmanager.cpp
- +10 −10 src/core/composer/qgslayoutmanager.h
- +75 −0 src/core/layout/qgsabstractlayoutiterator.h
- +419 −0 src/core/layout/qgsabstractreportsection.cpp
- +368 −0 src/core/layout/qgsabstractreportsection.h
- +63 −22 src/core/layout/qgslayout.cpp
- +40 −31 src/core/layout/qgslayout.h
- +544 −0 src/core/layout/qgslayoutatlas.cpp
- +398 −0 src/core/layout/qgslayoutatlas.h
- +391 −48 src/core/layout/qgslayoutexporter.cpp
- +121 −10 src/core/layout/qgslayoutexporter.h
- +17 −10 src/core/layout/qgslayoutitem.cpp
- +2 −0 src/core/layout/qgslayoutitem.h
- +8 −44 src/core/layout/qgslayoutitemattributetable.cpp
- +50 −36 src/core/layout/qgslayoutitemhtml.cpp
- +18 −0 src/core/layout/qgslayoutitemhtml.h
- +7 −24 src/core/layout/qgslayoutitemlabel.cpp
- +12 −9 src/core/layout/qgslayoutitemlegend.cpp
- +2 −1 src/core/layout/qgslayoutitemlegend.h
- +167 −33 src/core/layout/qgslayoutitemmap.cpp
- +6 −9 src/core/layout/qgslayoutitemmap.h
- +1 −1 src/core/layout/qgslayoutitemnodeitem.cpp
- +5 −5 src/core/layout/qgslayoutitempage.cpp
- +12 −13 src/core/layout/qgslayoutitempicture.cpp
- +2 −2 src/core/layout/qgslayoutitempolygon.cpp
- +2 −2 src/core/layout/qgslayoutitempolyline.cpp
- +15 −15 src/core/layout/qgslayoutitemregistry.cpp
- +2 −13 src/core/layout/qgslayoutitemregistry.h
- +1 −1 src/core/layout/qgslayoutitemscalebar.cpp
- +2 −11 src/core/layout/qgslayoutitemshape.cpp
- +3 −0 src/core/layout/qgslayoutobject.cpp
- +5 −0 src/core/layout/qgslayoutpagecollection.cpp
- +10 −0 src/core/layout/qgslayoutpagecollection.h
- +22 −26 src/core/layout/{qgslayoutcontext.cpp → qgslayoutrendercontext.cpp}
- +26 −49 src/core/layout/{qgslayoutcontext.h → qgslayoutrendercontext.h}
- +82 −0 src/core/layout/qgslayoutreportcontext.cpp
- +135 −0 src/core/layout/qgslayoutreportcontext.h
- +1 −1 src/core/layout/qgslayouttable.cpp
- +2 −2 src/core/layout/qgslayoututils.cpp
- +95 −0 src/core/layout/qgsmasterlayoutinterface.h
- +113 −0 src/core/layout/qgsprintlayout.cpp
- +78 −0 src/core/layout/qgsprintlayout.h
- +69 −0 src/core/layout/qgsreport.cpp
- +83 −0 src/core/layout/qgsreport.h
- +267 −0 src/core/layout/qgsreportsectionfieldgroup.cpp
- +161 −0 src/core/layout/qgsreportsectionfieldgroup.h
- +96 −0 src/core/layout/qgsreportsectionlayout.cpp
- +99 −0 src/core/layout/qgsreportsectionlayout.h
- +2 −2 src/core/qgsapplication.cpp
- +153 −11 src/core/qgsexpressioncontext.cpp
- +17 −1 src/core/qgsexpressioncontext.h
- +7 −1 src/gui/layout/qgslayoutdesignerinterface.h
- +28 −28 src/gui/layout/qgslayoutitemwidget.cpp
- +12 −9 src/gui/layout/qgslayoutitemwidget.h
- +3 −3 src/gui/layout/qgslayoutmousehandles.cpp
- +2 −2 src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
- +3 −0 src/gui/layout/qgslayoutruler.cpp
- +85 −0 src/gui/layout/qgslayoutview.cpp
- +1 −1 src/gui/layout/qgslayoutview.h
- +2 −1 src/gui/qgisinterface.h
- +0 −3 src/gui/qgsdockwidget.cpp
- +1 −0 src/gui/qgsmapcanvas.cpp
- +2 −2 src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp
- +1 −1 src/gui/symbology/qgsdatadefinedsizelegendwidget.cpp
- +1 −1 src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp
- +1 −1 src/gui/symbology/qgsheatmaprendererwidget.cpp
- +1 −1 src/gui/symbology/qgslayerpropertieswidget.cpp
- +1 −1 src/gui/symbology/qgsrendererwidget.cpp
- +1 −1 src/gui/symbology/qgssymbolwidgetcontext.cpp
- +398 −0 src/ui/layout/qgslayoutatlaswidgetbase.ui
- +7 −7 src/ui/layout/qgslayoutattributetablewidgetbase.ui
- +278 −4 src/ui/layout/qgslayoutdesignerbase.ui
- +163 −0 src/ui/layout/qgsreportorganizerwidgetbase.ui
- +132 −0 src/ui/layout/qgsreportwidgetfieldgroupsectionbase.ui
- +93 −0 src/ui/layout/qgsreportwidgetlayoutsectionbase.ui
- +79 −0 src/ui/layout/qgsreportwidgetsectionbase.ui
- +1 −0 tests/src/app/CMakeLists.txt
- +1 −0 tests/src/core/CMakeLists.txt
- +69 −6 tests/src/core/testqgslayout.cpp
- +428 −0 tests/src/core/testqgslayoutatlas.cpp
- +89 −23 tests/src/core/testqgslayoutcontext.cpp
- +8 −12 tests/src/core/testqgslayouthtml.cpp
- +56 −20 tests/src/core/testqgslayoutitem.cpp
- +56 −27 tests/src/core/testqgslayoutlabel.cpp
- +33 −10 tests/src/core/testqgslayoutmap.cpp
- +1 −1 tests/src/core/testqgslayoutmultiframe.cpp
- +2 −1 tests/src/core/testqgslayoutobject.cpp
- +1 −1 tests/src/core/testqgslayoutpage.cpp
- +38 −43 tests/src/core/testqgslayouttable.cpp
- +6 −6 tests/src/core/testqgslayoututils.cpp
- +1 −1 tests/src/gui/testqgslayoutview.cpp
- +2 −0 tests/src/python/CMakeLists.txt
- +3 −2 tests/src/python/test_qgslayout.py
- +617 −0 tests/src/python/test_qgslayoutatlas.py
- +293 −3 tests/src/python/test_qgslayoutexporter.py
- +24 −21 tests/src/python/test_qgslayoutlabel.py
- +34 −23 tests/src/python/test_qgslayoutmanager.py
- +789 −0 tests/src/python/test_qgsreport.py
- BIN tests/testdata/control_images/atlas/expected_atlas_autoscale1/expected_atlas_autoscale1_mask.png
- BIN tests/testdata/control_images/atlas/expected_atlas_autoscale2/expected_atlas_autoscale2_mask.png
- BIN tests/testdata/control_images/atlas/expected_atlas_filtering1/expected_atlas_filtering1_mask.png
- BIN tests/testdata/control_images/atlas/expected_atlas_fixedscale1/expected_atlas_fixedscale1_mask.png
- BIN tests/testdata/control_images/atlas/expected_atlas_fixedscale2/expected_atlas_fixedscale2_mask.png
- BIN tests/testdata/control_images/atlas/expected_atlas_hiding1/expected_atlas_hiding1_mask.png
- BIN tests/testdata/control_images/atlas/expected_atlas_hiding2/expected_atlas_hiding2_mask.png
- BIN ...a/control_images/atlas/expected_atlas_predefinedscales1/expected_atlas_predefinedscales1_mask.png
- BIN ...a/control_images/atlas/expected_atlas_predefinedscales2/expected_atlas_predefinedscales2_mask.png
- BIN tests/testdata/control_images/atlas/expected_atlas_sorting1/expected_atlas_sorting1_mask.png
- BIN tests/testdata/control_images/atlas/expected_atlas_sorting2/expected_atlas_sorting2_mask.png
- BIN tests/testdata/control_images/atlas/expected_atlas_two_maps1/expected_atlas_two_maps1_mask.png
- BIN tests/testdata/control_images/atlas/expected_atlas_two_maps2/expected_atlas_two_maps2_mask.png
- BIN ...s/composer_html/expected_composerhtml_setfeature/travis/expected_composerhtml_setfeature_mask.png
- BIN ...ut_exporter/expected_layoutexporter_iteratortoimage1/expected_layoutexporter_iteratortoimage1.png
- BIN ...porter/expected_layoutexporter_iteratortoimage1/expected_layoutexporter_iteratortoimage1_mask.png
- BIN ...ut_exporter/expected_layoutexporter_iteratortoimage2/expected_layoutexporter_iteratortoimage2.png
- BIN ...porter/expected_layoutexporter_iteratortoimage2/expected_layoutexporter_iteratortoimage2_mask.png
- BIN ...ges/layout_exporter/expected_layoutexporter_report_page1/expected_layoutexporter_report_page1.png
- BIN ...ges/layout_exporter/expected_layoutexporter_report_page2/expected_layoutexporter_report_page2.png
@@ -0,0 +1,71 @@ | ||
/************************************************************************ | ||
* This file has been generated automatically from * | ||
* * | ||
* src/core/layout/qgsabstractlayoutiterator.h * | ||
* * | ||
* Do not edit manually ! Edit header and run scripts/sipify.pl again * | ||
************************************************************************/ | ||
|
||
|
||
|
||
class QgsAbstractLayoutIterator | ||
{ | ||
%Docstring | ||
An abstract base class for QgsLayout based classes which can be exported by QgsLayoutExporter. | ||
|
||
.. versionadded:: 3.0 | ||
%End | ||
|
||
%TypeHeaderCode | ||
#include "qgsabstractlayoutiterator.h" | ||
%End | ||
public: | ||
|
||
virtual ~QgsAbstractLayoutIterator(); | ||
|
||
virtual QgsLayout *layout() = 0; | ||
%Docstring | ||
Returns the layout associated with the iterator. | ||
%End | ||
|
||
virtual bool beginRender() = 0; | ||
%Docstring | ||
Called when rendering begins, before iteration commences. Returns true if successful, false if no iteration | ||
is available or required. | ||
|
||
.. seealso:: :py:func:`endRender()` | ||
%End | ||
|
||
virtual bool endRender() = 0; | ||
%Docstring | ||
Ends the render, performing any required cleanup tasks. | ||
%End | ||
|
||
virtual int count() = 0; | ||
%Docstring | ||
Returns the number of features to iterate over. | ||
%End | ||
|
||
virtual bool next() = 0; | ||
%Docstring | ||
Iterates to next feature, returning false if no more features exist to iterate over. | ||
%End | ||
|
||
virtual QString filePath( const QString &baseFilePath, const QString &extension ) = 0; | ||
%Docstring | ||
Returns the file path for the current feature, based on a | ||
specified base file path and extension. | ||
%End | ||
|
||
}; | ||
|
||
|
||
|
||
|
||
/************************************************************************ | ||
* This file has been generated automatically from * | ||
* * | ||
* src/core/layout/qgsabstractlayoutiterator.h * | ||
* * | ||
* Do not edit manually ! Edit header and run scripts/sipify.pl again * | ||
************************************************************************/ |
Oops, something went wrong.