Skip to content

Commit

Permalink
more spelling fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Dec 26, 2016
1 parent c87aad2 commit e5a4426
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion python/core/raster/qgsrasterinterface.sip
Expand Up @@ -211,7 +211,7 @@ class QgsRasterInterface

/** \brief Get histogram. Histograms are cached in providers.
* @param theBandNo The band (number).
* @param theBinCount Number of bins (intervals,buckets). If 0, the number of bins is decided automaticaly according to data type, raster size etc.
* @param theBinCount Number of bins (intervals,buckets). If 0, the number of bins is decided automatically according to data type, raster size etc.
* @param theMinimum Minimum value, if NaN, raster minimum value will be used.
* @param theMaximum Maximum value, if NaN, raster minimum value will be used.
* @param theExtent Extent used to calc histogram, if empty, whole raster extent is used.
Expand Down
10 changes: 5 additions & 5 deletions python/plugins/processing/algs/qgis/Relief.py
Expand Up @@ -76,8 +76,8 @@ def setValue(self, value):
return True

if value == '':
if not self.optional:
return False
if not self.optional:
return False

if isinstance(value, str):
self.value = value if value != '' else None
Expand All @@ -97,7 +97,7 @@ def getAsScriptCode(self):
def fromScriptCode(self, line):
isOptional, name, definition = _splitParameterOptions(line)
descName = _createDescriptiveName(name)
parent = definition.lower().strip()[len('relief colors') + 1:]
parent = definition.lower().strip()[len('relief colors') + 1:]
return ParameterReliefColors(name, description, parent)

@staticmethod
Expand All @@ -117,7 +117,7 @@ def colorsToString(colors):
self.tr('Z factor'),
1.0, 999999.99, 1.0))
self.addParameter(ParameterBoolean(self.AUTO_COLORS,
self.tr('Generate relief classes automaticaly'),
self.tr('Generate relief classes automatically'),
False))
self.addParameter(ParameterReliefColors(self.COLORS,
self.tr('Relief colors'),
Expand Down Expand Up @@ -145,7 +145,7 @@ def processAlgorithm(self, progress):
else:
if colors is None:
raise GeoAlgorithmExecutionException(
self.tr('Specify relief colors or activate "Generate relief classes automaticaly" option.'))
self.tr('Specify relief colors or activate "Generate relief classes automatically" option.'))

reliefColors = []
for c in colors.split(';'):
Expand Down
2 changes: 1 addition & 1 deletion scripts/chkspelling_ag.sh
Expand Up @@ -40,7 +40,7 @@ if [[ ! -z $OUTPUT ]]; then
# < ---------- get files + error ---------------------------------------------------------------------->
ag --smart-case --only-matching --nogroup --nonumbers --all-text --word-regexp -p $AGIGNORE "$RE" $FILES | \
# <-- generate sed command .... <------------------------------ get correction word ----------------------------------> <------------------------------- match case -------------------------------------------> <-----replace : by / and add word boundary------> ...finalize sed command>
sed -e 's/\(\S*\):\([[:alnum:]]*\)$/ echo "sed -i \x27s\/"$( echo "\2:$(ag --nonumbers --ignore-case --word-regexp \2 scripts\/spelling.dat | cut -d: -f2)" | sed -r \x27s\/([A-Z]+):(.*)\/\\1:\\U\\2\/; s\/([A-Z][a-z]+):([a-z])\/\\1:\\U\\2\\L\/\x27 | sed -r \x27s\/(\\S\*):\/\\\\b\\1\\\\b\\\/\/\x27)"\/g\x27 \1" /e' | \
sed -e 's/\(\S*\):\([[:alnum:]]*\)$/ echo "sed -i \x27s\/\/"$( echo "\2:$(ag --nonumbers --ignore-case --word-regexp \2 scripts\/spelling.dat | cut -d: -f2)" | sed -r \x27s\/([A-Z]+):(.*)\/\\1:\\U\\2\/; s\/([A-Z][a-z]+):([a-z])\/\\1:\\U\\2\\L\/\x27 | sed -r \x27s\/(\\S\*):\/\\\\b\\1\\\\b\\\/\/\x27)"\/g\x27 \1" /e' | \
# remove duplicate line
sort -u
echo "****"
Expand Down
1 change: 1 addition & 0 deletions scripts/spelling.dat
Expand Up @@ -67,6 +67,7 @@ attemtps:attempts
attribut:attribute
attruibutes:attributes
authentification:authentication
automaticaly:automatically
automaticly:automatically
automatize:automate
automatized:automated
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsidentifyresultsdialog.cpp
Expand Up @@ -201,7 +201,7 @@ QgsWebView *QgsIdentifyResultsWebView::createWindow( QWebPage::WebWindowType typ
// loaded and contentsSizeChanged () is emitted.
//
// 3) If QgsIdentifyResultsWebView is resized (on page load) after it was inserted into
// QTreeWidget, the row does not reflect that change automaticaly and
// QTreeWidget, the row does not reflect that change automatically and
// consecutive resize of QTreeWidget will cause to shrink QgsIdentifyResultsWebView to the
// original row height. That is expected, Qt: "setItemWidget() should only
// be used to display static content... => we must not change QgsIdentifyResultsWebView
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterinterface.h
Expand Up @@ -208,7 +208,7 @@ class CORE_EXPORT QgsRasterInterface

/** \brief Get histogram. Histograms are cached in providers.
* @param theBandNo The band (number).
* @param theBinCount Number of bins (intervals,buckets). If 0, the number of bins is decided automaticaly according to data type, raster size etc.
* @param theBinCount Number of bins (intervals,buckets). If 0, the number of bins is decided automatically according to data type, raster size etc.
* @param theMinimum Minimum value, if NaN, raster minimum value will be used.
* @param theMaximum Maximum value, if NaN, raster minimum value will be used.
* @param theExtent Extent used to calc histogram, if empty, whole raster extent is used.
Expand Down
2 changes: 1 addition & 1 deletion src/gui/attributetable/qgsattributetablefiltermodel.cpp
Expand Up @@ -409,7 +409,7 @@ void QgsAttributeTableFilterModel::generateListOfVisibleFeatures()
if ( renderer && renderer->capabilities() & QgsFeatureRenderer::ScaleDependent )
{
// setup scale
// mapRenderer()->renderContext()->scale is not automaticaly updated when
// mapRenderer()->renderContext()->scale is not automatically updated when
// render extent changes (because it's scale is used to identify if changed
// since last render) -> use local context
renderContext.setExtent( ms.visibleExtent() );
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grass/qgsgrassmapcalc.h
Expand Up @@ -87,7 +87,7 @@ class QgsGrassMapcalc: public QMainWindow, private Ui::QgsGrassMapcalcBase,
//! Grow canvas and move items
void growCanvas( int left, int right, int top, int bottom );

//! Grow automaticaly if an item is near border
//! Grow automatically if an item is near border
void autoGrow();

void resizeCanvas( int width, int height );
Expand Down
2 changes: 1 addition & 1 deletion src/providers/wcs/qgswcsprovider.cpp
Expand Up @@ -282,7 +282,7 @@ QgsWcsProvider::QgsWcsProvider( const QString& uri )
QgsDebugMsg( QString( "myGdalDataType[%1] = %2" ).arg( i - 1 ).arg( myGdalDataType ) );
mSrcGdalDataType.append( myGdalDataType );

// UMN Mapserver does not automaticaly set null value, METADATA wcs_rangeset_nullvalue must be used
// UMN Mapserver does not automatically set null value, METADATA wcs_rangeset_nullvalue must be used
// http://lists.osgeo.org/pipermail/mapserver-users/2010-April/065328.html

// TODO: This could be shared with GDAL provider
Expand Down

0 comments on commit e5a4426

Please sign in to comment.