Skip to content

Commit 49b426d

Browse files
committedOct 5, 2017
Make doxygen_space script convert multiline //! comments
Because: - the /** format is much more prevalent throughout QGIS - sipify works correctly with /**
1 parent d9952b6 commit 49b426d

File tree

213 files changed

+2553
-1144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+2553
-1144
lines changed
 

‎python/analysis/raster/qgsalignraster.sip

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,12 @@ used for rescaling of values (if necessary)
148148

149149
struct ProgressHandler
150150
{
151+
151152
virtual bool progress( double complete ) = 0;
152153
%Docstring
153-
:return: false if the execution should be canceled, true otherwise
154+
Method to be overridden for progress reporting.
155+
\param complete Overall progress of the alignment operation
156+
:return: false if the execution should be canceled, true otherwise
154157
:rtype: bool
155158
%End
156159

@@ -209,44 +212,63 @@ Get the output CRS in WKT format
209212

210213
void setClipExtent( double xmin, double ymin, double xmax, double ymax );
211214
%Docstring
212-
No extra clipping is done if the rectangle is null
215+
Configure clipping extent (region of interest).
216+
No extra clipping is done if the rectangle is null
213217
%End
218+
214219
void setClipExtent( const QgsRectangle &extent );
215220
%Docstring
216-
No extra clipping is done if the rectangle is null
221+
Configure clipping extent (region of interest).
222+
No extra clipping is done if the rectangle is null
217223
%End
224+
218225
QgsRectangle clipExtent() const;
219226
%Docstring
220-
No extra clipping is done if the rectangle is null
227+
Get clipping extent (region of interest).
228+
No extra clipping is done if the rectangle is null
221229
:rtype: QgsRectangle
222230
%End
223231

224232
bool setParametersFromRaster( const RasterInfo &rasterInfo, const QString &customCRSWkt = QString(), QSizeF customCellSize = QSizeF(), QPointF customGridOffset = QPointF( -1, -1 ) );
225233
%Docstring
226-
:return: true on success (may fail if it is not possible to reproject raster to given CRS)
234+
Set destination CRS, cell size and grid offset from a raster file.
235+
The user may provide custom values for some of the parameters - in such case
236+
only the remaining parameters are calculated.
237+
238+
If default CRS is used, the parameters are set according to the raster file's geo-transform.
239+
If a custom CRS is provided, suggested reprojection is calculated first (using GDAL) in order
240+
to determine suitable defaults for cell size and grid offset.
241+
242+
:return: true on success (may fail if it is not possible to reproject raster to given CRS)
227243
:rtype: bool
228244
%End
245+
229246
bool setParametersFromRaster( const QString &filename, const QString &customCRSWkt = QString(), QSizeF customCellSize = QSizeF(), QPointF customGridOffset = QPointF( -1, -1 ) );
230247
%Docstring
231-
See the other variant for details.
248+
Overridden variant for convenience, taking filename instead RasterInfo object.
249+
See the other variant for details.
232250
:rtype: bool
233251
%End
234252

235253
bool checkInputParameters();
236254
%Docstring
237-
:return: true on success, sets error on error (see errorMessage())
255+
Determine destination extent from the input rasters and calculate derived values
256+
:return: true on success, sets error on error (see errorMessage())
238257
:rtype: bool
239258
%End
240259

241260
QSize alignedRasterSize() const;
242261
%Docstring
262+
Return expected size of the resulting aligned raster
243263
.. note::
244264

245265
first need to run checkInputParameters() which returns with success
246266
:rtype: QSize
247267
%End
268+
248269
QgsRectangle alignedRasterExtent() const;
249270
%Docstring
271+
Return expected extent of the resulting aligned raster
250272
.. note::
251273

252274
first need to run checkInputParameters() which returns with success
@@ -255,13 +277,15 @@ See the other variant for details.
255277

256278
bool run();
257279
%Docstring
258-
:return: true on success, sets error on error (see errorMessage())
280+
Run the alignment process
281+
:return: true on success, sets error on error (see errorMessage())
259282
:rtype: bool
260283
%End
261284

262285
QString errorMessage() const;
263286
%Docstring
264-
Error message is empty if run() succeeded (returned true)
287+
Return error from a previous run() call.
288+
Error message is empty if run() succeeded (returned true)
265289
:rtype: str
266290
%End
267291

‎python/analysis/raster/qgsrastermatrix.sip

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ Returns true if matrix is 1x1 (=scalar number)
6767
%End
6868

6969

70+
7071
void setData( int cols, int rows, double *data, double nodataValue );
7172

7273
int nColumns() const;

0 commit comments

Comments
 (0)
Please sign in to comment.