Skip to content
Permalink
Browse files
sip sync
  • Loading branch information
jef-n committed May 27, 2014
1 parent 260cff4 commit c4c131ef750012e2b8c670ef31ef5c351b5bf90d
Showing with 1,534 additions and 709 deletions.
  1. +15 −14 python/analysis/analysis.sip
  2. +7 −2 python/analysis/interpolation/DualEdgeTriangulation.sip
  3. +1 −1 python/analysis/interpolation/ParametricLine.sip
  4. +1 −1 python/analysis/interpolation/Vector3D.sip
  5. +3 −0 python/analysis/interpolation/qgsinterpolator.sip
  6. +0 −1 python/analysis/network/qgsdistancearcproperter.sip
  7. +0 −1 python/analysis/network/qgsgraph.sip
  8. +16 −15 python/core/composer/qgsatlascomposition.sip
  9. +1 −1 python/core/composer/qgscomposerframe.sip
  10. +10 −7 python/core/composer/qgscomposerhtml.sip
  11. +20 −12 python/core/composer/qgscomposeritem.sip
  12. +1 −1 python/core/composer/qgscomposerlabel.sip
  13. +10 −7 python/core/composer/qgscomposermap.sip
  14. +5 −5 python/core/composer/qgscomposermultiframe.sip
  15. +4 −4 python/core/composer/qgscomposerpicture.sip
  16. +2 −1 python/core/composer/qgscomposerscalebar.sip
  17. +6 −1 python/core/composer/qgscomposershape.sip
  18. +15 −13 python/core/composer/qgscomposition.sip
  19. +0 −2 python/core/core.sip
  20. +1 −1 python/core/diagram/qgsdiagram.sip
  21. +0 −1 python/core/diagram/qgstextdiagram.sip
  22. +14 −1 python/core/qgis.sip
  23. +12 −3 python/core/qgsapplication.sip
  24. +40 −11 python/core/qgscachedfeatureiterator.sip
  25. +4 −11 python/core/qgscontexthelp.sip
  26. +2 −0 python/core/qgscoordinatetransform.sip
  27. +3 −2 python/core/qgsdiagramrendererv2.sip
  28. +37 −0 python/core/qgsdistancearea.sip
  29. +14 −0 python/core/qgsexpression.sip
  30. +5 −1 python/core/qgsfeature.sip
  31. +2 −2 python/core/qgsfeatureiterator.sip
  32. +6 −7 python/core/qgsfeaturerequest.sip
  33. +10 −13 python/core/qgsfield.sip
  34. +7 −2 python/core/qgsgml.sip
  35. +2 −0 python/core/qgslabelsearchtree.sip
  36. +3 −0 python/core/qgslogger.sip
  37. +1 −1 python/core/qgsmaplayerregistry.sip
  38. +9 −9 python/core/qgsmaplayerrenderer.sip
  39. +22 −9 python/core/qgsmaprenderer.sip
  40. +7 −0 python/core/qgsmaprenderercache.sip
  41. +60 −1 python/core/qgsmaprendererjob.sip
  42. +87 −89 python/core/qgsmapsettings.sip
  43. +8 −7 python/core/qgsmapunitscale.sip
  44. +8 −3 python/core/qgsnetworkaccessmanager.sip
  45. +2 −1 python/core/qgsofflineediting.sip
  46. +1 −1 python/core/qgsogcutils.sip
  47. +173 −123 python/core/qgspallabeling.sip
  48. +42 −10 python/core/qgsproject.sip
  49. +1 −1 python/core/qgsprojectproperty.sip
  50. +0 −1 python/core/qgsproviderregistry.sip
  51. +14 −0 python/core/qgsrelation.sip
  52. +3 −1 python/core/qgsrenderchecker.sip
  53. +1 −1 python/core/qgsrendercontext.sip
  54. +4 −3 python/core/qgssnapper.sip
  55. +8 −2 python/core/qgsspatialindex.sip
  56. +18 −18 python/core/qgsvectordataprovider.sip
  57. +1 −1 python/core/qgsvectorfilewriter.sip
  58. +2 −2 python/core/qgsvectorlayer.sip
  59. +1 −0 python/core/qgsvectorlayercache.sip
  60. +21 −0 python/core/qgsvectorlayereditbuffer.sip
  61. +15 −6 python/core/qgsvectorlayerfeatureiterator.sip
  62. +0 −1 python/core/qgsvectorlayerimport.sip
  63. +1 −1 python/core/qgsvectorsimplifymethod.sip
  64. +1 −1 python/core/raster/qgsmultibandcolorrenderer.sip
  65. +9 −10 python/core/raster/qgsrasterbandstats.sip
  66. +5 −3 python/core/raster/qgsrasterdataprovider.sip
  67. +1 −1 python/core/raster/qgsrasterfilewriter.sip
  68. +1 −1 python/core/raster/qgsrasterinterface.sip
  69. +0 −1 python/core/raster/qgsrasterprojector.sip
  70. +2 −2 python/core/raster/qgsrastershader.sip
  71. +1 −1 python/core/raster/qgssinglebandcolordatarenderer.sip
  72. +1 −1 python/core/symbology-ng/qgscategorizedsymbolrendererv2.sip
  73. +0 −1 python/core/symbology-ng/qgscolorbrewerpalette.sip
  74. +21 −5 python/core/symbology-ng/qgscptcityarchive.sip
  75. +2 −4 python/core/symbology-ng/qgsfillsymbollayerv2.sip
  76. +5 −0 python/core/symbology-ng/qgsgraduatedsymbolrendererv2.sip
  77. +3 −0 python/core/symbology-ng/qgslinesymbollayerv2.sip
  78. +0 −1 python/core/symbology-ng/qgsmarkersymbollayerv2.sip
  79. +1 −0 python/core/symbology-ng/qgspointdisplacementrenderer.sip
  80. +6 −6 python/core/symbology-ng/qgsrendererv2.sip
  81. +3 −0 python/core/symbology-ng/qgsstylev2.sip
  82. +4 −0 python/core/symbology-ng/qgsvectorcolorrampv2.sip
  83. +1 −1 python/core/symbology-ng/qgsvectorfieldsymbollayer.sip
  84. +4 −0 python/gui/attributetable/qgsattributetablefiltermodel.sip
  85. +18 −0 python/gui/attributetable/qgsattributetableview.sip
  86. +4 −1 python/gui/attributetable/qgsdualview.sip
  87. +15 −0 python/gui/attributetable/qgsfeaturelistview.sip
  88. +2 −0 python/gui/attributetable/qgsfeaturelistviewdelegate.sip
  89. +0 −1 python/gui/attributetable/qgsfeaturemodel.sip
  90. +11 −0 python/gui/editorwidgets/core/qgseditorconfigwidget.sip
  91. +1 −1 python/gui/editorwidgets/core/qgseditorwidgetfactory.sip
  92. +64 −3 python/gui/editorwidgets/core/qgseditorwidgetregistry.sip
  93. +113 −3 python/gui/editorwidgets/core/qgseditorwidgetwrapper.sip
  94. +1 −1 python/gui/qgisinterface.sip
  95. +22 −0 python/gui/qgsattributedialog.sip
  96. +55 −1 python/gui/qgsattributeform.sip
  97. +1 −1 python/gui/qgsattributeforminterface.sip
  98. +1 −0 python/gui/qgsblendmodecombobox.sip
  99. +17 −1 python/gui/qgscollapsiblegroupbox.sip
  100. +3 −3 python/gui/qgscolorbutton.sip
  101. +24 −0 python/gui/qgsfieldexpressionwidget.sip
  102. +2 −1 python/gui/qgsfieldvalidator.sip
  103. +2 −1 python/gui/qgsfilterlineedit.sip
  104. +10 −9 python/gui/qgsmapcanvas.sip
  105. +4 −1 python/gui/qgsmapcanvasmap.sip
  106. +1 −1 python/gui/qgsmaplayercombobox.sip
  107. +6 −1 python/gui/qgsmaplayermodel.sip
  108. +11 −11 python/gui/qgsmaplayerproxymodel.sip
  109. +3 −0 python/gui/qgsmapoverviewcanvas.sip
  110. +12 −3 python/gui/qgsmaptool.sip
  111. +5 −0 python/gui/qgsmaptoolidentify.sip
  112. +2 −0 python/gui/qgsnewvectorlayerdialog.sip
  113. +2 −1 python/gui/qgsoptionsdialogbase.sip
  114. +0 −1 python/gui/qgspluginmanagerinterface.sip
  115. +65 −0 python/gui/qgsprojectbadlayerguihandler.sip
  116. +3 −0 python/gui/qgsprojectionselector.sip
  117. +3 −0 python/gui/qgsrasterformatsaveoptionswidget.sip
  118. +0 −1 python/gui/symbology-ng/qgsrendererv2propertiesdialog.sip
  119. +2 −0 python/gui/symbology-ng/qgssymbollayerv2widget.sip
  120. +1 −0 python/gui/symbology-ng/qgssymbollevelsv2dialog.sip
  121. +1 −0 python/gui/symbology-ng/qgssymbolv2selectordialog.sip
  122. +1 −1 src/analysis/CMakeLists.txt
  123. +2 −2 src/analysis/interpolation/Line3D.h
  124. +1 −0 src/analysis/interpolation/qgsinterpolator.h
  125. +9 −9 src/analysis/network/CMakeLists.txt
  126. +0 −2 src/analysis/network/qgslinevectorlayerdirector.h
  127. +8 −8 src/core/composer/qgscomposeritem.h
  128. +5 −5 src/core/composer/qgscomposerlabel.h
  129. +2 −2 src/core/composer/qgscomposershape.h
  130. +1 −1 src/core/qgsapplication.h
  131. +2 −0 src/core/qgsdistancearea.h
  132. +2 −2 src/core/qgsexpressionlexer.ll
  133. +2 −2 src/core/qgsexpressionparser.yy
  134. +1 −1 src/core/qgsgeometryvalidator.h
  135. +1 −1 src/core/qgsmaprenderer.h
  136. +3 −0 src/core/qgsmaprendererjob.h
  137. +4 −4 src/core/qgspallabeling.h
  138. +10 −2 src/core/qgsproject.h
  139. +3 −5 src/core/qgsprojectproperty.h
  140. +1 −0 src/core/qgsrelation.h
  141. +0 −2 src/core/qgsrelationmanager.h
  142. +0 −3 src/core/qgsrenderchecker.h
  143. +4 −3 src/core/qgssnapper.h
  144. +0 −1 src/core/qgsspatialindex.h
  145. +2 −2 src/core/qgsvectorfilewriter.h
  146. +0 −1 src/core/qgsvectorlayereditbuffer.h
  147. +1 −1 src/core/raster/qgsrasterdataprovider.h
  148. +2 −2 src/core/symbology-ng/qgscptcityarchive.h
  149. +0 −1 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  150. +5 −5 src/core/symbology-ng/qgsrendererv2.h
  151. +0 −1 src/core/symbology-ng/qgsstylev2.h
  152. +0 −2 src/core/symbology-ng/qgssymbollayerv2.h
  153. +0 −1 src/gui/attributetable/qgsfeaturelistmodel.h
  154. +3 −0 src/gui/editorwidgets/core/qgseditorwidgetwrapper.h
  155. +1 −1 src/gui/qgisinterface.h
  156. +1 −1 src/gui/qgsattributedialog.h
  157. +0 −1 src/gui/qgsattributeeditorcontext.h
  158. +1 −0 src/gui/qgsattributeform.h
  159. +1 −1 src/gui/qgscollapsiblegroupbox.h
  160. +0 −4 src/gui/qgscolorbutton.h
  161. +2 −2 src/gui/qgsexpressionbuilderwidget.h
  162. +6 −2 src/gui/qgsmapcanvas.h
  163. +1 −1 src/gui/qgsmaplayermodel.h
  164. +1 −1 src/gui/qgsmaplayerproxymodel.h
  165. +4 −4 src/gui/qgsprojectbadlayerguihandler.h
  166. +1 −1 src/gui/symbology-ng/qgsrendererv2widget.h
  167. +0 −1 src/gui/symbology-ng/qgssvgselectorwidget.h
  168. +0 −2 src/gui/symbology-ng/qgssymbollayerv2widget.h
  169. +13 −13 src/mapserver/CMakeLists.txt
  170. +7 −7 src/plugins/grass/CMakeLists.txt
  171. +14 −14 src/plugins/grass/modules/default.qgc
  172. +1 −1 src/plugins/plugin_template/README
  173. +6 −6 src/plugins/plugin_template/README.whatnext
  174. +2 −2 src/plugins/spatialquery/CMakeLists.txt
  175. +2 −2 src/plugins/topology/CMakeLists.txt
  176. +1 −1 src/providers/delimitedtext/CMakeLists.txt
  177. +6 −6 src/providers/gdal/CMakeLists.txt
  178. +1 −1 src/providers/gpx/CMakeLists.txt
  179. +9 −9 src/providers/grass/CMakeLists.txt
  180. +1 −1 src/providers/oracle/CMakeLists.txt
  181. +5 −5 src/providers/ows/CMakeLists.txt
  182. +1 −1 src/providers/postgres/CMakeLists.txt
  183. +2 −2 src/providers/sqlanywhere/sqlanyconnection/CMakeLists.txt
  184. +11 −11 src/providers/wcs/CMakeLists.txt
  185. +1 −1 src/providers/wcs/qgswcscapabilities.cpp
  186. +1 −1 src/providers/wfs/CMakeLists.txt
  187. +9 −9 src/providers/wms/CMakeLists.txt
@@ -14,20 +14,21 @@
%Include vector/qgstransectsample.sip
%Include vector/qgszonalstatistics.sip

// // %Include interpolation/Bezier3D.sip
// // %Include interpolation/CloughTocherInterpolator.sip
// // %Include interpolation/DualEdgeTriangulation.sip
// // %Include interpolation/HalfEdge.sip
// // %Include interpolation/LinTriangleInterpolator.sip
// // %Include interpolation/Line3D.sip
// // %Include interpolation/Node.sip
// // %Include interpolation/NormVecDecorator.sip
// // %Include interpolation/ParametricLine.sip
// // %Include interpolation/Point3D.sip
// // %Include interpolation/TriangleInterpolator.sip
// // %Include interpolation/Triangulation.sip
// // %Include interpolation/TriDecorator.sip
// // %Include interpolation/Vector3D.sip
// %Include interpolation/Bezier3D.sip
// %Include interpolation/CloughTocherInterpolator.sip
// %Include interpolation/DualEdgeTriangulation.sip
// %Include interpolation/HalfEdge.sip
// %Include interpolation/LinTriangleInterpolator.sip
// %Include interpolation/Line3D.sip
// %Include interpolation/Node.sip
// %Include interpolation/NormVecDecorator.sip
// %Include interpolation/ParametricLine.sip
// %Include interpolation/Point3D.sip
// %Include interpolation/TriangleInterpolator.sip
// %Include interpolation/Triangulation.sip
// %Include interpolation/TriDecorator.sip
// %Include interpolation/Vector3D.sip

%Include interpolation/qgsgridfilewriter.sip
%Include interpolation/qgsinterpolator.sip
%Include interpolation/qgsidwinterpolator.sip
@@ -25,6 +25,7 @@ class DualEdgeTriangulation: Triangulation
/**Returns the number of the point opposite to the triangle points p1, p2 (which have to be on a halfedge)*/
int getOppositePoint( int p1, int p2 );
/**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 bindings
// virtual bool getTriangle( double x, double y, Point3D* p1, int* n1, Point3D* p2, int* n2, Point3D* p3, int* n3 );
/**Finds out, in which triangle the point with coordinates x and y is and assigns addresses to the points at the vertices to 'p1', 'p2' and 'p3*/
virtual bool getTriangle( double x, double y, Point3D* p1, Point3D* p2, Point3D* p3 );
@@ -77,14 +78,18 @@ class DualEdgeTriangulation: Triangulation
unsigned int insertEdge( int dual, int next, int point, bool mbreak, bool forced );
/**inserts a forced segment between the points with the numbers p1 and p2 into the triangulation and returns the number of a HalfEdge belonging to this forced edge or -100 in case of failure*/
int insertForcedSegment( int p1, int p2, bool breakline );
/**Threshold for the leftOfTest to handle numerical instabilities*/
//const static double leftOfTresh=0.00001;
/**Security to prevent endless loops in 'baseEdgeOfTriangle'. It there are more iteration then this number, the point will not be inserted*/
const static int nBaseOfRuns = 300000;
/**Returns the number of an edge which points to the point with number 'point' or -1 if there is an error*/
int baseEdgeOfPoint( int point );
/**returns the number of a HalfEdge from a triangle in which 'point' is in. If the number -10 is returned, this means, that 'point' is outside the convex hull. If -5 is returned, then numerical problems with the leftOfTest occured (and the value of the possible edge is stored in the variable 'mUnstableEdge'. -20 means, that the inserted point is exactly on an edge (the number is stored in the variable 'mEdgeWithPoint'). -25 means, that the point is already in the triangulation (the number of the point is stored in the member 'mTwiceInsPoint'. If -100 is returned, this means that something else went wrong*/
int baseEdgeOfTriangle( Point3D* point );
/**Checks, if 'edge' has to be swapped because of the empty circle criterion. If so, doSwap(...) is called.*/
bool checkSwap( unsigned int edge );
bool checkSwap( unsigned int edge, unsigned int recursivDeep );
/**Swaps 'edge' and test recursively for other swaps (delaunay criterion)*/
void doSwap( unsigned int edge );
void doSwap( unsigned int edge, unsigned int recursivDeep );
/**Swaps 'edge' and does no recursiv testing*/
void doOnlySwap( unsigned int edge );
/**Returns true, if it is possible to swap an edge, otherwise false(concave quad or edge on (or outside) the convex hull)*/
@@ -26,6 +26,6 @@ class ParametricLine
//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 setControlPoly( QVector<Point3D*>* cp ) = 0;
virtual void setParent( ParametricLine* paral ) = 0;
};
@@ -13,7 +13,7 @@ class Vector3D
Vector3D( const Vector3D& v );
/**Destructor*/
~Vector3D();
//Vector3D& operator=( const Vector3D& v );
// Vector3D& operator=( const Vector3D& v );
bool operator==( const Vector3D& v );
bool operator!=( const Vector3D& v );
/**Returns the x-component of the vector*/
@@ -36,6 +36,9 @@ class QgsInterpolator
@return 0 in case of success*/
virtual int interpolatePoint( double x, double y, double& result ) = 0;

// @note not available in python bindings
// const QList<LayerData>& layerData() const;

protected:
/**Caches the vertex and value data from the provider. All the vertex data
will be held in virtual memory
@@ -8,4 +8,3 @@ class QgsDistanceArcProperter : QgsArcProperter
public:
virtual QVariant property( double distance, const QgsFeature& ) const;
};

@@ -130,4 +130,3 @@ class QgsGraph
*/
int findVertex( const QgsPoint& pt ) const;
};

@@ -21,18 +21,18 @@ public:
* @see setEnabled
*/
bool enabled() const;

/**Sets whether the atlas is enabled
* @param enabled set to true to enable to atlas
* @see enabled
*/
*/
void setEnabled( bool enabled );

/**Returns the map used by the atlas
* @deprecated Use QgsComposerMap::atlasDriven() instead
*/
QgsComposerMap* composerMap() const /Deprecated/;

/**Sets the map used by the atlas
* @deprecated Use QgsComposerMap::setAtlasDriven( true ) instead
*/
@@ -43,17 +43,18 @@ public:
* @see setHideCoverage
*/
bool hideCoverage() const;

/**Sets whether the coverage layer should be hidden in map items in the composition
* @param hide set to true to hide the coverage layer
* @see hideCoverage
*/
*/
void setHideCoverage( bool hide );

/**Returns whether the atlas map uses a fixed scale
* @deprecated since 2.4 Use QgsComposerMap::atlasScalingMode() instead
*/
bool fixedScale() const /Deprecated/;

/**Sets whether the atlas map should use a fixed scale
* @deprecated since 2.4 Use QgsComposerMap::setAtlasScalingMode() instead
*/
@@ -63,38 +64,38 @@ public:
* @deprecated Use QgsComposerMap::atlasMargin() instead
*/
float margin() const /Deprecated/;

/**Sets the margin for the atlas map
* @deprecated Use QgsComposerMap::setAtlasMargin( double ) instead
*/
void setMargin( float margin ) /Deprecated/;

/**Returns the filename expression used for generating output filenames for each
/**Returns the filename expression used for generating output filenames for each
* atlas page.
* @returns filename pattern
* @see setFilenamePattern
* @note This property has no effect when exporting to PDF if singleFile() is true
*/
QString filenamePattern() const;

/**Sets the filename expression used for generating output filenames for each
* atlas page.
* @param pattern expression to use for output filenames
* @see filenamePattern
* @note This method has no effect when exporting to PDF if singleFile() is true
*/
*/
void setFilenamePattern( const QString& pattern );

/**Returns the coverage layer used for the atlas features
* @returns atlas coverage layer
* @see setCoverageLayer
*/
QgsVectorLayer* coverageLayer() const;

/**Sets the coverage layer to use for the atlas features
* @param layer vector coverage layer
* @see coverageLayer
*/
*/
void setCoverageLayer( QgsVectorLayer* layer );

/**Returns whether the atlas will be exported to a single file. This is only
@@ -104,13 +105,13 @@ public:
* @note This property is only used for PDF exports.
*/
bool singleFile() const;

/**Sets whether the atlas should be exported to a single file. This is only
* applicable for PDF exports.
* @param single set to true to export atlas to a single file.
* @see singleFile
* @note This method is only used for PDF exports.
*/
*/
void setSingleFile( bool single );

bool sortFeatures() const;
@@ -138,7 +139,7 @@ public:
* @see QgsComposerMap::atlasScalingMode
*/
const QVector<double>& predefinedScales() const;

/**Sets the list of predefined scales for the atlas. This is used
* for maps which are set to the predefined atlas scaling mode.
* @param scales a vector of doubles representing predefined scales
@@ -203,7 +204,7 @@ public:

/**Is emitted when atlas rendering has ended*/
void renderEnded();

/**Is emitted when the current atlas feature changes*/
void featureChanged( QgsFeature* feature );

@@ -23,4 +23,4 @@ class QgsComposerFrame: QgsComposerItem
int type() const;

QgsComposerMultiFrame* multiFrame() const;
};
};
@@ -10,7 +10,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
~QgsComposerHtml();

void setUrl( const QUrl& url );
const QUrl& url() const;
const QUrl& url() const;

QSizeF totalSize() const;
void render( QPainter* p, const QRectF& renderExtent );
@@ -19,7 +19,10 @@ class QgsComposerHtml: QgsComposerMultiFrame
bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );

void addFrame( QgsComposerFrame* frame, bool recalcFrameSizes = true );


//overriden to break frames without dividing lines of text
double findNearbyPageBreak( double yPos );

/**Returns whether html item is using smart breaks. Smart breaks prevent
* the html frame contents from breaking mid-way though a line of text.
* @returns true if html item is using smart breaks
@@ -34,7 +37,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
* @see useSmartBreaks
*/
void setUseSmartBreaks( bool useSmartBreaks );

/**Sets the maximum distance allowed when calculating where to place page breaks
* in the html. This distance is the maximum amount of empty space allowed
* at the bottom of a frame after calculating the optimum break location. Setting
@@ -59,12 +62,12 @@ class QgsComposerHtml: QgsComposerMultiFrame
* @see useSmartBreaks
*/
double maxBreakDistance() const;
public slots:

public slots:

/**Reloads the html source from the url and redraws the item.
* @see setUrl
* @see url
*/
void loadHtml();
void loadHtml();
};
@@ -87,7 +87,7 @@ class QgsComposerItem : QObject, QGraphicsRectItem
enum ItemType
{
// base class for the items
ComposerItem = 65636, /* UserType + 100 ... SIP does not do arithmetic */
ComposerItem,

// derived classes
ComposerArrow,
@@ -174,16 +174,22 @@ class QgsComposerItem : QObject, QGraphicsRectItem
virtual void moveContent( double dx, double dy );

/**Zoom content of item. Does nothing per default (but implemented in composer map)
@param delta value from wheel event that describes magnitude and direction (positive /negative number)
@param x x-position of mouse cursor (in item coordinates)
@param y y-position of mouse cursor (in item coordinates)*/
@param delta value from wheel event that describes magnitude and direction (positive /negative number)
@param x x-position of mouse cursor (in item coordinates)
@param y y-position of mouse cursor (in item coordinates)*/
virtual void zoomContent( int delta, double x, double y );

/**Moves the item to a new position (in canvas coordinates)*/
void setItemPosition( double x, double y, ItemPositionMode itemPoint = UpperLeft );

/**Sets item position and width / height in one go
* @param posIncludesFrame set to true if the position and size arguments include the item's frame border
@param x item position x
@param y item position y
@param width item width
@param height item height
@param itemPoint item position mode
@param posIncludesFrame set to true if the position and size arguments include the item's frame border

@note: this method was added in version 1.6*/
void setItemPosition( double x, double y, double width, double height, ItemPositionMode itemPoint = UpperLeft, bool posIncludesFrame = false );

@@ -236,14 +242,14 @@ class QgsComposerItem : QObject, QGraphicsRectItem
* @see setFrameEnabled
*/
virtual void setFrameOutlineWidth( double outlineWidth );

/** Returns the frame's outline width. Only used if hasFrame is true.
* @returns Frame outline width
* @note introduced in 2.3
* @see hasFrame
* @see setFrameOutlineWidth
*/
double frameOutlineWidth() const;
double frameOutlineWidth() const;

/** Returns the join style used for drawing the item's frame
* @returns Join style for outline frame
@@ -252,7 +258,6 @@ class QgsComposerItem : QObject, QGraphicsRectItem
* @see setFrameJoinStyle
*/
Qt::PenJoinStyle frameJoinStyle() const;

/** Sets join style used when drawing the item's frame
* @param style Join style for outline frame
* @returns nothing
@@ -354,7 +359,13 @@ class QgsComposerItem : QObject, QGraphicsRectItem
void drawText( QPainter* p, double x, double y, const QString& text, const QFont& font ) const;

/**Like the above, but with a rectangle for multiline text
* @param flags allows for passing Qt::TextFlags to control appearance of rendered text
* @param p painter to use
* @param rect rectangle to draw into
* @param text text to draw
* @param font font to use
* @param halignment optional horizontal alignment
* @param valignment optional vertical alignment
* @param flags allows for passing Qt::TextFlags to control appearance of rendered text
*/
void drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment = Qt::AlignLeft, Qt::AlignmentFlag valignment = Qt::AlignTop, int flags = Qt::TextWordWrap ) const;

@@ -481,7 +492,6 @@ class QgsComposerItem : QObject, QGraphicsRectItem

/**Calculates width and hight of the picture (in mm) such that it fits into the item frame with the given rotation*/
bool imageSizeConsideringRotation( double& width, double& height, double rotation ) const;

/**Calculates width and hight of the picture (in mm) such that it fits into the item frame with the given rotation
* @deprecated Use bool imageSizeConsideringRotation( double& width, double& height, double rotation )
* instead
@@ -498,15 +508,13 @@ class QgsComposerItem : QObject, QGraphicsRectItem

/**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 /Deprecated/;

/**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 )
@@ -81,7 +81,7 @@ class QgsComposerLabel : QgsComposerItem
* @deprecated Use setItemRotation( double rotation ) instead
*/
virtual void setRotation( double r );

/* Sets rotation for the label */
virtual void setItemRotation( double r );
};

0 comments on commit c4c131e

Please sign in to comment.