sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
23,262 Commits 80 Branches 277 Tags
Commit Graph

28 Commits

Author SHA1 Message Date
Juergen E. Fischer
c4c131ef75 sip sync 2014-05-27 23:32:42 +02: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
Juergen E. Fischer
d647354a52 sip fixes 2014-01-28 00:26:13 +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
Nathan Woodrow
2cd89388b6 Use const pointer for QgsExpression:replaceExpressionText() 2013-10-10 13:37:53 +10:00
Matthias Kuhn
75896d922d QgsExpression takes const QgsFeature as pointer and by reference 2013-05-22 17:01:55 +02:00
Martin Dobias
b513674fa8 Moved expression to OGC filter code to QgsOgcUtils 2013-03-15 00:44:32 +01:00
Martin Dobias
16ec226d97 Moved visitor-based expression -> OGC filter code to QgsOgcUtils 2013-03-15 00:44:31 +01:00
Martin Dobias
837ac4de5c Moved creation of expression from OGC filter to QgsOgcUtils 2013-03-15 00:44:31 +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
Magnus Homann
e063c237d0 Update from master 2012-11-23 21:01:04 +01:00
Nathan Woodrow
a7699e2696 [FEATURE] Add ability to create user defined Python (and C++) expression functions 2012-11-10 11:20:26 +10:00
Martin Dobias
51122d263a Store attributes and fields in vectors instead of maps 2012-10-20 22:19:55 +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
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
Hugo Mercier
ff6b04b672 Fix QgsExpression SIP 2012-09-27 11:06:03 +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
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
Magnus Homann
6b26c4a9f8 Made qgsexpression be DA-aware 2012-09-04 12:10:03 +02:00
Nathan Woodrow
a61a15bb1e Move expression text replace to QgsExpression 
- Update actions, html map tips, and annotations
 2012-09-02 22:46:19 +10:00
Nathan Woodrow
c467e79f3c Add expression functions for handling date/time: 
- year,month,day,hour,minute,second extraction
    - new QgsInterval objects - handles time amounts
    - age() function returns the difference between two  datetimes
    - $now returns the current date and time
    - support for datetime - interval = new datetime
    - tointerval, todate, totime functions
    - tests ;)
 2012-06-30 20:40:54 +10:00
Martin Dobias
bf86521d49 Fixes for refinement of rules. 
- quoting of columns (#5536 and #5542)
- quoting of string
- do not quote of numbers (avoids type cast during evaluation)
- use at least 4 floating point digits for doubles
 2012-06-02 00:08:26 +02:00
Martin Dobias
c8bb12f7bb Expressions - conditional expressions (CASE) 
Right now only without "base" expression:
CASE WHEN cond1 THEN exp1 [WHEN cond2 THEN exp2]* [ELSE exp3] END
 2012-01-07 01:20:03 +01:00
Martin Dobias
06e3c725bc Expressions: support for visitor pattern, expresion->OGCFilter now a visitor 2012-01-06 20:54:51 +01:00
Martin Dobias
98a1c233af Added python bindings for QgsExpression 2011-08-09 20:48:13 +02:00