Merge pull request #5594 from nyalldawson/batch_lazy

[processing] Fix issues with batch processing and large count of layers
qgis · Nov 10, 2017 · f8cbc42 · f8cbc42
2 parents 6de3980 + 2ed2248
commit f8cbc42
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/python/plugins/processing/gui/BatchAlgorithmDialog.py b/python/plugins/processing/gui/BatchAlgorithmDialog.py
@@ -80,7 +80,9 @@ def accept(self):
         load = []
 
         feedback = self.createFeedback()
-        context = dataobjects.createContext(feedback)
+
+        load_layers = self.mainWidget.checkLoadLayersOnCompletion.isChecked()
+        project = QgsProject.instance() if load_layers else None
 
         for row in range(self.mainWidget.tblParameters.rowCount()):
             col = 0
@@ -90,7 +92,7 @@ def accept(self):
                     continue
                 wrapper = self.mainWidget.wrappers[row][col]
                 parameters[param.name()] = wrapper.value()
-                if not param.checkValueIsAcceptable(wrapper.value(), context):
+                if not param.checkValueIsAcceptable(wrapper.value()):
                     self.bar.pushMessage("", self.tr('Wrong or missing parameter value: {0} (row {1})').format(
                                          param.description(), row + 1),
                                          level=QgsMessageBar.WARNING, duration=5)
@@ -104,11 +106,11 @@ def accept(self):
                 count_visible_outputs += 1
                 widget = self.mainWidget.tblParameters.cellWidget(row, col)
                 text = widget.getValue()
-                if out.checkValueIsAcceptable(text, context):
+                if out.checkValueIsAcceptable(text):
                     if isinstance(out, (QgsProcessingParameterRasterDestination,
                                         QgsProcessingParameterFeatureSink)):
                         # load rasters and sinks on completion
-                        parameters[out.name()] = QgsProcessingOutputLayerDefinition(text, context.project())
+                        parameters[out.name()] = QgsProcessingOutputLayerDefinition(text, project)
                     else:
                         parameters[out.name()] = text
                     col += 1
@@ -145,6 +147,12 @@ def accept(self):
                 feedback.pushCommandInfo(pformat(parameters))
                 feedback.pushInfo('')
 
+                # important - we create a new context for each iteration
+                # this avoids holding onto resources and layers from earlier iterations,
+                # and allows batch processing of many more items then is possible
+                # if we hold on to these layers
+                context = dataobjects.createContext(feedback)
+
                 alg_start_time = time.time()
                 ret, results = execute(self.alg, parameters, context, feedback)
                 if ret:
@@ -159,9 +167,9 @@ def accept(self):
                 else:
                     break
 
-            feedback.pushInfo(self.tr('Batch execution completed in {0:0.2f} seconds'.format(time.time() - start_time)))
+                handleAlgorithmResults(self.alg, context, feedback, False)
 
-            handleAlgorithmResults(self.alg, context, feedback, False)
+        feedback.pushInfo(self.tr('Batch execution completed in {0:0.2f} seconds'.format(time.time() - start_time)))
 
         self.finish(algorithm_results)
         self.buttonCancel.setEnabled(False)

diff --git a/python/plugins/processing/ui/widgetBatchPanel.ui b/python/plugins/processing/ui/widgetBatchPanel.ui
@@ -120,6 +120,13 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="0" colspan="6">
+    <widget class="QCheckBox" name="checkLoadLayersOnCompletion">
+     <property name="text">
+      <string>Load layers on completion</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>