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

Updated SIP-files after r11275 and r11276. Fix for #1220.

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@11277 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
homann 2009-08-05 16:43:33 +00:00
parent b477428510
commit b4f7e94235
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/qgscontinuouscolorrenderer.sip
View File

@ -12,7 +12,7 @@ class QgsContinuousColorRenderer : QgsRenderer
virtual ~QgsContinuousColorRenderer();
/**Renders the feature using the minimum and maximum value of the classification field
* added in 1.2 */
void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected);
void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected, double opacity = 1.0 );
/**Returns the number of the classification field*/
int classificationField() const;
/**Sets the id of the classification field*/

2
python/core/qgsgraduatedsymbolrenderer.sip
View File

@ -52,7 +52,7 @@ class QgsGraduatedSymbolRenderer : QgsRenderer
\param p a painter (usually the one from the current map canvas)
\param f a pointer to a feature to render
\param t the transform object containing the information how to transform the map coordinates to screen coordinates*/
void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected);
void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected, double opacity = 1.0 );
/**Sets the number of the classicifation field
\param field the number of the field to classify*/

4
python/core/qgsmarkercatalogue.sip
View File

@ -19,12 +19,12 @@ public:
/** Returns pixmap of the marker
* \param fullName full name, e.g. hard:circle, svg:/home/usr1/marker1.svg
*/
QImage imageMarker (QString fullName, int size, QPen pen, QBrush brush, bool qtBug = true );
QImage imageMarker (QString fullName, int size, QPen pen, QBrush brush, double opacity );
/** Returns qpicture of the marker
* \param fullName full name, e.g. hard:circle, svg:/home/usr1/marker1.svg
*/
QPicture pictureMarker (QString fullName, int size, QPen pen, QBrush brush, bool qtBug = true );
QPicture pictureMarker (QString fullName, int size, QPen pen, QBrush brush, double opacity );
/** Returns a pixmap given a file name of a svg marker
* NOTE: this method needs to be public static for QgsMarkerDialog::visualizeMarkers */

4
python/core/qgsrenderer.sip
View File

@ -29,7 +29,9 @@ class QgsRenderer
@param selected the feature is to be shown selected
added in 1.2 */
virtual void renderFeature(QgsRenderContext &renderContext, QgsFeature& f,QImage* pic, bool selected)=0;
void renderFeature( QgsRenderContext &renderContext, QgsFeature& f, QImage* pic, bool selected );
virtual void renderFeature( QgsRenderContext &renderContext, QgsFeature& f, QImage* pic, bool selected, double opacity ) = 0;
/**Reads the renderer configuration from an XML file
@param rnode the Dom node to read

2
python/core/qgssinglesymbolrenderer.sip
View File

@ -16,7 +16,7 @@ class QgsSingleSymbolRenderer : QgsRenderer
const QgsSymbol* symbol() const;
/**Renders a feature added in 1.2 */
void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected);
void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected, double opacity = 1.0 );
/**Reads the renderer configuration from an XML file
@param rnode the Dom node to read

3
python/core/qgssymbol.sip
View File

@ -77,7 +77,8 @@ class QgsSymbol
QColor selectionColor = Qt::yellow,
double scale = 1.0,
double rotation = 0.0,
double rasterScaleFactor = 1.0 );
double rasterScaleFactor = 1.0
double opacity = 1.0 );
/**Writes the contents of the symbol to a configuration file
@ return true in case of success*/

2
python/core/qgsuniquevaluerenderer.sip
View File

@ -14,7 +14,7 @@ class QgsUniqueValueRenderer : QgsRenderer
/* render feature
* added in 1.2 */
void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected);
void renderFeature(QgsRenderContext &renderContext, QgsFeature& f, QImage* img, bool selected, double opacity = 1.0);
/**Reads the renderer configuration from an XML file
@param rnode the Dom node to read