mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-22 00:06:12 -05:00
spelling fixes
This commit is contained in:
Denis Rouzaud
parent
46f786eb52
commit
6c74e4ea5d
@ -451,7 +451,7 @@ IF (WIN32)
|
||||
SET (DEFAULT_BIN_SUBDIR bin)
|
||||
SET (DEFAULT_CGIBIN_SUBDIR bin)
|
||||
# put all the build products into a single directory
|
||||
# under build (doesnt affect install target) to make for
|
||||
# under build (doesn't affect install target) to make for
|
||||
# easier debugging.
|
||||
|
||||
# Turn on defines for non standard maths stuff
|
||||
|
||||
2
INSTALL
2
INSTALL
@ -753,7 +753,7 @@ to get versions that match your current Qt installed version.
|
||||
===========================
|
||||
|
||||
/!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
|
||||
successfull install, they're not needed anymore.
|
||||
successful install, they're not needed anymore.
|
||||
|
||||
|
||||
4.2.5. git
|
||||
|
||||
14
NEWS
14
NEWS
@ -1063,7 +1063,7 @@ features for you.
|
||||
|
||||
Probably the biggest new feature is the addition of the new vector symbology
|
||||
infrastructure. This is provided alongside the old implementation - you can
|
||||
switch using a button in the vector layer properties dialog. It does't replace
|
||||
switch using a button in the vector layer properties dialog. It doesn't replace
|
||||
the old symbology implementation completely yet because there are various isues
|
||||
that need to be resolved and a large amount of testinhen it is considered
|
||||
ready.
|
||||
@ -1926,13 +1926,13 @@ Complete buffering so that bar as well as text will be visible on both
|
||||
|
||||
Fix for bug [ 973922 ] Overview shows layers in wrong order
|
||||
|
||||
Fixed show stopper bug where maplayerregistry wasnt being cleared properly on file new
|
||||
Fixed show stopper bug where maplayerregistry wasn't being cleared properly on file new
|
||||
|
||||
Added setZOrder which will be used in next commit to fix projectio zorder problem
|
||||
|
||||
2004-06-20 [ts] 0.3.0devel43
|
||||
|
||||
Fix anoying 'mapcanvas isnt freezing while loading rasters' bug
|
||||
Fix anoying 'mapcanvas isn't freezing while loading rasters' bug
|
||||
|
||||
2004-06-19 [ts] 0.3.0devel42
|
||||
|
||||
@ -1947,8 +1947,8 @@ Added an option for setting the length of the scale bar to closest
|
||||
Win32 support for package path - which will hopefully ensure pyramid and overview mini
|
||||
icons are displayed on legend entry now.
|
||||
|
||||
Beginnings of generic vector file writer - incomplete and doesnt do anything useful
|
||||
yet except has abilty to make a shapefile with a couple of user defined fields e.g.
|
||||
Beginnings of generic vector file writer - incomplete and doesn't do anything useful
|
||||
yet except has ability to make a shapefile with a couple of user defined fields e.g.
|
||||
to create a new point shapefile:
|
||||
|
||||
QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
|
||||
@ -2394,7 +2394,7 @@ updated German translation
|
||||
!! otherwise it's not detected by the plugins autogen.sh (more exactly
|
||||
!! aclocal)
|
||||
!! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of
|
||||
!! autogen.sh. But be carefull not to commit that to CVS
|
||||
!! autogen.sh. But be careful not to commit that to CVS
|
||||
|
||||
2004-04-18 [jobi] 0.1.0devel33
|
||||
Added internationalisations stuff
|
||||
@ -2408,7 +2408,7 @@ Fix for crash when opening singleband grayscale images introduced by Steves
|
||||
grayscale
|
||||
|
||||
2004-04-06 [ts] 0.1.0devel31
|
||||
Added new plugin (grid_maker) to build arbitary sized graticules and add
|
||||
Added new plugin (grid_maker) to build arbitrary sized graticules and add
|
||||
them to the current map view.
|
||||
|
||||
2004-04-05 [jobi] 0.1.0devel30
|
||||
|
||||
@ -11,6 +11,5 @@ if [[ ! -z $TRAVIS_PULL_REQUEST_BRANCH ]]; then
|
||||
echo "TRAVIS PR BRANCH: $TRAVIS_PULL_REQUEST_BRANCH"
|
||||
FILES=$(git diff --diff-filter=AM --name-only $(git merge-base HEAD master) | tr '\n' ' ' )
|
||||
fi
|
||||
|
||||
./scripts/chkspelling_ag.sh $FILES
|
||||
|
||||
./scripts/spell_check/check_spelling.sh -r $FILES
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
# This file defines the following variables:
|
||||
#
|
||||
# PYQT4_VERSION - The version of PyQt4 found expressed as a 6 digit hex number
|
||||
# suitable for comparision as a string
|
||||
# suitable for comparison as a string
|
||||
#
|
||||
# PYQT4_VERSION_STR - The version of PyQt4 as a human readable string.
|
||||
#
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
# This file defines the following variables:
|
||||
#
|
||||
# PYQT5_VERSION - The version of PyQt5 found expressed as a 6 digit hex number
|
||||
# suitable for comparision as a string
|
||||
# suitable for comparison as a string
|
||||
#
|
||||
# PYQT5_VERSION_STR - The version of PyQt5 as a human readable string.
|
||||
#
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
# This file defines the following variables:
|
||||
#
|
||||
# SIP_VERSION - The version of SIP found expressed as a 6 digit hex number
|
||||
# suitable for comparision as a string.
|
||||
# suitable for comparison as a string.
|
||||
#
|
||||
# SIP_VERSION_STR - The version of SIP found as a human readable string.
|
||||
#
|
||||
|
||||
2
debian/changelog
vendored
2
debian/changelog
vendored
@ -279,7 +279,7 @@ qgis (1.3.0) UNRELEASED; urgency=low
|
||||
|
||||
* new upstream release
|
||||
* add analysis library and raster terrain analysis plugin
|
||||
* alternativly depend on libgdal1-1.6.0-grass
|
||||
* alternatively depend on libgdal1-1.6.0-grass
|
||||
* include CONTRIBUTORS, TRANSLATORS and DONORS
|
||||
* reverse order of libgdal1-*-grass dependencies
|
||||
|
||||
|
||||
@ -1094,7 +1094,7 @@ make install
|
||||
|
||||
<P>
|
||||
/!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
|
||||
successfull install, they're not needed anymore.
|
||||
successful install, they're not needed anymore.
|
||||
</P>
|
||||
|
||||
<H3>4.2.5. git</H3>
|
||||
|
||||
@ -108,7 +108,7 @@ make install
|
||||
==== Final python notes ====
|
||||
|
||||
/!\ You can delete the directories with unpacked SIP and PyQt4 sources after a
|
||||
successfull install, they're not needed anymore.
|
||||
successful install, they're not needed anymore.
|
||||
|
||||
=== git ===
|
||||
|
||||
|
||||
@ -1192,7 +1192,7 @@ features for you.
|
||||
<P>
|
||||
Probably the biggest new feature is the addition of the new vector symbology
|
||||
infrastructure. This is provided alongside the old implementation - you can
|
||||
switch using a button in the vector layer properties dialog. It does't replace
|
||||
switch using a button in the vector layer properties dialog. It doesn't replace
|
||||
the old symbology implementation completely yet because there are various isues
|
||||
that need to be resolved and a large amount of testinhen it is considered
|
||||
ready.
|
||||
@ -2099,13 +2099,13 @@ Complete buffering so that bar as well as text will be visible on both
|
||||
<P></P>
|
||||
Fix for bug [ 973922 ] Overview shows layers in wrong order
|
||||
<P></P>
|
||||
Fixed show stopper bug where maplayerregistry wasnt being cleared properly on file new
|
||||
Fixed show stopper bug where maplayerregistry wasn't being cleared properly on file new
|
||||
<P></P>
|
||||
Added setZOrder which will be used in next commit to fix projectio zorder problem
|
||||
<P></P>
|
||||
2004-06-20 [ts] 0.3.0devel43
|
||||
<P></P>
|
||||
Fix anoying 'mapcanvas isnt freezing while loading rasters' bug
|
||||
Fix anoying 'mapcanvas isn't freezing while loading rasters' bug
|
||||
<P></P>
|
||||
2004-06-19 [ts] 0.3.0devel42
|
||||
<P></P>
|
||||
@ -2120,8 +2120,8 @@ Added an option for setting the length of the scale bar to closest
|
||||
Win32 support for package path - which will hopefully ensure pyramid and overview mini
|
||||
icons are displayed on legend entry now.
|
||||
<P></P>
|
||||
Beginnings of generic vector file writer - incomplete and doesnt do anything useful
|
||||
yet except has abilty to make a shapefile with a couple of user defined fields e.g.
|
||||
Beginnings of generic vector file writer - incomplete and doesn't do anything useful
|
||||
yet except has ability to make a shapefile with a couple of user defined fields e.g.
|
||||
to create a new point shapefile:
|
||||
<P></P>
|
||||
QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
|
||||
@ -2682,7 +2682,7 @@ updated German translation
|
||||
!! otherwise it's not detected by the plugins autogen.sh (more exactly
|
||||
!! aclocal)
|
||||
!! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of
|
||||
!! autogen.sh. But be carefull not to commit that to CVS
|
||||
!! autogen.sh. But be careful not to commit that to CVS
|
||||
</P>
|
||||
<P>
|
||||
2004-04-18 [jobi] 0.1.0devel33
|
||||
@ -2699,7 +2699,7 @@ Fix for crash when opening singleband grayscale images introduced by Steves
|
||||
</P>
|
||||
<P>
|
||||
2004-04-06 [ts] 0.1.0devel31
|
||||
Added new plugin (grid_maker) to build arbitary sized graticules and add
|
||||
Added new plugin (grid_maker) to build arbitrary sized graticules and add
|
||||
them to the current map view.
|
||||
</P>
|
||||
<P>
|
||||
|
||||
14
doc/news.t2t
14
doc/news.t2t
@ -1032,7 +1032,7 @@ features for you.
|
||||
|
||||
Probably the biggest new feature is the addition of the new vector symbology
|
||||
infrastructure. This is provided alongside the old implementation - you can
|
||||
switch using a button in the vector layer properties dialog. It does't replace
|
||||
switch using a button in the vector layer properties dialog. It doesn't replace
|
||||
the old symbology implementation completely yet because there are various isues
|
||||
that need to be resolved and a large amount of testinhen it is considered
|
||||
ready.
|
||||
@ -1877,13 +1877,13 @@ Complete buffering so that bar as well as text will be visible on both
|
||||
|
||||
Fix for bug [ 973922 ] Overview shows layers in wrong order
|
||||
|
||||
Fixed show stopper bug where maplayerregistry wasnt being cleared properly on file new
|
||||
Fixed show stopper bug where maplayerregistry wasn't being cleared properly on file new
|
||||
|
||||
Added setZOrder which will be used in next commit to fix projectio zorder problem
|
||||
|
||||
2004-06-20 [ts] 0.3.0devel43
|
||||
|
||||
Fix anoying 'mapcanvas isnt freezing while loading rasters' bug
|
||||
Fix anoying 'mapcanvas isn't freezing while loading rasters' bug
|
||||
|
||||
2004-06-19 [ts] 0.3.0devel42
|
||||
|
||||
@ -1898,8 +1898,8 @@ Added an option for setting the length of the scale bar to closest
|
||||
Win32 support for package path - which will hopefully ensure pyramid and overview mini
|
||||
icons are displayed on legend entry now.
|
||||
|
||||
Beginnings of generic vector file writer - incomplete and doesnt do anything useful
|
||||
yet except has abilty to make a shapefile with a couple of user defined fields e.g.
|
||||
Beginnings of generic vector file writer - incomplete and doesn't do anything useful
|
||||
yet except has ability to make a shapefile with a couple of user defined fields e.g.
|
||||
to create a new point shapefile:
|
||||
|
||||
QgsVectorFileWriter myFileWriter("/tmp/test.shp", wkbPoint);
|
||||
@ -2348,7 +2348,7 @@ updated German translation
|
||||
!! otherwise it's not detected by the plugins autogen.sh (more exactly
|
||||
!! aclocal)
|
||||
!! It can be cheated by adding -I path/to/qgis.m4 to the aclocal of
|
||||
!! autogen.sh. But be carefull not to commit that to CVS
|
||||
!! autogen.sh. But be careful not to commit that to CVS
|
||||
|
||||
2004-04-18 [jobi] 0.1.0devel33
|
||||
Added internationalisations stuff
|
||||
@ -2362,7 +2362,7 @@ Fix for crash when opening singleband grayscale images introduced by Steves
|
||||
grayscale
|
||||
|
||||
2004-04-06 [ts] 0.1.0devel31
|
||||
Added new plugin (grid_maker) to build arbitary sized graticules and add
|
||||
Added new plugin (grid_maker) to build arbitrary sized graticules and add
|
||||
them to the current map view.
|
||||
|
||||
2004-04-05 [jobi] 0.1.0devel30
|
||||
|
||||
@ -26,7 +26,7 @@ class NormVecDecorator : TriDecorator
|
||||
bool estimateFirstDerivatives( QProgressDialog* d = 0 );
|
||||
/** Returns a pointer to the normal vector for the point with the number n*/
|
||||
Vector3D* getNormal( int n ) const;
|
||||
/** Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normaly taken from 'mNormVec', exept if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise*/
|
||||
/** Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normaly taken from 'mNormVec', except if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise*/
|
||||
bool getTriangle( double x, double y, Point3D* p1 /Out/, Vector3D* v1 /Out/, Point3D* p2 /Out/, Vector3D* v2 /Out/, Point3D* p3 /Out/, Vector3D* v3 /Out/ );
|
||||
/** This function behaves similar to the one above. Additionally, the numbers of the points are returned (ptn1, ptn2, ptn3) as well as the PointStates of the triangle points (state1, state2, state3)
|
||||
* @note not available in Python bindings
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* @brief The QgsOSMXmlImport class imports OpenStreetMap XML format to our topological representation
|
||||
* in a SQLite database (see QgsOSMDatabase for details).
|
||||
*
|
||||
* How to use the classs:
|
||||
* How to use the class:
|
||||
* 1. set input XML file name and output DB file name (in constructor or with respective functions)
|
||||
* 2. run import()
|
||||
* 3. check errorString() if the import failed
|
||||
|
||||
@ -121,7 +121,7 @@ class QgsAuthMethodConfig
|
||||
* against the config's uri() for auto-selecting authentication configs to use
|
||||
* @note Essentially strips the URL query variables, and by default, strips the path as well
|
||||
* @param accessurl A URL to process
|
||||
* @param resource Ouput variable for result
|
||||
* @param resource Output variable for result
|
||||
* @param withpath Whether to include the URI's path in output
|
||||
*/
|
||||
static bool uriToResource( const QString &accessurl, QString *resource, bool withpath = false );
|
||||
|
||||
@ -515,7 +515,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
|
||||
virtual void setVisibility( const bool visible );
|
||||
|
||||
/** Returns whether the item should be excluded from composer exports and prints
|
||||
* @param valueType controls whether the returned value is the user specified vaule,
|
||||
* @param valueType controls whether the returned value is the user specified value,
|
||||
* or the current evaluated value (which may be affected by data driven settings).
|
||||
* @returns true if item should be excluded
|
||||
* @note added in version 2.5
|
||||
@ -629,7 +629,7 @@ class QgsComposerItem : QgsComposerObject, QGraphicsRectItem
|
||||
|
||||
/** Evaluates an item's bounding rect to consider data defined position and size of item
|
||||
* and reference point
|
||||
* @param newRect target bouding rect for item
|
||||
* @param newRect target bounding rect for item
|
||||
* @param resizeOnly set to true if the item is only being resized. If true then
|
||||
* the position of the returned rect will be adjusted to account for the item's
|
||||
* position mode
|
||||
|
||||
@ -57,7 +57,7 @@ class QgsNetworkAccessManager : QNetworkAccessManager
|
||||
//! Get QNetworkRequest::CacheLoadControl from name
|
||||
static QNetworkRequest::CacheLoadControl cacheLoadControlFromName( const QString &theName );
|
||||
|
||||
//! Setup the NAM according to the user's settings
|
||||
//! Setup the NAM according to the user's settings #spellok
|
||||
void setupDefaultProxyAndCache();
|
||||
|
||||
//! return whether the system proxy should be used
|
||||
|
||||
@ -241,7 +241,7 @@ class QgsPoint
|
||||
/** Calculates azimuth between this point and other one (clockwise in degree, starting from north) */
|
||||
double azimuth( const QgsPoint& other ) const;
|
||||
|
||||
/** Returns a new point which correponds to this point projected by a specified distance
|
||||
/** Returns a new point which corresponds to this point projected by a specified distance
|
||||
* in a specified bearing.
|
||||
* @param distance distance to project
|
||||
* @param bearing angle to project in, clockwise in degrees starting from north
|
||||
|
||||
@ -80,7 +80,7 @@ class QgsRenderChecker
|
||||
bool runTest( const QString& theTestName, unsigned int theMismatchCount = 0 );
|
||||
|
||||
/**
|
||||
* Test using two arbitary images (map renderer will not be used)
|
||||
* Test using two arbitrary images (map renderer will not be used)
|
||||
* @param theTestName - to be used as the basis for writing a file to
|
||||
* e.g. /tmp/theTestName.png
|
||||
* @param theMismatchCount - defaults to 0 - the number of pixels that
|
||||
@ -93,9 +93,9 @@ class QgsRenderChecker
|
||||
bool compareImages( const QString& theTestName, unsigned int theMismatchCount = 0, const QString& theRenderedImageFile = "" );
|
||||
/** Get a list of all the anomalies. An anomaly is a rendered difference
|
||||
* file where there is some red pixel content (indicating a render check
|
||||
* mismatch), but where the output was still acceptible. If the render
|
||||
* mismatch), but where the output was still acceptable. If the render
|
||||
* diff matches one of these anomalies we will still consider it to be
|
||||
* acceptible.
|
||||
* acceptable.
|
||||
* @return a bool indicating if the diff matched one of the anomaly files
|
||||
*/
|
||||
bool isKnownAnomaly( const QString& theDiffImageFile );
|
||||
|
||||
@ -157,7 +157,7 @@ class QgsVectorDataProvider : QgsDataProvider
|
||||
* @param substring substring to match (case insensitive)
|
||||
* @param limit maxmum number of the values to return, or -1 to return all unique values
|
||||
* @param feedback optional feedback object for cancelling request
|
||||
* @returns list of unique strings containg substring
|
||||
* @returns list of unique strings containing substring
|
||||
*/
|
||||
virtual QStringList uniqueStringsMatching( int index, const QString& substring, int limit = -1,
|
||||
QgsFeedback* feedback = nullptr ) const;
|
||||
|
||||
@ -1580,7 +1580,7 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator
|
||||
/** Is emitted, when edited changes successfully have been written to the data provider */
|
||||
void editingStopped();
|
||||
|
||||
/** Is emitted, before changes are commited to the data provider */
|
||||
/** Is emitted, before changes are committed to the data provider */
|
||||
void beforeCommitChanges();
|
||||
|
||||
/** Is emitted, before changes are rolled back*/
|
||||
|
||||
@ -59,12 +59,12 @@ class QgsVectorLayerFeatureIterator : QgsAbstractFeatureIterator
|
||||
*/
|
||||
//void addVirtualAttributes( QgsFeature &f );
|
||||
|
||||
/** Update feature with uncommited attribute updates.
|
||||
/** Update feature with uncommitted attribute updates.
|
||||
* @note not available in Python bindings
|
||||
*/
|
||||
//void updateChangedAttributes( QgsFeature& f );
|
||||
|
||||
/** Update feature with uncommited geometry updates.
|
||||
/** Update feature with uncommitted geometry updates.
|
||||
* @note not available in Python bindings
|
||||
*/
|
||||
//void updateFeatureGeometry( QgsFeature& f );
|
||||
|
||||
@ -31,7 +31,7 @@ class QgsVectorLayerTools : QObject
|
||||
virtual bool startEditing( QgsVectorLayer* layer ) const = 0;
|
||||
|
||||
/**
|
||||
* Will be called, when an editing session is ended and the features should be commited.
|
||||
* Will be called, when an editing session is ended and the features should be committed.
|
||||
* Appropriate dialogs should be shown like
|
||||
*
|
||||
* @param layer The layer to commit
|
||||
@ -41,7 +41,7 @@ class QgsVectorLayerTools : QObject
|
||||
virtual bool stopEditing( QgsVectorLayer* layer, bool allowCancel = true ) const = 0;
|
||||
|
||||
/**
|
||||
* Should be called, when the features should be commited but the editing session is not ended.
|
||||
* Should be called, when the features should be committed but the editing session is not ended.
|
||||
*
|
||||
* @param layer The layer to commit
|
||||
* @return True if successful
|
||||
|
||||
@ -315,7 +315,7 @@ class QgsCptCityBrowserModel : QAbstractItemModel
|
||||
// Refresh item specified by path
|
||||
void refresh( const QString& path );
|
||||
|
||||
// Refresh item childs
|
||||
// Refresh item children
|
||||
void refresh( const QModelIndex &index = QModelIndex() );
|
||||
|
||||
//! return index of a path
|
||||
|
||||
@ -225,7 +225,7 @@ class QgsSymbolLayer
|
||||
virtual bool hasDataDefinedProperties() const;
|
||||
|
||||
/** Checks whether the layer has a matching data defined property and if
|
||||
* that property is currently actived.
|
||||
* that property is currently activated.
|
||||
* @param property property key
|
||||
* @returns true if data defined property exists and is active
|
||||
* @see hasDataDefinedProperties
|
||||
@ -243,7 +243,7 @@ class QgsSymbolLayer
|
||||
* @param defaultVal default value to return if evaluation was not successful
|
||||
* @param ok if specified, will be set to true if evaluation was successful
|
||||
* @returns calculated value for data defined property, or default value
|
||||
* if property does not exist or is deactived.
|
||||
* if property does not exist or is deactivated.
|
||||
* @see hasDataDefinedProperty
|
||||
* @see getDataDefinedProperty
|
||||
* @note added in QGIS 2.12
|
||||
|
||||
@ -86,7 +86,7 @@ class QgsAttributeTableView : QTableView
|
||||
signals:
|
||||
/**
|
||||
* @brief
|
||||
* Is emitted, in order to provide a hook to add aditional menu entries to the context menu.
|
||||
* Is emitted, in order to provide a hook to add additional* menu entries to the context menu.
|
||||
*
|
||||
* @param menu If additional QMenuItems are added, they will show up in the context menu.
|
||||
* @param atIndex The QModelIndex, to which the context menu belongs. Relative to the source model.
|
||||
|
||||
@ -53,7 +53,7 @@ class QgsFeatureListModel : QAbstractProxyModel, QgsFeatureModel
|
||||
|
||||
/**
|
||||
* @brief Returns a detailed message about errors while parsing a QgsExpression.
|
||||
* @return A message containg information about the parser error.
|
||||
* @return A message containing information about the parser error.
|
||||
*/
|
||||
QString parserErrorString();
|
||||
|
||||
|
||||
@ -57,7 +57,7 @@ class QgsFeatureListView : QListView
|
||||
/**
|
||||
* Returns a detailed message about errors while parsing a QgsExpression.
|
||||
*
|
||||
* @return A message containg information about the parser error.
|
||||
* @return A message containing information about the parser error.
|
||||
*/
|
||||
QString parserErrorString();
|
||||
|
||||
|
||||
@ -535,7 +535,7 @@ class QgisInterface : QObject
|
||||
virtual QgsVectorLayerTools* vectorLayerTools() = 0;
|
||||
|
||||
/** This method is only needed when using a UI form with a custom widget plugin and calling
|
||||
* openFeatureForm or getFeatureForm from Python (PyQt4) and you havn't used the info tool first.
|
||||
* openFeatureForm or getFeatureForm from Python (PyQt4) and you haven't used the info tool first.
|
||||
* Python will crash bringing QGIS wtih it
|
||||
* if the custom form is not loaded from a C++ method call.
|
||||
*
|
||||
|
||||
@ -310,7 +310,7 @@ class QgsAdvancedDigitizingDockWidget : QDockWidget
|
||||
|
||||
private slots:
|
||||
//! set the additiona constraint by clicking on the perpendicular/parallel buttons
|
||||
void addtionalConstraintClicked( bool activated );
|
||||
void additionalConstraintClicked( bool activated );
|
||||
|
||||
//! lock/unlock a constraint and set its value
|
||||
void lockConstraint( bool activate = true );
|
||||
|
||||
@ -38,7 +38,7 @@ class QgsExternalResourceWidget : QWidget
|
||||
|
||||
//! returns the type of content used in the document viewer
|
||||
QgsExternalResourceWidget::DocumentViewerContent documentViewerContent() const;
|
||||
//! setDocumentViewerContent defines the type of content to be shown. Widget will be adapated accordingly
|
||||
//! setDocumentViewerContent defines the type of content to be shown. Widget will be adapted accordingly
|
||||
void setDocumentViewerContent( QgsExternalResourceWidget::DocumentViewerContent content );
|
||||
|
||||
//! returns the height of the document viewer
|
||||
|
||||
@ -15,7 +15,7 @@ class QgsMapLayerAction : QAction
|
||||
typedef QFlags<QgsMapLayerAction::Target> Targets;
|
||||
|
||||
//! Creates a map layer action which can run on any layer
|
||||
//! @note using AllActions as a target probably does not make a lot of sense. This default action was settled for API compatiblity reasons.
|
||||
//! @note using AllActions as a target probably does not make a lot of sense. This default action was settled for API compatibility reasons.
|
||||
QgsMapLayerAction( const QString& name, QObject *parent /TransferThis/, Targets targets = AllActions, const QIcon& icon = QIcon() );
|
||||
|
||||
//! Creates a map layer action which can run only on a specific layer
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
/**
|
||||
* @brief The QgsMapToolAdvancedDigitizing class is a QgsMapTool whcih gives event directly in map coordinates and allows filtering its events.
|
||||
* @brief The QgsMapToolAdvancedDigitizing class is a QgsMapTool which gives event directly in map coordinates and allows filtering its events.
|
||||
* Events from QgsMapTool are caught and their QMouseEvent are transformed into QgsMapMouseEvent (with map coordinates).
|
||||
* Events are then forwarded to corresponding virtual methods which can be reimplemented in subclasses.
|
||||
* An event filter can be set on the map tool to filter and modify the events in map coordinates (@see QgsMapToolMapEventFilter).
|
||||
|
||||
@ -71,7 +71,7 @@ class QgsMapToolIdentify : QgsMapTool
|
||||
QList<QgsMapToolIdentify::IdentifyResult> identify( int x, int y, const QList<QgsMapLayer*>& layerList = QList<QgsMapLayer*>(), IdentifyMode mode = DefaultQgsSetting );
|
||||
|
||||
/** Performs the identification.
|
||||
To avoid beeing forced to specify IdentifyMode with a list of layers
|
||||
To avoid being forced to specify IdentifyMode with a list of layers
|
||||
this has been made private and two publics methods are offered
|
||||
@param x x coordinates of mouseEvent
|
||||
@param y y coordinates of mouseEvent
|
||||
@ -94,7 +94,7 @@ class QgsMapToolIdentify : QgsMapTool
|
||||
|
||||
protected:
|
||||
/** Performs the identification.
|
||||
To avoid beeing forced to specify IdentifyMode with a list of layers
|
||||
To avoid being forced to specify IdentifyMode with a list of layers
|
||||
this has been made private and two publics methods are offered
|
||||
@param x x coordinates of mouseEvent
|
||||
@param y y coordinates of mouseEvent
|
||||
|
||||
@ -104,7 +104,7 @@
|
||||
|
||||
* Connector
|
||||
* getVectorTablesCache should present only one line per table (don't show tables more than once).
|
||||
* correspondance between Oracle SDO_GTYPE and Qgis.WkbType in a class dict.
|
||||
* correspondence between Oracle SDO_GTYPE and Qgis.WkbType in a class dict.
|
||||
* Show only one table/layer in the table tree even if entry is duplicated in cache.
|
||||
* Reuse the pre-calculated extent metadata when updating.
|
||||
* Create a better privilege function using ALL_PRIVS_RECD
|
||||
|
||||
@ -513,7 +513,7 @@ class PostGisDBConnector(DBConnector):
|
||||
return res
|
||||
|
||||
def getTableIndexes(self, table):
|
||||
""" get info about table's indexes. ignore primary key constraint index, they get listed in constaints """
|
||||
""" get info about table's indexes. ignore primary key constraint index, they get listed in constraints """
|
||||
schema, tablename = self.getSchemaTableName(table)
|
||||
schema_where = u" AND nspname=%s " % self.quoteString(schema) if schema is not None else ""
|
||||
|
||||
|
||||
@ -116,7 +116,7 @@ spatialite_functions = [ # from www.gaia-gis.it/spatialite-2.3.0/spatialite-sql
|
||||
# SQL functions for Spatial-MetaData and Spatial-Index handling
|
||||
"*initspatialmetadata", "*addgeometrycolumn", "*recovergeometrycolumn", "*discardgeometrycolumn",
|
||||
"*createspatialindex", "*creatembrcache", "*disablespatialindex",
|
||||
# SQL functions implementing FDO/OGR compatibily
|
||||
# SQL functions implementing FDO/OGR compatibility
|
||||
"*checkspatialmetadata", "*autofdostart", "*autofdostop", "*initfdospatialmetadata",
|
||||
"*addfdogeometrycolumn", "*recoverfdogeometrycolumn", "*discardfdogeometrycolumn",
|
||||
# SQL functions for MbrCache-based queries
|
||||
|
||||
@ -117,7 +117,7 @@ spatialite_functions = [ # from www.gaia-gis.it/spatialite-2.3.0/spatialite-sql
|
||||
# SQL functions for Spatial-MetaData and Spatial-Index handling
|
||||
"*initspatialmetadata", "*addgeometrycolumn", "*recovergeometrycolumn", "*discardgeometrycolumn",
|
||||
"*createspatialindex", "*creatembrcache", "*disablespatialindex",
|
||||
# SQL functions implementing FDO/OGR compatibily
|
||||
# SQL functions implementing FDO/OGR compatibility
|
||||
"*checkspatialmetadata", "*autofdostart", "*autofdostop", "*initfdospatialmetadata",
|
||||
"*addfdogeometrycolumn", "*recoverfdogeometrycolumn", "*discardfdogeometrycolumn",
|
||||
# SQL functions for MbrCache-based queries
|
||||
|
||||
@ -247,7 +247,7 @@ qgis:intersection: >
|
||||
qgis:joinattributesbylocation: >
|
||||
This algorithm takes an input vector layer and creates a new vector layer that is an extended version of the input one, with additional attributes in its attribute table.
|
||||
|
||||
The additional attributes and their values are taken from a second vector layer. A spatial critera is applied to select the values from the second layer that are added to each feature from the first layer in the resulting one.
|
||||
The additional attributes and their values are taken from a second vector layer. A spatial criteria is applied to select the values from the second layer that are added to each feature from the first layer in the resulting one.
|
||||
|
||||
|
||||
qgis:joinattributestable: >
|
||||
@ -441,7 +441,7 @@ qgis:rasterlayerstatistics: >
|
||||
qgis:refactorfields: >
|
||||
This algorithms allows editing the structure of the attributes table of a vector layer. Fields can be modified in their type and name, using a fields mapping
|
||||
|
||||
The original layer is not modified. A new layer is generated, which contains a modified attributes table, accordint to the provided fields mapping
|
||||
The original layer is not modified. A new layer is generated, which contains a modified attributes table, according to the provided fields mapping
|
||||
|
||||
qgis:regularpoints:
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@ class lascontrol(LAStoolsAlgorithm):
|
||||
CONTROL_POINT_FILE = "CONTROL_POINT_FILE"
|
||||
PARSE_STRING = "PARSE_STRING"
|
||||
USE_POINTS = "USE_POINTS"
|
||||
USE_POINTS_LIST = ["all", "ground (2)", "ground (2) and keypoints (8)", "ground (2), buldings (6), and keypoints (8)"]
|
||||
USE_POINTS_LIST = ["all", "ground (2)", "ground (2) and keypoints (8)", "ground (2), buildings (6), and keypoints (8)"]
|
||||
ADJUST_Z = "ADJUST_Z"
|
||||
|
||||
def defineCharacteristics(self):
|
||||
|
||||
@ -154,7 +154,7 @@ class Eliminate(GeoAlgorithm):
|
||||
msg = ''
|
||||
|
||||
if y.isNull():
|
||||
# Conversion was unsuccessfull
|
||||
# Conversion was unsuccessful
|
||||
selectionError = True
|
||||
msg += self.tr('Enter the date and the date format, e.g. "07.26.2011" "MM.dd.yyyy".')
|
||||
|
||||
|
||||
@ -411,7 +411,7 @@ class GeoDB(object):
|
||||
|
||||
def get_table_indexes(self, table, schema=None):
|
||||
"""Get info about table's indexes. ignore primary key and unique
|
||||
index, they get listed in constaints.
|
||||
index, they get listed in constraints.
|
||||
"""
|
||||
|
||||
c = self.con.cursor()
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
"""
|
||||
/***************************************************************************
|
||||
Plugin Installer module
|
||||
Plugin version comparision functions
|
||||
Plugin version comparison functions
|
||||
-------------------
|
||||
Date : 2008-11-24
|
||||
Copyright : (C) 2008 by Borys Jurgiel
|
||||
@ -23,7 +23,7 @@ and recognizes all major notations, prefixes (ver. and version), delimiters
|
||||
|
||||
Usage: compareVersions(version1, version2)
|
||||
|
||||
The function accepts arguments of any type convertable to Unicode string
|
||||
The function accepts arguments of any type convertible to Unicode string
|
||||
and returns integer value:
|
||||
0 - the versions are equal
|
||||
1 - version 1 is higher
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
* made available to plugins.
|
||||
*
|
||||
* This class provides methods to access the request handler and
|
||||
* the capabilties cache. A method to read the environment
|
||||
* the capabilities cache. A method to read the environment
|
||||
* variables set in the main FCGI loop is also available.
|
||||
* Plugins can add listeners (instances of QgsServerFilter) with
|
||||
* a certain priority through the registerFilter( QgsServerFilter* , int) method.
|
||||
|
||||
@ -41,7 +41,7 @@ class QgsServiceModule
|
||||
virtual ~QgsServiceModule() = 0;
|
||||
|
||||
/**
|
||||
* Ask module to registe all provided services
|
||||
* Ask module to register all provided services
|
||||
* @param registry QgsServiceRegistry
|
||||
*/
|
||||
virtual void registerSelf( QgsServiceRegistry& registry,
|
||||
|
||||
2
qgis.dtd
2
qgis.dtd
@ -105,7 +105,7 @@ outlinecolor,outlinestyle,outlinewidth,fillcolor,fillpattern) >
|
||||
<!ELEMENT greenBandNameQString (#CDATA)>
|
||||
<!--Raster : the band to be associated with the color blue - usually blue -->
|
||||
<!ELEMENT blueBandNameQString (#CDATA)>
|
||||
<!--Raster : the band to be associated with the grayscale only ouput - usually gray -->
|
||||
<!--Raster : the band to be associated with the grayscale only output - usually gray -->
|
||||
<!ELEMENT grayBandNameQString (#CDATA)>
|
||||
<!-- Attribute Lists -->
|
||||
<!ATTLIST showDebugOverlayFlag boolean (1|0|true|false) "false">
|
||||
|
||||
@ -2,10 +2,10 @@
|
||||
<selection cadence="low">
|
||||
<name short="div">Diverging</name>
|
||||
<synopsis>
|
||||
Palettes for diverging, signed or anomoly data
|
||||
Palettes for diverging, signed or anomaly data
|
||||
</synopsis>
|
||||
<description>
|
||||
Palettes for diverging, signed or anomoly data.
|
||||
Palettes for diverging, signed or anomaly data.
|
||||
</description>
|
||||
<seealsocollects>
|
||||
<collect dir="km">Kenneth Moreland</collect>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Create a file local.cfg instead and redefine any options in your local.cfg.
|
||||
#
|
||||
# This file conatins a default configuration and will be overwritten by the
|
||||
# This file contains a default configuration and will be overwritten by the
|
||||
# maintainer.
|
||||
|
||||
# Where should the results go
|
||||
|
||||
@ -13,6 +13,7 @@ python/qsci_apis/
|
||||
src/app/dwg/libdxfrw/
|
||||
src/app/gps/qwtpolar-1.0/
|
||||
src/app/gps/qwtpolar-1.1.1/
|
||||
src/core/pal
|
||||
src/plugins/grass/qtermwidget/
|
||||
|
||||
#Extensions
|
||||
@ -45,5 +46,3 @@ resources/cpt-city-qgis-min/wkp/schwarzwald/COPYING.xml
|
||||
tests/testdata/qgis_server/ets-wms13/project.qgs
|
||||
tests/testdata/qgis_server_accesscontrol/project.qgs
|
||||
tests/testdata/qgis_server_accesscontrol/Hello.qml
|
||||
|
||||
|
||||
|
||||
@ -244,8 +244,8 @@ adecuate:adequate
|
||||
adequit:adequate
|
||||
adhearing:adhering
|
||||
adherance:adherence
|
||||
aditional:additional
|
||||
aditionally:additionally
|
||||
aditional:additional:*
|
||||
aditionally:additionally:*
|
||||
aditionaly:additionally
|
||||
admendment:amendment
|
||||
admininistrative:administrative
|
||||
@ -349,7 +349,7 @@ alcholic:alcoholic
|
||||
alcohal:alcohol
|
||||
alcoholical:alcoholic
|
||||
aleady:already
|
||||
aledge:allege
|
||||
aledge:allege:*
|
||||
aledged:alleged
|
||||
aledges:alleges
|
||||
alege:allege
|
||||
@ -537,7 +537,7 @@ apperances:appearances
|
||||
appereance:appearance
|
||||
appereances:appearances
|
||||
appered:appeared
|
||||
appers:appears
|
||||
appers:appears*
|
||||
applicaiton:application
|
||||
applicaitons:applications
|
||||
appliction:application
|
||||
@ -633,7 +633,7 @@ arguements:arguments
|
||||
aribitary:arbitrary
|
||||
aribtrarily:arbitrarily
|
||||
aribtrary:arbitrary
|
||||
arised:arose
|
||||
arised:arose:*
|
||||
arithmatic:arithmetic
|
||||
arithmentic:arithmetic
|
||||
aritmetic:arithmetic
|
||||
@ -781,7 +781,7 @@ attemts:attempts
|
||||
attendence:attendance
|
||||
attendent:attendant
|
||||
attendents:attendants
|
||||
attened:attended
|
||||
attened:attended:*
|
||||
attension:attention
|
||||
attibute:attribute
|
||||
attibutes:attributes
|
||||
@ -818,7 +818,7 @@ authrorities:authorities
|
||||
autochtonous:autochthonous
|
||||
autoctonous:autochthonous
|
||||
autoincrememnt:autoincrement
|
||||
automaticall:automatically
|
||||
automaticall:automatically*
|
||||
automaticaly:automatically
|
||||
automaticly:automatically
|
||||
automatize:automate
|
||||
@ -858,6 +858,7 @@ avaluated:evaluated
|
||||
avaluate:evaluate
|
||||
avaluates:evaluates
|
||||
avaluating:evaluating
|
||||
avaoided:avoided
|
||||
avation:aviation
|
||||
avengence:a vengeance
|
||||
averageed:averaged
|
||||
@ -1120,7 +1121,7 @@ cartilege:cartilage
|
||||
cartilidge:cartilage
|
||||
cartrige:cartridge
|
||||
casette:cassette
|
||||
casion:caisson
|
||||
casion:caisson:*
|
||||
cassawory:cassowary
|
||||
cassowarry:cassowary
|
||||
casue:cause
|
||||
@ -1273,7 +1274,7 @@ clasifies:classifies
|
||||
clasify:classify
|
||||
clasifying:classifying
|
||||
classess:classes
|
||||
classs:class
|
||||
classs:class:*
|
||||
classses:classes
|
||||
cleareance:clearance
|
||||
clearified:clarified
|
||||
@ -5335,6 +5336,7 @@ proctecting:protecting
|
||||
proctect:protect
|
||||
proctects:protects
|
||||
procude:produce
|
||||
proejction:projection
|
||||
profesion:profession
|
||||
profesor:professor
|
||||
professer:professor
|
||||
@ -5358,6 +5360,7 @@ progresss:progress
|
||||
progrom:program
|
||||
progroms:programs
|
||||
prohabition:prohibition
|
||||
projectio:projection
|
||||
prologomena:prolegomena
|
||||
prominance:prominence
|
||||
prominantly:prominently
|
||||
@ -5746,6 +5749,7 @@ reminscent:reminiscent
|
||||
reminsicent:reminiscent
|
||||
remoote:remote
|
||||
removeable:removable
|
||||
rendereing:rendering
|
||||
renderering:rendering
|
||||
rendevous:rendezvous
|
||||
rendezous:rendezvous
|
||||
@ -6156,6 +6160,7 @@ seperatly:separately
|
||||
seperator:separator
|
||||
sepina:subpoena
|
||||
sepperate:separate
|
||||
seprate:separate
|
||||
seprator:separator
|
||||
seprators:separators
|
||||
sepulchure:sepulchre
|
||||
@ -7375,6 +7380,7 @@ wehn:when
|
||||
weigth:weight
|
||||
weilded:wielded
|
||||
weild:wield
|
||||
weill:will
|
||||
weired:weird
|
||||
wendsay:Wednesday
|
||||
wensday:Wednesday
|
||||
|
||||
@ -73,7 +73,7 @@ bool CloughTocherInterpolator::calcNormVec( double x, double y, Vector3D* result
|
||||
if ( result )
|
||||
{
|
||||
init( x, y );
|
||||
Point3D barycoord( 0, 0, 0 );//barycentric coordinates of (x,y) whith respect to the triangle
|
||||
Point3D barycoord( 0, 0, 0 );//barycentric coordinates of (x,y) with respect to the triangle
|
||||
Point3D endpointUXY( 0, 0, 0 );//endpoint of the derivative in u-direction (in xy-coordinates)
|
||||
Point3D endpointV( 0, 0, 0 );//endpoint of the derivative in v-direction (in barycentric coordinates)
|
||||
Point3D endpointVXY( 0, 0, 0 );//endpoint of the derivative in v-direction (in xy-coordinates)
|
||||
|
||||
@ -1527,7 +1527,7 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline )
|
||||
rightPolygon.append( mHalfEdge[mHalfEdge[crossedEdges.last()]->getDual()]->getNext() );
|
||||
mHalfEdge[rightPolygon.last()]->setNext( dualfirstedge );//set 'Next' of the last edge to dualfirstedge
|
||||
|
||||
//set the necessary nexts of leftPolygon(exept the first)
|
||||
//set the necessary nexts of leftPolygon(except the first)
|
||||
int actedgel = leftPolygon[1];
|
||||
leftiter = leftPolygon.constBegin();
|
||||
leftiter += 2;
|
||||
|
||||
@ -51,7 +51,7 @@ class ANALYSIS_EXPORT NormVecDecorator: public TriDecorator
|
||||
bool estimateFirstDerivatives( QProgressDialog* d = nullptr );
|
||||
//! Returns a pointer to the normal vector for the point with the number n
|
||||
Vector3D* getNormal( int n ) const;
|
||||
//! Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normaly taken from 'mNormVec', exept if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise
|
||||
//! Finds out, in which triangle a point with coordinates x and y is and assigns the triangle points to p1, p2, p3 and the estimated normals to v1, v2, v3. The vectors are normaly taken from 'mNormVec', except if p1, p2 or p3 is a point on a breakline. In this case, the normal is calculated on-the-fly. Returns false, if something went wrong and true otherwise
|
||||
bool getTriangle( double x, double y, Point3D* p1, Vector3D* v1, Point3D* p2, Vector3D* v2, Point3D* p3, Vector3D* v3 );
|
||||
|
||||
/** This function behaves similar to the one above. Additionally, the numbers of the points are returned (ptn1, ptn2, ptn3) as well as the PointStates of the triangle points (state1, state2, state3)
|
||||
|
||||
@ -28,7 +28,7 @@ class QXmlStreamReader;
|
||||
* @brief The QgsOSMXmlImport class imports OpenStreetMap XML format to our topological representation
|
||||
* in a SQLite database (see QgsOSMDatabase for details).
|
||||
*
|
||||
* How to use the classs:
|
||||
* How to use the class:
|
||||
* 1. set input XML file name and output DB file name (in constructor or with respective functions)
|
||||
* 2. run import()
|
||||
* 3. check errorString() if the import failed
|
||||
|
||||
@ -64,7 +64,7 @@ int QgsPointSample::createRandomPoints( QProgressDialog* pd )
|
||||
QgsWkbTypes::Point,
|
||||
mInputLayer->crs() );
|
||||
|
||||
//check if creation of output layer successfull
|
||||
//check if creation of output layer successful
|
||||
if ( writer.hasError() != QgsVectorFileWriter::NoError )
|
||||
{
|
||||
return 3;
|
||||
|
||||
@ -61,7 +61,7 @@ class QgsComposerConfigObject: public QObject
|
||||
|
||||
/** Registers a data defined button, setting up its initial value, connections and description.
|
||||
* @param button button to register
|
||||
* @param property correponding data defined property
|
||||
* @param property corresponding data defined property
|
||||
* @param type valid data types for button
|
||||
* @param description user visible description for data defined property
|
||||
*/
|
||||
@ -101,7 +101,7 @@ class QgsComposerItemBaseWidget: public QgsPanelWidget
|
||||
|
||||
/** Registers a data defined button, setting up its initial value, connections and description.
|
||||
* @param button button to register
|
||||
* @param property correponding data defined property
|
||||
* @param property corresponding data defined property
|
||||
* @param type valid data types for button
|
||||
* @param description user visible description for data defined property
|
||||
*/
|
||||
|
||||
@ -683,7 +683,7 @@ void QgsGPSInformationWidget::displayGPSInformation( const QgsGPSInformation& in
|
||||
mTxtStatus->setText( info.status == 'A' ? tr( "Valid" ) : info.status == 'V' ? tr( "Invalid" ) : QLatin1String( "" ) );
|
||||
} //position
|
||||
|
||||
// Avoid refreshing / panning if we havent moved
|
||||
// Avoid refreshing / panning if we haven't moved
|
||||
if ( mLastGpsPosition != myNewCenter )
|
||||
{
|
||||
mLastGpsPosition = myNewCenter;
|
||||
|
||||
@ -497,7 +497,7 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
|
||||
virtual QgsVectorLayerTools* vectorLayerTools() override;
|
||||
|
||||
/** This method is only needed when using a UI form with a custom widget plugin and calling
|
||||
* openFeatureForm or getFeatureForm from Python (PyQt4) and you havn't used the info tool first.
|
||||
* openFeatureForm or getFeatureForm from Python (PyQt4) and you haven't used the info tool first.
|
||||
* Python will crash bringing QGIS wtih it
|
||||
* if the custom form is not loaded from a C++ method call.
|
||||
*
|
||||
|
||||
@ -46,7 +46,7 @@ class APP_EXPORT QgsDecorationNorthArrow: public QgsDecorationItem
|
||||
|
||||
//! Show the dialog box
|
||||
void run() override;
|
||||
//! draw some arbitary text to the screen
|
||||
//! draw some arbitrary text to the screen
|
||||
void render( QPainter * ) override;
|
||||
|
||||
//! try to calculate the direction for the north arrow. Sets the
|
||||
|
||||
@ -52,7 +52,7 @@ class QgsGuiVectorLayerTools : public QgsVectorLayerTools
|
||||
bool startEditing( QgsVectorLayer* layer ) const override;
|
||||
|
||||
/**
|
||||
* Should be called, when an editing session is ended and the features should be commited.
|
||||
* Should be called, when an editing session is ended and the features should be committed.
|
||||
* An appropriate dialog asking the user if he wants to save the edits will be shown if
|
||||
* allowCancel is set to true.
|
||||
*
|
||||
@ -64,7 +64,7 @@ class QgsGuiVectorLayerTools : public QgsVectorLayerTools
|
||||
bool stopEditing( QgsVectorLayer* layer, bool allowCancel = true ) const override;
|
||||
|
||||
/**
|
||||
* Should be called, when the features should be commited but the editing session is not ended.
|
||||
* Should be called, when the features should be committed but the editing session is not ended.
|
||||
*
|
||||
* @param layer The layer to commit
|
||||
* @return True if successful
|
||||
|
||||
@ -1941,7 +1941,7 @@ void QgsIdentifyResultsDialog::formatChanged( int index )
|
||||
// Store selected identify format in layer
|
||||
layer->setCustomProperty( QStringLiteral( "identify/format" ), QgsRasterDataProvider::identifyFormatName( format ) );
|
||||
|
||||
// remove all childs of that layer from results, except the first (format)
|
||||
// remove all children of that layer from results, except the first (format)
|
||||
QTreeWidgetItem *layItem = layerItem( layer );
|
||||
if ( !layItem )
|
||||
{
|
||||
|
||||
@ -173,7 +173,7 @@ class APP_EXPORT QgsProjectProperties : public QgsOptionsDialogBase, private Ui:
|
||||
//! Signal used to inform listeners that the mouse display precision may have changed
|
||||
void displayPrecisionChanged();
|
||||
|
||||
//! Signal used to inform listeners that project scale list may have chnaged
|
||||
//! Signal used to inform listeners that project scale list may have changed
|
||||
void scalesChanged( const QStringList &scales = QStringList() );
|
||||
|
||||
//! let listening canvases know to refresh
|
||||
|
||||
@ -1649,7 +1649,7 @@ string ASBeautifier::beautify(const string &originalLine)
|
||||
foundAssignmentOp = findHeader(line, i, assignmentOperators, true);
|
||||
const string *foundNonAssignmentOp = findHeader(line, i, nonAssignmentOperators, false);
|
||||
|
||||
// Since findHeader's boundry checking was not used above, it is possible
|
||||
// Since findHeader's boundary checking was not used above, it is possible
|
||||
// that both an assignment op and a non-assignment op where found,
|
||||
// e.g. '>>' and '>>='. If this is the case, treat the LONGER one as the
|
||||
// found operator.
|
||||
|
||||
@ -307,7 +307,7 @@ string ASFormatter::nextLine()
|
||||
}
|
||||
else // stuff to do when reading a new character...
|
||||
{
|
||||
// make sure that a virgin '{' at the beginning ofthe file will be treated as a block...
|
||||
// make sure that a virgin '{' at the beginning of the file will be treated as a block...
|
||||
if (isInVirginLine && currentChar == '{' && lineBeginsWith('{'))
|
||||
previousCommandChar = '{';
|
||||
isPreviousCharPostComment = isCharImmediatelyPostComment;
|
||||
|
||||
@ -160,7 +160,7 @@ bool g_isQuiet = false;
|
||||
bool g_optionsFileRequired = false;
|
||||
string g_origSuffix = ".orig";
|
||||
vector<string> g_excludeVector; // exclude from wildcard hits
|
||||
vector<bool> g_excludeHitsVector; // exclude flags for eror reporting
|
||||
vector<bool> g_excludeHitsVector; // exclude flags for error reporting
|
||||
size_t g_mainDirectoryLength; // main directory name can be excluded for displays
|
||||
// stringstream g_msg; // info messages are not printed until a file is read
|
||||
int _CRT_glob = 0; // turn off MinGW automatic file globbing
|
||||
|
||||
@ -154,7 +154,7 @@ class CORE_EXPORT QgsAuthMethodConfig
|
||||
* against the config's uri() for auto-selecting authentication configs to use
|
||||
* @note Essentially strips the URL query variables, and by default, strips the path as well
|
||||
* @param accessurl A URL to process
|
||||
* @param resource Ouput variable for result
|
||||
* @param resource Output variable for result
|
||||
* @param withpath Whether to include the URI's path in output
|
||||
*/
|
||||
static bool uriToResource( const QString &accessurl, QString *resource, bool withpath = false );
|
||||
|
||||
@ -36,7 +36,7 @@ QgsAddRemoveItemCommand::~QgsAddRemoveItemCommand()
|
||||
|
||||
void QgsAddRemoveItemCommand::redo()
|
||||
{
|
||||
QUndoCommand::redo(); // call redo() on all childs
|
||||
QUndoCommand::redo(); // call redo() on all children
|
||||
if ( mFirstRun )
|
||||
{
|
||||
mFirstRun = false;
|
||||
@ -47,7 +47,7 @@ void QgsAddRemoveItemCommand::redo()
|
||||
|
||||
void QgsAddRemoveItemCommand::undo()
|
||||
{
|
||||
QUndoCommand::undo(); // call undo() on all childs, in reverse order
|
||||
QUndoCommand::undo(); // call undo() on all children, in reverse order
|
||||
if ( mFirstRun )
|
||||
{
|
||||
mFirstRun = false;
|
||||
|
||||
@ -222,7 +222,7 @@ void QgsComposerArrow::drawHardcodedMarker( QPainter *p, MarkerType type )
|
||||
void QgsComposerArrow::drawSVGMarker( QPainter* p, MarkerType type, const QString &markerPath )
|
||||
{
|
||||
Q_UNUSED( markerPath );
|
||||
double ang = QgsComposerUtils::angle( mStartPoint, mStopPoint );
|
||||
double theAngle = QgsComposerUtils::angle( mStartPoint, mStopPoint );
|
||||
|
||||
double arrowHeadHeight;
|
||||
if ( type == StartMarker )
|
||||
@ -280,7 +280,7 @@ void QgsComposerArrow::drawSVGMarker( QPainter* p, MarkerType type, const QStrin
|
||||
fixPoint.setY( -arrowHeadHeight / 2.0 );
|
||||
}
|
||||
QPointF rotatedFixPoint;
|
||||
double angleRad = ang / 180 * M_PI;
|
||||
double angleRad = theAngle / 180 * M_PI;
|
||||
rotatedFixPoint.setX( fixPoint.x() * cos( angleRad ) + fixPoint.y() * -sin( angleRad ) );
|
||||
rotatedFixPoint.setY( fixPoint.x() * sin( angleRad ) + fixPoint.y() * cos( angleRad ) );
|
||||
p->translate( canvasPoint.x() - rotatedFixPoint.x(), canvasPoint.y() - rotatedFixPoint.y() );
|
||||
@ -290,7 +290,7 @@ void QgsComposerArrow::drawSVGMarker( QPainter* p, MarkerType type, const QStrin
|
||||
p->translate( canvasPoint.x(), canvasPoint.y() );
|
||||
}
|
||||
|
||||
p->rotate( ang );
|
||||
p->rotate( theAngle );
|
||||
p->translate( -mArrowHeadWidth / 2.0, -arrowHeadHeight / 2.0 );
|
||||
r.render( p, QRectF( 0, 0, mArrowHeadWidth, arrowHeadHeight ) );
|
||||
p->restore();
|
||||
|
||||
@ -475,7 +475,7 @@ class CORE_EXPORT QgsComposerItem: public QgsComposerObject, public QGraphicsRec
|
||||
virtual void setVisibility( const bool visible );
|
||||
|
||||
/** Returns whether the item should be excluded from composer exports and prints
|
||||
* @param valueType controls whether the returned value is the user specified vaule,
|
||||
* @param valueType controls whether the returned value is the user specified value,
|
||||
* or the current evaluated value (which may be affected by data driven settings).
|
||||
* @returns true if item should be excluded
|
||||
* @note added in version 2.5
|
||||
@ -647,7 +647,7 @@ class CORE_EXPORT QgsComposerItem: public QgsComposerObject, public QGraphicsRec
|
||||
|
||||
/** Evaluates an item's bounding rect to consider data defined position and size of item
|
||||
* and reference point
|
||||
* @param newRect target bouding rect for item
|
||||
* @param newRect target bounding rect for item
|
||||
* @param resizeOnly set to true if the item is only being resized. If true then
|
||||
* the position of the returned rect will be adjusted to account for the item's
|
||||
* position mode
|
||||
|
||||
@ -239,7 +239,7 @@ class CORE_EXPORT QgsGeometryUtils
|
||||
|
||||
/** Parses a WKT string and returns of list of blocks contained in the WKT.
|
||||
* @param wkt WKT string in the format "TYPE1 (contents1), TYPE2 (TYPE3 (contents3), TYPE4 (contents4))"
|
||||
* @param defaultType default geometry type for childen
|
||||
* @param defaultType default geometry type for children
|
||||
* @returns list of WKT child block strings, e.g., List("TYPE1 (contents1)", "TYPE2 (TYPE3 (contents3), TYPE4 (contents4))")
|
||||
*/
|
||||
static QStringList wktGetChildBlocks( const QString& wkt , const QString &defaultType = "" );
|
||||
|
||||
@ -484,7 +484,7 @@ QIcon QgsApplication::getThemeIcon( const QString &theName )
|
||||
else if ( QFile::exists( myDefaultPath ) )
|
||||
{
|
||||
//could still return an empty icon if it
|
||||
//doesnt exist in the default theme either!
|
||||
//doesn't exist in the default theme either!
|
||||
icon = QIcon( myDefaultPath );
|
||||
}
|
||||
else
|
||||
@ -509,7 +509,7 @@ QPixmap QgsApplication::getThemePixmap( const QString &theName )
|
||||
else
|
||||
{
|
||||
//could still return an empty icon if it
|
||||
//doesnt exist in the default theme either!
|
||||
//doesn't exist in the default theme either!
|
||||
return QPixmap( myDefaultPath );
|
||||
}
|
||||
}
|
||||
@ -1417,7 +1417,7 @@ bool QgsApplication::createDB( QString *errorMessage )
|
||||
// first we look for ~/.qgis/qgis.db
|
||||
if ( !qgisPrivateDbFile.exists() )
|
||||
{
|
||||
// if it doesnt exist we copy it in from the global resources dir
|
||||
// if it doesn't exist we copy it in from the global resources dir
|
||||
QString qgisMasterDbFileName = QgsApplication::qgisMasterDbFilePath();
|
||||
QFile masterFile( qgisMasterDbFileName );
|
||||
|
||||
|
||||
@ -195,7 +195,7 @@ inline void QgsClipper::trimPolygon( QPolygonF& pts, const QgsRectangle& clipRec
|
||||
trimPolygonToBoundary( tmpPts, pts, clipRect, YMin, clipRect.yMinimum() );
|
||||
}
|
||||
|
||||
// An auxilary function that is part of the polygon trimming
|
||||
// An auxiliary function that is part of the polygon trimming
|
||||
// code. Will trim the given polygon to the given boundary and return
|
||||
// the trimmed polygon in the out pointer. Uses Sutherland and
|
||||
// Hodgman's polygon-clipping algorithm.
|
||||
@ -299,7 +299,7 @@ inline void QgsClipper::trimPolygonToBoundary( const QPolygonF& inPts, QPolygonF
|
||||
}
|
||||
}
|
||||
|
||||
// An auxilary function to trimPolygonToBoundarY() that returns
|
||||
// An auxiliary function to trimPolygonToBoundarY() that returns
|
||||
// whether a point is inside or outside the given boundary.
|
||||
|
||||
inline bool QgsClipper::inside( const double x, const double y, Boundary b )
|
||||
@ -343,7 +343,7 @@ inline bool QgsClipper::inside( QPointF pt, Boundary b, double val )
|
||||
}
|
||||
|
||||
|
||||
// An auxilary function to trimPolygonToBoundarY() that calculates and
|
||||
// An auxiliary function to trimPolygonToBoundarY() that calculates and
|
||||
// returns the intersection of the line defined by the given points
|
||||
// and the given boundary.
|
||||
|
||||
|
||||
@ -580,7 +580,7 @@ class CORE_EXPORT QgsCoordinateReferenceSystem
|
||||
static void invalidateCache();
|
||||
|
||||
// Mutators -----------------------------------
|
||||
// We don't want to expose these to the public api since they wont create
|
||||
// We don't want to expose these to the public api since they won't create
|
||||
// a fully valid crs. Programmers should use the createFrom* methods rather
|
||||
private:
|
||||
|
||||
|
||||
@ -116,7 +116,7 @@ class QgsCoordinateReferenceSystemPrivate : public QSharedData
|
||||
mutable QString mWkt;
|
||||
mutable QString mProj4;
|
||||
|
||||
//! True if presence of an inverted axis needs to be recaculated
|
||||
//! True if presence of an inverted axis needs to be recalculated
|
||||
mutable bool mAxisInvertedDirty;
|
||||
|
||||
//! Whether this is a coordinate system has inverted axis
|
||||
|
||||
@ -191,7 +191,7 @@ class QgsCoordinateTransformPrivate : public QSharedData
|
||||
#endif
|
||||
|
||||
//XXX todo overload == operator for QgsCoordinateReferenceSystem
|
||||
//at the moment srs.parameters contains the whole proj def...soon it wont...
|
||||
//at the moment srs.parameters contains the whole proj def...soon it won't...
|
||||
//if (mSourceCRS->toProj4() == mDestCRS->toProj4())
|
||||
if ( mSourceCRS == mDestCRS )
|
||||
{
|
||||
|
||||
@ -57,7 +57,7 @@ QString QgsError::message( QgsErrorMessage::Format theFormat ) const
|
||||
|
||||
#if defined(QGISDEBUG) && defined(QGS_GIT_REMOTE_URL)
|
||||
// TODO: verify if we are not ahead to origin (remote hash does not exist)
|
||||
// and there are no local not commited changes
|
||||
// and there are no local not committed changes
|
||||
QString hash = QString( Qgis::QGIS_DEV_VERSION );
|
||||
QString remote = QStringLiteral( QGS_GIT_REMOTE_URL );
|
||||
if ( !hash.isEmpty() && !remote.isEmpty() && remote.contains( QLatin1String( "github.com" ) ) )
|
||||
|
||||
@ -335,7 +335,7 @@ QgsGeometry QgsMapToPixelSimplifier::simplify( const QgsGeometry& geometry ) con
|
||||
const QgsRectangle envelope = geometry.boundingBox();
|
||||
if ( qMax( envelope.width(), envelope.height() ) / numPoints > mTolerance * 2.0 )
|
||||
{
|
||||
//points are in average too far appart to lead to any significant simplification
|
||||
//points are in average too far apart to lead to any significant simplification
|
||||
return geometry;
|
||||
}
|
||||
|
||||
|
||||
@ -106,8 +106,8 @@ QgsVector QgsVector::perpVector() const
|
||||
|
||||
double QgsVector::angle() const
|
||||
{
|
||||
double ang = atan2( mY, mX );
|
||||
return ang < 0.0 ? ang + 2.0 * M_PI : ang;
|
||||
double theAngle = atan2( mY, mX );
|
||||
return theAngle < 0.0 ? theAngle + 2.0 * M_PI : theAngle;
|
||||
}
|
||||
|
||||
double QgsVector::angle( QgsVector v ) const
|
||||
@ -117,9 +117,9 @@ double QgsVector::angle( QgsVector v ) const
|
||||
|
||||
QgsVector QgsVector::rotateBy( double rot ) const
|
||||
{
|
||||
double ang = atan2( mY, mX ) + rot;
|
||||
double theAngle = atan2( mY, mX ) + rot;
|
||||
double len = length();
|
||||
return QgsVector( len * cos( ang ), len * sin( ang ) );
|
||||
return QgsVector( len * cos( theAngle ), len * sin( theAngle ) );
|
||||
}
|
||||
|
||||
QgsVector QgsVector::normalized() const
|
||||
|
||||
@ -298,7 +298,7 @@ class CORE_EXPORT QgsPoint
|
||||
//! Calculates azimuth between this point and other one (clockwise in degree, starting from north)
|
||||
double azimuth( const QgsPoint& other ) const;
|
||||
|
||||
/** Returns a new point which correponds to this point projected by a specified distance
|
||||
/** Returns a new point which corresponds to this point projected by a specified distance
|
||||
* in a specified bearing.
|
||||
* @param distance distance to project
|
||||
* @param bearing angle to project in, clockwise in degrees starting from north
|
||||
|
||||
@ -42,7 +42,7 @@ QgsProjectFileTransform::TransformItem QgsProjectFileTransform::sTransformers[]
|
||||
{PFV( 0, 9, 0 ), PFV( 0, 9, 1 ), &QgsProjectFileTransform::transformNull},
|
||||
{PFV( 0, 9, 1 ), PFV( 0, 10, 0 ), &QgsProjectFileTransform::transform091to0100},
|
||||
// Following line is a hack that takes us straight from 0.9.2 to 0.11.0
|
||||
// due to an unknown bug in migrating 0.9.2 files which we didnt pursue (TS & GS)
|
||||
// due to an unknown bug in migrating 0.9.2 files which we didn't pursue (TS & GS)
|
||||
{PFV( 0, 9, 2 ), PFV( 0, 11, 0 ), &QgsProjectFileTransform::transformNull},
|
||||
{PFV( 0, 10, 0 ), PFV( 0, 11, 0 ), &QgsProjectFileTransform::transform0100to0110},
|
||||
{PFV( 0, 11, 0 ), PFV( 1, 0, 0 ), &QgsProjectFileTransform::transform0110to1000},
|
||||
|
||||
@ -112,7 +112,7 @@ class CORE_EXPORT QgsRenderChecker
|
||||
bool runTest( const QString& theTestName, unsigned int theMismatchCount = 0 );
|
||||
|
||||
/**
|
||||
* Test using two arbitary images (map renderer will not be used)
|
||||
* Test using two arbitrary images (map renderer will not be used)
|
||||
* @param theTestName - to be used as the basis for writing a file to
|
||||
* e.g. /tmp/theTestName.png
|
||||
* @param theMismatchCount - defaults to 0 - the number of pixels that
|
||||
@ -126,9 +126,9 @@ class CORE_EXPORT QgsRenderChecker
|
||||
|
||||
/** Get a list of all the anomalies. An anomaly is a rendered difference
|
||||
* file where there is some red pixel content (indicating a render check
|
||||
* mismatch), but where the output was still acceptible. If the render
|
||||
* mismatch), but where the output was still acceptable. If the render
|
||||
* diff matches one of these anomalies we will still consider it to be
|
||||
* acceptible.
|
||||
* acceptable.
|
||||
* @return a bool indicating if the diff matched one of the anomaly files
|
||||
*/
|
||||
bool isKnownAnomaly( const QString& theDiffImageFile );
|
||||
|
||||
@ -454,7 +454,7 @@ class CORE_EXPORT QgsSQLStatement
|
||||
class CORE_EXPORT NodeColumnRef : public Node
|
||||
{
|
||||
public:
|
||||
//! Constructor with colum name only
|
||||
//! Constructor with column name only
|
||||
NodeColumnRef( const QString& name, bool star ) : mName( name ), mDistinct( false ), mStar( star ) {}
|
||||
//! Constructor with table and column name
|
||||
NodeColumnRef( const QString& tableName, const QString& name, bool star ) : mTableName( tableName ), mName( name ), mDistinct( false ), mStar( star ) {}
|
||||
|
||||
@ -2305,7 +2305,7 @@ void QgsTextRenderer::drawShadow( QgsRenderContext& context, const QgsTextRender
|
||||
componentHeight + ( pictbuffer * 2.0 ) + ( blurbuffer * 2.0 ),
|
||||
QImage::Format_ARGB32_Premultiplied );
|
||||
|
||||
// TODO: add labeling gui option to not show any shadows under/over a certian size
|
||||
// TODO: add labeling gui option to not show any shadows under/over a certain size
|
||||
// keep very small QImages from causing paint device issues, i.e. must be at least > 1
|
||||
int minBlurImgSize = 1;
|
||||
// max limitation on QgsSvgCache is 10,000 for screen, which will probably be reasonable for future caching here, too
|
||||
|
||||
@ -1740,7 +1740,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
|
||||
//! Is emitted, when edited changes successfully have been written to the data provider
|
||||
void editingStopped();
|
||||
|
||||
//! Is emitted, before changes are commited to the data provider
|
||||
//! Is emitted, before changes are committed to the data provider
|
||||
void beforeCommitChanges();
|
||||
|
||||
//! Is emitted, before changes are rolled back
|
||||
@ -1958,7 +1958,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
|
||||
*/
|
||||
bool setDataProvider( QString const & provider );
|
||||
|
||||
//! Goes through all features and finds a free id (e.g. to give it temporarily to a not-commited feature)
|
||||
//! Goes through all features and finds a free id (e.g. to give it temporarily to a not-committed feature)
|
||||
QgsFeatureId findFreeId();
|
||||
|
||||
/** Snaps to a geometry and adds the result to the multimap if it is within the snapping result
|
||||
|
||||
@ -153,12 +153,12 @@ class CORE_EXPORT QgsVectorLayerFeatureIterator : public QgsAbstractFeatureItera
|
||||
*/
|
||||
void addExpressionAttribute( QgsFeature& f, int attrIndex );
|
||||
|
||||
/** Update feature with uncommited attribute updates.
|
||||
/** Update feature with uncommitted attribute updates.
|
||||
* @note not available in Python bindings
|
||||
*/
|
||||
void updateChangedAttributes( QgsFeature& f );
|
||||
|
||||
/** Update feature with uncommited geometry updates.
|
||||
/** Update feature with uncommitted geometry updates.
|
||||
* @note not available in Python bindings
|
||||
*/
|
||||
void updateFeatureGeometry( QgsFeature& f );
|
||||
|
||||
@ -68,7 +68,7 @@ class CORE_EXPORT QgsVectorLayerTools : public QObject
|
||||
virtual bool startEditing( QgsVectorLayer* layer ) const = 0;
|
||||
|
||||
/**
|
||||
* Will be called, when an editing session is ended and the features should be commited.
|
||||
* Will be called, when an editing session is ended and the features should be committed.
|
||||
* Appropriate dialogs should be shown like
|
||||
*
|
||||
* @param layer The layer to commit
|
||||
@ -80,7 +80,7 @@ class CORE_EXPORT QgsVectorLayerTools : public QObject
|
||||
virtual bool stopEditing( QgsVectorLayer* layer, bool allowCancel = true ) const = 0;
|
||||
|
||||
/**
|
||||
* Should be called, when the features should be commited but the editing session is not ended.
|
||||
* Should be called, when the features should be committed but the editing session is not ended.
|
||||
*
|
||||
* @param layer The layer to commit
|
||||
* @return True if successful
|
||||
|
||||
@ -372,7 +372,7 @@ bool QgsColorRampShader::shade( double theValue, int* theReturnRedValue, int* th
|
||||
// get initial value from LUT
|
||||
idx = mLUT.at( lutIndex );
|
||||
|
||||
// check if it's correct and if not increase untill correct
|
||||
// check if it's correct and if not increase until correct
|
||||
// the LUT is made in such a way the index is always correct or too low, never too high
|
||||
while ( idx < colorRampItemListCount && mColorRampItemList.at( idx ).value + DOUBLE_DIFF_THRESHOLD < theValue )
|
||||
{
|
||||
|
||||
@ -268,7 +268,7 @@ void QgsRasterInterface::initHistogram( QgsRasterHistogram &theHistogram,
|
||||
else
|
||||
{
|
||||
// We need statistics -> avoid histogramDefaults in hasHistogram if possible
|
||||
// TODO: use approximated statistics if aproximated histogram is requested
|
||||
// TODO: use approximated statistics if approximated histogram is requested
|
||||
// (theSampleSize > 0)
|
||||
QgsRasterBandStats stats = bandStatistics( theBandNo, QgsRasterBandStats::Min, theExtent, theSampleSize );
|
||||
theHistogram.minimum = stats.minimumValue;
|
||||
|
||||
@ -1537,7 +1537,7 @@ bool QgsRasterLayer::readXml( const QDomNode& layer_node )
|
||||
|
||||
// Check timestamp
|
||||
// This was probably introduced to reload completely raster if data changed and
|
||||
// reset completly symbology to reflect new data type etc. It creates however
|
||||
// reset completely symbology to reflect new data type etc. It creates however
|
||||
// problems, because user defined symbology is complete lost if data file time
|
||||
// changed (the content may be the same). See also 6900.
|
||||
#if 0
|
||||
|
||||
@ -147,7 +147,7 @@ QgsRasterLayerRenderer::QgsRasterLayerRenderer( QgsRasterLayer* layer, QgsRender
|
||||
mRasterViewPort->mWidth = static_cast<int>( mRasterViewPort->mBottomRightPoint.x() - mRasterViewPort->mTopLeftPoint.x() );
|
||||
mRasterViewPort->mHeight = static_cast<int>( mRasterViewPort->mBottomRightPoint.y() - mRasterViewPort->mTopLeftPoint.y() );
|
||||
|
||||
//the drawable area can start to get very very large when you get down displaying 2x2 or smaller, this is becasue
|
||||
//the drawable area can start to get very very large when you get down displaying 2x2 or smaller, this is because
|
||||
//mapToPixel.mapUnitsPerPixel() is less then 1,
|
||||
//so we will just get the pixel data and then render these special cases differently in paintImageToCanvas()
|
||||
|
||||
|
||||
@ -655,7 +655,7 @@ void QgsCptCityDataItem::refresh()
|
||||
// Add new items
|
||||
Q_FOREACH ( QgsCptCityDataItem *item, items )
|
||||
{
|
||||
// Is it present in childs?
|
||||
// Is it present in children?
|
||||
if ( findItem( mChildren, item ) >= 0 )
|
||||
{
|
||||
delete item;
|
||||
|
||||
@ -361,7 +361,7 @@ class CORE_EXPORT QgsCptCityBrowserModel : public QAbstractItemModel
|
||||
// Refresh item specified by path
|
||||
void refresh( const QString& path );
|
||||
|
||||
// Refresh item childs
|
||||
// Refresh item children
|
||||
void refresh( const QModelIndex &index = QModelIndex() );
|
||||
|
||||
//! return index of a path
|
||||
|
||||
@ -389,7 +389,7 @@ void QgsRuleBasedRenderer::Rule::toSld( QDomDocument& doc, QDomElement &element,
|
||||
mSymbol->toSld( doc, ruleElem, props );
|
||||
}
|
||||
|
||||
// loop into childern rule list
|
||||
// loop into children rule list
|
||||
Q_FOREACH ( Rule* rule, mChildren )
|
||||
{
|
||||
rule->toSld( doc, element, props );
|
||||
|
||||
@ -366,7 +366,7 @@ bool QgsStyle::load( const QString& filename )
|
||||
return false;
|
||||
}
|
||||
|
||||
// Make sure there are no Null fields in parenting symbols ang groups
|
||||
// Make sure there are no Null fields in parenting symbols and groups
|
||||
char *query = sqlite3_mprintf( "UPDATE symbol SET favorite=0 WHERE favorite IS NULL;"
|
||||
"UPDATE colorramp SET favorite=0 WHERE favorite IS NULL;"
|
||||
"UPDATE symgroup SET parent=0 WHERE parent IS NULL;" );
|
||||
|
||||
@ -1083,10 +1083,10 @@ QgsMarkerSymbol::QgsMarkerSymbol( const QgsSymbolLayerList& layers )
|
||||
mLayers.append( new QgsSimpleMarkerSymbolLayer() );
|
||||
}
|
||||
|
||||
void QgsMarkerSymbol::setAngle( double ang )
|
||||
void QgsMarkerSymbol::setAngle( double theAngle )
|
||||
{
|
||||
double origAngle = angle();
|
||||
double angleDiff = ang - origAngle;
|
||||
double angleDiff = theAngle - origAngle;
|
||||
Q_FOREACH ( QgsSymbolLayer* layer, mLayers )
|
||||
{
|
||||
QgsMarkerSymbolLayer* markerLayer = dynamic_cast<QgsMarkerSymbolLayer*>( layer );
|
||||
|
||||
@ -214,7 +214,7 @@ class CORE_EXPORT QgsSymbolLayer
|
||||
virtual bool hasDataDefinedProperties() const;
|
||||
|
||||
/** Checks whether the layer has a matching data defined property and if
|
||||
* that property is currently actived.
|
||||
* that property is currently activated.
|
||||
* @param property property key
|
||||
* @returns true if data defined property exists and is active
|
||||
* @see hasDataDefinedProperties
|
||||
@ -232,7 +232,7 @@ class CORE_EXPORT QgsSymbolLayer
|
||||
* @param defaultVal default value to return if evaluation was not successful
|
||||
* @param ok if specified, will be set to true if evaluation was successful
|
||||
* @returns calculated value for data defined property, or default value
|
||||
* if property does not exist or is deactived.
|
||||
* if property does not exist or is deactivated.
|
||||
* @see hasDataDefinedProperty
|
||||
* @see getDataDefinedProperty
|
||||
* @note added in QGIS 2.12
|
||||
|
||||
@ -129,7 +129,7 @@ class GUI_EXPORT QgsAttributeTableView : public QTableView
|
||||
|
||||
/**
|
||||
* @brief
|
||||
* Is emitted, in order to provide a hook to add aditional menu entries to the context menu.
|
||||
* Is emitted, in order to provide a hook to add additional* menu entries to the context menu.
|
||||
*
|
||||
* @param menu If additional QMenuItems are added, they will show up in the context menu.
|
||||
* @param atIndex The QModelIndex, to which the context menu belongs. Relative to the source model.
|
||||
|
||||
@ -90,7 +90,7 @@ class GUI_EXPORT QgsFeatureListModel : public QAbstractProxyModel, public QgsFea
|
||||
|
||||
/**
|
||||
* @brief Returns a detailed message about errors while parsing a QgsExpression.
|
||||
* @return A message containg information about the parser error.
|
||||
* @return A message containing information about the parser error.
|
||||
*/
|
||||
QString parserErrorString();
|
||||
|
||||
|
||||
@ -95,7 +95,7 @@ class GUI_EXPORT QgsFeatureListView : public QListView
|
||||
/**
|
||||
* Returns a detailed message about errors while parsing a QgsExpression.
|
||||
*
|
||||
* @return A message containg information about the parser error.
|
||||
* @return A message containing information about the parser error.
|
||||
*/
|
||||
QString parserErrorString();
|
||||
|
||||
|
||||
@ -90,7 +90,7 @@ namespace QgisGui
|
||||
QMap<QString, QString> filterMap;
|
||||
Q_FOREACH ( const QByteArray& format, QImageWriter::supportedImageFormats() )
|
||||
{
|
||||
//svg doesnt work so skip it
|
||||
//svg doesn't work so skip it
|
||||
if ( format == "svg" )
|
||||
continue;
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user