Skip to content
Permalink
Browse files

update sip bindings II

  • Loading branch information
jef-n committed Jan 27, 2014
1 parent 08405c5 commit 74e7314c36970fc87d1f834def7ae70e0094bd7e
Showing with 1,502 additions and 547 deletions.
  1. +4 −0 python/analysis/interpolation/Bezier3D.sip
  2. +2 −0 python/analysis/interpolation/ParametricLine.sip
  3. +1 −0 python/analysis/interpolation/TriDecorator.sip
  4. +1 −0 python/analysis/interpolation/Triangulation.sip
  5. +1 −1 python/analysis/network/qgsgraphanalyzer.sip
  6. +1 −1 python/analysis/network/qgslinevectorlayerdirector.sip
  7. +3 −0 python/analysis/raster/qgsrastermatrix.sip
  8. +6 −7 python/analysis/vector/qgspointsample.sip
  9. +1 −3 python/analysis/vector/qgszonalstatistics.sip
  10. +18 −14 python/core/composer/qgsatlascomposition.sip
  11. +3 −2 python/core/composer/qgscomposerattributetable.sip
  12. +26 −13 python/core/composer/qgscomposeritem.sip
  13. +0 −2 python/core/composer/qgscomposerlabel.sip
  14. +6 −0 python/core/composer/qgscomposerlegend.sip
  15. +1 −1 python/core/composer/qgscomposerlegenditem.sip
  16. +45 −28 python/core/composer/qgscomposermap.sip
  17. +1 −1 python/core/composer/qgscomposermultiframe.sip
  18. +4 −4 python/core/composer/qgscomposerpicture.sip
  19. +4 −2 python/core/composer/qgscomposerscalebar.sip
  20. +1 −1 python/core/composer/qgscomposershape.sip
  21. +1 −0 python/core/composer/qgscomposertexttable.sip
  22. +8 −6 python/core/composer/qgscomposition.sip
  23. +9 −6 python/core/composer/qgslegendmodel.sip
  24. +15 −3 python/core/composer/qgspaperitem.sip
  25. +2 −1 python/core/core.sip
  26. +4 −2 python/core/diagram/qgsdiagram.sip
  27. +81 −0 python/core/dxf/qgsdxfexport.sip
  28. +9 −3 python/core/gps/qgsqtlocationconnection.sip
  29. +2 −1 python/core/qgsclipper.sip
  30. +1 −1 python/core/qgscoordinatereferencesystem.sip
  31. +1 −1 python/core/qgscoordinatetransform.sip
  32. +7 −0 python/core/qgscredentials.sip
  33. +3 −2 python/core/qgsdatadefined.sip
  34. +2 −0 python/core/qgsdataitem.sip
  35. +12 −0 python/core/qgsdataprovider.sip
  36. +6 −0 python/core/qgsdiagramrendererv2.sip
  37. +10 −7 python/core/qgsdistancearea.sip
  38. +0 −29 python/core/qgsdxfexport.sip
  39. +35 −0 python/core/qgserror.sip
  40. +0 −1 python/core/qgsexpression.sip
  41. +19 −23 python/core/qgsfeatureiterator.sip
  42. +3 −3 python/core/qgsfeaturerequest.sip
  43. +2 −2 python/core/qgsfeaturestore.sip
  44. +26 −4 python/core/qgsgeometrysimplifier.sip
  45. +12 −1 python/core/qgsgml.sip
  46. +1 −1 python/core/qgsgmlschema.sip
  47. +11 −3 python/core/qgslabelsearchtree.sip
  48. +2 −2 python/core/qgslogger.sip
  49. +2 −2 python/core/qgsmaplayer.sip
  50. +26 −1 python/core/qgsmaplayerregistry.sip
  51. +1 −1 python/core/qgsmessagelog.sip
  52. +1 −0 python/core/qgsmessageoutput.sip
  53. +3 −0 python/core/qgsogcutils.sip
  54. +9 −9 python/core/qgspallabeling.sip
  55. +8 −2 python/core/qgspluginlayerregistry.sip
  56. +4 −2 python/core/qgspoint.sip
  57. +19 −11 python/core/qgsproject.sip
  58. +2 −1 python/core/qgsprovidermetadata.sip
  59. +3 −1 python/core/qgsproviderregistry.sip
  60. +1 −1 python/core/qgspythonrunner.sip
  61. +12 −9 python/core/qgsrectangle.sip
  62. +25 −0 python/core/qgsrelationmanager.sip
  63. +8 −2 python/core/qgsrenderchecker.sip
  64. +2 −2 python/core/qgsscalecalculator.sip
  65. +7 −7 python/core/qgssimplifymethod.sip
  66. +2 −3 python/core/qgsvectorlayereditbuffer.sip
  67. +11 −0 python/core/qgsvectorlayereditutils.sip
  68. +0 −3 python/core/qgsvectorlayerfeatureiterator.sip
  69. +1 −1 python/core/qgsvectorlayerjoinbuffer.sip
  70. +93 −0 python/core/qgsvectorlayerundocommand.sip
  71. +3 −0 python/core/raster/qgscolorrampshader.sip
  72. +2 −0 python/core/raster/qgscontrastenhancement.sip
  73. +7 −0 python/core/raster/qgscontrastenhancementfunction.sip
  74. +1 −1 python/core/raster/qgscubicrasterresampler.sip
  75. +5 −2 python/core/raster/qgsmultibandcolorrenderer.sip
  76. +13 −2 python/core/raster/qgspalettedrasterrenderer.sip
  77. +25 −1 python/core/raster/qgsrasterblock.sip
  78. +7 −1 python/core/raster/qgsrasterchecker.sip
  79. +5 −0 python/core/raster/qgsrasterfilewriter.sip
  80. +4 −2 python/core/raster/qgsrasterhistogram.sip
  81. +18 −0 python/core/raster/qgsrasteridentifyresult.sip
  82. +4 −3 python/core/raster/qgsrasteriterator.sip
  83. +15 −38 python/core/raster/qgsrasterlayer.sip
  84. +2 −0 python/core/raster/qgsrasterpipe.sip
  85. +2 −1 python/core/raster/qgsrasterprojector.sip
  86. +14 −2 python/core/raster/qgsrasterrange.sip
  87. +1 −2 python/core/raster/qgsrasterrenderer.sip
  88. +2 −2 python/core/raster/qgsrasterresamplefilter.sip
  89. +1 −1 python/core/raster/qgsrastershaderfunction.sip
  90. +5 −4 python/core/raster/qgsrastertransparency.sip
  91. +7 −3 python/core/raster/qgssinglebandcolordatarenderer.sip
  92. +13 −2 python/core/raster/qgssinglebandgrayrenderer.sip
  93. +1 −1 python/core/raster/qgssinglebandpseudocolorrenderer.sip
  94. +9 −4 python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip
  95. +5 −1 python/core/symbology-ng/qgscptcityarchive.sip
  96. +0 −3 python/core/symbology-ng/qgsellipsesymbollayerv2.sip
  97. +27 −4 python/core/symbology-ng/qgsfillsymbollayerv2.sip
  98. +9 −3 python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip
  99. +20 −6 python/core/symbology-ng/qgslinesymbollayerv2.sip
  100. +28 −9 python/core/symbology-ng/qgsmarkersymbollayerv2.sip
  101. +2 −0 python/core/symbology-ng/qgspointdisplacementrenderer.sip
  102. +2 −2 python/core/symbology-ng/qgsrendererv2.sip
  103. +14 −2 python/core/symbology-ng/qgsrulebasedrendererv2.sip
  104. +1 −1 python/core/symbology-ng/qgssinglesymbolrendererv2.sip
  105. +0 −2 python/core/symbology-ng/qgsstylev2.sip
  106. +1 −1 python/core/symbology-ng/qgssvgcache.sip
  107. +12 −2 python/core/symbology-ng/qgssymbollayerv2.sip
  108. +3 −4 python/core/symbology-ng/qgssymbollayerv2registry.sip
  109. +2 −1 python/core/symbology-ng/qgssymbolv2.sip
  110. +4 −0 python/core/symbology-ng/qgsvectorcolorrampv2.sip
  111. +3 −1 python/gui/attributetable/qgsattributetablemodel.sip
  112. +25 −1 python/gui/attributetable/qgsdualview.sip
  113. +2 −0 python/gui/attributetable/qgsfeatureselectionmodel.sip
  114. 0 python/gui/editorwidgets/{ → core}/qgseditorconfigwidget.sip
  115. 0 python/gui/editorwidgets/{ → core}/qgseditorwidgetfactory.sip
  116. 0 python/gui/editorwidgets/{ → core}/qgseditorwidgetregistry.sip
  117. 0 python/gui/editorwidgets/{ → core}/qgseditorwidgetwrapper.sip
  118. +5 −4 python/gui/gui.sip
  119. +48 −19 python/gui/qgisinterface.sip
  120. +58 −16 python/gui/qgsattributedialog.sip
  121. +38 −1 python/gui/qgsattributeeditor.sip
  122. +33 −0 python/gui/qgsattributeeditorcontext.sip
  123. +2 −0 python/gui/qgsbusyindicatordialog.sip
  124. +6 −0 python/gui/qgscollapsiblegroupbox.sip
  125. +1 −1 python/gui/qgscolorbutton.sip
  126. +4 −0 python/gui/qgscomposerview.sip
  127. +4 −0 python/gui/qgsexpressionbuilderwidget.sip
  128. +5 −0 python/gui/qgslegendinterface.sip
  129. +3 −1 python/gui/qgsmapcanvas.sip
  130. +0 −2 python/gui/qgsmaplayeractionregistry.sip
  131. +1 −1 python/gui/qgsmaptool.sip
  132. +6 −7 python/gui/qgsmessagebar.sip
  133. +2 −0 python/gui/qgsoptionsdialogbase.sip
  134. +1 −0 python/gui/qgsowssourceselect.sip
  135. +3 −0 python/gui/qgsrasterformatsaveoptionswidget.sip
  136. +0 −1 python/gui/qgsrasterlayersaveasdialog.sip
  137. +1 −0 python/gui/qgsrasterpyramidsoptionswidget.sip
  138. +153 −44 python/gui/qgsrubberband.sip
  139. +33 −3 python/gui/qgsvectorlayertools.sip
  140. +3 −1 python/gui/raster/qgsrasterhistogramwidget.sip
  141. +2 −0 python/gui/symbology-ng/qgscptcitycolorrampv2dialog.sip
  142. +4 −2 python/gui/symbology-ng/qgssmartgroupeditordialog.sip
  143. +1 −1 python/gui/symbology-ng/qgsstylev2managerdialog.sip
  144. +32 −0 python/gui/symbology-ng/qgssymbollayerv2widget.sip
  145. +2 −1 python/gui/symbology-ng/qgssymbolv2selectordialog.sip
  146. +2 −0 python/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.sip
  147. +1 −0 src/analysis/interpolation/NormVecDecorator.h
  148. +2 −1 src/analysis/interpolation/ParametricLine.h
  149. +2 −4 src/analysis/network/qgsarcproperter.h
  150. +1 −1 src/analysis/network/qgslinevectorlayerdirector.h
  151. +1 −1 src/core/composer/qgscomposerlegenditem.h
  152. +1 −1 src/core/composer/qgscomposermap.h
  153. +3 −1 src/core/composer/qgscomposerscalebar.h
  154. +1 −1 src/core/composer/qgslegendmodel.h
  155. +1 −1 src/core/composer/qgspaperitem.h
  156. +0 −1 src/core/composer/qgsscalebarstyle.h
  157. +2 −0 src/core/dxf/qgsdxfexport.h
  158. +2 −2 src/core/gps/qgsqtlocationconnection.h
  159. +2 −0 src/core/qgsclipper.h
  160. +2 −4 src/core/qgsdataitem.h
  161. +3 −3 src/core/qgsdistancearea.h
  162. +1 −1 src/core/qgsgmlschema.h
  163. +2 −0 src/core/qgsmaplayerregistry.h
  164. +1 −0 src/core/qgsmessageoutput.h
  165. +2 −1 src/core/qgspallabeling.h
  166. +11 −23 src/core/qgsprojectproperty.h
  167. +3 −3 src/core/qgsrelationmanager.h
  168. +1 −3 src/core/qgsvectorfilewriter.h
  169. +2 −0 src/core/qgsvectorlayercache.h
  170. +1 −1 src/core/raster/qgsmultibandcolorrenderer.h
  171. +0 −3 src/core/raster/qgsrasterbandstats.h
  172. +2 −2 src/core/raster/qgsrasterchecker.h
  173. +1 −1 src/core/raster/qgsrasterdrawer.h
  174. +0 −6 src/core/raster/qgsrasterlayer.h
  175. +1 −1 src/core/raster/qgsrasternuller.h
  176. +0 −1 src/core/raster/qgsrastertransparency.h
  177. +1 −1 src/core/raster/qgssinglebandcolordatarenderer.h
  178. +2 −1 src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
  179. +3 −2 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  180. +0 −2 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  181. +1 −1 src/core/symbology-ng/qgsrendererv2.h
  182. +3 −2 src/core/symbology-ng/qgssymbollayerv2.h
  183. +1 −1 src/core/symbology-ng/qgssymbolv2.h
  184. +0 −2 src/gui/attributetable/qgsfeaturelistviewdelegate.h
  185. +3 −3 src/gui/qgsattributeeditor.h
  186. +1 −0 src/gui/qgsattributeeditorcontext.h
  187. +1 −1 src/gui/qgsexpressionselectiondialog.h
  188. +2 −4 src/gui/qgsrasterlayersaveasdialog.h
@@ -8,6 +8,7 @@ class Bezier3D : ParametricLine
/**Default constructor*/
Bezier3D();
/**Constructor, par is a pointer to the parent, controlpoly a controlpolygon*/
//! @note not available in python binding
// Bezier3D( ParametricLine* par, QVector<Point3D*>* controlpoly );
/**Destructor*/
virtual ~Bezier3D();
@@ -29,6 +30,7 @@ class Bezier3D : ParametricLine
/**Returns a control point*/
virtual const Point3D* getControlPoint( int number ) const;
/**Returns a pointer to the control polygon*/
//! @note not available in python binding
// virtual const QVector<Point3D*>* getControlPoly() const;
/**Returns the degree of the curve*/
virtual int getDegree() const;
@@ -37,5 +39,7 @@ class Bezier3D : ParametricLine
/** Sets the parent*/
virtual void setParent( ParametricLine* par );
/**Sets the control polygon*/
//! @note not available in python binding
// virtual void setControlPoly( QVector<Point3D*>* cp );

};
@@ -19,11 +19,13 @@ class ParametricLine
virtual void changeDirection() = 0;
//virtual void draw(QPainter* p);
virtual const Point3D* getControlPoint( int number ) const = 0;
//! @note not available in python binding
// virtual const QVector<Point3D*>* getControlPoly() const = 0;
virtual int getDegree() const = 0;
virtual ParametricLine* getParent() const = 0;
//virtual bool intersects(ParametricLine* pal);
virtual void remove( int i ) = 0;
//! @note not available in python binding
//virtual void setControlPoly( QVector<Point3D*>* cp ) = 0;
virtual void setParent( ParametricLine* paral ) = 0;
};
@@ -19,6 +19,7 @@ class TriDecorator : Triangulation
virtual bool calcPoint( double x, double y, Point3D* result );
virtual Point3D* getPoint( unsigned int i ) const;
virtual int getNumberOfPoints() const;
//! @note not available in python bindings
// bool getTriangle( double x, double y, Point3D* p1, int* n1, Point3D* p2, int* n2, Point3D* p3, int* n3 );
bool getTriangle( double x, double y, Point3D* p1, Point3D* p2, Point3D* p3 );
virtual int getOppositePoint( int p1, int p2 );
@@ -21,6 +21,7 @@ class Triangulation
/**Returns a pointer to the point with number i. Any virtual points must have the number -1*/
virtual Point3D* getPoint( unsigned int i ) const = 0;
/**Finds out, in which triangle the point with coordinates x and y is and assigns the numbers of the vertices to 'n1', 'n2' and 'n3' and the vertices to 'p1', 'p2' and 'p3'*/
//! @note not available in python binding
// virtual bool getTriangle( double x, double y, Point3D* p1, int* n1, Point3D* p2, int* n2, Point3D* p3, int* n3 ) = 0;
/**Finds out, in which triangle the point with coordinates x and y is and assigns the points at the vertices to 'p1', 'p2' and 'p3*/
virtual bool getTriangle( double x, double y, Point3D* p1 /Out/, Point3D* p2 /Out/, Point3D* p3 /Out/ ) = 0;
@@ -10,7 +10,7 @@ class QgsGraphAnalyzer
* @param source The source graph
* @param startVertexIdx index of start vertex
* @param criterionNum index of arc property as optimization criterion
* @param treeResult array represents the shortest path tree. resultTree[ vertexIndex ] == inboundingArcIndex if vertex reacheble and resultTree[ vertexIndex ] == -1 others.
* @param resultTree array represents the shortest path tree. resultTree[ vertexIndex ] == inboundingArcIndex if vertex reacheble and resultTree[ vertexIndex ] == -1 others.
* @param resultCost array of cost paths
*/
static SIP_PYLIST dijkstra( const QgsGraph* source, int startVertexIdx, int criterionNum );
@@ -18,7 +18,7 @@ class QgsLineVectorLayerDirector : QgsGraphDirector
* @param bothDirectionValue value for road
* @param defaultDirection 1 - direct direction, 2 - reverse direction, 3 - both direction
*/
QgsLineVectorLayerDirector( QgsVectorLayer* vl,
QgsLineVectorLayerDirector( QgsVectorLayer* myLayer,
int directionFieldId,
const QString& directDirectionValue,
const QString& reverseDirectionValue,
@@ -37,6 +37,7 @@ class QgsRasterMatrix

/**Takes ownership of data array*/
QgsRasterMatrix();
//! @note note available in python bindings
// QgsRasterMatrix( int nCols, int nRows, float* data, double nodataValue );
QgsRasterMatrix( const QgsRasterMatrix& m );
~QgsRasterMatrix();
@@ -46,8 +47,10 @@ class QgsRasterMatrix
double number() const;

/**Returns data array (but not ownership)*/
//! @note not available in python bindings
// float* data();
/**Returns data and ownership. Sets data and nrows, ncols of this matrix to 0*/
//! @note not available in python bindings
// float* takeData();

void setData( int cols, int rows, float* data, double nodataValue );
@@ -6,12 +6,11 @@ class QgsPointSample
%TypeHeaderCode
#include <qgspointsample.h>
%End
public:
QgsPointSample( QgsVectorLayer* inputLayer, const QString& outputLayer, QString nPointsAttribute, QString minDistAttribute = QString() );
~QgsPointSample();

public:
QgsPointSample( QgsVectorLayer* inputLayer, const QString& outputLayer, QString nPointsAttribute, QString minDistAttribute = QString() );
~QgsPointSample();

/**Starts calculation of random points
@return 0 in case of success*/
int createRandomPoints( QProgressDialog* pd );
/**Starts calculation of random points
@return 0 in case of success*/
int createRandomPoints( QProgressDialog* pd );
};
@@ -10,9 +10,7 @@ class QgsZonalStatistics
%End

public:

QgsZonalStatistics( QgsVectorLayer* polygonLayer, const QString& rasterFile,
const QString& attributePrefix = "", int rasterBand = 1 );
QgsZonalStatistics( QgsVectorLayer* polygonLayer, const QString& rasterFile, const QString& attributePrefix = "", int rasterBand = 1 );
~QgsZonalStatistics();

/**Starts the calculation
@@ -23,7 +23,7 @@ public:
QgsComposerMap* composerMap() const;
/**Sets the map used by the atlas
* @deprecated Use QgsComposerMap::setAtlasDriven( true ) instead
*/
*/
void setComposerMap( QgsComposerMap* map );

bool hideCoverage() const;
@@ -35,7 +35,7 @@ public:
bool fixedScale() const;
/**Sets whether the atlas map should use a fixed scale
* @deprecated Use QgsComposerMap::setAtlasFixedScale( bool ) instead
*/
*/
void setFixedScale( bool fixed );

/**Returns the margin for the atlas map
@@ -44,7 +44,7 @@ public:
float margin() const;
/**Sets the margin for the atlas map
* @deprecated Use QgsComposerMap::setAtlasMargin( double ) instead
*/
*/
void setMargin( float margin );

QString filenamePattern() const;
@@ -71,8 +71,9 @@ public:
int sortKeyAttributeIndex() const;
void setSortKeyAttributeIndex( int idx );

/** Begins the rendering. */
void beginRender();
/** Begins the rendering. Returns true if successful, false if no matching atlas
features found.*/
bool beginRender();
/** Ends the rendering. Restores original extent */
void endRender();

@@ -87,7 +88,12 @@ public:

/** Returns the current filename. Must be called after prepareForFeature( i ) */
const QString& currentFilename() const;


void writeXML( QDomElement& elem, QDomDocument& doc ) const;
void readXML( const QDomElement& elem, const QDomDocument& doc );

QgsComposition* composition();

/** Requeries the current atlas coverage layer and applies filtering and sorting. Returns
number of matching features. Must be called after prepareForFeature( i ) */
int updateFeatures();
@@ -96,17 +102,12 @@ public:
void prevFeature();
void lastFeature();
void firstFeature();

/** Returns the current atlas feature. Must be called after prepareForFeature( i ). */
QgsFeature* currentFeature();

/** Recalculates the bounds of an atlas driven map */
void prepareMap( QgsComposerMap* map );

void writeXML( QDomElement& elem, QDomDocument& doc ) const;
void readXML( const QDomElement& elem, const QDomDocument& doc );

QgsComposition* composition();
/** Recalculates the bounds of an atlas driven map */
void prepareMap( QgsComposerMap* map );

signals:
/** emitted when one of the parameters changes */
@@ -115,6 +116,9 @@ public:
/** emitted when atlas is enabled or disabled */
void toggled( bool );

/**Is emitted when the atlas has an updated status bar message for the composer window*/
void statusMsgChanged( QString message );

/**Is emitted when the coverage layer for an atlas changes*/
void coverageLayerChanged( QgsVectorLayer* layer );

@@ -15,6 +15,7 @@ class QgsComposerAttributeTableCompare
void setAscending( bool asc );
};

/**A table class that displays a vector attribute table*/
class QgsComposerAttributeTable : QgsComposerTable
{
%TypeHeaderCode
@@ -56,10 +57,10 @@ class QgsComposerAttributeTable : QgsComposerTable
void setSceneRect( const QRectF& rectangle );

// @note not available in python bindings
//void setSortAttributes( const QList<QPair<int, bool> > att );
// void setSortAttributes( const QList<QPair<int, bool> > att );

// @note not available in python bindings
//QList<QPair<int, bool> > sortAttributes() const;
// QList<QPair<int, bool> > sortAttributes() const;

protected:
virtual QMap<int, QString> getHeaderLabels() const;
@@ -1,7 +1,7 @@
/** \ingroup MapComposer
* A item that forms part of a map composition.
*/
class QgsComposerItem: QObject, QGraphicsRectItem
class QgsComposerItem : QObject, QGraphicsRectItem
{
%TypeHeaderCode
#include <qgscomposeritem.h>
@@ -154,7 +154,7 @@ class QgsComposerItem: QObject, QGraphicsRectItem
virtual void setSelected( bool s );

/** \brief Is selected */
virtual bool selected();
virtual bool selected() const;

/** stores state in project */
virtual bool writeSettings();
@@ -218,7 +218,7 @@ class QgsComposerItem: QObject, QGraphicsRectItem
* @note introduced since 1.8
* @see hasFrame
*/
bool hasFrame();
bool hasFrame() const;

/** Set whether this item has a frame drawn around it or not.
* @param drawFrame draw frame
@@ -339,7 +339,7 @@ class QgsComposerItem: QObject, QGraphicsRectItem
/**Returns the rotation for the composer item
* @deprecated Use itemRotation()
* instead
*/
*/
double rotation() const;

/**Updates item, with the possibility to do custom update for subclasses*/
@@ -361,13 +361,17 @@ class QgsComposerItem: QObject, QGraphicsRectItem
public slots:
/**Sets the item rotation
* @deprecated Use setItemRotation( double rotation ) instead
*/
*/
virtual void setRotation( double r );

/**Sets the item rotation
@param r item rotation in degrees
@param adjustPosition set to true if item should be shifted so that rotation occurs
around item center. If false, rotation occurs around item origin
@note this method was added in version 2.1
*/
virtual void setItemRotation( double r );
virtual void setItemRotation( double r, bool adjustPosition = false );

void repaint();

protected:
@@ -416,22 +420,31 @@ class QgsComposerItem: QObject, QGraphicsRectItem
* instead
*/
bool imageSizeConsideringRotation( double& width, double& height ) const;


/**Calculates the largest scaled version of originalRect which fits within boundsRect, when it is rotated by
* a specified amount
@param originalRect QRectF to be rotated and scaled
@param boundsRect QRectF specifying the bounds which the rotated and scaled rectangle must fit within
@param rotation the rotation in degrees to be applied to the rectangle
*/
QRectF largestRotatedRectWithinBounds( QRectF originalRect, QRectF boundsRect, double rotation ) const;

/**Calculates corner point after rotation and scaling*/
bool cornerPointOnRotatedAndScaledRect( double& x, double& y, double width, double height, double rotation ) const;
/**Calculates corner point after rotation and scaling
* @deprecated Use bool cornerPointOnRotatedAndScaledRect( double& x, double& y, double width, double height, double rotation )
* instead
*/
*/
bool cornerPointOnRotatedAndScaledRect( double& x, double& y, double width, double height ) const;

/**Calculates width / height of the bounding box of a rotated rectangle*/
void sizeChangedByRotation( double& width, double& height, double rotation );
/**Calculates width / height of the bounding box of a rotated rectangle
* @deprecated Use void sizeChangedByRotation( double& width, double& height, double rotation )
* instead
*/
/**Calculates width / height of the bounding box of a rotated rectangle
* @deprecated Use void sizeChangedByRotation( double& width, double& height, double rotation )
* instead
*/
void sizeChangedByRotation( double& width, double& height );

/**Rotates a point / vector
@param angle rotation angle in degrees, counterclockwise
@param x in/out: x coordinate before / after the rotation
@@ -447,7 +460,7 @@ class QgsComposerItem: QObject, QGraphicsRectItem
void deleteAlignItems();

signals:
/**Is emitted on rotation change to notify north arrow pictures*/
/**Is emitted on item rotation change*/
void itemRotationChanged( double newRotation );
/**Used e.g. by the item widgets to update the gui elements*/
void itemChanged();
@@ -64,8 +64,6 @@ class QgsComposerLabel : QgsComposerItem
@note: this function was added in version 1.4*/
QColor fontColor() const;

void setSceneRect( const QRectF& rectangle );

/** stores state in Dom element
* @param elem is Dom element corresponding to 'Composer' tag
* @param doc document
@@ -60,6 +60,12 @@ class QgsComposerLegend : QgsComposerItem
double symbolHeight() const;
void setSymbolHeight( double h );

double wmsLegendWidth() const;
void setWmsLegendWidth( double w );

double wmsLegendHeight() const;
void setWmsLegendHeight( double h );

void setWrapChar( const QString& t );
QString wrapChar() const;

@@ -34,7 +34,7 @@ class QgsComposerLegendItem : QStandardItem
// Get text defined by user
virtual QString userText() const;
// Set text defined by user
virtual void setUserText( const QString & text );
virtual void setUserText( const QString & text );
protected:
void writeXMLChildren( QDomElement& elem, QDomDocument& doc ) const;
};

0 comments on commit 74e7314

Please sign in to comment.