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

Fix failing indentation test

Browse Source
This commit is contained in:
Nyall Dawson 2016-01-14 10:59:38 +11:00
parent f639d1e4f0
commit d97a5e3a83
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/plugins/fTools/tools/doSimplify.py
View File

@ -112,9 +112,9 @@ class Dialog(QDialog, Ui_Dialog):
res = QMessageBox.warning(self, self.tr("Warning"),
self.tr(
"Currently QGIS doesn't allow simultaneous access from "
"different threads to the same datasource. Make sure your layer's "
"attribute tables are closed. Continue?"),
QMessageBox.Yes | QMessageBox.No)
"different threads to the same datasource. Make sure your layer's "
"attribute tables are closed. Continue?"),
QMessageBox.Yes | QMessageBox.No)
if res == QMessageBox.No:
self.btnOk.setEnabled(False)
return

2
python/plugins/processing/algs/grass/nviz.py
View File

@ -160,7 +160,7 @@ class nviz(GeoAlgorithm):
else:
layer = dataobjects.getObjectFromUri(param.value)
cellsize = max(cellsize, (layer.extent().xMaximum()
- layer.extent().xMinimum())
- layer.extent().xMinimum())
/ layer.width())
elif isinstance(param, ParameterMultipleInput):

2
scripts/verify-indentation.sh
View File

@ -38,7 +38,7 @@ do
echo "Checking $f" >>/tmp/ctest-important.log
case "$f" in
src/core/gps/qextserialport/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*)
src/core/gps/qextserialport/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*|scripts/customwidget_template*)
echo "$f skipped"
continue
;;