Improving navigation dialog initialization

Author: XavierCLL

core/editing.py

@@ -38,7 +38,6 @@
 from qgis.PyQt.QtCore import Qt
 
 from ThRasE.core.navigation import Navigation
-from ThRasE.gui.navigation_dialog import NavigationDialog
 from ThRasE.core.registry import Registry
 from ThRasE.utils.others_utils import get_xml_style
 from ThRasE.utils.qgis_utils import get_file_path_of_layer, apply_symbology
@@ -90,7 +89,7 @@ def __init__(self, layer, band):
         self.bounds = layer.extent().toRectF().getCoords()  # (xmin , ymin, xmax, ymax)
         # navigation
         self.navigation = Navigation(self)
-        self.navigation_dialog = NavigationDialog(layer_to_edit=self)
+        self.navigation_dialog = None  # Created only when navigation is explicitly enabled
         # store pixels: value, color, new_value, on/off
         #   -> [{"value": int, "color": {"R", "G", "B", "A"}, "new_value": int, "s/h": bool}, ...]
         self.pixels_backup = None  # backup for save the original values
@@ -488,7 +487,7 @@ def setup_path(_path):
         # navigation
         data["navigation"] = {}
 
-        if not ThRasE.dialog.QPBtn_EnableNavigation.isChecked() or not self.navigation.is_valid:
+        if self.navigation_dialog is None or not ThRasE.dialog.QPBtn_EnableNavigation.isChecked() or not self.navigation.is_valid:
             data["navigation"]["type"] = "free"
         else:
             data["navigation"]["type"] = self.navigation_dialog.QCBox_BuildNavType.currentText()

core/navigation.py

@@ -261,12 +261,14 @@ def delete(self):
 
         self.clear(rbs_in="main_dialog")
         self.clear(rbs_in="nav_dialog")
-        if LayerToEdit.current.navigation_dialog.highlight_tile:
+        if LayerToEdit.current.navigation_dialog and LayerToEdit.current.navigation_dialog.highlight_tile:
             LayerToEdit.current.navigation_dialog.highlight_tile.reset(QgsWkbTypes.PolygonGeometry)
         self.is_valid = False
         self.current_tile = None
         self.tiles = []
 
         # disable navigations widgets
-        LayerToEdit.current.navigation_dialog.SliderNavigationBlock.setEnabled(False)
-        ThRasE.dialog.NavigationBlockWidgetControls.setEnabled(False)
+        if LayerToEdit.current.navigation_dialog:
+            LayerToEdit.current.navigation_dialog.SliderNavigationBlock.setEnabled(False)
+        if hasattr(ThRasE.dialog, 'NavigationBlockWidgetControls'):
+            ThRasE.dialog.NavigationBlockWidgetControls.setEnabled(False)

gui/main_dialog.py

@@ -44,6 +44,7 @@
 from ThRasE.gui.about_dialog import AboutDialog
 from ThRasE.gui.view_widget import ViewWidget, ViewWidgetSingle, ViewWidgetMulti
 from ThRasE.gui.autofill_dialog import AutoFill
+from ThRasE.gui.navigation_dialog import NavigationDialog
 from ThRasE.gui.apply_from_thematic_classes import ApplyFromThematicClasses
 from ThRasE.utils.qgis_utils import load_and_select_filepath_in, valid_file_selected_in, apply_symbology, \
     get_nodata_value, unset_the_nodata_value, get_file_path_of_layer, unload_layer, load_layer, \
@@ -471,6 +472,9 @@ def get_restore_path(_path):
 
         # navigation
         if yaml_config["navigation"]["type"] != "free":
+            if LayerToEdit.current.navigation_dialog is None:
+                LayerToEdit.current.navigation_dialog = NavigationDialog(layer_to_edit=LayerToEdit.current)
+
             # TODO delete after some time, compatibility old yaml file
             if yaml_config["navigation"]["type"] == "by tiles throughout the thematic file":
                 yaml_config["navigation"]["type"] = "thematic file"
@@ -651,6 +655,9 @@ def enable_navigation_tool(self, checked):
             return
 
         if checked:
+            if LayerToEdit.current.navigation_dialog is None:
+                LayerToEdit.current.navigation_dialog = NavigationDialog(layer_to_edit=LayerToEdit.current)
+
             self.NavigationBlockWidget.setVisible(True)
             if LayerToEdit.current.navigation.is_valid:
                 LayerToEdit.current.navigation.current_tile.show()