Skip to content

Commit e382790

Browse files
author
jef
committedJun 21, 2008
fix a few comment typos
git-svn-id: http://svn.osgeo.org/qgis/trunk@8668 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8c744fe commit e382790

File tree

1 file changed

+49
-49
lines changed

1 file changed

+49
-49
lines changed
 

‎src/core/raster/qgsrasterlayer.h

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* onto the mapcanvas
2222
*
2323
* The qgsrasterlayer class makes use of gdal for data io, and thus supports
24-
* any gdal supported format. The constructor attemtps to infer what type of
24+
* any gdal supported format. The constructor attempts to infer what type of
2525
* file (RASTER_LAYER_TYPE) is being opened - not in terms of the file format (tif, ascii grid etc.)
2626
* but rather in terms of whether the image is a GRAYSCALE, PALETTED or MULTIBAND,
2727
*
@@ -31,18 +31,18 @@
3131
*
3232
* SINGLE_BAND_GRAY -> a GRAYSCALE layer drawn as a range of gray colors (0-255)
3333
* SINGLE_BAND_PSEUDO_COLOR -> a GRAYSCALE layer drawn using a pseudocolor algorithm
34-
* PALETTED_SINGLE_BAND_GRAY -> a PALLETED layer drawn in gray scale (using only one of the color components)
35-
* PALETTED_SINGLE_BAND_PSEUDO_COLOR -> a PALLETED layer having only one of its color components rendered as psuedo color
36-
* PALETTED_MULTI_BAND_COLOR -> a PALLETED image where the bands contains 24bit color info and 8 bits is pulled out per color
34+
* PALETTED_SINGLE_BAND_GRAY -> a PALETTED layer drawn in gray scale (using only one of the color components)
35+
* PALETTED_SINGLE_BAND_PSEUDO_COLOR -> a PALETTED layer having only one of its color components rendered as psuedo color
36+
* PALETTED_MULTI_BAND_COLOR -> a PALETTED image where the bands contains 24bit color info and 8 bits is pulled out per color
3737
* MULTI_BAND_SINGLE_BAND_GRAY -> a layer containing 2 or more bands, but using only one band to produce a grayscale image
3838
* MULTI_BAND_SINGLE_BAND_PSEUDO_COLOR -> a layer containing 2 or more bands, but using only one band to produce a pseudocolor image
3939
* MULTI_BAND_COLOR -> a layer containing 2 or more bands, mapped to the three RGBcolors. In the case of a multiband with only two bands, one band will have to be mapped to more than one color
4040
*
4141
* Each of the above mentioned drawing styles is implemented in its own draw* function.
4242
* Some of the drawing styles listed above require statistics about the layer such
43-
* as the min / max / mean / stddev etc. Statics for a band can be gathered using the
43+
* as the min / max / mean / stddev etc. statistics for a band can be gathered using the
4444
* getRasterBandStats function. Note that statistics gathering is a slow process and
45-
* evey effort should be made to call this function as few times as possible. For this
45+
* every effort should be made to call this function as few times as possible. For this
4646
* reason, qgsraster has a vector class member to store stats for each band. The
4747
* constructor initialises this vector on startup, but only populates the band name and
4848
* number fields.
@@ -52,10 +52,10 @@
5252
* applied to undefined layers to normalise the data into the 0-255 range.
5353
*
5454
* A qgsrasterlayer band can be referred to either by name or by number (base=1). It
55-
* should be noted that band names as stored in datafiles may not be uniqe, and
55+
* should be noted that band names as stored in datafiles may not be unique, and
5656
* so the rasterlayer class appends the band number in brackets behind each band name.
5757
*
58-
* Sample useage of the QgsRasterLayer class:
58+
* Sample usage of the QgsRasterLayer class:
5959
*
6060
* QString myFileNameQString = "/path/to/file";
6161
* QFileInfo myFileInfo(myFileNameQString);
@@ -86,7 +86,7 @@
8686
* }
8787
*
8888
* You can combine layer type detection with the setDrawingStyle method to override the default drawing style assigned
89-
* when a layer is loaded.:
89+
* when a layer is loaded:
9090
*
9191
* if (rasterLayer->getRasterLayerType()==QgsRasterLayer::MULTIBAND)
9292
* {
@@ -101,18 +101,18 @@
101101
* myRasterLayer->setDrawingStyle(QgsRasterLayer::SINGLE_BAND_PSEUDO_COLOR);
102102
* }
103103
*
104-
* Raster layers can also have an aribitary level of transparency defined, and have their
105-
* colour palettes inverted using the setTransparency and setInvertHistogramFlag methods.
104+
* Raster layers can also have an arbitary level of transparency defined, and have their
105+
* color palettes inverted using the setTransparency and setInvertHistogramFlag methods.
106106
*
107-
* Pseudocolour images can have their output adjusted to a given number of standard
107+
* Pseudocolor images can have their output adjusted to a given number of standard
108108
* deviations using the setStdDevsToPlot method.
109109
*
110110
* The final area of functionality you may be interested in is band mapping. Band mapping
111-
* allows you to choose arbitary band -> colour mappings and is applicable only to PALETTE
112-
* and MULTIBAND rasters, There are four mappings that can be made : red, green, blue and gray.
113-
* Mappings are non exclusive. That is a given band can be assigned to no, some or all
114-
* colour mappings. The constructor sets sensible defaults for band mappings but these can be
115-
* overridden at run time using the setRedBandName,setGreenBandName,setBlueBandName and setGrayBandName
111+
* allows you to choose arbitary band -> color mappings and is applicable only to PALETTE
112+
* and MULTIBAND rasters, There are four mappings that can be made: red, green, blue and gray.
113+
* Mappings are non-exclusive. That is a given band can be assigned to no, some or all
114+
* color mappings. The constructor sets sensible defaults for band mappings but these can be
115+
* overridden at run time using the setRedBandName, setGreenBandName, setBlueBandName and setGrayBandName
116116
* methods.
117117
*/
118118

@@ -207,27 +207,27 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
207207
*
208208
* -Determine whether the layer is gray, paletted or multiband.
209209
*
210-
* -Assign sensible defaults for the red,green, blue and gray bands.
210+
* -Assign sensible defaults for the red, green, blue and gray bands.
211211
*
212212
* -
213213
* */
214214
QgsRasterLayer(const QString & path = QString::null,
215215
const QString & baseName = QString::null,
216216
bool loadDefaultStyleFlag = true );
217217

218-
/** \brief The destuctor. */
218+
/** \brief The destructor. */
219219
~QgsRasterLayer();
220220

221221
/** \brief A list containing one RasterBandStats struct per raster band in this raster layer.
222-
* Note that while very RasterBandStats element will have the name and number of its associated
222+
* Note that while every RasterBandStats element will have the name and number of its associated
223223
* band populated, any additional stats are calculated on a need to know basis.*/
224224
typedef QList<QgsRasterBandStats> RasterStatsList;
225225

226226

227227
/** \brief A list containing one RasterPyramid struct per raster band in this raster layer.
228228
* POTENTIAL pyramid layer. How this works is we divide the height
229229
* and width of the raster by an incrementing number. As soon as the result
230-
* of the division is <=256 we stop allowing RasterPyramid stracuts
230+
* of the division is <=256 we stop allowing RasterPyramid structs
231231
* to be added to the list. Each time a RasterPyramid is created
232232
* we will check to see if a pyramid matching these dimensions already exists
233233
* in the raster layer, and if so mark the exists flag as true. */
@@ -269,10 +269,10 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
269269
/** \brief Draws a thumbnail of the rasterlayer into the supplied pixmap pointer */
270270
void drawThumbnail(QPixmap * theQPixmap);
271271

272-
/** \brief Get an 8x8 pixmap of the colour palette. If the layer has no palette a white pixmap will be returned. */
272+
/** \brief Get an 8x8 pixmap of the color palette. If the layer has no palette a white pixmap will be returned. */
273273
QPixmap getPaletteAsPixmap();
274274

275-
/** \brief This is called when the view on the rasterlayer needs to be refreshed (redrawn).
275+
/** \brief This is called when the view on the raster layer needs to be refreshed (redrawn).
276276
*/
277277
bool draw(QgsRenderContext& renderContext);
278278

@@ -354,8 +354,8 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
354354
const QgsRasterBandStats getRasterBandStats(int);
355355
/** \brief Check whether a given band number has stats associated with it */
356356
bool hasStats(int theBandNoInt);
357-
/** \brief Overloaded method that also returns stats for a band, but uses the band colour name
358-
* Note this approach is not recommeneded because it is possible for two gdal raster
357+
/** \brief Overloaded method that also returns stats for a band, but uses the band color name
358+
* Note this approach is not recommended because it is possible for two gdal raster
359359
* bands to have the same name!
360360
*/
361361
const QgsRasterBandStats getRasterBandStats(const QString &);
@@ -369,12 +369,12 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
369369
bool hasBand(const QString & theBandName);
370370
/** \brief Call any inline image manipulation filters */
371371
void filterLayer(QImage * theQImage);
372-
/** \brief Accessor for red band name (allows alternate mappings e.g. map blue as red colour). */
372+
/** \brief Accessor for red band name (allows alternate mappings e.g. map blue as red color). */
373373
QString getRedBandName()
374374
{
375375
return mRedBandName;
376376
}
377-
/** \brief Mutator for red band name (allows alternate mappings e.g. map blue as red colour). */
377+
/** \brief Mutator for red band name (allows alternate mappings e.g. map blue as red color). */
378378
void setRedBandName(const QString & theBandNameQString);
379379
//
380380
// Accessor and mutator for green band name
@@ -594,13 +594,13 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
594594
//
595595
// Accessor and mutator for the color shader algorithm
596596
//
597-
/** \brief Accessor for colour shader algorithm. */
597+
/** \brief Accessor for color shader algorithm. */
598598
QgsRasterLayer::COLOR_SHADING_ALGORITHM getColorShadingAlgorithm()
599599
{
600600
return mColorShadingAlgorithm;
601601
}
602602

603-
/** \brief Accessor for colour shader algorithm. */
603+
/** \brief Accessor for color shader algorithm. */
604604
QString getColorShadingAlgorithmAsQString();
605605

606606
/** \brief Mutator for color shader algorithm. */
@@ -662,7 +662,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
662662
void setDrawingStyle(const DRAWING_STYLE & theDrawingStyle) {drawingStyle=theDrawingStyle;}
663663
/** \brief Overloaded version of the above function for convenience when restoring from xml.
664664
*
665-
* Implementaed mainly for serialisation / deserialisation of settings to xml.
665+
* Implemented mainly for serialisation / deserialisation of settings to xml.
666666
* NOTE: May be deprecated in the future! Use alternate implementation above rather.
667667
* */
668668
void setDrawingStyle(const QString & theDrawingStyleQString);
@@ -675,7 +675,7 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
675675
MULTIBAND
676676
} rasterLayerType;
677677
//
678-
//accessor and for raster layer type (READ ONLY)
678+
// Accessor and for raster layer type (READ ONLY)
679679
//
680680
/** \brief Accessor for raster layer type (which is a read only property) */
681681
RASTER_LAYER_TYPE getRasterLayerType() { return rasterLayerType; }
@@ -835,7 +835,7 @@ public slots:
835835
*/
836836
//void const convertTo();
837837
/**
838-
* Mainly inteded for use in propogating progress updates from gdal up to the parent app.
838+
* Mainly intended for use in propagating progress updates from gdal up to the parent app.
839839
**/
840840
void updateProgress(int,int);
841841

@@ -855,16 +855,16 @@ public slots:
855855
void *theData);
856856
*/
857857

858-
/** Populate the histogram vector for a given layer
859-
* @param theBandNoInt - which band to compute the histogram for
860-
* @param theBinCountInt - how many 'bins' to categorise the data into
861-
* @param theIgnoreOutOfRangeFlag - whether to ignore values that are out of range (default=true)
862-
* @param theThoroughBandScanFlag - whether to visit each cell when computing the histogram (default=false)
863-
*/
864-
void populateHistogram(int theBandNoInt,
865-
int theBinCountInt=256,
866-
bool theIgnoreOutOfRangeFlag=true,
867-
bool theThoroughBandScanFlag=false);
858+
/** Populate the histogram vector for a given layer
859+
* @param theBandNoInt - which band to compute the histogram for
860+
* @param theBinCountInt - how many 'bins' to categorise the data into
861+
* @param theIgnoreOutOfRangeFlag - whether to ignore values that are out of range (default=true)
862+
* @param theThoroughBandScanFlag - whether to visit each cell when computing the histogram (default=false)
863+
*/
864+
void populateHistogram(int theBandNoInt,
865+
int theBinCountInt=256,
866+
bool theIgnoreOutOfRangeFlag=true,
867+
bool theThoroughBandScanFlag=false);
868868

869869
/** \brief Color table
870870
* \param band number
@@ -1014,13 +1014,13 @@ public slots:
10141014

10151015
/** \brief Raster width. */
10161016
int mRasterXDim;
1017-
/** \brief Raster Height. */
1017+
/** \brief Raster height. */
10181018
int mRasterYDim;
10191019
/** \brief Cell value representing no data. e.g. -9999 */
10201020
double mNoDataValue;
10211021
/** \brief Flag indicating if the nodatavalue is valid*/
10221022
bool mValidNoDataValue;
1023-
/** \brief Flag to indicate whether debug infor overlay should be rendered onto the raster. */
1023+
/** \brief Flag to indicate whether debug info overlay should be rendered onto the raster. */
10241024
bool mDebugOverlayFlag;
10251025
/** \brief Pointer to the gdaldataset. */
10261026
GDALDatasetH mGdalBaseDataset;
@@ -1029,15 +1029,15 @@ public slots:
10291029
/** \brief Values for mapping pixel to world coordinates. Contents of
10301030
* this array are the same as the gdal adfGeoTransform */
10311031
double mGeoTransform[6];
1032-
/** \brief Flag indicating whether the colour of pixels should be inverted or not. */
1032+
/** \brief Flag indicating whether the color of pixels should be inverted or not. */
10331033
bool mInvertPixelsFlag;
10341034
/** \brief Number of stddev to plot (0) to ignore. Not applicable to all layer types. */
10351035
double mStandardDeviations;
10361036
/** \brief A collection of stats - one for each band in the layer.
10371037
* The typedef for this is defined above before class declaration
10381038
*/
10391039
RasterStatsList mRasterStatsList;
1040-
/** \brief List containging the contrast enhancements for each band */
1040+
/** \brief List containing the contrast enhancements for each band */
10411041
ContrastEnhancementList mContrastEnhancementList;
10421042
/** \brief The contrast enhancement algorithm being used */
10431043
QgsContrastEnhancement::CONTRAST_ENHANCEMENT_ALGORITHM mContrastEnhancementAlgorithm;
@@ -1055,7 +1055,7 @@ public slots:
10551055
QgsRasterTransparency mRasterTransparency;
10561056
/** \brief The band to be associated with transparency. */
10571057
QString mTransparencyBandName;
1058-
/** \brief The band to be associated with the grayscale only ouput - usually 1. */
1058+
/** \brief The band to be associated with the grayscale only output - usually 1. */
10591059
QString mGrayBandName;
10601060
/** \brief Whether this raster has overviews / pyramids or not */
10611061
bool hasPyramidsFlag;
@@ -1068,7 +1068,7 @@ public slots:
10681068
/** \brief Flag to indicate of the min max values are actual or estimates/user defined */
10691069
bool mGrayActualMinimumMaximum;
10701070
/** \brief This list holds a series of RasterPyramid structs
1071-
* which store infomation for each potential pyramid level for this raster.*/
1071+
* which store information for each potential pyramid level for this raster.*/
10721072
RasterPyramidList mPyramidList;
10731073

10741074
/*
@@ -1124,7 +1124,7 @@ public slots:
11241124
/**Flag indicating wheter the layer is in editing mode or not*/
11251125
bool mEditable;
11261126

1127-
/**Flag indicating wheter the layer has been modified since the last commit*/
1127+
/**Flag indicating whether the layer has been modified since the last commit*/
11281128
bool mModified;
11291129

11301130
//! Timestamp, the last modified time of the data source when the layer was created

0 commit comments

Comments
 (0)
Please sign in to comment.