sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

spelling fixes

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-07-26 14:39:30 +02:00
parent 644bdf046f
commit b165875fa6
19 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/ECMQt4To5Porting.cmake
View File

@ -30,7 +30,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#=============================================================================
# The automoc_qt4 macro is superceded by CMAKE_AUTOMOC from CMake 2.8.6
# The automoc_qt4 macro is superceeded by CMAKE_AUTOMOC from CMake 2.8.6
# A Qt 5 version is not provided by CMake or Qt.
include(MacroAddFileDependencies)

2
python/analysis/raster/qgsrastercalculator.sip
View File

@ -34,7 +34,7 @@ class QgsRasterCalculator
* @param formulaString formula for raster calculation
* @param outputFile output file path
* @param outputFormat output file format
* @param outputExtent output extent, CRS is specifed by outputCrs parameter
* @param outputExtent output extent, CRS is specified by outputCrs parameter
* @param outputCrs destination CRS for output raster
* @param nOutputColumns number of columns in output raster
* @param nOutputRows number of rows in output raster

2
python/core/effects/qgseffectstack.sip
View File

@ -72,7 +72,7 @@ class QgsEffectStack : QgsPaintEffect
*/
bool insertEffect( const int index, QgsPaintEffect* effect /Transfer/);
/** Replaces the effect at a speficied position within the stack.
/** Replaces the effect at a specified position within the stack.
* @param index position of effect to replace
* @param effect QgsPaintEffect to replace with. Ownership of the effect will be
* transferred to the stack object.

4
python/gui/qgshistogramwidget.sip
View File

@ -66,13 +66,13 @@ class QgsHistogramWidget : QWidget
*/
QBrush brush() const;
/** Sets the graduated ranges associated with the histogram. If set, the ranges will be used to colour the histogram
/** Sets the graduated ranges associated with the histogram. If set, the ranges will be used to color the histogram
* bars and for showing vertical dividers at the histogram breaks.
* @param ranges graduated range list
*/
void setGraduatedRanges( const QgsRangeList& ranges );
/** Returns the graduated ranges associated with the histogram. If set, the ranges will be used to colour the histogram
/** Returns the graduated ranges associated with the histogram. If set, the ranges will be used to color the histogram
* bars and for showing vertical dividers at the histogram breaks.
* @returns graduated range list
* @see setGraduatedRanges

10
python/plugins/db_manager/db_plugins/oracle/TODO.md
View File

@ -73,7 +73,7 @@
* Create view button.
* Spatial Index tab (find if can be activated: no because Oracle use spatial index internally).
* Can't open query builder.
* Modify dictionnary to add math/string/aggregates functions/operators.
* Modify dictionary to add math/string/aggregates functions/operators.
* Can't open column values from query builder.
* GEOM columns are not retrieved. (Done: don't grab them, just use GEOMETRY string instead to speed columns population)
* Can't open a query in QGis.
@ -124,7 +124,7 @@
* For rows estimation: use a query to scan nb_rows in object !
* Refresh on the fly data that are not stored in cache (comments/table type/row counts).
* Bad comparison between metadata extent and calculated extent (was format syntax).
* If user can't udpate metadata, dont pull the link for update action.
* If user can't udpate metadata, don't pull the link for update action.
* Can't update metadata extent: find if table is in USER_SDO_GEOM_METADATA.
* Print QGis Geometry Type in string instead of int.
@ -134,10 +134,10 @@
* Indexes:
* Add rebuild index action for indexes.
* Add more informations: Compression/Valid/Last analyzed/ityp_name.
* Add more information: Compression/Valid/Last analyzed/ityp_name.
* Refresh:
* Make getTables and getVectorTables functions retrieve less informations and manage them on the fly.
* Make getTables and getVectorTables functions retrieve less information and manage them on the fly.
* Refreshing a schema refresh only the schema, not the whole connection.
* Still problems with refreshing (QPyNullVariant for detectedSrid).
* Mark views as views.
@ -156,7 +156,7 @@
* retrieve definition.
* unitary comments retrieving.
* Primary key mask.
* Refreshing informations.
* Refreshing information.
* Action to refresh the mview.
* View/MView definition is not interpreted as Html anymore.

10
python/plugins/db_manager/db_plugins/oracle/connector.py
View File

@ -937,7 +937,7 @@ class OracleDBConnector(DBConnector):
return res
def getMViewInfo(self, table):
"""Find some informations about materialized views"""
"""Find some information about materialized views"""
schema, tablename = self.getSchemaTableName(table)
where = u" AND a.OWNER = {} ".format(
self.quoteString(schema)) if schema else u""
@ -959,7 +959,7 @@ class OracleDBConnector(DBConnector):
return res
def getTableConstraints(self, table):
"""Find all the contraints for a table."""
"""Find all the constraints for a table."""
schema, tablename = self.getSchemaTableName(table)
schema_where = u" AND c.OWNER={} ".format(
self.quoteString(schema)) if schema else u""
@ -1279,7 +1279,7 @@ class OracleDBConnector(DBConnector):
# Calculate the extent
extent = self.getTableExtent(view, geoCol)
# Insert informations into metadata table
# Insert information into metadata table
self.insertMetadata(view, geoCol, extent, srids[0])
return True
@ -1454,7 +1454,7 @@ class OracleDBConnector(DBConnector):
def updateMetadata(self, table, geom_column, new_geom_column=None,
new_table=None, extent=None, srid=None):
"""update the metadata table with the new informations"""
"""update the metadata table with the new information"""
schema, tablename = self.getSchemaTableName(table)
if not (self.getRawTablePrivileges('USER_SDO_GEOM_METADATA',
@ -1694,7 +1694,7 @@ class OracleDBConnector(DBConnector):
return getQueryBuilderDictionary()
def getSqlDictionary(self):
"""Returns the dictionnary for SQL dialog."""
"""Returns the dictionary for SQL dialog."""
from .sql_dictionary import getSqlDictionary
sql_dict = getSqlDictionary()

4
python/plugins/db_manager/db_plugins/oracle/info_model.py
View File

@ -470,14 +470,14 @@ class ORTableInfo(TableInfo):
HtmlSection(
QApplication.translate(
"DBManagerPlugin",
'Materialized View informations'),
'Materialized View information'),
mview_info))
return ret
def getMViewInfo(self):
"""If the table is a materialized view, grab more
informations...
information...
"""
ret = []
tbl = []

2
python/plugins/processing/algs/grass/description/v.split.length.txt
View File

@ -3,4 +3,4 @@ v.split.length - Split lines to shorter segments by length.
Vector (v.*)
ParameterVector|input|Input lines layer|1|False
ParameterNumber|length|Maximum segment length|None|None|10.0
OutputVector|output|Splitted by legth
OutputVector|output|Split by length

2
python/plugins/processing/algs/grass/description/v.split.vert.txt
View File

@ -3,4 +3,4 @@ v.split.vert - Split lines to shorter segments by max number of vertices.
Vector (v.*)
ParameterVector|input|Input lines layer|1|False
ParameterNumber|vertices|Maximum number of vertices in segment|None|None|10
OutputVector|output|Splitted by vertices
OutputVector|output|Split by vertices

2
python/plugins/processing/algs/grass7/description/v.split.length.txt
View File

@ -3,4 +3,4 @@ v.split.length - Split lines to shorter segments by length.
Vector (v.*)
ParameterVector|input|Input lines layer|1|False
ParameterNumber|length|Maximum segment length|None|None|10.0
OutputVector|output|Splitted by length
OutputVector|output|Split by length

2
python/plugins/processing/algs/grass7/description/v.split.vert.txt
View File

@ -3,4 +3,4 @@ v.split.vert - Split lines to shorter segments by max number of vertices.
Vector (v.*)
ParameterVector|input|Input lines layer|1|False
ParameterNumber|vertices|Maximum number of vertices in segment|None|None|10
OutputVector|output|Splitted by vertices
OutputVector|output|Split by vertices

8
python/plugins/processing/algs/qgis/Datasources2Vrt.py
View File

@ -44,8 +44,8 @@ class Datasources2Vrt(GeoAlgorithm):
""" This algorithm merge the layers of different data sources in
a single vrt file
This algo is expecially useful in case an algo need multiple layers
but accept only one vrt in wich the layers are specified
This algo is especially useful in case an algo need multiple layers
but accept only one vrt in which the layers are specified
"""
# Constants used to refer to parameters and outputs.
@ -124,7 +124,7 @@ class Datasources2Vrt(GeoAlgorithm):
#######################################################
# function to do the work
# fuction so it can be included in other code
# function so it can be included in other code
# IT NOT POSSIBILE TO ADD THIS FUNCTION AS Datasources2Vrt
# CLASS METHOD => SET AS SIMPLE FUNCTION
#######################################################
@ -132,7 +132,7 @@ def mergeDataSources2Vrt(data_sources=[],
outfile=None,
relative=False,
schema=False,
progress=None): # progress is pased because of avoid interferences with GeoAlgorithm
progress=None): # progress is passed because of avoid interferences with GeoAlgorithm
'''Function to do the work of merging datasources in a single vrt format
@param data_sources: Array of path strings

4
rpm/qgis.spec.template
View File

@ -910,12 +910,12 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
- fixing Requires statements for sub-packages
* Tue May 15 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.0-2
- added devel dependancy on qgis
- added devel dependency on qgis
- moved qgis-config to devel package
- moving doc directory
- removed zero-length NEWS doc
- added postin/postun ldconfig calls
- split packages up to reduce package size and split out dependancies
- split packages up to reduce package size and split out dependencies
grass, theme-nkids
* Mon May 14 2007 Douglas E. Warner <silfreed@silfreed.net> 0.8.0-1

1
scripts/spelling.dat
View File

@ -473,3 +473,4 @@ an other:another
swaped:swapped
stoped:stopped
tranform:transform
wich:which

17
src/analysis/raster/qgsrastercalculator.h
View File

@ -36,7 +36,7 @@ struct ANALYSIS_EXPORT QgsRasterCalculatorEntry
int bandNumber; //raster band number
};
/**Raster calculator class*/
/** Raster calculator class*/
class ANALYSIS_EXPORT QgsRasterCalculator
{
public:
@ -67,10 +67,9 @@ class ANALYSIS_EXPORT QgsRasterCalculator
QgsRasterCalculator( const QString& formulaString, const QString& outputFile, const QString& outputFormat,
const QgsRectangle& outputExtent, const QgsCoordinateReferenceSystem& outputCrs, int nOutputColumns, int nOutputRows, const QVector<QgsRasterCalculatorEntry>& rasterEntries );
~QgsRasterCalculator();
/**Starts the calculation and writes new raster
/** Starts the calculation and writes new raster
@param p progress bar (or 0 if called from non-gui code)
@return 0 in case of success*/
int processCalculation( QProgressDialog* p = 0 );
@ -79,15 +78,15 @@ class ANALYSIS_EXPORT QgsRasterCalculator
//default constructor forbidden. We need formula, output file, output format and output raster resolution obligatory
QgsRasterCalculator();
/**Opens the output driver and tests if it supports the creation of a new dataset
/** Opens the output driver and tests if it supports the creation of a new dataset
@return NULL on error and the driver handle on success*/
GDALDriverH openOutputDriver();
/**Opens the output file and sets the same geotransform and CRS as the input data
/** Opens the output file and sets the same geotransform and CRS as the input data
@return the output dataset or NULL in case of error*/
GDALDatasetH openOutputFile( GDALDriverH outputDriver );
/**Sets gdal 6 parameters array from mOutputRectangle, mNumOutputColumns, mNumOutputRows
/** Sets gdal 6 parameters array from mOutputRectangle, mNumOutputColumns, mNumOutputRows
@param transform double[6] array that receives the GDAL parameters*/
void outputGeoTransform( double* transform ) const;
@ -95,13 +94,13 @@ class ANALYSIS_EXPORT QgsRasterCalculator
QString mOutputFile;
QString mOutputFormat;
/**Output raster extent*/
/** Output raster extent*/
QgsRectangle mOutputRectangle;
QgsCoordinateReferenceSystem mOutputCrs;
/**Number of output columns*/
/** Number of output columns*/
int mNumOutputColumns;
/**Number of output rows*/
/** Number of output rows*/
int mNumOutputRows;
/***/

6
src/app/qgsoptions.cpp
View File

@ -271,9 +271,9 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl ) :
QString proxyExcludedURLs = settings.value( "proxy/proxyExcludedUrls", "" ).toString();
if ( !proxyExcludedURLs.isEmpty() )
{
QStringList splittedUrls = proxyExcludedURLs.split( "|" );
QStringList::const_iterator urlIt = splittedUrls.constBegin();
for ( ; urlIt != splittedUrls.constEnd(); ++urlIt )
QStringList splitUrls = proxyExcludedURLs.split( "|" );
QStringList::const_iterator urlIt = splitUrls.constBegin();
for ( ; urlIt != splitUrls.constEnd(); ++urlIt )
{
QListWidgetItem* newItem = new QListWidgetItem( mExcludeUrlListWidget );
newItem->setText( *urlIt );

2
src/core/qgsstringutils.h
View File

@ -34,7 +34,7 @@ class CORE_EXPORT QgsStringUtils
* @param string1 first string
* @param string2 second string
* @param caseSensitive set to true for case sensitive comparison
* @returns edit distance. Lower distances indicate more similiar strings.
* @returns edit distance. Lower distances indicate more similar strings.
*/
static int levenshteinDistance( const QString &string1, const QString &string2, bool caseSensitive = false );

2
src/providers/grass/qgsgrass.h
View File

@ -476,7 +476,7 @@ class GRASS_LIB_EXPORT QgsGrass : public QObject
static void sleep( int ms );
signals:
/** Signal emited after mapset was opened */
/** Signal emitted after mapset was opened */
void mapsetChanged();
/** Emitted when path to modules config dir changed */

2
src/server/qgsserver.cpp
View File

@ -172,7 +172,7 @@ void QgsServer::printRequestParameters( const QMap< QString, QString>& parameter
}
/**
* @brief QgsServer::printRequestInfos prints debug informations about the request
* @brief QgsServer::printRequestInfos prints debug information about the request
*/
void QgsServer::printRequestInfos()
{