sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-06-04 00:04:19 -04:00
Code Issues Packages Projects Releases Wiki Activity
54,223 Commits 91 Branches 283 Tags
Commit Graph

5506 Commits

Author SHA1 Message Date
Hugo Mercier
d904da4ce1 Update of QgsAtlasComposition SIP (with Python unit tests as well) 2012-10-05 16:25:11 +02:00
Juergen E. Fischer
14cad93bae setup sip dependencies 2012-10-04 13:15:42 +02:00
Hugo Mercier
e4364f3615 Merge branch 'atlas' into atlas2 
Conflicts:
	python/core/composer/qgscomposition.sip
	tests/src/python/CMakeLists.txt
 2012-10-04 11:44:18 +02:00
Hugo Mercier
b5f736ad21 Revert "Resolved merge conflicts when reverting 686f632" 
This reverts commit a654e274a352ef29354de0bcb13e96444868c806.
 2012-10-04 11:19:04 +02:00
Hugo Mercier
45593bf4b5 Revert "Revert "Merge pull request #245 from Oslandia/atlas_integration"" 
This reverts commit 8a1953b9e710ea25dac502b32eab9e0e8d652b10.
 2012-10-04 11:18:17 +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
Radim Blazek
d2a54d525c wcs capabilities cache, fix extent verification 2012-10-03 23:45:37 +02:00
Juergen E. Fischer
8349d52015 indentation cleanup 2012-10-02 16:20:04 +02:00
Hugo Mercier
2aa566d316 Add/Fix SIP for QgsComposition, QgsComposerMap and QgsAtlasRendering 2012-10-02 14:27:42 +02:00
endmax
7f208338ae - QgsSymbolLayerV2 descendants missing from sip. 
QgsSymbolLayerV2 class has been modified to convert into SubClass as needed
- A test is provided for check subclasses binding and behaviour
- A fix has been done for src\core\symbology-ng\qgsellipsesymbollayerv2.cpp because of an error in createFromSld about fillColor

Signed-off-by: endmax <massimo.endrighi@geopartner.it>
 2012-10-02 13:18:00 +02:00
Tim Sutton
8a1953b9e7 Revert "Merge pull request #245 from Oslandia/atlas_integration" 
This reverts commit fe8385e7f5735507adf1acfcce81a399fa6bc6f5, reversing
changes made to 23352ce0d66855a4a9c403a81feaa1884415e45c.
 2012-10-01 11:04:04 +02:00
Tim Sutton
a654e274a3 Resolved merge conflicts when reverting 686f632 2012-10-01 11:03:48 +02:00
Juergen E. Fischer
4b263d6b06 and more sip fixes 2012-09-30 18:18:40 +02:00
Juergen E. Fischer
686f632f32 fix destruction of private members in atlas and add sip bindings (also adds 
CORE_EXPORT)
 2012-09-29 16:20:08 +02:00
Hugo Mercier
6e2320f26a Merge branch 'master' of https://github.com/qgis/Quantum-GIS into atlas 
Conflicts:
	src/core/composer/qgscomposition.cpp
 2012-09-28 15:46:13 +02:00
Hugo Mercier
ff6b04b672 Fix QgsExpression SIP 2012-09-27 11:06:03 +02:00
Juergen E. Fischer
c918952c74 more sip fixes 2012-09-26 18:46:52 +02:00
Juergen E. Fischer
71c5d4cff9 sip fixes 2012-09-26 17:56:27 +02:00
Hugo Mercier
ff41bec29b Merge branch 'master' of https://github.com/qgis/Quantum-GIS into atlas 
Conflicts:
	python/core/qgsexpression.sip

Add a missing function to QgsExpression
 2012-09-26 17:51:44 +02:00
Hugo Mercier
e70b1524f9 Update QgsExpression's SIP 2012-09-26 16:40:22 +02:00
Hugo Mercier
9a671f98a0 Add support for user-defined special columns in expressions 2012-09-26 16:39:18 +02:00
Juergen E. Fischer
b86453a390 typo fixes and german function help update 2012-09-26 09:01:07 +02:00
Juergen E. Fischer
4c97806d26 fix doxygen warnings 2012-09-25 21:29:32 +02:00
Juergen E. Fischer
ded943d77d update bindings 2012-09-25 14:28:06 +02:00
Juergen E. Fischer
eef8627663 more sip fixes 2012-09-24 22:40:24 +02:00
Juergen E. Fischer
60ab4b3290 fix typos 2012-09-24 22:40:24 +02:00
Tim Sutton
1d435a5938 Fix compilation error caused by numeric_limits::quiet_NaN not being passed a type 2012-09-24 19:20:22 +02:00
Tim Sutton
782484206a Transfer ownership of transparency 2012-09-24 19:01:52 +02:00
Juergen E. Fischer
74fd0e48ae more sip fixes: 
- also move enum StyleEntity in QgsStyleV2
- fix some warnings
 2012-09-24 18:43:20 +02:00
Alexander Bruy
cd97358263 fix SIP bindings 2012-09-24 16:56:59 +03:00
Juergen E. Fischer
86217d0a1a fix QgsSymbolLayerV2Metadata sip bindings 2012-09-24 14:31:05 +02:00
Tim Sutton
ffb7f1b17d Reinstate public qualifier for vector gradient colour ramp 2012-09-24 14:15:35 +02:00
Tim Sutton
ee515bd989 Reinstate symbol layer registry sip stuff 2012-09-24 12:49:47 +02:00
Tim Sutton
4f2d9dba9f Merge branch 'master' of github.com:qgis/Quantum-GIS 2012-09-24 10:47:35 +02:00
Juergen E. Fischer
34f542edef fix sip syntax error 2012-09-24 10:46:31 +02:00
Tim Sutton
5f79bcb16f Resolved merge conflicts with origin master 2012-09-24 10:03:06 +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
Tim Sutton
f7af2defa9 Merge branch 'master' of github.com:qgis/Quantum-GIS 2012-09-22 22:17:48 +02:00
Juergen E. Fischer
3e08931e40 update QgsDiagramRendererV2 sip bindings 2012-09-21 21:01:11 +02:00
Tim Sutton
6b878341f2 Fixes for fetching a CompositionHtml from a Composition 2012-09-21 15:36:30 +02:00
Tim Sutton
ad78d7b5d6 Merge branch 'master' of github.com:qgis/Quantum-GIS 2012-09-20 08:03:23 +02:00
Tim Sutton
8fd78059c9 Added bindings for getting an item by id and a composerhtml instance that belongs to an item. 2012-09-19 23:26:47 +02:00
Tim Sutton
11dead9a3a In progress support for retrieval of html composer and items by id from map composition. Also refactoring python composer tests. 2012-09-19 17:15:39 +02:00
Radim Blazek
212145d902 nodata per band, src nodata optional 2012-09-19 16:23:18 +02:00
Radim Blazek
9c6ebdd4ee fixes for QgsRasterInterface subclassing in Python 2012-09-18 21:02:16 +02:00
Juergen E. Fischer
aad3f4e5a1 add sip bindings to QgsCredentials 2012-09-17 12:41:29 +02:00
Juergen E. Fischer
0138c47e45 add more sip bindings: 
QgsCentroidFillSymbolLayerV2
QgsImageFillSymbolLayer
QgsLinePatternFillSymbolLayer
QgsPointPatternFillSymbolLayer
QgsSVGFillSymbolLayer
QgsSimpleFillSymbolLayerV2
 2012-09-17 00:18:34 +02:00
Juergen E. Fischer
8898e6b847 missed the new file 2012-09-16 20:40:18 +02:00
Juergen E. Fischer
d8675ba32a add sip bindings for QgsPalLabeling, QgsSimpleMarkerSymbolLayerV2, 
QgsSvgMarkerSymbolLayerV2, QgsFontMarkerSymbolLayerV2
 2012-09-16 20:21:37 +02:00
Magnus Homann
802ab85673 Fix stupid SIP error 2012-09-16 18:58:46 +02:00