31231 Commits

Author SHA1 Message Date
nirvn
b4ee36d86d [labeling] add rule-based, obstacle icons 2016-02-15 12:41:38 +07:00
Nyall Dawson
6dc0b6910f Move handling of angular units to QgsUnitTypes, swap angle and distance
radio buttons to combo boxes in options dialog for consistency with
project properties
2016-02-15 15:22:30 +11:00
Nyall Dawson
dfdcec8922 Fix project unit confusion (pt 3): add area unit settings with a
ton of available area units (eg m2, km2, mi2, ft2, yd2, ha, ac,
etc)

Adds a new option in both the QGIS setting and project properties to
set the units used for area measurements. Just like the distance
setting, this defaults to the units set in QGIS options, but can
then be overridden for specific projects.

The setting is respected for area calculations in:
- Attribute table field update bar
- Field calculator calculations
- Identify tool derived length and perimeter values

Also adds unit tests to ensure that area calculated by attribute table
update bar, field calculator and identify tool are consistent wrt
ellipsoidal calculations and area units.

TODO: make measure tool respect area setting

(refs #13209, #4252 and fixes #12939, #2402, #4857)
2016-02-15 12:47:36 +11:00
Nyall Dawson
35c2d185fb Add square nautical miles as a supported areal unit, add API
method for converting a distance unit to corresponding area unit
2016-02-15 12:47:36 +11:00
Jürgen Fischer
bd3bbc4707 Merge pull request #2790 from SebDieBln/ImproveVersionCheck
[Bugfix] Improve version check (refs #14022)
2016-02-15 02:18:23 +01:00
Juergen E. Fischer
36000463ff alternate fix for #13938 (folloup 5d989ab) 2016-02-15 02:16:43 +01:00
Juergen E. Fischer
6a3753e2e8 processing: fix translation context for AlgorithmDialogBase 2016-02-15 00:16:51 +01:00
Sebastian Dietrich
8359bfe40c add command line option to skip the version check at startup
--noversioncheck or -V are recognized
2016-02-15 00:12:31 +01:00
Sebastian Dietrich
25a727a05a show correct host name when version check fails to find host 2016-02-15 00:12:30 +01:00
Sebastian Dietrich
af88924ad9 new setting to allow disabling the version check at startup (refs #14022) 2016-02-15 00:12:30 +01:00
Juergen E. Fischer
5d989abd6f fix parsing of IS NOT and NOT LIKE, NOT ILIKE and dumping of IS (NOT ...) (fixes #13938) 2016-02-14 23:44:06 +01:00
Juergen E. Fischer
b7a9634264 don't run version check from build directory 2016-02-14 22:06:10 +01:00
Nyall Dawson
1f2cc3d051 Revert deprecation of QgsSymbolV2Utils::encode/decodeOutputUnit
...as it causes circular dependancies. Defer to 3.0 when we can
move QgsSymbolV2::OutputUnit to QgsUnitTypes
2016-02-15 07:24:35 +11:00
Juergen E. Fischer
9a081df105 fix git marker detection (fixes #13680) 2016-02-14 20:43:40 +01:00
Jürgen Fischer
25c289441e Merge pull request #2789 from SebDieBln/DbManager_FixMoveToSchema
[DbManager] Fix the 'MoveToSchema' functionality (fixes #14219)
2016-02-14 19:07:21 +01:00
Nyall Dawson
ddbdcf8ab1 Fix project unit confusion (pt 2): add project distance unit setting
Adds a new option in project properties to set the units used for
distance measurements. This setting defaults to the units set in
QGIS options, but can then be overridden for specific projects.

The setting is respected for length and perimeter calculations in:
- Attribute table field update bar
- Field calculator calculations
- Identify tool derived length and perimeter values
- Default unit shown in measure dialog

Also adds unit tests to ensure that length and perimeter calculated
by attribute table update bar, field calculator and identify tool
are consistent wrt ellipsoidal calculations and distance units.

(refs #13209, #12939, #2402, #4857, #4252)
2016-02-14 21:04:41 +11:00
Nyall Dawson
17a29f90d6 Add area units to QgsUnitTypes (refs #13209) 2016-02-14 14:57:38 +11:00
Nyall Dawson
85b51fd554 Fix outdated notes in QgsExpression docs 2016-02-14 14:57:38 +11:00
Nyall Dawson
6453907cb6 Fix project unit confusion (part 1)
- Remove existing (confusing and totally useless) "canvas units"
setting. This setting was supposed to be used for a confusing number
of totally different uses, eg changing the coordinate display
format and changing the default measurement units, but it was
so broken it did none of these things except change the
coordinate display and it only did that if OTF was off.

- Add a new "coordinate display" section in project settings,
which allows choice of format for coordinate display via a
combo box (this will also make it easy to add additional custom
formats in future), and make this setting work regardless of
whether OTF is on or off. This setting applies to both the
coordinate display in the status bar and coordinates shown
via the identify tool

(refs #13209, fixes #9730)
2016-02-14 14:57:38 +11:00
Juergen E. Fischer
a90be95f7b sip sync 2016-02-14 03:50:49 +01:00
Werner Macho
67d89355fa Merge pull request #2784 from Cracert/trans2
Add polish translator
2016-02-13 23:06:12 +01:00
Nyall Dawson
be4909776b Avoid warning 2016-02-13 20:59:54 +11:00
Nyall Dawson
c62a6e76d5 Optimise some loops over QMap/QHash objects
Avoid iterating over keys() and then later retrieving the matching
values, and instead use QMap/QHash iterators to retrieve both the
keys and values at the same time
2016-02-13 20:59:54 +11:00
Juergen E. Fischer
62f272e44d processing: fix path setting for saga 2016-02-13 02:00:10 +01:00
Nyall Dawson
9f772bce29 Add API call for setting preferred distance unit for QgsExpression
(refs #13209, #12939, #4857)
2016-02-13 11:36:51 +11:00
Nyall Dawson
99e52af4aa Don't show 'unknown' suffix for when displaying measurements 2016-02-13 11:36:51 +11:00
Nyall Dawson
087e1489e3 Increase maximum size of diagram spinbox (fix #14282) 2016-02-13 11:36:50 +11:00
Sebastian Dietrich
0ab3653831 [DbManager] Fix the 'MoveToSchema' functionality (fixes #14219) 2016-02-13 01:01:05 +01:00
Juergen E. Fischer
7489af8695 debian packaging: fix removed diversion (take II; followup 8b054e6; reverts 5f310a7) 2016-02-12 22:58:56 +01:00
Médéric RIBREUX
8e9b8c77cf [Processing] Fix GRASS7 v.db.select (fixes Redmine #11212) 2016-02-12 21:38:36 +01:00
Nyall Dawson
9e2890dad4 Fix (harmless) Coverity warnings 2016-02-13 07:29:57 +11:00
Nyall Dawson
356719144c Fix failing expression test on OSX 2016-02-13 07:13:47 +11:00
Nyall Dawson
c50033bbaa Misc optimisations suggested by clazy
- avoid Q_FOREACH( ..., QMap.values() ) as it allocates an unnecessary
list
- use .endsWith( ... , Qt::CaseInsensitive) instead of
.lower().endsWith( ... ) as it avoids an extra QString allocation
2016-02-12 20:54:25 +11:00
Nyall Dawson
d0e595f85f Indentation 2016-02-12 20:54:25 +11:00
Nyall Dawson
229ef29170 If no geomCalculator is set for QgsExpression, perform cartesian
calculations for $length, $area, $perimeter (refs #13209)

ie, the default is now to use planimeteric calculations unless
a geomCalculator has been explicitly set
2016-02-12 20:54:25 +11:00
Hugo Mercier
6bbe3b93a2 Fix DependencySorter.sortedLayerIds. Fixes #14281 2016-02-12 09:16:46 +01:00
Martin Dobias
0c478d0148 Merge pull request #2729 from dgoedkoop/digitisecrs2
Fix floating point inaccuracies when digitizing (to fix bug #13745)
2016-02-12 09:46:10 +08:00
Juergen E. Fischer
a111889973 postgres provider: don't log expected failure (followup 6b3651fa) 2016-02-12 01:36:28 +01:00
Juergen E. Fischer
c7a0543050 reduce wkb debugging noise (followup 2ea3d77) 2016-02-12 01:21:35 +01:00
Robert Szczepanek
77bd6953a6 Add polish translator 2016-02-11 23:44:36 +01:00
Daan Goedkoop
384da5665e Fix floating point inaccuracies when digitizing (to fix bug #13745) 2016-02-11 21:05:34 +01:00
Juergen E. Fischer
bcc8e2a792 debian packaging: add yaml dependency python-qgis 2016-02-11 20:32:30 +01:00
Alexander Bruy
8ba6149d7c [processing] make DTM2ASCII tool visible in toolbox 2016-02-11 19:45:45 +02:00
Sebastian Dietrich
f99ed7a0e7 Change the title of QgsNewVectorLayerDialog to match the actions that show it. 2016-02-11 16:48:01 +01:00
Radim Blazek
c8161aac88 [GRASS] fixed stds input 2016-02-11 16:15:05 +01:00
Radim Blazek
dfdb420f23 [GRASS] fixed module search on windows, fixes #14241 2016-02-11 15:23:58 +01:00
Alexander Bruy
0d652b2fe0 Merge pull request #2774 from medspx/processing_fix_parameternumber
[processing] fix ParameterNumber float detection
2016-02-11 13:47:48 +02:00
Alexander Bruy
169d35f319 [processing] fix example script 2016-02-10 16:37:14 +02:00
Juergen E. Fischer
294f033b81 adapt wfs capabilities test data to d11c689e 2016-02-10 09:54:40 +01:00
Alexander Bruy
5715ed3b39 Merge pull request #2775 from NaturalGIS/processing_fix_saga_default_extent
[processing] remove wrong/non mandatory default extent for raster analysis
2016-02-10 10:45:49 +02:00