Skip to content

Commit 6475043

Browse files
committed
indentation update
1 parent 9ce0ea3 commit 6475043

18 files changed

+51
-51
lines changed

python/plugins/processing/algs/qgis/ImportIntoPostGIS.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ def processAlgorithm(self, progress):
7676

7777
layerUri = self.getParameterValue(self.INPUT)
7878
layer = dataobjects.getObjectFromUri(layerUri)
79-
79+
8080
table = self.getParameterValue(self.TABLENAME).strip()
8181
if table == '':
82-
table = layer.name().lower()
82+
table = layer.name().lower()
8383
table.replace(' ', '')
8484
providerName = 'postgres'
8585

python/plugins/processing/algs/qgis/QGISAlgorithmProvider.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
class QGISAlgorithmProvider(AlgorithmProvider):
118118

119119
_icon = QIcon(':/processing/images/qgis.png')
120-
120+
121121
def __init__(self):
122122
AlgorithmProvider.__init__(self)
123123
self.alglist = [SumLines(), PointsInPolygon(),
@@ -170,10 +170,10 @@ def __init__(self):
170170
# RasterLayerHistogram(), MeanAndStdDevPlot(),
171171
# BarPlot(), PolarPlot()
172172
]
173-
173+
174174
folder = os.path.join(os.path.dirname(__file__), 'scripts')
175175
scripts = ScriptUtils.loadFromFolder(folder)
176-
for script in scripts:
176+
for script in scripts:
177177
script.allowEdit = False
178178
self.alglist.extend(scripts)
179179
for alg in self.alglist:

python/plugins/processing/algs/qgis/scripts/Fill_holes.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,29 @@
1818

1919
writer = VectorWriter(Results, None, polyPrder.fields(),
2020
QGis.WKBMultiPolygon, polyPrder.crs())
21-
21+
2222

2323
resgeom = QgsGeometry()
2424
resfeat = QgsFeature()
2525

2626
for feat in processing.features(polyLayer):
2727
progress.setPercentage(int(100*l/n))
2828
l+=1
29-
29+
3030
g = loads(feat.geometry().asWkb())
31-
32-
if g.geom_type == 'MultiPolygon':
31+
32+
if g.geom_type == 'MultiPolygon':
3333
resg = [Polygon(p.exterior,
3434
[r for r in p.interiors if Polygon(r).area > Max_area]) for p in g]
35-
35+
3636
else:
3737
resg = [Polygon(g.exterior,
3838
[r for r in g.interiors if Polygon(r).area > Max_area])]
3939

4040
resgeom = QgsGeometry().fromWkt(dumps(MultiPolygon(resg)))
41-
41+
4242
resfeat.setAttributes(feat.attributes())
43-
resfeat.setGeometry(resgeom)
44-
writer.addFeature(resfeat)
43+
resfeat.setGeometry(resgeom)
44+
writer.addFeature(resfeat)
4545

4646
del writer

python/plugins/processing/algs/qgis/scripts/Frequency_analysis.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
inputFields = layer.pendingFields()
1313
fieldIdxs = []
1414
fields = Fields.split(',')
15-
for f in fields:
16-
idx = inputFields.indexFromName(f)
15+
for f in fields:
16+
idx = inputFields.indexFromName(f)
1717
if idx == -1:
1818
raise GeoAlgorithmExecutionException('Field not found:' + f)
1919
fieldIdxs.append(idx)
@@ -24,11 +24,11 @@
2424
nFeats = len(feats)
2525
counts = defaultdict(int)
2626
for i, feat in enumerate(feats):
27-
progress.setPercentage(int(100 * i / nFeats))
27+
progress.setPercentage(int(100 * i / nFeats))
2828
attrs = feat.attributes()
29-
clazz = tuple([attrs[idx] for idx in fieldIdxs])
29+
clazz = tuple([attrs[idx] for idx in fieldIdxs])
3030
counts[clazz] += 1
3131

32-
for c in counts:
32+
for c in counts:
3333
writer.addRecord(list(c) + [counts[c]])
3434

python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
if To_keep < 1:
1313
progress.setInfo("'To keep' value has been modified to be at least 1.")
1414
To_keep = 1
15-
15+
1616

1717
polyLayer = processing.getObject(Polygons)
1818
polyPrder = polyLayer.dataProvider()
@@ -27,17 +27,17 @@
2727
if geom.isMultipart():
2828
featres = feat
2929
geoms = geom.asGeometryCollection()
30-
geomarea = [(i, geoms[i].area()) for i in range(len(geoms))]
31-
geomarea.sort(key=itemgetter(1))
30+
geomarea = [(i, geoms[i].area()) for i in range(len(geoms))]
31+
geomarea.sort(key=itemgetter(1))
3232
if To_keep == 1:
3333
featres.setGeometry(geoms[geomrea[-1][0]])
3434
elif To_keep > len(geoms):
3535
featres.setGeometry(geom)
3636
else:
37-
featres.setGeometry(geom)
37+
featres.setGeometry(geom)
3838
geomres = [geoms[i].asPolygon() for i,a in geomarea[-1 * To_keep]]
39-
featres.setGeometry(QgsGeometry.fromMultiPolygon(geomres))
40-
writer.addFeature(featres)
39+
featres.setGeometry(QgsGeometry.fromMultiPolygon(geomres))
40+
writer.addFeature(featres)
4141
else:
4242
writer.addFeature(feat)
4343

python/plugins/processing/algs/qgis/scripts/Number_of_unique_values_in_classes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
feats = processing.features(layer)
3636
for n, inFeat in enumerate(feats):
37-
progress.setPercentage(int(100 * n / nFeat))
37+
progress.setPercentage(int(100 * n / nFeat))
3838
inGeom = inFeat.geometry()
3939
outFeat.setGeometry(inGeom)
4040
attrs = inFeat.attributes()

python/plugins/processing/core/GeoAlgorithm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454

5555
class GeoAlgorithm:
56-
56+
5757
_icon = QtGui.QIcon(os.path.dirname(__file__) + '/../images/alg.png')
5858

5959
def __init__(self):

python/plugins/processing/gui/GetScriptsAndModels.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ def okPressed(self):
201201
f.write(code)
202202
self.progressBar.setValue(i + 1)
203203
except HTTPError:
204-
QMessageBox.critical(iface.mainWindow(), "Connection problem",
204+
QMessageBox.critical(iface.mainWindow(), "Connection problem",
205205
"Could not download file :" + filename)
206206
return
207-
207+
208208

209209
toDelete = []
210210
for i in xrange(self.uptodateItem.childCount()):

python/plugins/processing/modeler/MultilineTextPanel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class MultilineTextPanel(QtGui.QWidget):
3434

3535
def __init__(self, options, parent=None):
3636
super(MultilineTextPanel, self).__init__(parent)
37-
self.options = options
37+
self.options = options
3838
self.verticalLayout = QtGui.QVBoxLayout(self)
3939
self.verticalLayout.setSpacing(2)
4040
self.verticalLayout.setMargin(0)

python/plugins/processing/script/ScriptAlgorithm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
class ScriptAlgorithm(GeoAlgorithm):
5757

5858
_icon = QtGui.QIcon(os.path.dirname(__file__) + '/../images/script.png')
59-
59+
6060
def __init__(self, descriptionFile, script=None):
6161
"""The script parameter can be used to directly pass the code
6262
of the script without a file.

python/plugins/processing/script/ScriptAlgorithmProvider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040

4141
class ScriptAlgorithmProvider(AlgorithmProvider):
42-
42+
4343
def __init__(self):
4444
AlgorithmProvider.__init__(self)
4545
self.actions.extend([CreateNewScriptAction('Create new script',

python/plugins/processing/script/ScriptUtils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ def scriptsFolder():
4545
mkdir(folder)
4646

4747
return os.path.abspath(folder)
48-
48+
4949
@staticmethod
50-
def loadFromFolder(folder):
50+
def loadFromFolder(folder):
5151
if not os.path.exists(folder):
5252
return []
5353
algs = []

scripts/astyle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ $ARTISTIC_STYLE_OPTIONS \
6161
for f in "$@"; do
6262
case "$f" in
6363
src/app/gps/qwtpolar-*|src/core/spatialite/*|src/core/spatialindex/src/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/ext-libs/*|src/providers/spatialite/qspatialite/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*)
64-
echo $f skipped
64+
echo -ne "$f skipped $elcr"
6565
continue
6666
;;
6767

src/core/pal/feature.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ namespace pal
220220
* \param bbox[3] problem y max
221221
* return A set of feature which are in the bbox or null if the feature is in the bbox
222222
*/
223-
LinkedList<Feature*> *splitFeature( double bbox[4]);
223+
LinkedList<Feature*> *splitFeature( double bbox[4] );
224224

225225

226226
/**

src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1235,7 +1235,7 @@ bool QgsGraduatedSymbolRendererV2::legendSymbolItemsCheckable() const
12351235

12361236
bool QgsGraduatedSymbolRendererV2::legendSymbolItemChecked( int index )
12371237
{
1238-
if( index >= 0 && index < mRanges.size() )
1238+
if ( index >= 0 && index < mRanges.size() )
12391239
return mRanges[ index ].renderState();
12401240
else
12411241
return true;

src/core/symbology-ng/qgsrendererv2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ bool QgsFeatureRendererV2::legendSymbolItemChecked( int index )
524524
return false;
525525
}
526526

527-
void QgsFeatureRendererV2::checkLegendSymbolItem(int index, bool state )
527+
void QgsFeatureRendererV2::checkLegendSymbolItem( int index, bool state )
528528
{
529529
Q_UNUSED( index );
530530
Q_UNUSED( state );

src/gui/layertree/qgslayertreemodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
167167
if ( !nodeL || !nodeL->childrenCheckable() )
168168
return QVariant();
169169

170-
if( !nodeL->isVisible() )
170+
if ( !nodeL->isVisible() )
171171
return Qt::PartiallyChecked;
172172

173173
QgsVectorLayer* vlayer = static_cast<QgsVectorLayer*>( nodeL->layer() );

tests/src/core/testqgscomposerdd.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,17 +104,17 @@ void TestQgsComposerDD::initTestCase()
104104

105105
void TestQgsComposerDD::cleanupTestCase()
106106
{
107-
delete mComposition;
108-
delete mVectorLayer;
109-
110-
QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
111-
QFile myFile( myReportFile );
112-
if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
113-
{
114-
QTextStream myQTextStream( &myFile );
115-
myQTextStream << mReport;
116-
myFile.close();
117-
}
107+
delete mComposition;
108+
delete mVectorLayer;
109+
110+
QString myReportFile = QDir::tempPath() + QDir::separator() + "qgistest.html";
111+
QFile myFile( myReportFile );
112+
if ( myFile.open( QIODevice::WriteOnly | QIODevice::Append ) )
113+
{
114+
QTextStream myQTextStream( &myFile );
115+
myQTextStream << mReport;
116+
myFile.close();
117+
}
118118
}
119119

120120
void TestQgsComposerDD::init()
@@ -128,11 +128,11 @@ void TestQgsComposerDD::cleanup()
128128
void TestQgsComposerDD::ddEvaluate()
129129
{
130130
//set a data defined property
131-
mAtlasMap->setDataDefinedProperty( QgsComposerItem::PositionY, true, true, QString("20+30"),QString() );
131+
mAtlasMap->setDataDefinedProperty( QgsComposerItem::PositionY, true, true, QString( "20+30" ), QString() );
132132
//evaluate property
133133
mAtlasMap->refreshDataDefinedProperty( QgsComposerItem::PositionY );
134134
QCOMPARE( mAtlasMap->pos().y(), 50.0 );
135-
mAtlasMap->setDataDefinedProperty( QgsComposerItem::PositionY, false, false, QString(),QString() );
135+
mAtlasMap->setDataDefinedProperty( QgsComposerItem::PositionY, false, false, QString(), QString() );
136136
}
137137

138138
QTEST_MAIN( TestQgsComposerDD )

0 commit comments

Comments
 (0)