[QGIS Commit] r12140 - in trunk/qgis: python/core src/core
src/core/renderer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Mon Nov 16 06:53:52 EST 2009
Author: wonder
Date: 2009-11-16 06:53:50 -0500 (Mon, 16 Nov 2009)
New Revision: 12140
Modified:
trunk/qgis/python/core/qgsapplication.sip
trunk/qgis/python/core/qgsmaplayer.sip
trunk/qgis/python/core/qgsrenderer.sip
trunk/qgis/python/core/qgsvectorlayer.sip
trunk/qgis/src/core/qgsapplication.h
trunk/qgis/src/core/qgsmaplayer.h
trunk/qgis/src/core/qgsvectorlayer.h
trunk/qgis/src/core/renderer/qgsrenderer.h
Log:
Updated version of QGIS when the new function were added to 1.4
Modified: trunk/qgis/python/core/qgsapplication.sip
===================================================================
--- trunk/qgis/python/core/qgsapplication.sip 2009-11-16 10:36:24 UTC (rev 12139)
+++ trunk/qgis/python/core/qgsapplication.sip 2009-11-16 11:53:50 UTC (rev 12140)
@@ -156,10 +156,10 @@
//! @note deprecated
static const QString svgPath();
- //! Returns the path to user's style. Added in QGIS 1.2
+ //! Returns the path to user's style. Added in QGIS 1.4
static const QString userStyleV2Path();
- //! Returns the path to default style (works as a starting point). Added in QGIS 1.2
+ //! Returns the path to default style (works as a starting point). Added in QGIS 1.4
static const QString defaultStyleV2Path();
//! Returns the path to the application prefix directory.
Modified: trunk/qgis/python/core/qgsmaplayer.sip
===================================================================
--- trunk/qgis/python/core/qgsmaplayer.sip 2009-11-16 10:36:24 UTC (rev 12139)
+++ trunk/qgis/python/core/qgsmaplayer.sip 2009-11-16 11:53:50 UTC (rev 12140)
@@ -145,13 +145,13 @@
bool writeXML(QDomNode & layer_node, QDomDocument & document) const;
/** Set a custom property for layer. Properties are stored in a map and saved in project file.
- * @note Added in v1.3 */
+ * @note Added in v1.4 */
void setCustomProperty( const QString& key, const QVariant& value );
/** Read a custom property from layer. Properties are stored in a map and saved in project file.
- * @note Added in v1.3 */
+ * @note Added in v1.4 */
QVariant customProperty( const QString& value, const QVariant& defaultValue = QVariant() ) const;
/** Remove a custom property from layer. Properties are stored in a map and saved in project file.
- * @note Added in v1.3 */
+ * @note Added in v1.4 */
void removeCustomProperty( const QString& key );
/** Read the symbology for the current layer from the Dom node supplied.
Modified: trunk/qgis/python/core/qgsrenderer.sip
===================================================================
--- trunk/qgis/python/core/qgsrenderer.sip 2009-11-16 10:36:24 UTC (rev 12139)
+++ trunk/qgis/python/core/qgsrenderer.sip 2009-11-16 11:53:50 UTC (rev 12140)
@@ -52,7 +52,7 @@
virtual QgsRenderer* clone() const=0;
/** Change selection color */
static void setSelectionColor(QColor color);
- /** Get selection color */
+ /** Get selection color. Added in QGIS v1.4 */
static QColor selectionColor();
/**Returns true if this renderer returns a pixmap in the render method (e.g. for point data or diagrams)*/
virtual bool containsPixmap() const;
Modified: trunk/qgis/python/core/qgsvectorlayer.sip
===================================================================
--- trunk/qgis/python/core/qgsvectorlayer.sip 2009-11-16 10:36:24 UTC (rev 12139)
+++ trunk/qgis/python/core/qgsvectorlayer.sip 2009-11-16 11:53:50 UTC (rev 12140)
@@ -101,16 +101,18 @@
/** Sets the renderer. If a renderer is already present, it is deleted */
void setRenderer(QgsRenderer * r /Transfer/);
- /** Return renderer V2. Added in QGIS 1.2 */
+ /** Return renderer V2. Added in QGIS 1.4 */
QgsFeatureRendererV2* rendererV2();
- /** Set renderer V2. Added in QGIS 1.2 */
+ /** Set renderer V2. Added in QGIS 1.4 */
void setRendererV2(QgsFeatureRendererV2* r);
- /** Return whether using renderer V2. Added in QGIS 1.2 */
+ /** Return whether using renderer V2. Added in QGIS 1.4 */
bool isUsingRendererV2();
- /** set whether to use renderer V2 for drawing. Added in QGIS 1.2 */
+ /** set whether to use renderer V2 for drawing. Added in QGIS 1.4 */
void setUsingRendererV2(bool usingRendererV2);
+ /** Draw layer with renderer V2. Added in QGIS 1.4 */
void drawRendererV2( QgsRenderContext& rendererContext, bool labeling );
+ /** Draw layer with renderer V2 using symbol levels. Added in QGIS 1.4 */
void drawRendererV2Levels( QgsRenderContext& rendererContext, bool labeling );
/** Returns point, line or polygon */
Modified: trunk/qgis/src/core/qgsapplication.h
===================================================================
--- trunk/qgis/src/core/qgsapplication.h 2009-11-16 10:36:24 UTC (rev 12139)
+++ trunk/qgis/src/core/qgsapplication.h 2009-11-16 11:53:50 UTC (rev 12140)
@@ -127,10 +127,10 @@
//! Returns the path to the default theme directory.
static const QString defaultThemePath();
- //! Returns the path to user's style. Added in QGIS 1.2
+ //! Returns the path to user's style. Added in QGIS 1.4
static const QString userStyleV2Path();
- //! Returns the path to default style (works as a starting point). Added in QGIS 1.2
+ //! Returns the path to default style (works as a starting point). Added in QGIS 1.4
static const QString defaultStyleV2Path();
//! Alters prefix path - used by 3rd party apps
Modified: trunk/qgis/src/core/qgsmaplayer.h
===================================================================
--- trunk/qgis/src/core/qgsmaplayer.h 2009-11-16 10:36:24 UTC (rev 12139)
+++ trunk/qgis/src/core/qgsmaplayer.h 2009-11-16 11:53:50 UTC (rev 12140)
@@ -162,13 +162,13 @@
bool writeXML( QDomNode & layer_node, QDomDocument & document );
/** Set a custom property for layer. Properties are stored in a map and saved in project file.
- * @note Added in v1.3 */
+ * @note Added in v1.4 */
void setCustomProperty( const QString& key, const QVariant& value );
/** Read a custom property from layer. Properties are stored in a map and saved in project file.
- * @note Added in v1.3 */
+ * @note Added in v1.4 */
QVariant customProperty( const QString& value, const QVariant& defaultValue = QVariant() ) const;
/** Remove a custom property from layer. Properties are stored in a map and saved in project file.
- * @note Added in v1.3 */
+ * @note Added in v1.4 */
void removeCustomProperty( const QString& key );
/** Copies the symbology settings from another layer. Returns true in case of success */
@@ -348,10 +348,10 @@
virtual bool writeXml( QDomNode & layer_node, QDomDocument & document );
- /** Read custom properties from project file. Added in v1.3 */
+ /** Read custom properties from project file. Added in v1.4 */
void readCustomProperties( QDomNode & layerNode );
- /** Write custom properties to project file. Added in v1.3 */
+ /** Write custom properties to project file. Added in v1.4 */
void writeCustomProperties( QDomNode & layerNode, QDomDocument & doc );
/** debugging member - invoked when a connect() is made to this object */
Modified: trunk/qgis/src/core/qgsvectorlayer.h
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.h 2009-11-16 10:36:24 UTC (rev 12139)
+++ trunk/qgis/src/core/qgsvectorlayer.h 2009-11-16 11:53:50 UTC (rev 12140)
@@ -177,16 +177,18 @@
/** Sets the renderer. If a renderer is already present, it is deleted */
void setRenderer( QgsRenderer * r );
- /** Return renderer V2. Added in QGIS 1.2 */
+ /** Return renderer V2. Added in QGIS 1.4 */
QgsFeatureRendererV2* rendererV2();
- /** Set renderer V2. Added in QGIS 1.2 */
+ /** Set renderer V2. Added in QGIS 1.4 */
void setRendererV2(QgsFeatureRendererV2* r);
- /** Return whether using renderer V2. Added in QGIS 1.2 */
+ /** Return whether using renderer V2. Added in QGIS 1.4 */
bool isUsingRendererV2();
- /** set whether to use renderer V2 for drawing. Added in QGIS 1.2 */
+ /** set whether to use renderer V2 for drawing. Added in QGIS 1.4 */
void setUsingRendererV2(bool usingRendererV2);
+ /** Draw layer with renderer V2. Added in QGIS 1.4 */
void drawRendererV2( QgsRenderContext& rendererContext, bool labeling );
+ /** Draw layer with renderer V2 using symbol levels. Added in QGIS 1.4 */
void drawRendererV2Levels( QgsRenderContext& rendererContext, bool labeling );
/** Returns point, line or polygon */
@@ -359,6 +361,7 @@
/** Label is on */
bool hasLabelsEnabled( void ) const;
+ /** Assign a custom labeling engine with layer. Added in v1.4 */
void setLabelingEngine(QgsLabelingEngineInterface* engine);
/** Returns true if the provider is in editing mode */
Modified: trunk/qgis/src/core/renderer/qgsrenderer.h
===================================================================
--- trunk/qgis/src/core/renderer/qgsrenderer.h 2009-11-16 10:36:24 UTC (rev 12139)
+++ trunk/qgis/src/core/renderer/qgsrenderer.h 2009-11-16 11:53:50 UTC (rev 12140)
@@ -101,7 +101,7 @@
virtual QgsRenderer* clone() const = 0;
/** Change selection color */
static void setSelectionColor( QColor color );
- /** Get selection color */
+ /** Get selection color. Added in QGIS v1.4 */
static QColor selectionColor();
/**Returns true if this renderer returns a pixmap in the render method (e.g. for point data or diagrams)*/
virtual bool containsPixmap() const;
More information about the QGIS-commit
mailing list