Override mouse cursor for all time consuming operations

opengisch · Jul 31, 2023 · 5b1c253 · 5b1c253
1 parent f357511
commit 5b1c253
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 43 deletions.
diff --git a/pzp/calculation.py b/pzp/calculation.py
@@ -12,7 +12,6 @@
     QgsProject,
     QgsVectorLayer,
 )
-from qgis.PyQt.QtCore import Qt
 
 from pzp import utils
 
@@ -201,8 +200,7 @@ def guess_params(group):
         return
 
     try:
-        with utils.OverrideCursor(Qt.WaitCursor):
-            calculate(process_type, layer_intensity)
+        calculate(process_type, layer_intensity)
 
     except QgsProcessingException as processingException:
         utils.push_error("Errore di processing: {0}".format(str(processingException)), showMore=traceback.format_exc())

diff --git a/pzp/pzp.py b/pzp/pzp.py
@@ -23,28 +23,14 @@ def initGui(self):
         self.toolbar.setObjectName("PZPToolbar")
         self.toolbar.setToolTip("PZP Toolbar")
 
-        self.toolbar.addAction(
-            self.create_action(
-                "landslide.png", "Aggiungi processo", self.do_add_process
-            )
-        )
+        self.toolbar.addAction(self.create_action("landslide.png", "Aggiungi processo", self.do_add_process))
 
         geodata_menu = QMenu()
-        add_basemaps_action = self.create_action(
-            "world.png", "Aggiungi mappe base", self.do_add_basemaps
-        )
+        add_basemaps_action = self.create_action("world.png", "Aggiungi mappe base", self.do_add_basemaps)
 
         geodata_menu.addAction(add_basemaps_action)
-        geodata_menu.addAction(
-            self.create_action(
-                "ruler.png", "Aggiungi dati base WMS", self.do_add_base_data_wms
-            )
-        )
-        geodata_menu.addAction(
-            self.create_action(
-                "ruler.png", "Aggiungi dati base WFS", self.do_add_base_data_wfs
-            )
-        )
+        geodata_menu.addAction(self.create_action("ruler.png", "Aggiungi dati base WMS", self.do_add_base_data_wms))
+        geodata_menu.addAction(self.create_action("ruler.png", "Aggiungi dati base WFS", self.do_add_base_data_wfs))
 
         toolButton = QToolButton()
         toolButton.setDefaultAction(add_basemaps_action)
@@ -61,16 +47,10 @@ def initGui(self):
         )
 
         self.toolbar.addAction(
-            self.create_action(
-                "propagation.png", "Calcola propagazione", self.do_calculate_propagation
-            )
+            self.create_action("propagation.png", "Calcola propagazione", self.do_calculate_propagation)
         )
 
-        self.toolbar.addAction(
-            self.create_action(
-                "process.png", "Calcola zone di pericolo", self.do_calculate_zones
-            )
-        )
+        self.toolbar.addAction(self.create_action("process.png", "Calcola zone di pericolo", self.do_calculate_zones))
 
         a_b_menu = QMenu()
         a_b_action = self.create_action("a_b.png", "A->B", self.do_a_b)
@@ -89,9 +69,7 @@ def initGui(self):
         self.iface.registerOptionsWidgetFactory(self.options_factory)
 
     def create_action(self, icon, name, callback):
-        action = QAction(
-            QIcon(f":/plugins/pzp/icons/{icon}"), name, self.iface.mainWindow()
-        )
+        action = QAction(QIcon(f":/plugins/pzp/icons/{icon}"), name, self.iface.mainWindow())
         action.triggered.connect(callback)
         self.iface.addPluginToMenu("PZP", action)
         return action
@@ -106,7 +84,8 @@ def unload(self):
 
     def do_add_process(self):
         dlg = AddProcessDialog(self.iface)
-        dlg.exec_()
+        with utils.OverrideCursor(Qt.WaitCursor):
+            dlg.exec_()
 
     def do_add_basemaps(self):
         utils.load_qlr_layer("mappe_base")
@@ -131,7 +110,8 @@ def do_calculate_propagation(self):
         if isinstance(current_node, QgsLayerTreeGroup):
             # TODO: Check we have all the layers in the group
             dlg = PropagationDialog(self.iface, current_node)
-            dlg.exec_()
+            with utils.OverrideCursor(Qt.WaitCursor):
+                dlg.exec_()
         else:
             utils.push_error("Selezionare il gruppo che contiene il processo", 3)
 
@@ -141,7 +121,8 @@ def do_calculate_zones(self):
         if isinstance(current_node, QgsLayerTreeGroup):
             # TODO: Check we have all the layers in the group
             dlg = CalculationDialog(self.iface, current_node)
-            dlg.exec_()
+            with utils.OverrideCursor(Qt.WaitCursor):
+                dlg.exec_()
         else:
             utils.push_error("Selezionare il gruppo che contiene il processo", 3)
 
@@ -157,10 +138,7 @@ def do_calculate_no_impact(self):
     def do_a_b(self):
         layer = self.iface.activeLayer()
         if layer:
-            if (
-                QgsExpressionContextUtils.layerScope(layer).variable("pzp_layer")
-                == "danger_zones"
-            ):
+            if QgsExpressionContextUtils.layerScope(layer).variable("pzp_layer") == "danger_zones":
                 a_b.a_b(layer)
                 return
 
@@ -169,10 +147,7 @@ def do_a_b(self):
     def do_b_a(self):
         layer = self.iface.activeLayer()
         if layer:
-            if (
-                QgsExpressionContextUtils.layerScope(layer).variable("pzp_layer")
-                == "danger_zones"
-            ):
+            if QgsExpressionContextUtils.layerScope(layer).variable("pzp_layer") == "danger_zones":
                 a_b.b_a(layer)
                 return