Skip to content

Commit

Permalink
spelling fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Jan 8, 2016
1 parent 8d2f7bb commit bd6169e
Show file tree
Hide file tree
Showing 21 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion python/core/qgseditformconfig.sip
Expand Up @@ -195,7 +195,7 @@ class QgsEditFormConfig : QObject

/**
* This returns true if the field is manually set to read only or if the field
* does not support editing like joins or vitual fields.
* does not support editing like joins or virtual fields.
*/
bool readOnly( int idx );

Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/algs/help/qgis.yaml
Expand Up @@ -86,7 +86,7 @@ qgis:createconstantrasterlayer: >
Given an input raster layer an a value, this algorithm generates a new layer with the same extent and cellsize as the input one, and all cells with the specified value.

qgis:creategrid:
This algorith creates a vector layer with a grid convering a given extent. Features can be lines or polygons, and the shape used in the grid can be rectangles, diamond or hexagons.
This algorithm creates a vector layer with a grid convering a given extent. Features can be lines or polygons, and the shape used in the grid can be rectangles, diamond or hexagons.

The size of each element in the grid is defined using a horizontal and vertical spaciong.

Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/algs/otb/OTBUtils.py
Expand Up @@ -171,7 +171,7 @@ def get_choices_of(doc, parameter):
return choices


def remove_dependant_choices(doc, parameter, choice):
def remove_dependent_choices(doc, parameter, choice):
choices = get_choices_of(doc, parameter)
choices.remove(choice)
for a_choice in choices:
Expand All @@ -186,7 +186,7 @@ def renameValueField(doc, textitem, field, newValue):
t5.find(field).text = newValue


def remove_independant_choices(doc, parameter, choice):
def remove_independent_choices(doc, parameter, choice):
choices = []
choices.append(choice)
for a_choice in choices:
Expand Down Expand Up @@ -230,7 +230,7 @@ def split_by_choice(doc, parameter):
for choice in choices:
#creates a new copy of the document
working_copy = copy.deepcopy(doc)
remove_dependant_choices(working_copy, parameter, choice)
remove_dependent_choices(working_copy, parameter, choice)
#remove all other choices except the current one
remove_other_choices(working_copy, parameter, choice)
#set a new name according to the choice
Expand Down
Expand Up @@ -3,7 +3,7 @@
<exec>otbcli_ComputePolylineFeatureFromImage</exec>
<longname>Compute Polyline Feature From Image</longname>
<group>Feature Extraction</group>
<description>This application compute for each studied polyline, contained in the input VectorData, the choosen descriptors.</description>
<description>This application compute for each studied polyline, contained in the input VectorData, the chosen descriptors.</description>
<parameter>
<parameter_type source_parameter_type="ParameterType_InputImage">ParameterRaster</parameter_type>
<key>in</key>
Expand Down
Expand Up @@ -142,7 +142,7 @@
<key>atmo.rsr</key>
<name>Relative Spectral Response File</name>
<description>Sensor relative spectral response file
By default the application gets these informations in the metadata</description>
By default the application gets this information in the metadata</description>
<isFolder />
<optional>True</optional>
</parameter>
Expand Down
Expand Up @@ -38,7 +38,7 @@
im1b2 + im2b2 (2)
....

Nevertheless, the first expression is by far much pleaseant. We call this new functionnality the 'batch mode'
Nevertheless, the first expression is by far much pleaseant. We call this new functionality the 'batch mode'
(performing the same operation in a band-to-band fashion).


Expand All @@ -50,7 +50,7 @@
- J is an number identifying the band (remember, first band is indexed by 1)
- KxP are two numbers that represent the size of the neighborhood (first one is related to the horizontal direction)
All neighborhood are centred, thus K and P must be odd numbers.
Many operators come with this new functionnality: dotpr, mean var median min max...
Many operators come with this new functionality: dotpr, mean var median min max...
For instance, if im1 represents the pixel of 3 bands image:

im1 - mean(im1b1N5x5,im1b2N5x5,im1b3N5x5) (3)
Expand All @@ -66,7 +66,7 @@
matrices (for instance cos, sin, ...). These new operators/ functions keep the original names to which we added the prefix 'v' for vector (vcos, vsin, ...).
- mult, div and pow operators, that perform element-wise multiplication, division or exponentiation of vector/matrices (for instance im1 div im2)
- mlt, dv and pw operators, that perform multiplication, division or exponentiation of vector/matrices by a scalar (for instance im1 dv 2.0)
- bands, which is a very usefull operator. It allows to select specific bands from an image, and/or to rearrange them in a new vector;
- bands, which is a very useful operator. It allows to select specific bands from an image, and/or to rearrange them in a new vector;
for instance bands(im1,{1,2,1,1}) produces a vector of 4 components made of band 1, band 2, band 1 and band 1 values from the first input.
Note that curly brackets must be used in order to select the desired band indices.
... and so on.
Expand Down Expand Up @@ -95,4 +95,4 @@

Finally, we strongly recommend that the reader takes a look at the cookbook, where additional information can be found (http://www.orfeo-toolbox.org/packages/OTBCookBook.pdf).
<h2>Parameters</h2><ul><li><b>[param] -il</b> &lt;string&gt; Image list to perform computation on.. Mandatory: True. Default Value: &quot;0&quot;</li><li><b>[param] -out</b> &lt;string&gt; Output image.. Mandatory: True. Default Value: &quot;&quot;</li><li><b>[param] -ram</b> &lt;int32&gt; Available memory for processing (in MB). Mandatory: False. Default Value: &quot;128&quot;</li><li><b>[param] -exp</b> &lt;string&gt; Mathematical expression to apply.. Mandatory: False. Default Value: &quot;&quot;</li><li><b>[param] -incontext</b> &lt;string&gt; A txt file containing user's constants and expressions.. Mandatory: False. Default Value: &quot;&quot;</li><li><b>[param] -outcontext</b> &lt;string&gt; A txt file where to save user's constants and expressions.. Mandatory: False. Default Value: &quot;&quot;</li><li><b>[param] -inxml</b> &lt;string&gt; Load otb application from xml file. Mandatory: False. Default Value: &quot;&quot;</li><li><b>[param] -outxml</b> &lt;string&gt; Save otb application to xml file. Mandatory: False. Default Value: &quot;&quot;</li></ul><h2>Limitations</h2>The application is currently unable to produce one output image per expression, contrary to otbBandMathXImageFilter.
Separating expressions by semi-colons (; ) will concatenate their results into a unique multiband output image. <h2>Authors</h2>OTB-Team<h2>See Also</h2> <h2>Example of use</h2><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">il: verySmallFSATSW_r.tif verySmallFSATSW_nir.tif verySmallFSATSW.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">out: apTvUtBandMathOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">exp: "cos(im1b1)+im2b1*im3b1-im3b2+ndvi(im3b3, im3b4)"</p></li></ul></body></html>
Separating expressions by semi-colons (; ) will concatenate their results into a unique multiband output image. <h2>Authors</h2>OTB-Team<h2>See Also</h2> <h2>Example of use</h2><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">il: verySmallFSATSW_r.tif verySmallFSATSW_nir.tif verySmallFSATSW.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">out: apTvUtBandMathOutput.tif</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">exp: "cos(im1b1)+im2b1*im3b1-im3b2+ndvi(im3b3, im3b4)"</p></li></ul></body></html>
Expand Up @@ -2,4 +2,4 @@
<style type="text/css">
dl { border: 3px double #ccc; padding: 0.5em; } dt { float: left; clear: left; text-align: left; font-weight: bold; color: green; } dt:after { content: ":"; } dd { margin: 0 0 0 220px; padding: 0 0 0.5em 0; }
</style>
</head><body><h1>ComputePolylineFeatureFromImage</h1><h2>Brief Description</h2>This application compute for each studied polyline, contained in the input VectorData, the choosen descriptors.<h2>Tags</h2>Feature Extraction<h2>Long Description</h2>The first step in the classifier fusion based validation is to compute, for each studied polyline, the choosen descriptors. <h2>Parameters</h2><ul><li><b>[param] -in</b> &lt;string&gt; An image to compute the descriptors on.. Mandatory: True. Default Value: &quot;&quot;</li><li><b>[param] -vd</b> &lt;string&gt; Vector data containing the polylines where the features will be computed.. Mandatory: True. Default Value: &quot;&quot;</li><li><b>[param] -elev</b> &lt;string&gt; This group of parameters allows to manage elevation values. Supported formats are SRTM, DTED or any geotiff. DownloadSRTMTiles application could be a useful tool to list/download tiles related to a product.. Mandatory: True. Default Value: &quot;0&quot;</li><li><b>[param] -expr</b> &lt;string&gt; The feature formula (b1 < 0.3) where b1 is the standard name of input image first band. Mandatory: True. Default Value: &quot;&quot;</li><li><b>[param] -field</b> &lt;string&gt; The field name corresponding to the feature codename (NONDVI, ROADSA...). Mandatory: True. Default Value: &quot;&quot;</li><li><b>[param] -out</b> &lt;string&gt; The output vector data containing polylines with a new field. Mandatory: True. Default Value: &quot;&quot;</li><li><b>[param] -inxml</b> &lt;string&gt; Load otb application from xml file. Mandatory: False. Default Value: &quot;&quot;</li><li><b>[param] -outxml</b> &lt;string&gt; Save otb application to xml file. Mandatory: False. Default Value: &quot;&quot;</li></ul><h2>Limitations</h2>Since it does not rely on streaming process, take care of the size of input image before launching application.<h2>Authors</h2>OTB-Team<h2>See Also</h2> <h2>Example of use</h2><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">in: NDVI.TIF</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">vd: roads_ground_truth.shp</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">expr: "(b1 > 0.4)"</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">field: NONDVI</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">out: PolylineFeatureFromImage_LI_NONDVI_gt.shp</p></li></ul></body></html>
</head><body><h1>ComputePolylineFeatureFromImage</h1><h2>Brief Description</h2>This application compute for each studied polyline, contained in the input VectorData, the chosen descriptors.<h2>Tags</h2>Feature Extraction<h2>Long Description</h2>The first step in the classifier fusion based validation is to compute, for each studied polyline, the chosen descriptors. <h2>Parameters</h2><ul><li><b>[param] -in</b> &lt;string&gt; An image to compute the descriptors on.. Mandatory: True. Default Value: &quot;&quot;</li><li><b>[param] -vd</b> &lt;string&gt; Vector data containing the polylines where the features will be computed.. Mandatory: True. Default Value: &quot;&quot;</li><li><b>[param] -elev</b> &lt;string&gt; This group of parameters allows to manage elevation values. Supported formats are SRTM, DTED or any geotiff. DownloadSRTMTiles application could be a useful tool to list/download tiles related to a product.. Mandatory: True. Default Value: &quot;0&quot;</li><li><b>[param] -expr</b> &lt;string&gt; The feature formula (b1 < 0.3) where b1 is the standard name of input image first band. Mandatory: True. Default Value: &quot;&quot;</li><li><b>[param] -field</b> &lt;string&gt; The field name corresponding to the feature codename (NONDVI, ROADSA...). Mandatory: True. Default Value: &quot;&quot;</li><li><b>[param] -out</b> &lt;string&gt; The output vector data containing polylines with a new field. Mandatory: True. Default Value: &quot;&quot;</li><li><b>[param] -inxml</b> &lt;string&gt; Load otb application from xml file. Mandatory: False. Default Value: &quot;&quot;</li><li><b>[param] -outxml</b> &lt;string&gt; Save otb application to xml file. Mandatory: False. Default Value: &quot;&quot;</li></ul><h2>Limitations</h2>Since it does not rely on streaming process, take care of the size of input image before launching application.<h2>Authors</h2>OTB-Team<h2>See Also</h2> <h2>Example of use</h2><ul><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">in: NDVI.TIF</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">vd: roads_ground_truth.shp</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">expr: "(b1 > 0.4)"</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">field: NONDVI</p></li><li><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">out: PolylineFeatureFromImage_LI_NONDVI_gt.shp</p></li></ul></body></html>

0 comments on commit bd6169e

Please sign in to comment.