4747from sextante .parameters .ParameterFixedTable import ParameterFixedTable
4848from sextante .gui .FixedTablePanel import FixedTablePanel
4949from sextante .parameters .ParameterMultipleInput import ParameterMultipleInput
50- import copy
5150from sextante .gui .BatchOutputSelectionPanel import BatchOutputSelectionPanel
5251from sextante .gui .AlgorithmExecutor import AlgorithmExecutor
5352from sextante .outputs .OutputHTML import OutputHTML
5453from sextante .core .SextanteResults import SextanteResults
5554from sextante .core .SextanteLog import SextanteLog
5655from sextante .core .SextanteConfig import SextanteConfig
57- from sextante .gui .UnthreadedAlgorithmExecutor import SilentProgress ,\
58- UnthreadedAlgorithmExecutor
56+ from sextante .gui .UnthreadedAlgorithmExecutor import UnthreadedAlgorithmExecutor
5957
6058class BatchProcessingDialog (AlgorithmExecutionDialog ):
6159 def __init__ (self , alg ):
6260 self .algs = None
6361 self .table = QtGui .QTableWidget (None )
64- AlgorithmExecutionDialog .__init__ (self , alg , self .table )
65- #self.setModal(True)
62+ AlgorithmExecutionDialog .__init__ (self , alg , self .table )
6663 self .setWindowModality (1 )
6764 self .algEx = None
6865 self .resize (800 , 500 )
@@ -87,9 +84,7 @@ def __init__(self, alg):
8784 self .setTableContent ()
8885 self .table .horizontalHeader ().setStretchLastSection (True )
8986 self .table .verticalHeader ().setVisible (False )
90- self .table .setSizePolicy (QtGui .QSizePolicy .Expanding , QtGui .QSizePolicy .Expanding )
91- #self.progress = QtGui.QProgressBar()
92- #self.progress.setMaximum(100)
87+ self .table .setSizePolicy (QtGui .QSizePolicy .Expanding , QtGui .QSizePolicy .Expanding )
9388 self .addRowButton .clicked .connect (self .addRow )
9489 self .deleteRowButton .clicked .connect (self .deleteRow )
9590
@@ -137,11 +132,9 @@ def accept(self):
137132 return
138133 self .algs .append (alg )
139134
140- QApplication .setOverrideCursor (QCursor (Qt .WaitCursor ))
141- #self.progress.setMaximum(len(self.algs))
135+ QApplication .setOverrideCursor (QCursor (Qt .WaitCursor ))
142136 self .table .setEnabled (False )
143- if SextanteConfig .getSetting (SextanteConfig .USE_THREADS ):
144- #self.progress.setValue(0)
137+ if SextanteConfig .getSetting (SextanteConfig .USE_THREADS ):
145138 self .nextAlg (0 )
146139 else :
147140 i = 1
@@ -209,9 +202,11 @@ def createSummaryTable(self):
209202 outputFile = SextanteUtils .getTempFilename ("html" )
210203 f = open (outputFile , "w" )
211204 for alg in self .algs :
205+ f .write ("<hr>\n " )
212206 for out in alg .outputs :
213207 if isinstance (out , (OutputNumber ,OutputString )):
214208 f .write ("<p>" + out .description + ": " + str (out .value ) + "</p>\n " )
209+ f .write ("<hr>\n " )
215210 f .close ()
216211 SextanteResults .addResult (self .algs [0 ].name + "[summary]" , outputFile )
217212
0 commit comments