sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated version of QGIS when the new function were added to 1.4

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@12140 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
wonder 2009-11-16 11:53:50 +00:00
parent 961742e243
commit 55c3c7bcc7
8 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/core/qgsapplication.sip
View File

@ -156,10 +156,10 @@ static void qtgui_UpdatePyArgv(PyObject *argvlist, int argc, char **argv)
//! @note deprecated //! @note deprecated
static const QString svgPath(); 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(); 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(); static const QString defaultStyleV2Path();
//! Returns the path to the application prefix directory. //! Returns the path to the application prefix directory.

6
python/core/qgsmaplayer.sip
View File

@ -145,13 +145,13 @@ public:
bool writeXML(QDomNode & layer_node, QDomDocument & document) const; 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. /** 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 ); 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. /** 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; 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. /** 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 ); void removeCustomProperty( const QString& key );
/** Read the symbology for the current layer from the Dom node supplied. /** Read the symbology for the current layer from the Dom node supplied.

2
python/core/qgsrenderer.sip
View File

@ -52,7 +52,7 @@ class QgsRenderer
virtual QgsRenderer* clone() const=0; virtual QgsRenderer* clone() const=0;
/** Change selection color */ /** Change selection color */
static void setSelectionColor(QColor color); static void setSelectionColor(QColor color);
/** Get selection color */ /** Get selection color. Added in QGIS v1.4 */
static QColor selectionColor(); static QColor selectionColor();
/**Returns true if this renderer returns a pixmap in the render method (e.g. for point data or diagrams)*/ /**Returns true if this renderer returns a pixmap in the render method (e.g. for point data or diagrams)*/
virtual bool containsPixmap() const; virtual bool containsPixmap() const;

10
python/core/qgsvectorlayer.sip
View File

@ -101,16 +101,18 @@ public:
/** Sets the renderer. If a renderer is already present, it is deleted */ /** Sets the renderer. If a renderer is already present, it is deleted */
void setRenderer(QgsRenderer * r /Transfer/); void setRenderer(QgsRenderer * r /Transfer/);
/** Return renderer V2. Added in QGIS 1.2 */ /** Return renderer V2. Added in QGIS 1.4 */
QgsFeatureRendererV2* rendererV2(); QgsFeatureRendererV2* rendererV2();
/** Set renderer V2. Added in QGIS 1.2 */ /** Set renderer V2. Added in QGIS 1.4 */
void setRendererV2(QgsFeatureRendererV2* r); 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(); 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); void setUsingRendererV2(bool usingRendererV2);
/** Draw layer with renderer V2. Added in QGIS 1.4 */
void drawRendererV2( QgsRenderContext& rendererContext, bool labeling ); 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 ); void drawRendererV2Levels( QgsRenderContext& rendererContext, bool labeling );
/** Returns point, line or polygon */ /** Returns point, line or polygon */

4
src/core/qgsapplication.h
View File

@ -127,10 +127,10 @@ class CORE_EXPORT QgsApplication: public QApplication
//! Returns the path to the default theme directory. //! Returns the path to the default theme directory.
static const QString defaultThemePath(); 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(); 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(); static const QString defaultStyleV2Path();
//! Alters prefix path - used by 3rd party apps //! Alters prefix path - used by 3rd party apps

10
src/core/qgsmaplayer.h
View File

@ -162,13 +162,13 @@ class CORE_EXPORT QgsMapLayer : public QObject
bool writeXML( QDomNode & layer_node, QDomDocument & document ); bool writeXML( QDomNode & layer_node, QDomDocument & document );
/** Set a custom property for layer. Properties are stored in a map and saved in project file. /** 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 ); 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. /** 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; 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. /** 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 ); void removeCustomProperty( const QString& key );
/** Copies the symbology settings from another layer. Returns true in case of success */ /** Copies the symbology settings from another layer. Returns true in case of success */
@ -348,10 +348,10 @@ class CORE_EXPORT QgsMapLayer : public QObject
virtual bool writeXml( QDomNode & layer_node, QDomDocument & document ); 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 ); 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 ); void writeCustomProperties( QDomNode & layerNode, QDomDocument & doc );
/** debugging member - invoked when a connect() is made to this object */ /** debugging member - invoked when a connect() is made to this object */

11
src/core/qgsvectorlayer.h
View File

@ -177,16 +177,18 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
/** Sets the renderer. If a renderer is already present, it is deleted */ /** Sets the renderer. If a renderer is already present, it is deleted */
void setRenderer( QgsRenderer * r ); void setRenderer( QgsRenderer * r );
/** Return renderer V2. Added in QGIS 1.2 */ /** Return renderer V2. Added in QGIS 1.4 */
QgsFeatureRendererV2* rendererV2(); QgsFeatureRendererV2* rendererV2();
/** Set renderer V2. Added in QGIS 1.2 */ /** Set renderer V2. Added in QGIS 1.4 */
void setRendererV2(QgsFeatureRendererV2* r); 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(); 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); void setUsingRendererV2(bool usingRendererV2);
/** Draw layer with renderer V2. Added in QGIS 1.4 */
void drawRendererV2( QgsRenderContext& rendererContext, bool labeling ); 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 ); void drawRendererV2Levels( QgsRenderContext& rendererContext, bool labeling );
/** Returns point, line or polygon */ /** Returns point, line or polygon */
@ -359,6 +361,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
/** Label is on */ /** Label is on */
bool hasLabelsEnabled( void ) const; bool hasLabelsEnabled( void ) const;
/** Assign a custom labeling engine with layer. Added in v1.4 */
void setLabelingEngine(QgsLabelingEngineInterface* engine); void setLabelingEngine(QgsLabelingEngineInterface* engine);
/** Returns true if the provider is in editing mode */ /** Returns true if the provider is in editing mode */

2
src/core/renderer/qgsrenderer.h
View File

@ -101,7 +101,7 @@ class CORE_EXPORT QgsRenderer
virtual QgsRenderer* clone() const = 0; virtual QgsRenderer* clone() const = 0;
/** Change selection color */ /** Change selection color */
static void setSelectionColor( QColor color ); static void setSelectionColor( QColor color );
/** Get selection color */ /** Get selection color. Added in QGIS v1.4 */
static QColor selectionColor(); static QColor selectionColor();
/**Returns true if this renderer returns a pixmap in the render method (e.g. for point data or diagrams)*/ /**Returns true if this renderer returns a pixmap in the render method (e.g. for point data or diagrams)*/
virtual bool containsPixmap() const; virtual bool containsPixmap() const;