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

Formatting update, using newer autopep8 version

Browse Source
This commit is contained in:
Nyall Dawson 2016-01-30 09:33:24 +11:00
parent 4a3d3db2d2
commit cbe8cb7282
39 changed files with 127 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/console/console_sci.py
View File

@ -449,7 +449,7 @@ class ShellScintilla(QsciScintilla, code.InteractiveInterpreter):
return
elif t == '(' and (re.match(r'^[ \t]*def \w+$', txt)
or re.match(r'^[ \t]*class \w+$', txt)):
self.insert('):')
self.insert('):')
else:
self.insert(self.closing[i])
## FIXES #8392 (automatically removes the redundant char

10
python/custom_widgets/qgis_customwidgets.py
View File

@ -48,8 +48,8 @@ pluginType = MODULE
def moduleInformation():
try:
import qgis.gui
return "qgis.gui", dir(qgis.gui)
except ImportError:
return "", []
try:
import qgis.gui
return "qgis.gui", dir(qgis.gui)
except ImportError:
return "", []

8
python/plugins/MetaSearch/plugin.py
View File

@ -57,9 +57,9 @@ class MetaSearchPlugin(object):
self.action_run = QAction(run_icon, 'MetaSearch',
self.iface.mainWindow())
self.action_run.setWhatsThis(QCoreApplication.translate('MetaSearch',
'MetaSearch plugin'))
'MetaSearch plugin'))
self.action_run.setStatusTip(QCoreApplication.translate('MetaSearch',
'Search Metadata Catalogues'))
'Search Metadata Catalogues'))
self.action_run.triggered.connect(self.run)
@ -70,9 +70,9 @@ class MetaSearchPlugin(object):
help_icon = QIcon('%s/%s' % (self.context.ppath, 'images/help.png'))
self.action_help = QAction(help_icon, 'Help', self.iface.mainWindow())
self.action_help.setWhatsThis(QCoreApplication.translate('MetaSearch',
'MetaSearch plugin help'))
'MetaSearch plugin help'))
self.action_help.setStatusTip(QCoreApplication.translate('MetaSearch',
'Get Help on MetaSearch'))
'Get Help on MetaSearch'))
self.action_help.triggered.connect(self.help)
self.iface.addPluginToWebMenu(self.web_menu, self.action_help)

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

@ -50,7 +50,7 @@ class ORDatabaseInfo(DatabaseInfo):
tbl.append((QApplication.translate("DBManagerPlugin", "Host:"),
self.db.connector.host))
tbl.append((QApplication.translate("DBManagerPlugin", "Database:"),
self.db.connector.dbname))
self.db.connector.dbname))
tbl.append((QApplication.translate("DBManagerPlugin", "User:"),
self.db.connector.user))
tbl.append((QApplication.translate("DBManagerPlugin",

28
python/plugins/fTools/tools/doEliminate.py
View File

@ -174,24 +174,24 @@ class Dialog(QDialog, Ui_Dialog):
selFeat = QgsFeature()
while fit.nextFeature(selFeat):
selGeom = selFeat.geometry()
selGeom = selFeat.geometry()
if geom2Eliminate.intersects(selGeom): # we have a candidate
iGeom = geom2Eliminate.intersection(selGeom)
if geom2Eliminate.intersects(selGeom): # we have a candidate
iGeom = geom2Eliminate.intersection(selGeom)
if boundary:
selValue = iGeom.length()
if boundary:
selValue = iGeom.length()
else:
# we need a common boundary
if 0 < iGeom.length():
selValue = selGeom.area()
else:
# we need a common boundary
if 0 < iGeom.length():
selValue = selGeom.area()
else:
selValue = 0
selValue = 0
if selValue > max:
max = selValue
mergeWithFid = selFeat.id()
mergeWithGeom = QgsGeometry(selGeom) # deep copy of the geometry
if selValue > max:
max = selValue
mergeWithFid = selFeat.id()
mergeWithGeom = QgsGeometry(selGeom) # deep copy of the geometry
if mergeWithFid is not None: # a successful candidate
newGeom = mergeWithGeom.combine(geom2Eliminate)

2
python/plugins/fTools/tools/doValidate.py
View File

@ -112,7 +112,7 @@ class ValidateDialog(QDialog, Ui_Dialog):
def keyPressEvent(self, e):
if (e.modifiers() == Qt.ControlModifier or
e.modifiers() == Qt.MetaModifier ) and \
e.modifiers() == Qt.MetaModifier ) and \
e.key() == Qt.Key_C:
items = ""
for row in range(self.tblUnique.rowCount()):

2
python/plugins/processing/algs/gdal/ClipByMask.py
View File

@ -70,7 +70,7 @@ class ClipByMask(GdalAlgorithm):
self.group, self.i18n_group = self.trAlgorithm('[GDAL] Extraction')
self.addParameter(ParameterRaster(self.INPUT, self.tr('Input layer'), False))
self.addParameter(ParameterVector(self.MASK, self.tr('Mask layer'),
[ParameterVector.VECTOR_TYPE_POLYGON]))
[ParameterVector.VECTOR_TYPE_POLYGON]))
self.addParameter(ParameterString(self.NO_DATA,
self.tr("Nodata value, leave blank to take the nodata value from input"),
'-9999'))

2
python/plugins/processing/algs/gdal/ogrinfo.py
View File

@ -48,7 +48,7 @@ class OgrInfo(GdalAlgorithm):
self.group, self.i18n_group = self.trAlgorithm('[OGR] Miscellaneous')
self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer'),
[ParameterVector.VECTOR_TYPE_ANY], False))
[ParameterVector.VECTOR_TYPE_ANY], False))
self.addParameter(ParameterBoolean(self.SUMMARY_ONLY,
self.tr('Summary output only'),
True))

2
python/plugins/processing/algs/gdal/ogrsql.py
View File

@ -52,7 +52,7 @@ class OgrSql(GdalAlgorithm):
self.group, self.i18n_group = self.trAlgorithm('[OGR] Miscellaneous')
self.addParameter(ParameterVector(self.INPUT, self.tr('Input layer'),
[ParameterVector.VECTOR_TYPE_ANY], False))
[ParameterVector.VECTOR_TYPE_ANY], False))
self.addParameter(ParameterString(self.SQL, self.tr('SQL'), ''))
self.addParameter(ParameterSelection(

2
python/plugins/processing/algs/grass7/nviz7.py
View File

@ -165,7 +165,7 @@ class nviz7(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
python/plugins/processing/algs/lidar/LidarToolsAlgorithmProvider.py
View File

@ -200,7 +200,7 @@ class LidarToolsAlgorithmProvider(AlgorithmProvider):
Catalog(), CloudMetrics(), CanopyMaxima(), CanopyModel(), ClipData(),
Csv2Grid(), Cover(), FilterData(), GridMetrics(), GroundFilter(),
GridSurfaceCreate(), MergeData(), TinSurfaceCreate(), PolyClipData(),
DTM2TIF(), FirstLastReturn(), ASCII2DTM()
DTM2TIF(), FirstLastReturn(), ASCII2DTM()
]
for alg in fusiontools:
alg.group, alg.i18n_group = alg.trAlgorithm('Fusion')

2
python/plugins/processing/algs/qgis/AddTableField.py
View File

@ -81,7 +81,7 @@ class AddTableField(GeoAlgorithm):
provider = layer.dataProvider()
fields = provider.fields()
fields.append(QgsField(fieldName, self.TYPES[fieldType], '',
fieldLength, fieldPrecision))
fieldLength, fieldPrecision))
writer = output.getVectorWriter(fields, provider.geometryType(),
layer.crs())
outFeat = QgsFeature()

4
python/plugins/processing/algs/qgis/ExtentFromLayer.py
View File

@ -94,7 +94,7 @@ class ExtentFromLayer(GeoAlgorithm):
perim = 2 * width + 2 * height
rect = [QgsPoint(minx, miny), QgsPoint(minx, maxy), QgsPoint(maxx,
maxy), QgsPoint(maxx, miny), QgsPoint(minx, miny)]
maxy), QgsPoint(maxx, miny), QgsPoint(minx, miny)]
geometry = QgsGeometry().fromPolygon([rect])
feat = QgsFeature()
feat.setGeometry(geometry)
@ -131,7 +131,7 @@ class ExtentFromLayer(GeoAlgorithm):
area = width * height
perim = 2 * width + 2 * height
rect = [QgsPoint(minx, miny), QgsPoint(minx, maxy), QgsPoint(maxx,
maxy), QgsPoint(maxx, miny), QgsPoint(minx, miny)]
maxy), QgsPoint(maxx, miny), QgsPoint(minx, miny)]
geometry = QgsGeometry().fromPolygon([rect])
feat.setGeometry(geometry)

2
python/plugins/processing/algs/qgis/FieldPyculator.py
View File

@ -91,7 +91,7 @@ class FieldsPyculator(GeoAlgorithm):
provider = layer.dataProvider()
fields = provider.fields()
fields.append(QgsField(fieldName, self.TYPES[fieldType], '',
fieldLength, fieldPrecision))
fieldLength, fieldPrecision))
writer = output.getVectorWriter(fields, provider.geometryType(),
layer.crs())
outFeat = QgsFeature()

4
python/plugins/processing/algs/qgis/PointDistance.py
View File

@ -145,8 +145,8 @@ class PointDistance(GeoAlgorithm):
vari += (i - mean) * (i - mean)
vari = math.sqrt(vari / len(distList))
self.writer.addRecord([inID, unicode(mean),
unicode(vari), unicode(min(distList)),
unicode(max(distList))])
unicode(vari), unicode(min(distList)),
unicode(max(distList))])
current += 1
progress.setPercentage(int(current * total))

2
python/plugins/processing/algs/qgis/Polygonize.py
View File

@ -97,7 +97,7 @@ class Polygonize(GeoAlgorithm):
outFeat.setGeometry(QgsGeometry.fromWkt(polygon.wkt))
if self.getParameterValue(self.GEOMETRY):
outFeat.setAttributes([None] * fieldsCount + [polygon.area,
polygon.length])
polygon.length])
writer.addFeature(outFeat)
current += 1
progress.setPercentage(50 + int(current * total))

2
python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py
View File

@ -93,7 +93,7 @@ class SinglePartsToMultiparts(GeoAlgorithm):
outFeat.setAttributes(attrs)
outGeom = QgsGeometry(self.convertGeometry(multi_feature,
vType))
vType))
outFeat.setGeometry(outGeom)
writer.addFeature(outFeat)

2
python/plugins/processing/algs/qgis/UniqueValues.py
View File

@ -63,7 +63,7 @@ class UniqueValues(GeoAlgorithm):
self.createHTML(outputFile, values)
self.setOutputValue(self.TOTAL_VALUES, len(values))
self.setOutputValue(self.UNIQUE_VALUES, ';'.join([unicode(v) for v in
values]))
values]))
def createHTML(self, outputFile, algData):
f = codecs.open(outputFile, 'w', encoding='utf-8')

14
python/plugins/processing/algs/qgis/VoronoiPolygons.py
View File

@ -93,7 +93,7 @@ class VoronoiPolygons(GeoAlgorithm):
uniqueSet = Set(item for item in pts)
ids = [pts.index(item) for item in uniqueSet]
sl = voronoi.SiteList([voronoi.Site(i[0], i[1], sitenum=j) for (j,
i) in enumerate(uniqueSet)])
i) in enumerate(uniqueSet)])
voronoi.voronoi(sl, c)
inFeat = QgsFeature()
@ -223,9 +223,9 @@ class VoronoiPolygons(GeoAlgorithm):
)
if x1 or x2 or y1 or y2:
lines.append(QgsPoint(x1 + extent.xMinimum(), y1
+ extent.yMinimum()))
+ extent.yMinimum()))
lines.append(QgsPoint(x2 + extent.xMinimum(), y2
+ extent.yMinimum()))
+ extent.yMinimum()))
if 0 - exX in (x1, x2):
hasXMin = True
if 0 - exY in (y1, y2):
@ -237,15 +237,15 @@ class VoronoiPolygons(GeoAlgorithm):
if hasXMin:
if hasYMax:
lines.append(QgsPoint(extent.xMinimum() - exX, height
+ extent.yMinimum() + exY))
+ extent.yMinimum() + exY))
if hasYMin:
lines.append(QgsPoint(extent.xMinimum() - exX,
extent.yMinimum() - exY))
extent.yMinimum() - exY))
if hasXMax:
if hasYMax:
lines.append(QgsPoint(width + extent.xMinimum() + exX, height
+ extent.yMinimum() + exY))
+ extent.yMinimum() + exY))
if hasYMin:
lines.append(QgsPoint(width + extent.xMinimum() + exX,
extent.yMinimum() - exY))
extent.yMinimum() - exY))
return lines

2
python/plugins/processing/algs/qgis/postgis_utils.py
View File

@ -295,7 +295,7 @@ class GeoDB:
def get_table_rows(self, table, schema=None):
c = self.con.cursor()
self._exec_sql(c, 'SELECT COUNT(*) FROM %s' % self._table_name(schema,
table))
table))
return c.fetchone()[0]
def get_table_fields(self, table, schema=None):

26
python/plugins/processing/algs/qgis/scripts/Fill_holes.py
View File

@ -22,23 +22,23 @@ resgeom = QgsGeometry()
resfeat = QgsFeature()
for feat in processing.features(polyLayer):
progress.setPercentage(int(100 * l / n))
l += 1
progress.setPercentage(int(100 * l / n))
l += 1
g = loads(feat.geometry().asWkb())
g = loads(feat.geometry().asWkb())
if g.geom_type == 'MultiPolygon':
resg = [Polygon(p.exterior,
[r for r in p.interiors if Polygon(r).area > Max_area]) for p in g]
if g.geom_type == 'MultiPolygon':
resg = [Polygon(p.exterior,
[r for r in p.interiors if Polygon(r).area > Max_area]) for p in g]
else:
resg = [Polygon(g.exterior,
[r for r in g.interiors if Polygon(r).area > Max_area])]
else:
resg = [Polygon(g.exterior,
[r for r in g.interiors if Polygon(r).area > Max_area])]
resgeom = QgsGeometry().fromWkt(dumps(MultiPolygon(resg)))
resgeom = QgsGeometry().fromWkt(dumps(MultiPolygon(resg)))
resfeat.setAttributes(feat.attributes())
resfeat.setGeometry(resgeom)
writer.addFeature(resfeat)
resfeat.setAttributes(feat.attributes())
resfeat.setGeometry(resgeom)
writer.addFeature(resfeat)
del writer

38
python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py
View File

@ -8,8 +8,8 @@ from operator import itemgetter
To_keep = int(To_keep)
if To_keep < 1:
progress.setInfo("'To keep' value has been modified to be at least 1.")
To_keep = 1
progress.setInfo("'To keep' value has been modified to be at least 1.")
To_keep = 1
polyLayer = processing.getObject(Polygons)
@ -20,23 +20,23 @@ writer = processing.VectorWriter(Results, None, polyPrder.fields(),
for n, feat in enumerate(processing.features(polyLayer)):
progress.setPercentage(int(100 * n / count))
geom = feat.geometry()
if geom.isMultipart():
featres = feat
geoms = geom.asGeometryCollection()
geomarea = [(i, geoms[i].area()) for i in range(len(geoms))]
geomarea.sort(key=itemgetter(1))
if To_keep == 1:
featres.setGeometry(geoms[geomarea[-1][0]])
elif To_keep > len(geoms):
featres.setGeometry(geom)
else:
featres.setGeometry(geom)
geomres = [geoms[i].asPolygon() for i, a in geomarea[-1 * To_keep:]]
featres.setGeometry(QgsGeometry.fromMultiPolygon(geomres))
writer.addFeature(featres)
progress.setPercentage(int(100 * n / count))
geom = feat.geometry()
if geom.isMultipart():
featres = feat
geoms = geom.asGeometryCollection()
geomarea = [(i, geoms[i].area()) for i in range(len(geoms))]
geomarea.sort(key=itemgetter(1))
if To_keep == 1:
featres.setGeometry(geoms[geomarea[-1][0]])
elif To_keep > len(geoms):
featres.setGeometry(geom)
else:
writer.addFeature(feat)
featres.setGeometry(geom)
geomres = [geoms[i].asPolygon() for i, a in geomarea[-1 * To_keep:]]
featres.setGeometry(QgsGeometry.fromMultiPolygon(geomres))
writer.addFeature(featres)
else:
writer.addFeature(feat)
del writer

2
python/plugins/processing/algs/r/RAlgorithm.py
View File

@ -342,7 +342,7 @@ class RAlgorithm(GeoAlgorithm):
commands.append(param.name + ' <- read.csv("' + value
+ '", head=TRUE, sep=",")')
elif isinstance(param, (ParameterTableField, ParameterString,
ParameterFile)):
ParameterFile)):
commands.append(param.name + '="' + param.value + '"')
elif isinstance(param, (ParameterNumber, ParameterSelection)):
commands.append(param.name + '=' + unicode(param.value))

2
python/plugins/processing/algs/saga/SagaAlgorithm213.py
View File

@ -121,7 +121,7 @@ class SagaAlgorithm213(SagaAlgorithm212):
if param.value is None:
continue
if isinstance(param, (ParameterRaster, ParameterVector,
ParameterTable)):
ParameterTable)):
value = param.value
if value in self.exportedLayers.keys():
command += ' -' + param.name + ' "' \

4
python/plugins/processing/core/ProcessingConfig.py
View File

@ -137,13 +137,13 @@ class ProcessingConfig:
ProcessingConfig.tr('General'),
ProcessingConfig.DEFAULT_OUTPUT_VECTOR_LAYER_EXT,
ProcessingConfig.tr('Default output vector layer extension'), extensions[0],
valuetype=Setting.SELECTION, options=extensions))
valuetype=Setting.SELECTION, options=extensions))
extensions = processing.tools.dataobjects.getSupportedOutputRasterLayerExtensions()
ProcessingConfig.addSetting(Setting(
ProcessingConfig.tr('General'),
ProcessingConfig.DEFAULT_OUTPUT_RASTER_LAYER_EXT,
ProcessingConfig.tr('Default output raster layer extension'), extensions[0],
valuetype=Setting.SELECTION, options=extensions))
valuetype=Setting.SELECTION, options=extensions))
@staticmethod
def setGroupIcon(group, icon):

14
python/plugins/processing/gui/NumberInputDialog.py
View File

@ -68,13 +68,13 @@ class NumberInputDialog(BASE, WIDGET):
layerItem = QTreeWidgetItem()
layerItem.setText(0, unicode(layer.name()))
layerItem.addChild(TreeValueItem(self.tr('Min X'),
layer.extent().xMinimum()))
layer.extent().xMinimum()))
layerItem.addChild(TreeValueItem(self.tr('Max X'),
layer.extent().xMaximum()))
layer.extent().xMaximum()))
layerItem.addChild(TreeValueItem(self.tr('Min Y'),
layer.extent().yMinimum()))
layer.extent().yMinimum()))
layerItem.addChild(TreeValueItem(self.tr('Max Y'),
layer.extent().yMaximum()))
layer.extent().yMaximum()))
if isinstance(layer, QgsRasterLayer):
cellsize = (layer.extent().xMaximum()
- layer.extent().xMinimum()) / layer.width()
@ -93,11 +93,11 @@ class NumberInputDialog(BASE, WIDGET):
layerItem.setText(0, unicode(layer.name()))
layerItem.addChild(TreeValueItem(self.tr('Mean'), stats.mean))
layerItem.addChild(TreeValueItem(self.tr('Std. deviation'),
stats.stdDev))
stats.stdDev))
layerItem.addChild(TreeValueItem(self.tr('Max value'),
stats.maximumValue))
stats.maximumValue))
layerItem.addChild(TreeValueItem(self.tr('Min value'),
stats.minimumValue))
stats.minimumValue))
layersItem.addChild(layerItem)
canvasItem = QTreeWidgetItem()

2
python/plugins/processing/gui/ScriptEdit.py
View File

@ -192,7 +192,7 @@ class ScriptEdit(QsciScintilla):
settings = QSettings()
useDefaultAPI = bool(settings.value('pythonConsole/preloadAPI',
True))
True))
if useDefaultAPI:
# Load QGIS API shipped with Python console
self.api.loadPrepared(

4
python/plugins/processing/gui/ScriptEditorDialog.py
View File

@ -228,8 +228,8 @@ class ScriptEditorDialog(BASE, WIDGET):
filterName = self.tr('Processing R script (*.rsx)')
self.filename = unicode(QFileDialog.getSaveFileName(self,
self.tr('Save script'), scriptDir,
filterName))
self.tr('Save script'), scriptDir,
filterName))
if self.filename:
if self.algType == self.SCRIPT_PYTHON and \

2
python/plugins/processing/modeler/CalculatorModelerAlgorithm.py
View File

@ -54,7 +54,7 @@ class CalculatorModelerAlgorithm(GeoAlgorithm):
self.tr('Formula', 'CalculatorModelerAlgorithm'), ''))
for i in range(AVAILABLE_VARIABLES):
self.addParameter(ParameterNumber(NUMBER
+ unicode(i), 'dummy'))
+ unicode(i), 'dummy'))
self.addOutput(OutputNumber(RESULT,
self.tr('Result', 'CalculatorModelerAlgorithm')))

2
python/plugins/processing/modeler/ModelerArrowItem.py
View File

@ -66,7 +66,7 @@ class ModelerArrowItem(QGraphicsPathItem):
self.setFlag(QGraphicsItem.ItemIsSelectable, False)
self.myColor = Qt.gray
self.setPen(QPen(self.myColor, 1, Qt.SolidLine,
Qt.RoundCap, Qt.RoundJoin))
Qt.RoundCap, Qt.RoundJoin))
self.setZValue(0)
def updatePath(self):

16
python/plugins/processing/modeler/ModelerGraphicItem.py
View File

@ -263,12 +263,12 @@ class ModelerGraphicItem(QGraphicsItem):
painter.drawText(pt, 'Out')
if not self.element.outputsFolded:
for i, out in enumerate(self.element.algorithm.outputs):
text = self.getAdjustedText(out.description)
h = fm.height() * 1.2 * (i + 2)
h = h + ModelerGraphicItem.BOX_HEIGHT / 2.0
pt = QPointF(-ModelerGraphicItem.BOX_WIDTH / 2
+ 33, h)
painter.drawText(pt, text)
text = self.getAdjustedText(out.description)
h = fm.height() * 1.2 * (i + 2)
h = h + ModelerGraphicItem.BOX_HEIGHT / 2.0
pt = QPointF(-ModelerGraphicItem.BOX_WIDTH / 2
+ 33, h)
painter.drawText(pt, text)
if self.pixmap:
painter.drawPixmap(-(ModelerGraphicItem.BOX_WIDTH / 2.0) + 3, -8,
self.pixmap)
@ -354,11 +354,11 @@ class FlatButtonGraphicItem(QGraphicsItem):
if self.isIn:
painter.setPen(QPen(Qt.transparent, 1))
painter.setBrush(QBrush(Qt.lightGray,
Qt.SolidPattern))
Qt.SolidPattern))
else:
painter.setPen(QPen(Qt.transparent, 1))
painter.setBrush(QBrush(Qt.transparent,
Qt.SolidPattern))
Qt.SolidPattern))
painter.drawRect(rect)
painter.drawPixmap(pt.x(), pt.y(), self.pixmap)

6
python/plugins/processing/modeler/RasterLayerBoundsAlgorithm.py
View File

@ -61,6 +61,6 @@ class RasterLayerBoundsAlgorithm(GeoAlgorithm):
self.setOutputValue(self.YMIN, layer.extent().yMinimum())
self.setOutputValue(self.YMAX, layer.extent().yMaximum())
self.setOutputValue(self.EXTENT, (layer.extent().xMinimum(),
layer.extent().xMaximum(),
layer.extent().yMinimum(),
layer.extent().yMaximum()))
layer.extent().xMaximum(),
layer.extent().yMinimum(),
layer.extent().yMaximum()))

6
python/plugins/processing/modeler/VectorLayerBoundsAlgorithm.py
View File

@ -61,6 +61,6 @@ class VectorLayerBoundsAlgorithm(GeoAlgorithm):
self.setOutputValue(self.YMIN, layer.extent().yMinimum())
self.setOutputValue(self.YMAX, layer.extent().yMaximum())
self.setOutputValue(self.EXTENT, (layer.extent().xMinimum(),
layer.extent().xMaximum(),
layer.extent().yMinimum(),
layer.extent().yMaximum()))
layer.extent().xMaximum(),
layer.extent().yMinimum(),
layer.extent().yMaximum()))

12
python/plugins/processing/script/ScriptAlgorithmProvider.py
View File

@ -46,9 +46,9 @@ class ScriptAlgorithmProvider(AlgorithmProvider):
def __init__(self):
AlgorithmProvider.__init__(self)
self.actions.extend([CreateNewScriptAction(self.tr('Create new script', 'ScriptAlgorithmProvider'),
CreateNewScriptAction.SCRIPT_PYTHON),
AddScriptFromFileAction(),
GetScriptsAction()])
CreateNewScriptAction.SCRIPT_PYTHON),
AddScriptFromFileAction(),
GetScriptsAction()])
self.contextMenuActions = \
[EditScriptAction(EditScriptAction.SCRIPT_PYTHON),
DeleteScriptAction(DeleteScriptAction.SCRIPT_PYTHON)]
@ -56,9 +56,9 @@ class ScriptAlgorithmProvider(AlgorithmProvider):
def initializeSettings(self):
AlgorithmProvider.initializeSettings(self)
ProcessingConfig.addSetting(Setting(self.getDescription(),
ScriptUtils.SCRIPTS_FOLDER,
self.tr('Scripts folder', 'ScriptAlgorithmProvider'),
ScriptUtils.scriptsFolder(), valuetype=Setting.FOLDER))
ScriptUtils.SCRIPTS_FOLDER,
self.tr('Scripts folder', 'ScriptAlgorithmProvider'),
ScriptUtils.scriptsFolder(), valuetype=Setting.FOLDER))
def unload(self):
AlgorithmProvider.unload(self)

6
python/plugins/processing/tests/qgis_interface.py
View File

@ -47,7 +47,7 @@ class QgisInterface(QObject):
self.testVector])
self.statusBar = type('FakeStatusBar', (), {'showMessage': lambda _,
m: None})()
m: None})()
def zoomFull(self):
"""Zoom to the map full extent"""
@ -98,7 +98,7 @@ class QgisInterface(QObject):
"""
return type('FakeMainWindow', (), {'statusBar': lambda _:
self.statusBar})()
self.statusBar})()
def addDockWidget(self, area, dockwidget):
"""Add a dock widget to the main window"""
@ -106,4 +106,4 @@ class QgisInterface(QObject):
def legendInterface(self):
return type('FakeLInterface', (), {'layers': lambda _:
[self.testRaster, self.testVector]})()
[self.testRaster, self.testVector]})()

2
python/plugins/processing/tests/test.py
View File

@ -90,7 +90,7 @@ class ProcessingProviderTestCase(unittest.TestCase):
self.alg = alg
self.threaded = threaded
self.msg = 'ALG %s (%s %s)' % (self.algId, {True: 'threaded',
False: 'unthreaded'}[threaded], dialog)
False: 'unthreaded'}[threaded], dialog)
unittest.TestCase.__init__(self, 'runalg_%s' % dialog)
def gen_test_parameters(self, alg, doSet=False):

4
python/plugins/processing/tools/vector.py
View File

@ -592,7 +592,7 @@ class VectorWriter:
_runSQL("CREATE TABLE %s.%s (%s)" % (uri.schema(), uri.table().lower(), fieldsdesc))
_runSQL("SELECT AddGeometryColumn('{schema}', '{table}', 'the_geom', {srid}, '{typmod}', 2)".format(
table=uri.table().lower(), schema=uri.schema(), srid=crs.authid().split(":")[-1],
typmod=GEOM_TYPE_MAP[geometryType].upper()))
typmod=GEOM_TYPE_MAP[geometryType].upper()))
self.layer = QgsVectorLayer(uri.uri(), uri.table(), "postgres")
self.writer = self.layer.dataProvider()
@ -622,7 +622,7 @@ class VectorWriter:
_runSQL("CREATE TABLE %s (%s)" % (uri.table().lower(), fieldsdesc))
_runSQL("SELECT AddGeometryColumn('{table}', 'the_geom', {srid}, '{typmod}', 2)".format(
table=uri.table().lower(), srid=crs.authid().split(":")[-1],
typmod=GEOM_TYPE_MAP[geometryType].upper()))
typmod=GEOM_TYPE_MAP[geometryType].upper()))
self.layer = QgsVectorLayer(uri.uri(), uri.table(), "spatialite")
self.writer = self.layer.dataProvider()

2
python/pyplugin_installer/installer_data.py
View File

@ -450,7 +450,7 @@ class Repositories(QObject):
#if compatible, add the plugin to the list
if not pluginNodes.item(i).firstChildElement("disabled").text().strip().upper() in ["TRUE", "YES"]:
if isCompatible(QGis.QGIS_VERSION, qgisMinimumVersion, qgisMaximumVersion):
#add the plugin to the cache
#add the plugin to the cache
plugins.addFromRepository(plugin)
self.mRepositories[reposName]["state"] = 2
else:

8
src/plugins/grass/scripts/r.external.all.py
View File

@ -88,12 +88,12 @@ except:
def import_directory_of_rasters(directory, recursive):
for dir, dirnames, filenames in os.walk(directory):
for filename in filenames:
if grass.run_command('r.external', flags=flags_string, input=os.path.join(dir, filename), band=options['band'], output=filename[:-4], title=filename[:-4]) != 0:
grass.warning('Cannot import file' + filename)
if grass.run_command('r.external', flags=flags_string, input=os.path.join(dir, filename), band=options['band'], output=filename[:-4], title=filename[:-4]) != 0:
grass.warning('Cannot import file' + filename)
if not recursive:
break
break
for dirname in dirnames:
import_directory_of_rasters(dirname, recursive)
import_directory_of_rasters(dirname, recursive)
def main():