Question time

spacesyntax · Jul 29, 2016 · f5b1699 · f5b1699
1 parent a6b0514
commit f5b1699
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/catchment_analyser.py b/catchment_analyser.py
@@ -371,6 +371,7 @@ def analysisFinish(self, output):
         self.analysis_thread.quit()
         self.analysis_thread.wait()
         self.analysis_thread.deleteLater()
+        self.analysis.deleteLater()
 
         # Closing the dialog
         self.dlg.closeDialog()

diff --git a/catchment_tools.py b/catchment_tools.py
@@ -655,6 +655,10 @@ def polygon_writer(self, catchment_points, distances, output_polygon, polygon_to
         unique_origins_list = []
         polygon_dict = {}
         for tied_point in catchment_points:
+            # Kill check
+            if self.killed == True:
+                self.kill.emit(True)
+                break
             name = catchment_points[tied_point]['name']
             if name not in unique_origins_list:
                 polygon_dict[name] = {distance: [] for distance in distances}
@@ -666,7 +670,6 @@ def polygon_writer(self, catchment_points, distances, output_polygon, polygon_to
                     polygon_dict[name][distance].append(hull)
                     print len(polygon_dict[name][distance])
 
-
         # Create list of hulls for each distance and each unique origin
         index = 1
         hull_validity = True