Expand Up
@@ -37,9 +37,9 @@ def __init__(self, iface, commandName):
BasePluginWidget .__init__ (self , iface , commandName )
def getBatchArguments (self , inFile , outFile = None ):
arguments = QStringList ()
arguments << self .getArguments ()
arguments << inFile
arguments = []
arguments . append ( self .getArguments () )
arguments . append ( inFile )
if outFile != None :
arguments << outFile
return arguments
Expand All
@@ -62,9 +62,9 @@ def getBatchOutputFileName(self, fn):
# if overwrites existent files
if outDir == None or outDir == inDir :
return QString ( fn ). append ( ".tmp" )
return fn + ".tmp"
return QString ( fn ). mid ( len (inDir ) ). prepend ( outDir )
return outDir + fn [ len (inDir ):]
def onRun ( self ):
if not self .isBatchEnabled ():
Expand All
@@ -85,7 +85,7 @@ def batchRun(self):
for f in self .inFiles :
self .outFiles .append ( self .getBatchOutputFileName ( f ) )
self .errors = QStringList ()
self .errors = []
self .batchIndex = 0
self .batchTotal = len ( self .inFiles )
self .setProgressRange ( self .batchTotal )
Expand All
@@ -112,7 +112,7 @@ def onFinished(self, exitCode, status):
BasePluginWidget .onFinished (self , exitCode , status )
return
msg = QString . fromLocal8Bit ( self .base .process .readAllStandardError () )
msg = bytes . decode ( bytes ( self .base .process .readAllStandardError () ) )
if not msg .isEmpty ():
self .errors .append ( ">> " + self .inFiles [self .batchIndex ] + "<br>" + msg .replace ( "\n " , "<br>" ) )
Expand All
@@ -134,7 +134,7 @@ def batchFinished( self ):
self .base .stop ()
if not self .errors .isEmpty ():
msg = QString ( "Processing of the following files ended with error: <br><br>" ). append ( self . errors . join ( "<br><br>" ) )
msg = u "Processing of the following files ended with error: <br><br>"+ "<br><br>" . join ( self . errors )
QErrorMessage ( self ).showMessage ( msg )
inDir = self .getInputFileName ()
Expand All
@@ -146,17 +146,17 @@ def batchFinished( self ):
canvas = self .iface .mapCanvas ()
previousRenderFlag = canvas .renderFlag ()
canvas .setRenderFlag ( False )
notCreatedList = QStringList ()
notCreatedList = []
for item in self .outFiles :
fileInfo = QFileInfo ( item )
if fileInfo .exists ():
if self .base .loadCheckBox .isChecked ():
self .addLayerIntoCanvas ( fileInfo )
else :
notCreatedList << item
notCreatedList . append ( item )
canvas .setRenderFlag ( previousRenderFlag )
if notCreatedList . isEmpty () :
if len ( notCreatedList ) == 0 :
QMessageBox .information ( self , self .tr ( "Finished" ), self .tr ( "Operation completed." ) )
else :
QMessageBox .warning ( self , self .tr ( "Warning" ), self .tr ( "The following files were not created: \n %1" ).arg ( notCreatedList .join ( ", " ) ) )
Expand Down