108 Commits

Author SHA1 Message Date
Nyall Dawson
899c2f8b5d [composer] Prevent hang on trying to export compositions and atlases to files which can't be overwritten, and warn user instead (fix #9283) (fix #10016). Fix mouse cursor getting stuck after failed atlas exports. 2014-06-26 20:16:14 +10:00
Nyall Dawson
01b3d9662c [composer] Fix order of vertices returned by mapPolygon when map rotation is set, fix drawing overview frame when either map is rotated (fix #10644) 2014-06-23 19:14:39 +10:00
Nyall Dawson
20e34e8e1c [composer] Fix attribute table column sort order could not be changed after initially adding columns to sort 2014-06-21 21:33:19 +10:00
Sandro Mani
456adad745 Consider also font descent and baseline in QgsComposerLabel::adjustSizeToText. Funded by Sourcepole QGIS Enterprise. 2014-06-07 18:17:37 +10:00
Sandro Mani
b199dc7be1 QgsComposition::addItemsFromXML for python (without optional arguments). Funded by Sourcepole QGIS Enterprise. 2014-06-04 13:30:05 +02:00
Juergen E. Fischer
45c0be1059 sip: remove enum constants 2014-06-02 21:52:02 +02:00
Nyall Dawson
166f8fc534 [composer] Small improvements to api docs 2014-06-01 13:10:32 +10:00
Sandro Mani
b7423cf24b [composer] Composer item controls in GUI show position relative to page origin (also save page number and relative position to xml) (fix #9411) 2014-06-01 13:10:32 +10:00
Nyall Dawson
c38d3e12af [composer] Remove use of runtime_error for providing feedback from atlas 2014-05-29 22:49:58 +10:00
Juergen E. Fischer
c4c131ef75 sip sync 2014-05-27 23:32:42 +02:00
Nyall Dawson
e8b7ca943c [composer] Small improvements to API docs 2014-05-23 11:17:05 +10:00
Hugo Mercier
084fa8992b [FEATURE][composer] Add a 'predefined scales' mode to atlas maps, which sets an atlas maps' extent to the largest predefined scale which fits the atlas feature. Scales are taken from the project's predefined scales, or the global predefined scales. 2014-05-23 11:17:05 +10:00
Juergen E. Fischer
bbdf7cd220 sync some sip bindings 2014-05-18 15:22:32 +02:00
Juergen E. Fischer
7c75ffa3b0 spelling fixes 2014-05-17 22:02:03 +02:00
Nathan Woodrow
a1aa980928 Fix windows build 2014-05-15 22:28:11 +10:00
Nyall Dawson
dc905accac [FEATURE][composer] Rework attribute tables to make tables more flexible.
- Add support for reordering columns in a table (fix #5942)
- Add support for expression based columns
- Add support for setting column alignment (fix #2957)
- Add support for setting column header alignment
- Make sorting in tables correctly handle nulls, dates, times, locale aware string sorting
This work also paves the way for future expansion of attribute tables to allow for setting column widths, column colors, etc.
2014-05-15 12:06:32 +10:00
Nyall Dawson
fa0f0bd176 [FEATURE][composer] Add option for controlling placement of rendered images inside a picture item (eg, top left, bottom right, etc) 2014-05-15 11:58:54 +10:00
Nyall Dawson
ecf2600a4e [composer] Allow for finer control over text rendered with QgsComposerItem::drawText, fixes clipped text when using italic fonts in legend titles 2014-05-15 10:04:23 +10:00
Nyall Dawson
0d3838759e [composer] Allow user to set maximum distance for page breaking in html items. 2014-05-08 20:23:16 +10:00
Nyall Dawson
93fa94f913 [FEATURE][composer] Add button to create new frame when using composer items in Use Existing Frames mode 2014-05-07 19:40:34 +10:00
Nyall Dawson
2d7cd38b45 [composer] Refresh view action now also reloads html items and refreshes attribute table features. 2014-05-01 23:00:43 +10:00
Nyall Dawson
8eb929aeda [composer] Add refresh button to html items, to reload the html source from the url. 2014-05-01 23:00:43 +10:00
Nyall Dawson
ad0b4daf8d [composer] Add checkbox for controlling whether html items should use smart page breaking (sponsored by City of Uster, Switzerland) 2014-04-28 22:14:53 +10:00
Nyall Dawson
de301e9ada [composer] Add frameOutlineWidth property for composer items (sponsored by City of Uster, Switzerland) 2014-04-28 20:59:41 +10:00
Nyall Dawson
8b9c9c49a1 [composer] Update picture item header documentation and sip bindings (sponsored by City of Uster, Switzerland) 2014-04-28 20:19:01 +10:00
Nyall Dawson
ecc2ebf59a [composer] Add signal for when composition print resolution changes (sponsored by City of Uster, Switzerland) 2014-04-28 20:19:01 +10:00
Nyall Dawson
ca186c78ee [composer] Add a featureChanged signal for when the current atlas feature changes (sponsored by City of Uster, Switzerland) 2014-04-28 20:19:00 +10:00
Nyall Dawson
e48225ca35 [composer] Add more tests to attribute table test suite 2014-04-28 19:29:05 +10:00
Nyall Dawson
7e977bcfd3 [composer] Some api documentation improvements and fix ups 2014-04-28 19:29:04 +10:00
Nyall Dawson
e0c64028b5 [composer] Rename getHeaderLabels to headerLabels and make it public for composer text/attribute tables. 2014-04-28 19:29:04 +10:00
Nyall Dawson
a386e898f0 [composer] Cache features for attribute table, to reduce excessive cpu use and multiple queries to layer provider 2014-04-23 06:28:56 +10:00
Nyall Dawson
122034a07a [composer] Some small fixes to svg layers export, naming improvements, additional comments 2014-04-16 19:47:40 +10:00
vmora
0c19945c04 [composer] add svg export with layers 2014-04-16 19:11:20 +10:00
Sandro Mani
b9bd4d247e [composer] Correctly update extent when restoring composermap state, except when composer map is not yet visible after loading 2014-04-15 20:08:19 +10:00
Nyall Dawson
114d46c018 [FEATURE][composer] Allow filtering rows in attribute tables 2014-04-14 20:50:14 +10:00
Nyall Dawson
103b3b4e9a [FEATURE][composer] Allow setting line join and cap style for scalebars 2014-04-14 20:43:10 +10:00
Nyall Dawson
5bd87c81e8 [composer] Add undo/redo support for item transparency and blend modes, symbol change for shapes, overviews and grid styles 2014-04-13 22:19:47 +10:00
Sandro Mani
a714a18e82 [FEATURE][composer] Add support for specifying legend title horizontal alignment in composer 2014-04-13 15:02:20 +10:00
Nyall Dawson
12b025ea12 Update composer shape sip 2014-04-11 13:04:49 +10:00
Nyall Dawson
cfc83031ef [composer] Allow setting the join style for composer item frames 2014-04-08 20:20:25 +10:00
Juergen E. Fischer
8bd80f43c5 fix windows build 2014-04-05 01:19:50 +02:00
Denis Rouzaud
8b06a16a75 model/view for layer/field selectors 2014-04-03 14:51:26 +02:00
Bas Couwenberg
3d44c5934a Disable features on ARM.
Building QGIS on ARM produces the error:

sip: qgis/python/core/qgsclipper.sip:44: \
QgsClipper::trimFeature() unsupported function argument type - provide %MethodCode and a C++ signature

For the Android builds this was fixed in commit 2cc684793ceb29d8600d71564fb38f92c998f588.

This patch adapts the Android fix, by disabling the SIP features on all ARM systems.

Bug-Debian: http://bugs.debian.org/737814
2014-03-28 10:41:22 +01:00
Nyall Dawson
dd4975f285 Merge pull request #1255 from Oslandia/atlas_signals
Atlas signals
2014-03-21 13:23:59 +11:00
Nyall Dawson
13cbfd138c [FEATURE] Add 'shapeburst' fill style. Shapeburst fills implement a buffered gradient fill, where a gradient is drawn from the boundary of a polygon towards the polygon's centre. Configurable parameters include distance from the boundary to shade, use of color ramps or simple two color gradients, optional blurring of the fill and offsets. 2014-03-21 12:50:50 +11:00
Hugo Mercier
9eb8ef4e98 Add signals to atlas generation 2014-03-18 17:08:09 +01:00
Martin Dobias
5a4f8d07a0 Change "added/deprecated in 2.1" notes to 2.4 for stuff related to threading 2014-02-21 17:33:09 +07:00
Martin Dobias
a3af93394e Merge branch 'master' into threading-revival
Some features are still disabled - will be fixed later

Conflicts:
	python/core/composer/qgscomposition.sip
	python/core/diagram/qgsdiagram.sip
	python/core/diagram/qgshistogramdiagram.sip
	python/core/diagram/qgspiediagram.sip
	python/core/diagram/qgstextdiagram.sip
	python/core/qgsdiagramrendererv2.sip
	python/core/qgsfield.sip
	python/core/qgslabelsearchtree.sip
	python/core/qgsmaprenderer.sip
	python/core/qgsrenderchecker.sip
	python/core/symbology-ng/qgssymbollayerv2.sip
	python/gui/qgsmapcanvas.sip
	src/app/composer/qgscomposerlegendwidget.cpp
	src/app/qgisapp.cpp
	src/core/composer/qgsatlascomposition.cpp
	src/core/composer/qgscomposerattributetable.cpp
	src/core/composer/qgscomposermap.cpp
	src/core/composer/qgscomposition.cpp
	src/core/composer/qgscomposition.h
	src/core/diagram/qgsdiagram.h
	src/core/diagram/qgshistogramdiagram.cpp
	src/core/diagram/qgshistogramdiagram.h
	src/core/diagram/qgspiediagram.cpp
	src/core/diagram/qgspiediagram.h
	src/core/diagram/qgstextdiagram.cpp
	src/core/diagram/qgstextdiagram.h
	src/core/qgsdiagramrendererv2.cpp
	src/core/qgsdiagramrendererv2.h
	src/core/qgsmaprenderer.cpp
	src/core/qgsmaprenderer.h
	src/core/qgsnetworkaccessmanager.h
	src/core/qgspallabeling.cpp
	src/core/qgsrenderchecker.h
	src/core/qgsvectorlayer.cpp
	src/core/qgsvectorlayer.h
	src/core/qgsvectorlayerfeatureiterator.cpp
	src/core/qgsvectorlayerfeatureiterator.h
	src/core/raster/qgsrasterlayer.cpp
	src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
	src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
	src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
	src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
	src/core/symbology-ng/qgssymbollayerv2.cpp
	src/core/symbology-ng/qgssymbollayerv2.h
	src/core/symbology-ng/qgssymbolv2.cpp
	src/gui/qgshighlight.cpp
	src/gui/qgsmapcanvas.cpp
	src/gui/qgsmapcanvas.h
	src/gui/qgsmapcanvasitem.cpp
	src/gui/qgsmaptoolidentify.cpp
	src/plugins/georeferencer/qgsgeorefplugingui.cpp
	src/providers/memory/qgsmemoryfeatureiterator.cpp
	src/providers/ogr/qgsogrfeatureiterator.cpp
	src/providers/ogr/qgsogrfeatureiterator.h
	src/providers/ogr/qgsogrprovider.cpp
	src/providers/oracle/qgsoraclefeatureiterator.cpp
	src/providers/oracle/qgsoracleprovider.cpp
	src/providers/postgres/qgspostgresconn.cpp
	src/providers/postgres/qgspostgresfeatureiterator.cpp
	src/providers/postgres/qgspostgresfeatureiterator.h
	src/providers/wfs/qgswfsfeatureiterator.cpp
	src/providers/wms/qgswmsprovider.cpp
	src/providers/wms/qgswmsprovider.h
	src/ui/qgsoptionsbase.ui
	tests/src/core/CMakeLists.txt
	tests/src/core/testqgscomposereffects.cpp
	tests/src/core/testqgscomposerhtml.cpp
	tests/src/core/testqgscomposerscalebar.cpp
	tests/src/core/testqgscomposershapes.cpp
2014-02-18 11:28:46 +07:00
Nyall Dawson
9e948dfb2b [composer] Fix scrollbars in composer by correctly calculating scene bounds (fix #7691) 2014-02-13 22:38:01 +11:00
Nyall Dawson
d22f7e8b9d [composer] Fix stacking of items breaks after pasting items. Make sure pasted items are always placed in correct order on top of composition. 2014-02-06 22:46:42 +11:00