Giuseppe Sucameli 
							
						 
					 
					
						
						
						
						
							
						
						
							9dffa42eea 
							
						 
					 
					
						
						
							
							Merge pull request  #394  from etiennesky/gdaltools1  
						
						 
						
						... 
						
						
						
						GdalTools - use raster format save option and pyramids dialogs 
						
						
					 
					
						2013-01-28 13:49:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							4cbec1811c 
							
						 
					 
					
						
						
							
							fix warnings, add copyright headers, cosmetics  
						
						 
						
						
						
						
					 
					
						2013-01-28 01:39:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							5f304b34a1 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into new_vector_api  
						
						 
						
						... 
						
						
						
						Conflicts:
	python/core/qgsvectordataprovider.sip
	src/app/legend/qgslegendlayer.cpp
	src/app/qgisapp.cpp
	src/app/qgsmergeattributesdialog.cpp
	src/core/qgsvectordataprovider.cpp
	src/core/qgsvectordataprovider.h
	src/core/qgsvectorlayer.cpp
	src/gui/qgssearchquerybuilder.cpp
	src/providers/postgres/qgspostgresprovider.cpp
	src/providers/wfs/CMakeLists.txt 
						
						
					 
					
						2013-01-23 23:46:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Etienne Tourigny 
							
						 
					 
					
						
						
						
						
							
						
						
							2fb78db2b5 
							
						 
					 
					
						
						
							
							update raster format and pyramid save widgets for python, add pyramid config options support to raster writer, other fixes  
						
						 
						
						
						
						
					 
					
						2013-01-18 18:18:47 -02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							ac29c5b11f 
							
						 
					 
					
						
						
							
							prepare-commit.sh: remove trailing blanks from python files  
						
						 
						
						
						
						
					 
					
						2013-01-12 23:48:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marco Hugentobler 
							
						 
					 
					
						
						
						
						
							
						
						
							dc3272a7ef 
							
						 
					 
					
						
						
							
							Consider datum transform in raster projector  
						
						 
						
						
						
						
					 
					
						2013-11-16 11:18:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radim Blazek 
							
						 
					 
					
						
						
						
						
							
						
						
							24bcec43d5 
							
						 
					 
					
						
						
							
							[FEATURE] labels support in QgsPalettedRasterRenderer,  fixes   #8886  
						
						 
						
						
						
						
					 
					
						2013-11-02 18:21:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radim Blazek 
							
						 
					 
					
						
						
						
						
							
						
						
							47b055f5a6 
							
						 
					 
					
						
						
							
							introduced qgssize in rasters instead of size_t to typedef it easily in SIP  
						
						 
						
						
						
						
					 
					
						2013-11-02 13:52:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alexander Bruy 
							
						 
					 
					
						
						
						
						
							
						
						
							5e45a22d06 
							
						 
					 
					
						
						
							
							remove deprecated methods from API  
						
						 
						
						
						
						
					 
					
						2012-12-23 10:40:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radim Blazek 
							
						 
					 
					
						
						
						
						
							
						
						
							d58d3476c0 
							
						 
					 
					
						
						
							
							raster creation moved from QgsGdalProvider::create() to GDAL provider extern C function  
						
						 
						
						
						
						
					 
					
						2012-12-20 14:44:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							9317ffd89a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into new_vector_api  
						
						 
						
						... 
						
						
						
						Also disabled mapserver until compilation is fixed.
Fixed tests.
Conflicts:
	src/app/legend/qgslegendlayer.cpp
	src/app/qgsattributedialog.cpp
	src/app/qgsattributedialog.h
	src/app/qgslabelpropertydialog.cpp
	src/app/qgsmaptoollabel.cpp
	src/app/qgsvectorlayerproperties.cpp
	src/core/CMakeLists.txt
	src/core/composer/qgsatlascomposition.cpp
	src/core/qgsexpression.cpp
	src/core/qgspallabeling.cpp
	src/core/qgsvectorlayer.cpp
	src/core/qgsvectorlayer.h
	src/core/qgsvectorlayerimport.cpp
	src/mapserver/qgsprojectparser.cpp
	src/mapserver/qgswfsserver.cpp
	src/mapserver/qgswfsserver.h
	src/mapserver/qgswmsserver.cpp
	src/providers/postgres/qgspostgresprovider.cpp
	src/providers/spatialite/qgsspatialiteprovider.h
	tests/src/core/testqgsexpression.cpp
	tests/src/python/test_qgsmemoryprovider.py 
						
						
					 
					
						2012-12-18 01:35:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radim Blazek 
							
						 
					 
					
						
						
						
						
							
						
						
							76115ec886 
							
						 
					 
					
						
						
							
							Raster statistics and histogram moved from QgsRasterDataProvider to QgsRasterInterface  
						
						 
						
						
						
						
					 
					
						2012-12-17 18:29:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radim Blazek 
							
						 
					 
					
						
						
						
						
							
						
						
							d435bfc876 
							
						 
					 
					
						
						
							
							QgsRasterBlock::DataType moved to QGis::DataType  
						
						 
						
						
						
						
					 
					
						2012-12-17 14:04:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Sutton 
							
						 
					 
					
						
						
						
						
							
						
						
							cd74d71a1d 
							
						 
					 
					
						
						
							
							Transfer ownership of transparency to prevent crashing python apps.  
						
						 
						
						
						
						
					 
					
						2012-12-06 12:52:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radim Blazek 
							
						 
					 
					
						
						
						
						
							
						
						
							a8934a28f7 
							
						 
					 
					
						
						
							
							invert raster colors better  
						
						 
						
						
						
						
					 
					
						2012-10-27 21:32:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radim Blazek 
							
						 
					 
					
						
						
						
						
							
						
						
							e210a57101 
							
						 
					 
					
						
						
							
							QgsError for better error propagation to user, started using for rasters  
						
						 
						
						
						
						
					 
					
						2012-10-24 13:59:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Martin Dobias 
							
						 
					 
					
						
						
						
						
							
						
						
							51122d263a 
							
						 
					 
					
						
						
							
							Store attributes and fields in vectors instead of maps  
						
						 
						
						
						
						
					 
					
						2012-10-20 22:19:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marco Hugentobler 
							
						 
					 
					
						
						
						
						
							
						
						
							d6b155f74c 
							
						 
					 
					
						
						
							
							Add const  
						
						 
						
						
						
						
					 
					
						2012-10-20 00:56:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radim Blazek 
							
						 
					 
					
						
						
						
						
							
						
						
							b5412cbf95 
							
						 
					 
					
						
						
							
							raster identify sip fix  
						
						 
						
						
						
						
					 
					
						2012-10-18 22:42:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radim Blazek 
							
						 
					 
					
						
						
						
						
							
						
						
							df85492c40 
							
						 
					 
					
						
						
							
							raster identify context, QVariant values, enables wcs caching and makes wms more robust  
						
						 
						
						
						
						
					 
					
						2012-10-17 14:51:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radim Blazek 
							
						 
					 
					
						
						
						
						
							
						
						
							5a6401c983 
							
						 
					 
					
						
						
							
							VSI/CPLMalloc/Free replaced by QgsMalloc/Free where feasible  
						
						 
						
						
						
						
					 
					
						2012-10-16 11:10:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radim Blazek 
							
						 
					 
					
						
						
						
						
							
						
						
							6b55ee4fa0 
							
						 
					 
					
						
						
							
							undersampling if possible in QgsRasterDataProvider, multicolor widget loadMinMax fix  
						
						 
						
						
						
						
					 
					
						2012-10-16 10:34:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Radim Blazek 
							
						 
					 
					
						
						
						
						
							
						
						
							7cb523a26f 
							
						 
					 
					
						
						
							
							+ QgsRasterBlock  
						
						 
						
						
						
						
					 
					
						2012-10-11 16:12:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							9fb31117cb 
							
						 
					 
					
						
						
							
							sip updates  
						
						 
						
						
						
						
					 
					
						2012-10-06 11:22:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							3c525fdf30 
							
						 
					 
					
						
						
							
							python fixes:  
						
						 
						
						... 
						
						
						
						- update sip bindings (including QgsRasterPipe and QgsOWSSourceSelect)
- helpConsole: show icons from resources 
						
						
					 
					
						2012-10-05 21:56:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							14cad93bae 
							
						 
					 
					
						
						
							
							setup sip dependencies  
						
						 
						
						
						
						
					 
					
						2012-10-04 13:15:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Etienne Tourigny 
							
						 
					 
					
						
						
						
						
							
						
						
							777ce59420 
							
						 
					 
					
						
						
							
							replace QgsRasterLayer::thumbnailAsPixmap() with previewAsPixmap() : return QPixmap and add size and background color parameters ; remove QgsRasterLayer::thumbnailAsImage() as it's not used  
						
						 
						
						
						
						
					 
					
						2012-10-04 01:45:27 -03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							c918952c74 
							
						 
					 
					
						
						
							
							more sip fixes  
						
						 
						
						
						
						
					 
					
						2012-09-26 18:46:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							eef8627663 
							
						 
					 
					
						
						
							
							more sip fixes  
						
						 
						
						
						
						
					 
					
						2012-09-24 22:40:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juergen E. Fischer 
							
						 
					 
					
						
						
						
						
							
						
						
							f3cb57b1eb 
							
						 
					 
					
						
						
							
							SIP bindings update:  
						
						 
						
						... 
						
						
						
						- update methods of existing classes
- add comment to methods missing in the sip bindings
- split up collective sip files into single files and use
  same directory structure in python/ as in src/
- add a lot of missing classes (some might not make sense because of
  missing python methods in those classes)
- remove some non-existing methods from the header files
- add scripts/sipdiff
- replace some usages of std::vector and std::set with QVector/QSet 
						
						
					 
					
						2012-09-24 02:42:57 +02:00