27 Commits

Author SHA1 Message Date
vmora
0c19945c04 [composer] add svg export with layers 2014-04-16 19:11:20 +10: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
Juergen E. Fischer
74e7314c36 update sip bindings II 2014-01-27 09:22:53 +01:00
Martin Dobias
2bece090f5 Update Python bindings to match changes in core/gui libraries. 2013-12-05 18:27:45 +07:00
nyalldawson
247e6c762d Remove redundant composer selection tolerance setting 2013-10-31 13:28:11 +11:00
Nyall Dawson
ac0c5d1bd2 Add sip bindings for guide controls 2013-10-29 08:25:40 +01:00
Nyall Dawson
46009c6950 [FEATURE] Add clear guides action to composer view menu 2013-10-29 08:25:24 +01:00
nyalldawson
71b762bbb5 [FEATURE] Move option to snap to grid to composer view menu, add independant option to show/hide grid 2013-10-29 08:24:22 +01:00
Nyall Dawson
24d110606c [FEATURE] Allow multi item drag and resize in composer (fix #7918)
[FEATURE] Always draw selection handles on top of composition, add dashed border for selected items (fix #7793)
Move responsibility for drawing selection mouse handles and mouse interaction with selection to new class
2013-10-02 09:09:16 +02:00
Hugo Mercier
b18f2736e1 Change computeWorldFileParameters signature and fix Python unit test 2013-09-08 13:17:39 +02:00
Juergen E. Fischer
146233388c spelling fixes 2013-06-23 16:40:03 +02:00
Juergen E. Fischer
3854086d47 sip update 2013-06-23 16:00:24 +02:00
olivierdalang
1e30eb0c75 - add find by UUID 2013-03-15 08:13:48 +01:00
Marco Hugentobler
06374d9b64 Update composition sip bindings 2013-01-18 16:50:13 +01:00
Juergen E. Fischer
b4d7e02d3a fix windows build (also syncs QgsComposition sip binding) 2014-01-08 09:46:16 +01:00
Nyall Dawson
22514b6dc1 [composer] Tweak interface for atlas previews, fix occasional wrong extent in atlas previews. 2014-01-07 21:24:15 +11:00
Hugo Mercier
9135226514 Add access to the atlas' layer in the expression builder GUI for labels.
QgsAtlasComposition is now held by QgsComposition
2012-10-06 13:22:04 +02:00
Hugo Mercier
d904da4ce1 Update of QgsAtlasComposition SIP (with Python unit tests as well) 2012-10-05 16:25:11 +02:00
Hugo Mercier
b5f736ad21 Revert "Resolved merge conflicts when reverting 686f632"
This reverts commit a654e274a352ef29354de0bcb13e96444868c806.
2012-10-04 11:19:04 +02:00
Tim Sutton
a654e274a3 Resolved merge conflicts when reverting 686f632 2012-10-01 11:03:48 +02:00
Juergen E. Fischer
4b263d6b06 and more sip fixes 2012-09-30 18:18:40 +02:00
Juergen E. Fischer
686f632f32 fix destruction of private members in atlas and add sip bindings (also adds
CORE_EXPORT)
2012-09-29 16:20:08 +02:00
Tim Sutton
5f79bcb16f Resolved merge conflicts with origin master 2012-09-24 10:03:06 +02:00
Juergen E. Fischer
f3cb57b1eb SIP bindings update:
- update methods of existing classes
- add comment to methods missing in the sip bindings
- split up collective sip files into single files and use
  same directory structure in python/ as in src/
- add a lot of missing classes (some might not make sense because of
  missing python methods in those classes)
- remove some non-existing methods from the header files
- add scripts/sipdiff
- replace some usages of std::vector and std::set with QVector/QSet
2012-09-24 02:42:57 +02:00