Skip to content

Commit

Permalink
[spellcheck] fix case detection + some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Jan 16, 2017
1 parent 5679fb0 commit bf22cbf
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -2605,7 +2605,7 @@ Raster support for most GDAL formats
Raster implementation supports a variety of rendering settings including
semi transparent overlays, pallette inversion, flexible band to color mapping
in multiband images and creation of pseudocolor.
Change to a data provider architecture for vector layers. Addtional data
Change to a data provider architecture for vector layers. Additional data
types can be supported by writing a provider plugin
Buffer plugin for PostGIS layers
PostgreSQL port number can be specified when making connections
Expand Down
2 changes: 1 addition & 1 deletion doc/news.html
Original file line number Diff line number Diff line change
Expand Up @@ -2936,7 +2936,7 @@ <H1>28. 0.5</H1>
Raster implementation supports a variety of rendering settings including
semi transparent overlays, pallette inversion, flexible band to color mapping
in multiband images and creation of pseudocolor.
Change to a data provider architecture for vector layers. Addtional data
Change to a data provider architecture for vector layers. Additional data
types can be supported by writing a provider plugin
Buffer plugin for PostGIS layers
PostgreSQL port number can be specified when making connections
Expand Down
2 changes: 1 addition & 1 deletion doc/news.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -2558,7 +2558,7 @@ Raster support for most GDAL formats
Raster implementation supports a variety of rendering settings including
semi transparent overlays, pallette inversion, flexible band to color mapping
in multiband images and creation of pseudocolor.
Change to a data provider architecture for vector layers. Addtional data
Change to a data provider architecture for vector layers. Additional data
types can be supported by writing a provider plugin
Buffer plugin for PostGIS layers
PostgreSQL port number can be specified when making connections
Expand Down
2 changes: 1 addition & 1 deletion python/core/qgsvectorlayer.sip
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator
bool removeJoin( const QString& joinLayerId );

/**
* Acccessor to the join buffer object
* Accessor to the join buffer object
* @note added 2.14.7
*/
QgsVectorLayerJoinBuffer* joinBuffer();
Expand Down
20 changes: 10 additions & 10 deletions scripts/spell_check/check_spelling.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ SPLIT=4
${GNUPREFIX}split --number=l/$SPLIT --numeric-suffixes --suffix-length=1 --additional-suffix=~ ${DIR}/spelling.dat spelling

# global replace variables (dictionary)
declare -A GLOBREP_ALLFILES
declare -A GLOBREP_CURRENTFILE
declare -A GLOBREP_IGNORE
declare -A GLOBREP_ALLFILES=()
declare -A GLOBREP_CURRENTFILE=()
declare -A GLOBREP_IGNORE=()

for ((I=0;I<$SPLIT;I++)) ; do
SPELLFILE=spelling$I~;
Expand Down Expand Up @@ -130,9 +130,9 @@ for ((I=0;I<$SPLIT;I++)) ; do
# Display menu
echo "***"
echo -e "Error found: \x1B[31m$ERROR\x1B[0m"
echo -e " \x1B[4mr\x1B[0meplace by \x1B[33m$CORRECTION\x1B[0m at line $NUMBER"
echo -e " replace all occurences by \x1B[33m$CORRECTION\x1B[0m in current \x1B[4mf\x1B[0mile"
echo -e " replace all occurences by \x1B[33m$CORRECTION\x1B[0m in \x1B[4ma\x1B[0mll files"
echo -e " \x1B[4mr\x1B[0meplace by \x1B[33m$CORRECTIONCASE\x1B[0m at line $NUMBER"
echo -e " replace all occurences by \x1B[33m$CORRECTIONCASE\x1B[0m in current \x1B[4mf\x1B[0mile"
echo -e " replace all occurences by \x1B[33m$CORRECTIONCASE\x1B[0m in \x1B[4ma\x1B[0mll files"
echo -e " a\x1B[4mp\x1B[0mpend \x1B[33m$SPELLOKSTR\x1B[0m at the end of the line $NUMBER to avoid spell check on this line"
echo -e " en\x1B[4mt\x1B[0mer your own correction"
echo -e " skip and \x1B[4mc\x1B[0montinue"
Expand All @@ -148,13 +148,13 @@ for ((I=0;I<$SPLIT;I++)) ; do
break
;;
f)
GLOBREP_CURRENTFILE+=(["$ERROR"]="$CORRECTION")
GLOBREP_CURRENTFILE+=(["$ERROR"]=1)
echo -e "replacing \x1B[33m$ERROR\x1B[0m by \x1B[33m$CORRECTIONCASE\x1B[0m in \x1B[33m$FILE\x1B[0m"
${GNUPREFIX}sed -i -r "/${SPELLOKRX}/! s/$ERROR/$CORRECTIONCASE/g" $FILE
break
;;
a)
GLOBREP_CURRENTFILE+=(["$ERROR"]="$CORRECTION")
GLOBREP_CURRENTFILE+=(["$ERROR"]=1)
GLOBREP_ALLFILES+=(["$ERROR"]="$CORRECTION")
echo -e "replace \x1B[33m$ERROR\x1B[0m by \x1B[33m$CORRECTIONCASE\x1B[0m in \x1B[33m$FILE\x1B[0m"
${GNUPREFIX}sed -i -r "/${SPELLOKRX}/! s/$ERROR/$CORRECTIONCASE/g" $FILE
Expand Down Expand Up @@ -193,8 +193,8 @@ for ((I=0;I<$SPLIT;I++)) ; do
FILE=""
fi
fi
done 3< <(unbuffer ag --smart-case --all-text --nopager --color-match "30;43" --numbers --nomultiline --word-regexp -p $AGIGNORE "${WHOLEWORDS}"'(?!.*'"${SPELLOKRX}"')' $INPUTFILES ; \
unbuffer ag --smart-case --all-text --nopager --color-match "30;43" --numbers --nomultiline -p $AGIGNORE "${INWORDS}"'(?!.*'"${SPELLOKRX}"')' $INPUTFILES )
done 3< <(unbuffer ag --ignore-case --all-text --nopager --color-match "30;43" --numbers --nomultiline --word-regexp -p $AGIGNORE "${WHOLEWORDS}"'(?!.*'"${SPELLOKRX}"')' $INPUTFILES ; \
unbuffer ag --ignore-case --all-text --nopager --color-match "30;43" --numbers --nomultiline -p $AGIGNORE "${INWORDS}"'(?!.*'"${SPELLOKRX}"')' $INPUTFILES )

rm $SPELLFILE

Expand Down
30 changes: 15 additions & 15 deletions scripts/spell_check/spelling.dat
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ accesing:accessing
accesnt:accent
accesories:accessories
accessable:accessible
accesss:access
accesss:access:*
accidant:accident
accidentaly:accidentally
accidential:accidental
Expand Down Expand Up @@ -351,8 +351,8 @@ alcoholical:alcoholic
aleady:already
aledge:allege:*
aledged:alleged
aledges:alleges
alege:allege
aledges:alleges:*
alege:allege:*
aleged:alleged
alegience:allegiance
alegorical:allegorical
Expand All @@ -368,10 +368,10 @@ algorythm:algorithm
alientating:alienating
alignemnt:alignment
alignemnts:alignments
alledge:allege
alledge:allege:*
alledged:alleged
alledgedly:allegedly
alledges:alleges
alledges:alleges:*
allegedely:allegedly
allegedy:allegedly
allegely:allegedly
Expand All @@ -387,7 +387,7 @@ alliviate:alleviate
allmost:almost
allopone:allophone
allopones:allophones
allowd:allowed
allowd:allowed:*
allpication:application
allready:already
allthough:although
Expand Down Expand Up @@ -985,7 +985,7 @@ boudaries:boundaries
boudary:boundary
bouding:bounding
boundries:boundaries
boundry:boundary
boundry:boundary:*
bouyancy:buoyancy
bouyant:buoyant
boyant:buoyant
Expand Down Expand Up @@ -1054,7 +1054,7 @@ calcualte:calculate
calcualted:calculated
calcualtes:calculates
calcualting:calculating
calculater:calculator
calculater:calculator:*
calculs:calculus
calender:calendar
calenders:calendars
Expand Down Expand Up @@ -1239,11 +1239,11 @@ chemestry:chemistry
chemicaly:chemically
childen:children
childern:children
childs:children
childs:children:*
chnage:change
chnages:changes
choise:choice
choosed:chose
choosed:chose:*
choosen:chosen
chosing:choosing
chould:should
Expand Down Expand Up @@ -1281,7 +1281,7 @@ clearified:clarified
clearifies:clarifies
clearify:clarify
clearifying:clarifying
cleint:client
cleint:client:*
cleints:clients
clera:clear
clincial:clinical
Expand Down Expand Up @@ -1387,10 +1387,10 @@ commisioned:commissioned
commisioner:commissioner
commisioning:commissioning
commisions:commissions
commited:committed
commitee:committee
commiter:committer
commiters:committers
commited:committed:*
commitee:committee:*
commiter:committer:*
commiters:committers:*
commiting:committing
committ:commit
committe:committee
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsvectorlayer.h
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
bool removeJoin( const QString& joinLayerId );

/**
* Acccessor to the join buffer object
* Accessor to the join buffer object
* @note added 2.14.7
*/
QgsVectorLayerJoinBuffer* joinBuffer() { return mJoinBuffer; }
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsvectorlayerfeatureiterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ class CORE_EXPORT QgsVectorLayerFeatureIterator : public QgsAbstractFeatureItera
*/
struct FetchJoinInfo
{
const QgsVectorJoinInfo* joinInfo;//!< Cannonical source of information about the join
const QgsVectorJoinInfo* joinInfo;//!< Canonical source of information about the join
QgsAttributeList attributes; //!< Attributes to fetch
int indexOffset; //!< At what position the joined fields start
QgsVectorLayer* joinLayer; //!< Resolved pointer to the joined layer
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgisgui.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ namespace QgisGui
* for platforms such as the Mac where modal and modeless dialogs have
* different looks, QGIS modal dialogs will look the same as Qt modal
* dialogs and all modal dialogs will look distinct from modeless dialogs.
* Althought not the standard Mac modal look, it does lack the minimize
* Although not the standard Mac modal look, it does lack the minimize
* control which makes sense only for modeless dislogs.
*
* The Qt3 method of creating a true Mac modal dialog is deprecated in Qt4
Expand Down
2 changes: 1 addition & 1 deletion src/providers/wfs/qgswfsdatasourceuri.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
QgsWFSDataSourceURI::QgsWFSDataSourceURI( const QString& uri )
: mURI( uri )
{
// Compatiblity with QGIS < 2.16 layer URI of the format
// Compatibility with QGIS < 2.16 layer URI of the format
// http://example.com/?SERVICE=WFS&VERSION=1.0.0&REQUEST=GetFeature&TYPENAME=x&SRSNAME=y&username=foo&password=
if ( !mURI.hasParam( QgsWFSConstants::URI_PARAM_URL ) )
{
Expand Down
4 changes: 2 additions & 2 deletions src/providers/wfs/qgswfsshareddata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -729,8 +729,8 @@ bool QgsWFSSharedData::changeGeometryValues( const QgsGeometryMap &geometry_map
newAttrMap[idx] = QString( wkb.toHex().data() );
newChangedAttrMap[ iter.key()] = newAttrMap;

QgsGeometry polyBoudingBox = QgsGeometry::fromRect( iter.value().boundingBox() );
newGeometryMap[ iter.key()] = polyBoudingBox;
QgsGeometry polyBoundingBox = QgsGeometry::fromRect( iter.value().boundingBox() );
newGeometryMap[ iter.key()] = polyBoundingBox;
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion tests/src/core/testqgsexpression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2158,7 +2158,7 @@ class TestQgsExpression: public QObject
QTest::newRow( "OGR no Crosses" ) << "crosses( $geometry, geomFromWKT('LINESTRING ( 0 0, 0 10 )') )" << QgsGeometry::fromPolyline( line ) << false << QVariant( 0 );
QTest::newRow( "OGR Within" ) << "within( $geometry, geomFromWKT('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))') )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 1 );
QTest::newRow( "OGR no Within" ) << "within( geomFromWKT('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))'), $geometry )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 0 );
QTest::newRow( "OGR Contians" ) << "contains( geomFromWKT('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))'), $geometry )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 1 );
QTest::newRow( "OGR Contains" ) << "contains( geomFromWKT('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))'), $geometry )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 1 );
QTest::newRow( "OGR no Contains" ) << "contains( $geometry, geomFromWKT('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))') )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 0 );
QTest::newRow( "OGR no Overlaps" ) << "overlaps( geomFromWKT('POLYGON((-90 -90, -90 90, 190 -90, -90 -90))'), $geometry )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 0 );
QTest::newRow( "OGR overlaps" ) << "overlaps( geomFromWKT('POLYGON((0 -5,10 5,10 -5,0 -5))'), $geometry )" << QgsGeometry::fromPolygon( polygon ) << false << QVariant( 1 );
Expand Down

0 comments on commit bf22cbf

Please sign in to comment.