sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-10 00:05:25 -04:00
Code Issues Packages Projects Releases Wiki Activity
32,648 Commits 88 Branches 279 Tags
Commit Graph

261 Commits

Author SHA1 Message Date
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
Nyall Dawson
78ecef6f2a [composer] Draw mouse handles and item bounds outside of item's frames, so that snapping occurs to edge of item frame (fix #8943) 2014-02-04 19:01:41 +11:00
Juergen E. Fischer
74e7314c36 update sip bindings II 2014-01-27 09:22:53 +01:00
Juergen E. Fischer
d4e369414b update sip bindings 2014-01-26 18:36:29 +01:00
Nyall Dawson
85a17c246a Add QgsMapLayerAction and QgsMapLayerActionRegistry, which can be 
used as a generic api for registering actions which can apply to
a specific map layer or layer type.

Create a QgsMapLayerAction for setting features as the current
atlas feature for compositions.

This work was kindly sponsored by SIGE (www.sige.ch).
 2014-01-20 21:35:56 +11:00
Juergen E. Fischer
a9d8bd1e5b update sip some bindings 2014-01-18 23:05:32 +01:00
Nyall Dawson
6bb9dfec00 [FEATURE][composer] Allow for more than one atlas controlled map in compositions (or none), by moving some atlas properties to map items (fix #9248) (fix #6484) 2014-01-14 22:52:01 +11: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
Juergen E. Fischer
51297d5990 indentation update (note to self: always run scripts/prepare-commit.sh before committing) 2013-09-17 12:41:43 +02:00
nyalldawson
58d0483c46 [FEATURE] Setting for corner radius for composer rectangle shapes, allows creation of rounded rectangles in composers 
Add tests for composer shapes
 2013-09-17 08:17:51 +02:00
Marco Bernasocchi
2cc684793c worcarounds to make sip generation work on android 2013-09-09 17:15:38 -06:00
Hugo Mercier
b18f2736e1 Change computeWorldFileParameters signature and fix Python unit test 2013-09-08 13:17:39 +02:00
Juergen E. Fischer
0a1d44fc63 make qgis_app a shared library and fix some more stl warnings with msvc 2013-09-07 00:22:10 +02:00
Paolo Cavallini
135ef36569 Merge pull request #665 from Oslandia/overview_centering 
[2.1] Overview centering
 2013-09-05 02:22:42 -07:00
Juergen E. Fischer
abd7533fca composer table: 
- fix api updates (fixes #7781)
- store/restore geometry of attribute selection dialog
 2013-07-08 21:49:07 +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
Juergen E. Fischer
99f998aa30 - add missing sip bindings 
- port widgets_tree.py to QtXml and update customization.xml (fixes #5752 and  #8054)
 2013-06-22 19:41:34 +02:00
Hugo Mercier
5c4f2ed984 Fix overview autocentering: always center, not only when the overview is not visible. 
Work funded by Tuscany Region - SITA. Contract "Support to the use
of GFOSS (Geographic Free and Open Source Software) Desktop tools"
(CIG Z3B06FA6D7).
 2013-06-19 09:15:56 +02:00
Hugo Mercier
f0f72ca8a9 Add SIP and Python unit test for overview autocentering. 
Work funded by Tuscany Region - SITA. Contract "Support to the use
of GFOSS (Geographic Free and Open Source Software) Desktop tools"
(CIG Z3B06FA6D7).
 2013-06-17 17:34:33 +02:00
nyalldawson
519fe2f4ac Add python bindings and tests for grid blending, grid annotation font color, vector feature blending and vector layer transparency 2013-05-13 22:28:00 +10:00
nyalldawson
9e870c7893 Add tests for python bindings for composer item blending and transparency 
Add python bindings for composer item background
 2013-05-01 14:05:43 +10:00
nyalldawson
171973a54f Add blending mode for overview frame, option to invert overview frame 2013-04-29 21:48:49 +10:00
nyalldawson
13d7ced401 Add SIP bindings for composer item blend mode and transparency 2013-04-22 14:16:30 +10:00
Martin Dobias
ba49ef078c [API] Removed QgsSymbol, QgsMarkerCatalgoue and QgsSymbologyUtils 2013-04-07 23:46:57 +02:00
Radim Blazek
ee84bb1f2c composer legend styles, fixes partialy #6960 2013-03-26 20:04:49 +01:00
olivierdalang
1e30eb0c75 - add find by UUID 2013-03-15 08:13:48 +01:00
olivierdalang
00c832b151 Implemented ComposerItem's Uuids 
- uuid are kept on cut/paste, but deleted on import template or copy/paste
- removed obsolete id reference in QgsComposerLabelWidget
 2013-03-15 08:13:30 +01:00
Juergen E. Fischer
0fbea1911e german translation update 2013-02-19 23:33:17 +01:00
olivierdalang
2d4220bba9 Update of composer item's GUI 2013-02-19 02:28:43 -07:00
Hugo Mercier
12f85af0ee [Atlas] Add SIP bindings for feature sorting and filtering 2013-02-06 15:06:59 +01:00
Marco Hugentobler
06374d9b64 Update composition sip bindings 2013-01-18 16:50:13 +01:00
Nyall Dawson
860e23afc7 [FEATURE][composer] Add styling support for composer shapes 2013-01-12 16:21:00 +11:00
Juergen E. Fischer
b4d7e02d3a fix windows build (also syncs QgsComposition sip binding) 2014-01-08 09:46:16 +01:00
jtornero
4fd3b1fb07 [composer] Add nautical miles support to scalebar, more rational default scale 2014-01-08 17:44:25 +11: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
Nyall Dawson
719c78c2c7 [composer] Clean up item rotation api, seperate item rotation (for shapes, labels) from map rotation and picture rotation. 
Maintain compatibility with 2.0 api, deprecate ambiguous rotation/setRotation methods
 2013-12-30 20:00:55 +11:00
nyalldawson
aa3e40a0eb [FEATURE][composer] Add controls for changing zebra frame colors and line thickness, fix output of zebra style grids (fix #8767) 2013-12-29 09:52:15 +11:00
Matthias Kuhn
f867506b8e [composer] Fix python bindings for composer attribute table 2013-11-14 16:12:08 +01:00
Alexander Bruy
5e45a22d06 remove deprecated methods from API 2012-12-23 10:40:23 +02:00
mhugent
9f0d858175 Merge pull request #274 from Oslandia/atlas_integration 
Add access to the atlas layer in the expression builder GUI for labels.
 2012-10-06 06:24:58 -07:00
Alexander Bruy
29e009f0ae fix SIP bindings after atlas merge 2012-10-06 14:49:01 +03: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