From 60ab4b3290b6ccaf5b71ff7fc71637cc92d414d1 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Mon, 24 Sep 2012 20:07:37 +0200 Subject: [PATCH] fix typos --- python/analysis/network/qgsgraph.sip | 4 ++-- python/core/symbology-ng/qgsstylev2.sip | 2 +- python/plugins/sextante/help/3rdParty.html | 6 +++--- python/plugins/sextante/help/_sources/3rdParty.txt | 2 +- python/plugins/sextante/help/_sources/modeler.txt | 2 +- python/plugins/sextante/help/_static/searchtools.js | 4 ++-- python/plugins/sextante/help/_static/websupport.js | 2 +- python/plugins/sextante/pymorph/html/index.html | 4 ++-- .../sextante/pymorph/html/morph/mmdemos/mmdfabric.html | 4 ++-- python/plugins/sextante/pymorph/mmorph.py | 8 ++++---- .../saga/help/PotentialIncomingSolarRadiation.html | 2 +- scripts/spelling.dat | 1 + src/core/qgsdataitem.h | 2 +- src/core/qgsprojectfiletransform.cpp | 2 +- src/core/symbology-ng/qgsfillsymbollayerv2.cpp | 2 +- src/core/symbology-ng/qgsstylev2.h | 4 ++-- 16 files changed, 26 insertions(+), 25 deletions(-) diff --git a/python/analysis/network/qgsgraph.sip b/python/analysis/network/qgsgraph.sip index 9b2639d276a..0a75694cfd4 100644 --- a/python/analysis/network/qgsgraph.sip +++ b/python/analysis/network/qgsgraph.sip @@ -105,7 +105,7 @@ class QgsGraph int addArc( int outVertexIdx, int inVertexIdx, const QVector< QVariant >& properties ); /** - * retrun vertex count + * return vertex count */ int vertexCount() const; @@ -120,7 +120,7 @@ class QgsGraph int arcCount() const; /** - * retrun edge at index + * return edge at index */ const QgsGraphArc& arc( int idx ) const; diff --git a/python/core/symbology-ng/qgsstylev2.sip b/python/core/symbology-ng/qgsstylev2.sip index f98df577f42..ca6292c9b1a 100644 --- a/python/core/symbology-ng/qgsstylev2.sip +++ b/python/core/symbology-ng/qgsstylev2.sip @@ -153,7 +153,7 @@ class QgsStyleV2 */ QStringList symbolsWithTag( StyleEntity type, int tagid ); - //! applies the specifed group to the symbol or colorramp specified by StyleEntity + //! applies the specified group to the symbol or colorramp specified by StyleEntity /*! * \param type is either SymbolEntity of ColorrampEntity * \param name is the name of the symbol or coloramp whose group is to be set diff --git a/python/plugins/sextante/help/3rdParty.html b/python/plugins/sextante/help/3rdParty.html index 89ce64488ca..ef699ec5473 100644 --- a/python/plugins/sextante/help/3rdParty.html +++ b/python/plugins/sextante/help/3rdParty.html @@ -231,7 +231,7 @@ used as input for R commands

vector named polyg. When executing the algorithm, SEXTANTE will open in R the layer selected by the user and store it in a variable also named polyg. So the name of a parameter is also the -name of the variable that we can use in R for accesing the value of that +name of the variable that we can use in R for accessing the value of that parameter (thus, you should avoid using reserved R words as parameter names).

Spatial elements such as vector and raster layers are read using the @@ -304,7 +304,7 @@ by SEXTANTE.

GRASSΒΆ

Configuring GRASS is not much different from configuring SAGA. First, the path to the GRASS folder has to be defined, but only if you are -running Windows. Additionaly, a shell interpreter (usually msys.exe, +running Windows. Additionally, a shell interpreter (usually msys.exe, which can be found in most GRASS for Windows distributions) has to be defined and its path set up as well.

By default, SEXTANTE tries to configure its GRASS connector to use the GRASS distribution that ships along with QGIS. This should work without problems in most systems, but if you experience problems, you might have to do it manually. Also, if you want to use a different GRASS version, you can change that setting and point to the folder where that other version is kept. GRASS 6.4 is needed for algorithms to work correctly.

@@ -403,4 +403,4 @@ with uses geographical (lat/lon) coordinates or projected ones.

Created using Sphinx 1.1.3. - \ No newline at end of file + diff --git a/python/plugins/sextante/help/_sources/3rdParty.txt b/python/plugins/sextante/help/_sources/3rdParty.txt index e15ea455070..9e1bac0a337 100644 --- a/python/plugins/sextante/help/_sources/3rdParty.txt +++ b/python/plugins/sextante/help/_sources/3rdParty.txt @@ -213,7 +213,7 @@ In the above example, we are declaring an input of type ``vector`` named ``polyg``. When executing the algorithm, SEXTANTE will open in R the layer selected by the user and store it in a variable also named ``polyg``. So the name of a parameter is also the -name of the variable that we can use in R for accesing the value of that +name of the variable that we can use in R for accessing the value of that parameter (thus, you should avoid using reserved R words as parameter names). diff --git a/python/plugins/sextante/help/_sources/modeler.txt b/python/plugins/sextante/help/_sources/modeler.txt index 6805b96515e..7f1f5034b08 100644 --- a/python/plugins/sextante/help/_sources/modeler.txt +++ b/python/plugins/sextante/help/_sources/modeler.txt @@ -252,7 +252,7 @@ if the number of output layers cannot be know in advance), then it is not possible to use it within a model, and thus does not appear in the list of them that you can find in the modeler dialog. -Additionaly, you will see some algorithms in the modeler that are not +Additionally, you will see some algorithms in the modeler that are not found in the toolbox. This algorithms are meant to be used exclusively as part of a model, and they are of no interest in a different context. The *Calculator* algorithm is an example of that. It is just a simple diff --git a/python/plugins/sextante/help/_static/searchtools.js b/python/plugins/sextante/help/_static/searchtools.js index 663be4c909b..d7fc9cd6705 100644 --- a/python/plugins/sextante/help/_static/searchtools.js +++ b/python/plugins/sextante/help/_static/searchtools.js @@ -2,7 +2,7 @@ * searchtools.js_t * ~~~~~~~~~~~~~~~~ * - * Sphinx JavaScript utilties for the full-text search. + * Sphinx JavaScript utilities for the full-text search. * * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. @@ -557,4 +557,4 @@ var Search = { $(document).ready(function() { Search.init(); -}); \ No newline at end of file +}); diff --git a/python/plugins/sextante/help/_static/websupport.js b/python/plugins/sextante/help/_static/websupport.js index e9bd1b851c6..33d66fb5629 100644 --- a/python/plugins/sextante/help/_static/websupport.js +++ b/python/plugins/sextante/help/_static/websupport.js @@ -2,7 +2,7 @@ * websupport.js * ~~~~~~~~~~~~~ * - * sphinx.websupport utilties for all documentation. + * sphinx.websupport utilities for all documentation. * * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. * :license: BSD, see LICENSE for details. diff --git a/python/plugins/sextante/pymorph/html/index.html b/python/plugins/sextante/pymorph/html/index.html index a124411ed0b..c018c698490 100644 --- a/python/plugins/sextante/pymorph/html/index.html +++ b/python/plugins/sextante/pymorph/html/index.html @@ -68,7 +68,7 @@ toolbox implementations".

-

As the fuctions are written in pure Python, some functions are +

As the functions are written in pure Python, some functions are not very efficient and may take very long to process. In this case, it is possible to use a professional version available at http://www.mmorph.com/pymorphpro @@ -138,4 +138,4 @@ - \ No newline at end of file + diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdfabric.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdfabric.html index ff637e95cc0..2929fbf8f5a 100644 --- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdfabric.html +++ b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdfabric.html @@ -307,7 +307,7 @@

-

Area measurement and ploting

+

Area measurement and plotting

@@ -360,4 +360,4 @@ - \ No newline at end of file + diff --git a/python/plugins/sextante/pymorph/mmorph.py b/python/plugins/sextante/pymorph/mmorph.py index 6ce56272fa6..70266bbd62d 100644 --- a/python/plugins/sextante/pymorph/mmorph.py +++ b/python/plugins/sextante/pymorph/mmorph.py @@ -630,7 +630,7 @@ def overlay(X, red=None, green=None, blue=None, magenta=None, yellow=None, cyan= """ Y = overlay(X, red=None, green=None, blue=None, magenta=None, yellow=None, cyan=None) - Apply binary overlays as colour layers on a binary or gray-scale image + Apply binary overlays as color layers on a binary or gray-scale image Parameters ---------- @@ -4273,7 +4273,7 @@ def to_gray(f): """ g = to_gray(f) - Transform (possibly colour) image to gray image. + Transform (possibly color) image to gray image. If input file is a color RGB image, it is converted to gray-scale using the equation: @@ -4283,7 +4283,7 @@ def to_gray(f): Parameters ---------- f : ndarray of shape HxWx3 - colour image. + color image. Returns ------- @@ -4294,7 +4294,7 @@ def to_gray(f): if len(f.shape) == 2: return f if len(f.shape) != 3: - raise ValueError, 'pymorph.to_gray: can only handle gray and colour images' + raise ValueError, 'pymorph.to_gray: can only handle gray and color images' r = f[:,:,0] g = f[:,:,1] b = f[:,:,2] diff --git a/python/plugins/sextante/saga/help/PotentialIncomingSolarRadiation.html b/python/plugins/sextante/saga/help/PotentialIncomingSolarRadiation.html index 96c74ded698..1dd836a0d35 100644 --- a/python/plugins/sextante/saga/help/PotentialIncomingSolarRadiation.html +++ b/python/plugins/sextante/saga/help/PotentialIncomingSolarRadiation.html @@ -36,7 +36,7 @@ References:

Time Span [h]
Value range
Time span used for the calculation of daily radiation sums.
Minimum: 1.39579710889e-316; Maximum: 1.395734659e-316
Time Resolution [h]: Day
Floating point
Time step size for a day's calculation given in hours.
Maximum: 24.0
Time Resolution [d]: Range of Days
Integer
Time step size for a range of days calculation given in days.
Minimum: 1.0
-
Update
Choice
show direct insolation for each time step.
Available choices: do not update, update, colour stretch for each time step, update, fixed colour stretch
+
Update
Choice
show direct insolation for each time step.
Available choices: do not update, update, color stretch for each time step, update, fixed color stretch
Day of Year
Node
Day of Month
Choice
Available choices: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
Month
Choice
Available choices: January, February, March, April, May, June, July, August, September, October, November, December
diff --git a/scripts/spelling.dat b/scripts/spelling.dat index 80624076ff8..ada7dc1a83b 100644 --- a/scripts/spelling.dat +++ b/scripts/spelling.dat @@ -53,6 +53,7 @@ persistant:persistent developement:development necesary:necessary recieved:received +retrun:return ressize:resize assigment:assignment automatizes:automates diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h index f32af6d0de2..f309f916c99 100644 --- a/src/core/qgsdataitem.h +++ b/src/core/qgsdataitem.h @@ -314,7 +314,7 @@ class CORE_EXPORT QgsZipItem : public QgsDataCollectionItem QVector createChildren(); const QStringList & getZipFileList(); - //! @note not avialable via python bindings + //! @note not available via python bindings static QVector mDataItemPtr; static QStringList mProviderNames; diff --git a/src/core/qgsprojectfiletransform.cpp b/src/core/qgsprojectfiletransform.cpp index 88d35989402..572c09367d7 100644 --- a/src/core/qgsprojectfiletransform.cpp +++ b/src/core/qgsprojectfiletransform.cpp @@ -538,7 +538,7 @@ void QgsProjectFileTransform::convertRasterProperties( QDomDocument& doc, QDomNo QDomElement& rasterPropertiesElem, QgsRasterLayer* rlayer ) { //no data - //TODO: We would need to set no data on all bands, but we dont know number of bands here + //TODO: We would need to set no data on all bands, but we don't know number of bands here QDomNode noDataNode = rasterPropertiesElem.namedItem( "mNoDataValue" ); QDomElement noDataElement = noDataNode.toElement(); if ( !noDataElement.text().isEmpty() ) diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp index 327ba2060da..d039b360689 100644 --- a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp +++ b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp @@ -83,7 +83,7 @@ void QgsSimpleFillSymbolLayerV2::startRender( QgsSymbolV2RenderContext& context QColor selPenColor = selColor == mColor ? selColor : mBorderColor; if ( ! selectionIsOpaque ) selColor.setAlphaF( context.alpha() ); mSelBrush = QBrush( selColor ); - // N.B. unless a "selection line colour" is implemented in addition to the "selection colour" option + // N.B. unless a "selection line color" is implemented in addition to the "selection color" option // this would mean symbols with "no fill" look the same whether or not they are selected if ( selectFillStyle ) mSelBrush.setStyle( mBrushStyle ); diff --git a/src/core/symbology-ng/qgsstylev2.h b/src/core/symbology-ng/qgsstylev2.h index 095c931c4c6..ccd6a3ed913 100644 --- a/src/core/symbology-ng/qgsstylev2.h +++ b/src/core/symbology-ng/qgsstylev2.h @@ -213,7 +213,7 @@ class CORE_EXPORT QgsStyleV2 */ QStringList symbolsWithTag( StyleEntity type, int tagid ); - //! applies the specifed group to the symbol or colorramp specified by StyleEntity + //! applies the specified group to the symbol or colorramp specified by StyleEntity /*! * \param type is either SymbolEntity of ColorrampEntity * \param name is the name of the symbol or coloramp whose group is to be set @@ -339,7 +339,7 @@ class CORE_EXPORT QgsStyleV2 //! updates the properties of an existing symbol/colorramp /*! - * \note This should not be called seperately, only called through addSymbol or addColorRamp + * \note This should not be called separately, only called through addSymbol or addColorRamp * \param type is either SymbolEntity or ColorrampEntity * \param name is the name of an existing symbol or a color ramp * \return Success state of the update operation