sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity
24,125 Commits 81 Branches 277 Tags
Commit Graph

1086 Commits

Author SHA1 Message Date
Martin Dobias
8ac3a94b99 Fix #8898 (optional filter extent for vector save as) 2014-03-04 17:39:30 +07:00
Jürgen Fischer
2f2d6ac95b Merge pull request #1120 from 3nids/pasteconvertgeom 
copy/paste: try to convert geometries (fixes #3604)
 2014-03-03 09:38:30 +01:00
Juergen E. Fischer
d6495abee4 wms provider: 
* support JSON for feature info
* implement feature info for WMTS
* cleanup metadata display
 2014-03-02 01:16:48 +01:00
Denis Rouzaud
643e59a23d copy/paste: try to convert geometries 2014-02-28 13:22:39 +01:00
Martin Dobias
3a317a061e Fix #9658 (crash with diagrams) 2014-02-28 12:11:20 +07:00
Juergen E. Fischer
5db13abcf5 * remove deprecated overloads QgsRasterLayer::lastError() and QgsRasterLayer::lastErrorTitle() 
* deprecate QgsRasterLayer::previewAsPixmap() (doesn't work in background threads)
* QImage::fill( QColor ) does not exists prior to Qt 4.8
diff --git a/src/core/raster/qgsrasterlayerrenderer.h b/src/core/raster/qgsrasterlayerrenderer.h
index 6ab4a49..40a27a2 100644
--- a/src/core/raster/qgsrasterlayerrenderer.h
+++ b/src/core/raster/qgsrasterlayerrenderer.h
@@ -8,7 +8,7 @@ class QPainter;
 class QgsMapToPixel;
 class QgsRasterLayer;
 class QgsRasterPipe;
-class QgsRasterViewPort;
+struct QgsRasterViewPort;
 class QgsRenderContext;

 class QgsRasterLayerRenderer : public QgsMapLayerRenderer
 2014-02-24 18:11:20 +01:00
Etienne Tourigny
75a2edb3e9 add QgsRasterLayer::previewAsImage() for MTR rendering (see bug 9626) 2014-02-24 12:20:17 -03:00
Martin Dobias
fafa58ed24 Merge remote-tracking branch 'origin/master' into threading-revival 
Conflicts:
	src/core/qgspallabeling.cpp
	src/core/qgsrenderchecker.h
	src/core/qgsvectorlayer.cpp
	src/core/symbology-ng/qgslinesymbollayerv2.cpp
	src/core/symbology-ng/qgssymbollayerv2.cpp
	src/providers/wms/qgswmsdataitems.cpp
	tests/src/core/testqgsblendmodes.cpp
 2014-02-23 20:12:50 +07: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
da1ebc2693 Comments and API improvements of simplification (no functional changes) 
- moved QgsVectorLayer::SimplifyHint enum to QgsVectorSimplifyMethod
- use QFlags instead of int for hints
- added few notes about simplification being added in 2.2
 2014-02-21 12:08:50 +07:00
Larry Shaffer
523fd44d86 Add more standard test font functions to QgsFontUtils 2014-02-19 13:27:59 -07:00
Larry Shaffer
2d4ecbac00 Move loading of test fonts to QgsFontUtils 
- Always add testdata.qrc to desktop and server, but only auto-load Roman and Bold if built in debug mode
- Test fonts can now be loaded directly, after startup
- Add sip binding and unit tests
 2014-02-19 13:27:59 -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
Martin Dobias
684dd890a3 Fix #9459 (layer fails to render when rule-based symbology make use of $atlasfeatureid) 2014-02-11 23:57:02 +07:00
Martin Dobias
e6c2ecd9f3 Fix #9290 (crashes in symbology on fields with special characters) 
Fixes several crashes and problems with backwards compatibility.
Before expressions were allowed, field names were loaded and saved
unquoted, e.g. x.y  - with introduction of expressions it was
necessary to use properly quoted "x.y" name so that expression
is correctly parsed. With these changes both options are possible
and when possible, the unquoted field name is used for compatibility
 2014-02-11 14:27:01 +07:00
Juergen E. Fischer
52616b6549 vector layer: save old attribute values where available to speedup undo (and rollback) (fixes #9509) 
field calculator & app: use wait cursor while calculating and committing or rolling back
 2014-02-08 23:28:52 +01:00
Martin Dobias
caf33b657f Fix #8174 (overlaps when using 'avoid intersections' functionality) + test 
I am not entirely confident if it will work perfectly with older versions of GEOS (< 3.3)
because of the lack of unary union (that is emulated by series of unions of two geometries)
 2014-02-07 12:03:18 +07: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
bc757ffe50 * fix QgsGeometry::moveVertex for multipolygons() 
* add test for QgsGeometry::addPart()
* remove expectedFailure decoration from PyQgsGeometry.testSimplifyIssue4189
* modify move and translate tests by 1,1 to 1,2
 2014-01-29 21:36:50 +01:00
Juergen E. Fischer
d647354a52 sip fixes 2014-01-28 00:26:13 +01:00
Nathan Woodrow
7b21c727f3 Fix windows build 2014-01-27 22:55:02 +10:00
Juergen E. Fischer
b49dda6984 sip documentation fix 2014-01-27 09:30:53 +01: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
Juergen E. Fischer
cb5c4e9982 add QgsDistanceArea tests and enhance QgsGeometry tests a bit 
(in preparation for a QgsGeometry wkb update)
 2014-01-23 21:37:03 +01:00
Martin Dobias
3568fe761e Merge pull request #1075 from Oslandia/expressions_in_symbol_rotation_and_scale_for_pr 
[FEATURE] allow for expressions in symbol rotation and scale
 2014-01-23 00:12:04 -08:00
Alvaro Huarte
f6f0384c6b #87525R: refactoring and minor changes 2014-01-22 12:52:06 +01:00
Tim Sutton
f2d0100d5d Merge pull request #1094 from ahuarte47/Issue_8725R-maxscale 
Feature #8725R: support for maximum scale at which the layer should be simplified
 2014-01-22 02:14:41 -08:00
Marco Hugentobler
a5b0e04585 Consider scale based visibility in dxf export. Const correctness for maplayer accessors 2014-01-21 09:18:22 +01:00
Nyall Dawson
7d2bf150ed [FEATURE] Add option for simple line symbols to be drawn only inside a 
polygon. Allows for creation of "national geographic" style borders on
maps where a thick border does not overlap into neighbouring polygons.
 2014-01-21 15:58:29 +11:00
ahuarte47
031596c4e4 #8725R: define simplifyDrawingCanbeApplied better 2014-01-21 02:12:12 +01:00
ahuarte47
653af3a459 #8725R: add maximum scale at which the layer should be simplified 2014-01-21 01:39:16 +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
Juergen E. Fischer
7ca60b30e5 followup f33c4904d3b: add Q_DECL_DEPRECATED and sip annotation to hasCrsTransformEnabled signal 2014-01-17 14:09:25 +01:00
Radim Blazek
f33c4904d3 signal hasCrsTransformEnabled() renamed to hasCrsTransformEnabledChanged() 2014-01-16 17:28:00 +01:00
Alvaro Huarte
8fb87f1828 #8725-R: minor changes 2014-01-15 11:00:01 +01:00
ahuarte47
61041dac25 #8725-R: simplify edited geometries in QgsVectorLayerFeatureIterator 2014-01-15 11:00:01 +01:00
ahuarte47
d439dfbc88 #8725-R: include qgsvectorsimplifymethod.sip 2014-01-15 11:00:01 +01:00
vmora
7d404d97ca allow for expressions in symbol rotation and scale 
the single, graduated and categorised symbol renderers have been
refactored to avoid use of raw pointers (auto_ptr are used instead, they
are deprecated in c++11 but the change for unique_ptr is an easy one and
they clearly state the design intend: exclusive ownership)

2 general use function to quote and unquote strings for/from xml have
been added to qgis.h
 2014-01-14 17:25:00 +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
Radim Blazek
a18b4a35c6 highlight identified feature using real feature shape 2014-01-12 18:19:32 +01:00
Nyall Dawson
9f7868263b Merge pull request #1046 from ahuarte47/Issue_9254 
Bug #9254: fix point-style with "outline width" = 0 still show the outline
 2014-01-12 02:52:30 -08:00
ahuarte47
183dd8eed6 #9254: define overloaded wellKnownMarkerFromSld function in sip 
in sip
 2014-01-02 08:12:35 +01:00
ahuarte47
27521074db #9254: avoid break compatibility with the 2.0 api 2014-01-02 08:12:34 +01:00
ahuarte47
4f6c9cdee7 #9254: Support for OutlineStyle in SLD files 2014-01-02 08:12:34 +01: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
6aed6fee08 [tests] Fix python compositionchecker to derive from render checker, fix most python composer tests (fix #9117) 2013-12-29 09:52:16 +11:00