sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
45,673 Commits 80 Branches 277 Tags
Commit Graph

12043 Commits

Author SHA1 Message Date
Nyall Dawson
421ef88de0
Merge pull request #5966 from nyalldawson/layout_next 
[layouts] Atlas and reporting framework
 2018-01-05 15:29:28 +10:00
Nyall Dawson
bf6c95d575 Add icons for report section types, and show pencil 'editing' 
icon in report organizer for section currently being edited in
the designer

This should help indicate to users which section is currently being
edited and give more visual hints as to exactly what's happening
in the ui.
 2018-01-05 13:52:22 +10:00
Nyall Dawson
3ac214170f Auto generated names for reports are 'Report #' 2018-01-05 12:51:52 +10:00
Nyall Dawson
eae4eeb8f5 Use correct layout type (report/print layout) in new title dialog 2018-01-05 11:52:57 +10:00
Denis Rouzaud
42976df82e do not override QDateTimeEdit::dateTimeChanged 
see de03186745 (diff-f135574df9edcdda660e1bc4320a053e)
 2018-01-04 21:40:55 -04:00
Denis Rouzaud
2528639320 doxymentattion 2018-01-04 21:40:45 -04:00
Nyall Dawson
51a7efbe4b Nicer ui widgets for sections, add missing control for 
disabling body sections
 2018-01-05 11:15:04 +10:00
Nyall Dawson
d2c880af50 Use 'report' text instead of 'atlas' when inside a report designer 2018-01-05 11:15:04 +10:00
Nyall Dawson
5d64f3cd22 Fix missing feature contexts for report section header/footers 
and expand unit tests
 2018-01-05 11:15:04 +10:00
Nyall Dawson
4e45639c45 Restore direct print actions 2018-01-05 11:15:04 +10:00
Nyall Dawson
39ae0eef7d Add method to seek atlas directly to a QgsFeature 2018-01-05 11:15:04 +10:00
Nyall Dawson
ea4f61f024 Dox and spelling 2018-01-05 11:15:04 +10:00
Nyall Dawson
c9ddc9fda0 Start on ui for configuring reports 2018-01-05 11:15:04 +10:00
Nyall Dawson
f4a99b65bb Add a row method to QgsAbstractReportSection 2018-01-05 11:15:04 +10:00
Nyall Dawson
b862db06f0 Fix clashing inherited methods 2018-01-05 11:15:04 +10:00
Nyall Dawson
19b058103b Add crappy inappropriate icons for layout types 2018-01-05 11:15:04 +10:00
Nyall Dawson
aef0432fdc Implement sort order customisation for field groups 2018-01-05 11:15:04 +10:00
Nyall Dawson
2654454c0b Implement serialization of reports 2018-01-05 11:15:04 +10:00
Nyall Dawson
6f2c63f3e5 Add a common base class for print layouts and reports, and adapt 
QgsLayoutManager to suit
 2018-01-05 11:15:04 +10:00
Nyall Dawson
d8af098d83 Code shuffle and cleanup 2018-01-05 11:15:04 +10:00
Nyall Dawson
159986fdec Implement QgsReportSectionFieldGroup 2018-01-05 11:15:04 +10:00
Nyall Dawson
6284f5e36f Correct project and parent handling for report sections 2018-01-05 11:15:04 +10:00
Nyall Dawson
767075a3d4 Hookup filename generation for reports 2018-01-05 11:15:04 +10:00
Nyall Dawson
935dfa32d8 Add reprt iteration test 2018-01-05 11:15:04 +10:00
Nyall Dawson
cdf5cf21e1 Add report section subclass with single layout as body 2018-01-05 11:15:04 +10:00
Nyall Dawson
acb44643e3 Add missing factory annotation 2018-01-05 11:15:04 +10:00
Nyall Dawson
1ea5a5fb98 [FEATURE] Reporting framework 
Reports are based on the new layouts engine. They consist of multiple
nested sections. Each individual section (and the report itself)
can have an optional header and footer (which are themselves layouts,
and can consist of multiple pages!).

Two different types of sections are implemented so far:
- a standard section, which has a single, static body layout. This
can be used to embed static layouts mid way through a report
- a "field group" section, which repeats its body layout for
every feature in a layer. The features are sorted by the selected
grouping feature (with an option for ascending/descending sort).
If a field group section has child sections (e.g. another field
group section with a different field, then only features
with unique values for the group feature are iterated over.
This allows nested reports, e.g.

Report
- Country: Australia
    - State: NSW
        - Town: Sydney
        - Town: Woolongong
    - State: QLD
        - Town: Beerburrum
        - Town: Brisbane
        - Town: Emerald
- Country: NZ
    - State: ... etc

In this example country, state or town groups can have their
own headers and footers which will be inserted in the report.

Reports are configured through a new panel in the layout designer
dialog, which is shown when editing a report (created through
the Layout Manager Dialog). The organizer allows for adding
(and removing) sections to the report, and for selecting which
layout (e.g. headers, footers, bodies) to edit within the
layout designer.
 2018-01-05 11:15:04 +10:00
Nyall Dawson
811145eb96 Remove const from count method 2018-01-05 11:15:04 +10:00
Nyall Dawson
4d2f0deb1a Add a clone method to QgsLayout 2018-01-05 11:15:04 +10:00
Nyall Dawson
5bc543af6a Refactor layout context 
Split render context from reporting context
 2018-01-05 11:15:04 +10:00
Nyall Dawson
8de8bb387f Try (and fail) to avoid a qApp->processEvents() call 
I just can't find any other reliable way to wait until javascript
execution in a web page has completed.
 2018-01-05 11:15:03 +10:00
Nyall Dawson
88a839061d Restore more unit tests 2018-01-05 11:15:03 +10:00
Nyall Dawson
1b932319a2 Fix some layout expression context handling, restore some tests 2018-01-05 11:15:03 +10:00
Nyall Dawson
70e7185cb5 Force a refresh after disabling view updates 2018-01-05 11:15:03 +10:00
Nyall Dawson
7d8953f1da Restore atlas multiple pdf exports 2018-01-05 11:15:03 +10:00
Nyall Dawson
427da5c081 Restore atlas single file pdf export 2018-01-05 11:15:03 +10:00
Nyall Dawson
9751c77063 Restore svg atlas export 2018-01-05 11:15:03 +10:00
Nyall Dawson
d81bf5d95a Add api to export layout atlas as images 2018-01-05 11:15:03 +10:00
Nyall Dawson
b6f1425828 Flesh out QgsAbstractLayoutIterator interface 2018-01-05 11:15:03 +10:00
Nyall Dawson
e312d02c2b Tighten QgsAbstractLayoutIterator interface 2018-01-05 11:15:03 +10:00
Nyall Dawson
69ddc32d0f Restore atlas map handling 2018-01-05 11:15:03 +10:00
Nyall Dawson
3ffdda3e30 Port predefined scale handling to layouts 2018-01-05 11:15:03 +10:00
Nyall Dawson
7c086beb92 Fix some map item todos 2018-01-05 11:15:03 +10:00
Nyall Dawson
49eaebbf40 Remove outdated icon support for item metadata 
Now handled in QgsLayoutItem directly
 2018-01-05 11:15:03 +10:00
Nyall Dawson
3994c4a476 Restore legend atlas behavior 2018-01-05 11:15:03 +10:00
Nyall Dawson
2ef3a5f199 Port current geometry from atlas to layouts 2018-01-05 11:15:03 +10:00
Nyall Dawson
92003c8797 Code shuffle, to make QgsLayoutContext aware of parent QgsLayout 2018-01-05 11:15:03 +10:00
Nyall Dawson
4a7813b953 Restore picture atlas handling 2018-01-05 11:15:03 +10:00
Nyall Dawson
e72e20b8e0 Restore attribute table atlas handling 2018-01-05 11:15:03 +10:00
Nyall Dawson
5d1d25b36b Add atlas expression context scope to layouts 2018-01-05 11:15:03 +10:00