sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-26 00:02:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
22,287 Commits 83 Branches 277 Tags
Commit Graph

3069 Commits

Author SHA1 Message Date
Hugo Mercier
3f48ec9322 Expose QgsMapToPixelSimplifier to Python 2014-03-18 09:37:10 +01:00
Marco Hugentobler
0a78102c36 Fix sip binding for eventLayer function 2014-03-14 17:09:15 +01:00
unknown
ed5f7781ba There is an indentation error in the Dissolve.py script that writes out the intermediate object on every merge with an input feature rather than just once at the end of the processing. This results in very large output file sizes. 
I have also edited the defineCharacteristics function to allow the tool input to accept polyline features as well as polygons, in line with the fTools UI.
 2014-03-12 10:49:54 +00:00
Larry Shaffer
9c139c28fe Merge pull request #1230 from dakcarto/issue_9704_gdal-qsettings 
Fix #9704, GdalTools file dialogs return QPyNullVariant due to QSettings undefined return type
 2014-03-10 11:02:56 -06:00
Nathan Woodrow
3c3872176c Add load and saving a Layer Definition file. Fix #9688 2014-03-10 09:19:38 +10:00
Larry Shaffer
073dbf1748 Fix #9704, GdalTools file dialogs return QPyNullVariant due to QSettings undefined return type 2014-03-08 16:56:22 -07:00
alexbruy
a089cff5f7 Merge pull request #1217 from nirvn/ftool_random_points_fix 
[ftools] fix random points tool not recognizing memory layer integer column (fix #9695)
 2014-03-07 14:37:59 +02:00
Juergen E. Fischer
100f9729ad add GUI_EXPORT and sip bindings to QgsExtentGroupBox, 
fix sip binding of QgsRasterLayerSaveAsDialog
 2014-03-04 15:49:04 +01:00
Martin Dobias
8ed4114255 Merged "save as" and "save selection as" actions - choice moved to the dialog 2014-03-04 17:39:30 +07:00
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
Alexander Bruy
d378eef0f0 allow to use custom QSettings for managing QgsOptionsDialog parameters. 
Useful for plugins and custom apps
 2014-03-02 11:28:45 +02: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
Mathieu Pellerin (nirvn)
0e907298de [ftools] fix random points tool not recognizing memory layer integer column (fix #9695) 2014-02-26 14:03:56 +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
Juergen E. Fischer
91ecc5f31b add 'warning' to the respective python message log tab 2014-02-24 02:03:42 +01: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
Matthias Kuhn
f9e0093ce7 [fTools] Spatial join aggregates: handle NULL values 2014-02-23 10:39:14 +01: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
Salvatore Larosa
42a4e75536 [pyqgis-console] prepared apis file update 2014-02-19 16:56:56 +01:00
Juergen E. Fischer
5cd53dd28e dbmanager versioning: use lower case 'sql' language (fixes #9434) 2014-02-18 17:45:20 +01:00
Borys Jurgiel
88e8f9d6b6 [Plugin Installer] More robust xml parsing: fix lonely ampersands. Fixes #9524 2014-02-18 17:01:41 +01: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
Martin Dobias
8b10eb0306 Color ramp combo box: do not show "random colors" if gradients-only is on 
+ added option to query whether gradients-only option is enabled
 2014-02-14 19:20:34 +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
8e330e3ad4 [processing] Fix Qt warnings when opening config dialog 2014-02-13 13:25:44 +07:00
Martin Dobias
3a8770e71e Merge remote-tracking branch 'slarosa/fix_9328' 2014-02-13 12:25:46 +07:00
Juergen E. Fischer
57dd8779ac dbmanager: fix 'load as new layer' (fixes #9548) 2014-02-13 00:00:25 +01:00
Salvatore Larosa
c060164bca [processing] fixes #9328: 
addressed: http://hub.qgis.org/issues/9328
 2014-02-12 18:58:22 +01: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
6b74feed5c [db manager] Also removed completer.py file and its imports 2014-02-11 19:26:44 +07:00
Alexander Bruy
83baa914bd [db manager] use QScintilla for SQL window 2014-02-11 13:10:15 +02: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
Martin Dobias
c465c9f03d Fix #8434 (join by spatial location locks up QGIS) 
By caching the features of the provider in the inner loop, there is
a considerable speedup (compared to doing millions of queries)
 2014-02-10 14:47:51 +07:00
Sandro Santilli
0d4968c80a Fix type of "face_seed" layer in TopoViewer 2014-02-09 21:42:12 +01:00
Martin Dobias
77a24cbeb4 Fix #8996 (Composer crashes QGIS when setComposition() method called) 2014-02-09 20:25:20 +07:00
Juergen E. Fischer
780443e200 indentation update 2014-02-09 11:26:56 +01: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
Sandro Santilli
02409e9901 Pass extent of loaded views to the provider via URI 
Completes the speed up loading of view layers in TopoViewer.
Finally and definitely fixes #9510.

NOTE: the commit also adds a layer for face's MBR, which serves
the purpose (among others) to allow for easy computing extent.
 2014-02-08 19:25:04 +01:00
Sandro Santilli
56bebb193b Pass wkbType and SRID of loaded views to the provider via URI 
Slighly speeds up loading of view layers in TopoViewer (#9510).
Unfortunately there's no way to also pass in the Extent, so loading
is still slow.
 2014-02-08 17:05:47 +01:00
Sandro Santilli
188b373bad Fix loading of face layers after breaking it with 73b49867 
Fix #9510 again
 2014-02-08 14:31:29 +01:00
Sandro Santilli
6dd0cbe542 Update TopoViewer style templates to 2.2.0 version 
Fix #9512
 2014-02-08 14:11:24 +01:00
Sandro Santilli
73b4986747 Speed up topology loading 
When loading topology viewer on a PostGIS-2.0+ database, it includes
type and srid typmod in the view layers, avoiding a full scan of
the datasets.

Fix #9510
 2014-02-08 12:26:19 +01:00
Juergen E. Fischer
5397dfe538 update qgis.org links 2014-02-07 21:02:11 +01:00