Skip to content

Commit dc8ac45

Browse files
jef-njef-n
committed
[FEATURE] allow adding of sql queries with SelectAtId=false
- sync sip bindings of QGis, QgsApplication, QgsDataSourceURI and QgsPoint with C++
1 parent 5988a9c commit dc8ac45

File tree

11 files changed

+418
-320
lines changed

11 files changed

+418
-320
lines changed

‎python/core/qgis.sip

+125-113
Original file line numberDiff line numberDiff line change
@@ -24,120 +24,132 @@ class QGis
2424
#include <qgis.h>
2525
%End
2626

27-
public:
28-
// Version constants
29-
//
30-
// Version string
31-
static const char* QGIS_VERSION;
32-
// Version number used for comparing versions using the "Check QGIS Version" function
33-
static const int QGIS_VERSION_INT;
34-
// Release name
35-
static const char* QGIS_RELEASE_NAME;
36-
// The subversion version
37-
static const char* QGIS_DEV_VERSION;
38-
39-
// Enumerations
40-
//
41-
42-
//! Used for symbology operations
43-
// Feature types
44-
enum WkbType
45-
{
46-
WKBPoint = 1,
47-
WKBLineString,
48-
WKBPolygon,
49-
WKBMultiPoint,
50-
WKBMultiLineString,
51-
WKBMultiPolygon,
52-
WKBUnknown,
53-
WKBPoint25D = 0x80000001,
54-
WKBLineString25D,
55-
WKBPolygon25D,
56-
WKBMultiPoint25D,
57-
WKBMultiLineString25D,
58-
WKBMultiPolygon25D
59-
};
60-
enum GeometryType
61-
{
62-
Point,
63-
Line,
64-
Polygon,
65-
UnknownGeometry
66-
};
67-
68-
// TODO:
69-
//static const char *qgisVectorGeometryType[];
70-
//! description strings for feature types
71-
//static const char *qgisFeatureTypes[];
72-
73-
/** Map units that qgis supports
74-
* @note that QGIS < 1.4 api had only Meters, Feet, Degrees and UnknownUnit
75-
* @note that QGIS > 1.8 api returns to that
76-
*/
77-
enum UnitType
78-
{
79-
Meters = 0,
80-
Feet = 1,
81-
Degrees = 2,
82-
UnknownUnit = 3,
83-
84-
// for [1.4;1.8] api backwards compatibility
85-
DecimalDegrees = 2,
86-
DegreesMinutesSeconds = 2,
87-
DegreesDecimalMinutes = 2,
88-
};
89-
90-
//! User defined event types
91-
enum UserEvent
92-
{
93-
// These first two are useful for threads to alert their parent data providers
94-
95-
//! The extents have been calculated by a provider of a layer
96-
ProviderExtentCalcEvent = QgisEvent,
97-
98-
//! The row count has been calculated by a provider of a layer
99-
ProviderCountCalcEvent
100-
};
101-
102-
static const int DEFAULT_IDENTIFY_RADIUS;
27+
public:
28+
// Version constants
29+
//
30+
// Version string
31+
static const char* QGIS_VERSION;
32+
// Version number used for comparing versions using the "Check QGIS Version" function
33+
static const int QGIS_VERSION_INT;
34+
// Release name
35+
static const char* QGIS_RELEASE_NAME;
36+
// The development version
37+
static const char* QGIS_DEV_VERSION;
38+
39+
// Enumerations
40+
//
41+
42+
//! Used for symbology operations
43+
// Feature types
44+
enum WkbType
45+
{
46+
WKBUnknown = 0,
47+
WKBPoint = 1,
48+
WKBLineString,
49+
WKBPolygon,
50+
WKBMultiPoint,
51+
WKBMultiLineString,
52+
WKBMultiPolygon,
53+
WKBNoGeometry = 100, //attributes only
54+
WKBPoint25D = 0x80000001,
55+
WKBLineString25D,
56+
WKBPolygon25D,
57+
WKBMultiPoint25D,
58+
WKBMultiLineString25D,
59+
WKBMultiPolygon25D,
60+
};
61+
62+
enum GeometryType
63+
{
64+
Point,
65+
Line,
66+
Polygon,
67+
UnknownGeometry,
68+
NoGeometry
69+
};
70+
71+
// TODO: String representation of geometry types (set in qgis.cpp)
72+
// static const char *qgisVectorGeometryType[];
73+
74+
//! description strings for feature types
75+
// static const char *qgisFeatureTypes[];
76+
77+
/** Map units that qgis supports
78+
* @note that QGIS < 1.4 api had only Meters, Feet, Degrees and UnknownUnit
79+
* @note and QGIS >1.8 returns to that
80+
*/
81+
enum UnitType
82+
{
83+
Meters = 0,
84+
Feet = 1,
85+
Degrees = 2, //for 1.0 api backwards compatibility
86+
UnknownUnit = 3,
87+
88+
// for [1.4;1.8] api compatibility
89+
DecimalDegrees = 2, // was 2
90+
DegreesMinutesSeconds = 2, // was 4
91+
DegreesDecimalMinutes = 2, // was 5
92+
};
93+
94+
//! User defined event types
95+
enum UserEvent
96+
{
97+
// These first two are useful for threads to alert their parent data providers
98+
99+
//! The extents have been calculated by a provider of a layer
100+
ProviderExtentCalcEvent = QgisEvent,
101+
102+
//! The row count has been calculated by a provider of a layer
103+
ProviderCountCalcEvent
104+
};
105+
106+
static const double DEFAULT_IDENTIFY_RADIUS;
103107
};
104108

105109

106-
/** Wkt string that represents a geographic coord sys
107-
* @note added in 1.8 to replace GEOWkt
108-
*/
109-
const QString GEOWKT;
110-
/** Wkt string that represents a geographic coord sys
111-
* @note deprecated in 1.8 due to violation of coding conventions (globals
112-
* should be in all caps).
113-
*/
114-
const QString GEOWkt /Deprecated/;
115-
116-
/** PROJ4 string that represents a geographic coord sys */
117-
const QString GEOPROJ4;
118-
/** Magic number for a geographic coord sys in POSTGIS SRID */
119-
const long GEOSRID;
120-
/** Magic number for a geographic coord sys in QGIS srs.db tbl_srs.srs_id */
121-
const long GEOCRS_ID;
122-
/** Magic number for a geographic coord sys in EpsgCrsId ID format */
123-
const long GEO_EPSG_CRS_ID;
124-
/** The length of teh string "+proj=" */
125-
const int PROJ_PREFIX_LEN;
126-
/** The length of teh string "+ellps=" */
127-
const int ELLPS_PREFIX_LEN;
128-
/** The length of the string "+lat_1=" */
129-
const int LAT_PREFIX_LEN;
130-
/** Magick number that determins whether a projection srsid is a system (srs.db)
131-
* or user (~/.qgis.qgis.db) defined projection. */
132-
const int USER_CRS_START_ID;
133-
134-
//
135-
// Constants for point symbols
136-
//
137-
138-
/** Magic number that determines the minimum allowable point size for point symbols */
139-
const float MINIMUM_POINT_SIZE;
140-
/** Magic number that determines the minimum allowable point size for point symbols */
141-
const float DEFAULT_POINT_SIZE;
142-
const double DEFAULT_LINE_WIDTH;
110+
/** Wkt string that represents a geographic coord sys
111+
* @note added in 1.8 to replace GEOWkt
112+
*/
113+
const QString GEOWKT;
114+
115+
/** Wkt string that represents a geographic coord sys
116+
* @note deprecated in 1.8 due to violation of coding conventions (globals
117+
* should be in all caps).
118+
*/
119+
const QString GEOWkt /Deprecated/;
120+
121+
const QString PROJECT_SCALES;
122+
123+
/** PROJ4 string that represents a geographic coord sys */
124+
const QString GEOPROJ4;
125+
/** Magic number for a geographic coord sys in POSTGIS SRID */
126+
const long GEOSRID;
127+
/** Magic number for a geographic coord sys in QGIS srs.db tbl_srs.srs_id */
128+
const long GEOCRS_ID;
129+
/** Magic number for a geographic coord sys in EpsgCrsId ID format */
130+
const long GEO_EPSG_CRS_ID;
131+
/** Geographic coord sys from EPSG authority */
132+
const QString GEO_EPSG_CRS_AUTHID;
133+
/** The length of the string "+proj=" */
134+
const int PROJ_PREFIX_LEN;
135+
/** The length of the string "+ellps=" */
136+
const int ELLPS_PREFIX_LEN;
137+
/** The length of the string "+lat_1=" */
138+
const int LAT_PREFIX_LEN;
139+
/** Magick number that determines whether a projection crsid is a system (srs.db)
140+
* or user (~/.qgis.qgis.db) defined projection. */
141+
const int USER_CRS_START_ID;
142+
143+
//
144+
// Constants for point symbols
145+
//
146+
147+
/** Magic number that determines the minimum allowable point size for point symbols */
148+
const double MINIMUM_POINT_SIZE;
149+
/** Magic number that determines the default point size for point symbols */
150+
const double DEFAULT_POINT_SIZE;
151+
const double DEFAULT_LINE_WIDTH;
152+
153+
/** default snapping tolerance for segments (@note added in 1.8) */
154+
const double DEFAULT_SEGMENT_EPSILON;
143155

0 commit comments

Comments
 (0)