Skip to content

Commit 55c3c7b

Browse files
author
wonder
committedNov 16, 2009
Updated version of QGIS when the new function were added to 1.4
git-svn-id: http://svn.osgeo.org/qgis/trunk@12140 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 961742e commit 55c3c7b

File tree

8 files changed

+27
-22
lines changed

8 files changed

+27
-22
lines changed
 

‎python/core/qgsapplication.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,10 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
156156
//! @note deprecated
157157
static const QString svgPath();
158158

159-
//! Returns the path to user's style. Added in QGIS 1.2
159+
//! Returns the path to user's style. Added in QGIS 1.4
160160
static const QString userStyleV2Path();
161161

162-
//! Returns the path to default style (works as a starting point). Added in QGIS 1.2
162+
//! Returns the path to default style (works as a starting point). Added in QGIS 1.4
163163
static const QString defaultStyleV2Path();
164164

165165
//! Returns the path to the application prefix directory.

‎python/core/qgsmaplayer.sip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,13 +145,13 @@ public:
145145
bool writeXML(QDomNode & layer_node, QDomDocument & document) const;
146146

147147
/** Set a custom property for layer. Properties are stored in a map and saved in project file.
148-
* @note Added in v1.3 */
148+
* @note Added in v1.4 */
149149
void setCustomProperty( const QString& key, const QVariant& value );
150150
/** Read a custom property from layer. Properties are stored in a map and saved in project file.
151-
* @note Added in v1.3 */
151+
* @note Added in v1.4 */
152152
QVariant customProperty( const QString& value, const QVariant& defaultValue = QVariant() ) const;
153153
/** Remove a custom property from layer. Properties are stored in a map and saved in project file.
154-
* @note Added in v1.3 */
154+
* @note Added in v1.4 */
155155
void removeCustomProperty( const QString& key );
156156

157157
/** Read the symbology for the current layer from the Dom node supplied.

‎python/core/qgsrenderer.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class QgsRenderer
5252
virtual QgsRenderer* clone() const=0;
5353
/** Change selection color */
5454
static void setSelectionColor(QColor color);
55-
/** Get selection color */
55+
/** Get selection color. Added in QGIS v1.4 */
5656
static QColor selectionColor();
5757
/**Returns true if this renderer returns a pixmap in the render method (e.g. for point data or diagrams)*/
5858
virtual bool containsPixmap() const;

‎python/core/qgsvectorlayer.sip

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,18 @@ public:
101101
/** Sets the renderer. If a renderer is already present, it is deleted */
102102
void setRenderer(QgsRenderer * r /Transfer/);
103103

104-
/** Return renderer V2. Added in QGIS 1.2 */
104+
/** Return renderer V2. Added in QGIS 1.4 */
105105
QgsFeatureRendererV2* rendererV2();
106-
/** Set renderer V2. Added in QGIS 1.2 */
106+
/** Set renderer V2. Added in QGIS 1.4 */
107107
void setRendererV2(QgsFeatureRendererV2* r);
108-
/** Return whether using renderer V2. Added in QGIS 1.2 */
108+
/** Return whether using renderer V2. Added in QGIS 1.4 */
109109
bool isUsingRendererV2();
110-
/** set whether to use renderer V2 for drawing. Added in QGIS 1.2 */
110+
/** set whether to use renderer V2 for drawing. Added in QGIS 1.4 */
111111
void setUsingRendererV2(bool usingRendererV2);
112112

113+
/** Draw layer with renderer V2. Added in QGIS 1.4 */
113114
void drawRendererV2( QgsRenderContext& rendererContext, bool labeling );
115+
/** Draw layer with renderer V2 using symbol levels. Added in QGIS 1.4 */
114116
void drawRendererV2Levels( QgsRenderContext& rendererContext, bool labeling );
115117

116118
/** Returns point, line or polygon */

‎src/core/qgsapplication.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ class CORE_EXPORT QgsApplication: public QApplication
127127
//! Returns the path to the default theme directory.
128128
static const QString defaultThemePath();
129129

130-
//! Returns the path to user's style. Added in QGIS 1.2
130+
//! Returns the path to user's style. Added in QGIS 1.4
131131
static const QString userStyleV2Path();
132132

133-
//! Returns the path to default style (works as a starting point). Added in QGIS 1.2
133+
//! Returns the path to default style (works as a starting point). Added in QGIS 1.4
134134
static const QString defaultStyleV2Path();
135135

136136
//! Alters prefix path - used by 3rd party apps

‎src/core/qgsmaplayer.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ class CORE_EXPORT QgsMapLayer : public QObject
162162
bool writeXML( QDomNode & layer_node, QDomDocument & document );
163163

164164
/** Set a custom property for layer. Properties are stored in a map and saved in project file.
165-
* @note Added in v1.3 */
165+
* @note Added in v1.4 */
166166
void setCustomProperty( const QString& key, const QVariant& value );
167167
/** Read a custom property from layer. Properties are stored in a map and saved in project file.
168-
* @note Added in v1.3 */
168+
* @note Added in v1.4 */
169169
QVariant customProperty( const QString& value, const QVariant& defaultValue = QVariant() ) const;
170170
/** Remove a custom property from layer. Properties are stored in a map and saved in project file.
171-
* @note Added in v1.3 */
171+
* @note Added in v1.4 */
172172
void removeCustomProperty( const QString& key );
173173

174174
/** Copies the symbology settings from another layer. Returns true in case of success */
@@ -348,10 +348,10 @@ class CORE_EXPORT QgsMapLayer : public QObject
348348
virtual bool writeXml( QDomNode & layer_node, QDomDocument & document );
349349

350350

351-
/** Read custom properties from project file. Added in v1.3 */
351+
/** Read custom properties from project file. Added in v1.4 */
352352
void readCustomProperties( QDomNode & layerNode );
353353

354-
/** Write custom properties to project file. Added in v1.3 */
354+
/** Write custom properties to project file. Added in v1.4 */
355355
void writeCustomProperties( QDomNode & layerNode, QDomDocument & doc );
356356

357357
/** debugging member - invoked when a connect() is made to this object */

‎src/core/qgsvectorlayer.h

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,16 +177,18 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
177177
/** Sets the renderer. If a renderer is already present, it is deleted */
178178
void setRenderer( QgsRenderer * r );
179179

180-
/** Return renderer V2. Added in QGIS 1.2 */
180+
/** Return renderer V2. Added in QGIS 1.4 */
181181
QgsFeatureRendererV2* rendererV2();
182-
/** Set renderer V2. Added in QGIS 1.2 */
182+
/** Set renderer V2. Added in QGIS 1.4 */
183183
void setRendererV2(QgsFeatureRendererV2* r);
184-
/** Return whether using renderer V2. Added in QGIS 1.2 */
184+
/** Return whether using renderer V2. Added in QGIS 1.4 */
185185
bool isUsingRendererV2();
186-
/** set whether to use renderer V2 for drawing. Added in QGIS 1.2 */
186+
/** set whether to use renderer V2 for drawing. Added in QGIS 1.4 */
187187
void setUsingRendererV2(bool usingRendererV2);
188188

189+
/** Draw layer with renderer V2. Added in QGIS 1.4 */
189190
void drawRendererV2( QgsRenderContext& rendererContext, bool labeling );
191+
/** Draw layer with renderer V2 using symbol levels. Added in QGIS 1.4 */
190192
void drawRendererV2Levels( QgsRenderContext& rendererContext, bool labeling );
191193

192194
/** Returns point, line or polygon */
@@ -359,6 +361,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
359361
/** Label is on */
360362
bool hasLabelsEnabled( void ) const;
361363

364+
/** Assign a custom labeling engine with layer. Added in v1.4 */
362365
void setLabelingEngine(QgsLabelingEngineInterface* engine);
363366

364367
/** Returns true if the provider is in editing mode */

‎src/core/renderer/qgsrenderer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class CORE_EXPORT QgsRenderer
101101
virtual QgsRenderer* clone() const = 0;
102102
/** Change selection color */
103103
static void setSelectionColor( QColor color );
104-
/** Get selection color */
104+
/** Get selection color. Added in QGIS v1.4 */
105105
static QColor selectionColor();
106106
/**Returns true if this renderer returns a pixmap in the render method (e.g. for point data or diagrams)*/
107107
virtual bool containsPixmap() const;

0 commit comments

Comments
 (0)
Please sign in to comment.