15179 Commits

Author SHA1 Message Date
Tim Sutton
4d630b7d79 Merge branch 'master' of github.com:qgis/Quantum-GIS 2012-09-07 12:51:21 +02:00
Tim Sutton
6e63f9f083 Added Jaka to contributors list - thanks \o/ 2012-09-07 12:50:21 +02:00
Tim Sutton
3a4fa2fdb6 Merge pull request #225 from lynxlynxlynx/master
linking fix + coalesce tests + coalesce doc
2012-09-07 03:44:54 -07:00
Jaka Kranjc
89811ae0c1 added english coalesce() function help 2012-09-07 12:22:09 +02:00
Jaka Kranjc
68cfb6c8ef tests: added coalesce coverage 2012-09-07 12:22:08 +02:00
Jaka Kranjc
1111a60007 fixed building of qgis.g.info when nothing else passes the math link flag 2012-09-07 12:22:08 +02:00
Tim Sutton
c5763f975e Removed added in 1.9 comment for qgsrectangle::scale 2012-09-07 11:21:25 +02:00
Tim Sutton
373741e256 Added version note for scale method in qgsrectangle 2012-09-07 11:05:45 +02:00
Tim Sutton
9b58fe2fe8 Make linear interpolation default for pseudocolor raster renderer 2012-09-07 10:03:13 +02:00
Juergen E. Fischer
e9afe03460 german translation update and typo fixes 2012-09-07 01:54:52 +02:00
Juergen E. Fischer
5603cc0bd2 indentation update 2012-09-07 01:54:52 +02:00
Juergen E. Fischer
30c7ec407a fix windows build 2012-09-07 01:07:53 +02:00
Etienne Tourigny
8074edc334 Merge branch 'master' of github.com:qgis/Quantum-GIS 2012-09-06 14:33:42 -03:00
Radim Blazek
ea86b93e0d more raster Python bindings, raster write test in Python 2012-09-06 19:16:53 +02:00
Etienne Tourigny
0d189ffaea Merge branch 'master' of github.com:qgis/Quantum-GIS 2012-09-06 14:16:36 -03:00
Etienne Tourigny
5b49c9e6d9 add cpt-city files to debian builds 2012-09-06 14:14:59 -03:00
Tim Sutton
e690048b46 Merge branch 'master' of github.com:qgis/Quantum-GIS 2012-09-06 16:00:15 +02:00
Tim Sutton
d77973d0d3 Revert "Fix from lynxlynxlynxlynxlynx for building grass on mac"
This reverts commit 977518af3a669aac1045eebb5b00fce2b6d50680.
2012-09-06 15:59:17 +02:00
Larry Shaffer
ea2de726d3 Adjust wording about PAL engine 2012-09-06 06:24:10 -06:00
Tim Sutton
2b03c140d3 Fix issue where layer order panel is restored in place of layers panel 2012-09-06 13:45:53 +02:00
Tim Sutton
977518af3a Fix from lynxlynxlynxlynxlynx for building grass on mac 2012-09-06 13:40:07 +02:00
Larry Shaffer
652deba734 Fix for #6309, add case-insensitive sort for vector provider encodings 2012-09-06 04:57:33 -06:00
mhugent
24d50e4b93 Merge pull request #224 from matthias-kuhn/diagram
Minor diagram improvements
2012-09-06 01:59:18 -07:00
Marco Hugentobler
4d90320d9c Better reusage of composer functionality between server and desktop 2012-09-06 10:52:56 +02:00
Matthias Kuhn
6cd3d77762 Double clicking an attribute item adds it to assigned items 2012-09-06 09:26:05 +02:00
Marco Hugentobler
a88af64eeb Fix item reading for GetPrint (project file format changed between 1.8 and 1.9) 2012-09-06 08:28:21 +02:00
homann
fb84775629 Merge pull request #223 from homann/custom_ellipsoid
Custom ellipsoid for measurement and corresponding UI changes
2012-09-05 22:31:56 -07:00
Magnus Homann
07488674b2 Adjusted major/minor printout 2012-09-06 00:21:50 +02:00
Magnus Homann
5d88748656 No divide by zero, thanks 2012-09-06 00:01:31 +02:00
Magnus Homann
91ab330324 Removed unused functions and polished UI 2012-09-05 23:03:54 +02:00
Magnus Homann
655fe1e13d Changed UI for selecting ellipsoid, and added custom parameters for ellipsoids 2012-09-05 23:03:54 +02:00
Radim Blazek
e1091013af New QgsRasterChecker class for raster comparison in tests.
New test for raster file writer.
2012-09-05 17:11:03 +02:00
Matthias Kuhn
ba0bed00fa Fix warnings 2012-09-05 16:06:47 +02:00
Juergen E. Fischer
8cb578f698 fix windows build 2012-09-05 12:02:00 +02:00
Radim Blazek
08bd084aa8 GRASS raster rendered by default as pseudo color, color table loaded from GRASS 2012-09-05 11:43:48 +02:00
Radim Blazek
7b05793b54 GRASS stats upgrade 2012-09-05 10:05:58 +02:00
Radim Blazek
eb93568f76 calc raster stats in grass module, time reduced to 20%, solves part of #4862 2012-09-05 10:05:58 +02:00
Marco Hugentobler
66626012a6 Merge branch 'master' of github.com:qgis/Quantum-GIS 2012-09-05 09:51:57 +02:00
Marco Hugentobler
9d5b16e842 Added Matthias to contributor list 2012-09-05 09:45:35 +02:00
Marco Hugentobler
1497cbbabc Fix printing of pie and text diagrams 2012-09-05 09:36:25 +02:00
Marco Hugentobler
0c7f729612 [Feature]: Merge diagram improvements provided by Matthias Kuhn 2012-09-05 09:29:19 +02:00
pcav
1e1cdb83b3 Fix #6105 2012-09-05 08:45:57 +02:00
Marco Hugentobler
cfa15ff560 Add documentation for function QgsComposition::loadFromTemplate 2012-09-05 08:23:58 +02:00
Marco Hugentobler
07696ab678 Allow text substitution for template loading 2012-09-05 08:23:58 +02:00
Marco Hugentobler
a877057361 Don't create undo action if loading template via gui 2012-09-05 08:23:58 +02:00
Marco Hugentobler
351ccc0087 Ensure item widgets are deleted if loading composer templates 2012-09-05 08:23:58 +02:00
Marco Hugentobler
fd514a0e74 Add method QgsComposition::loadFromTemplate and python bindings 2012-09-05 08:23:58 +02:00
Larry Shaffer
17393bde76 Clean up label engine dialog 2012-09-04 18:25:13 -06:00
Larry Shaffer
a584a9a7e4 Add 'show all labels' setting to individual PAL layers
- Implements a version of #5874
- Show-all labels are not obstacles for other PAL layer labels during collisions
(i.e. they will overlap or underlie other labels depending upon render order)
2012-09-04 17:22:45 -06:00
Nathan Woodrow
141c38d377 Add tests for expression scale function 2012-09-05 07:28:27 +10:00