Merge branch 'dev_dylan' into scenarios

src/Model/Study.py

@@ -546,7 +546,7 @@ class Study(SQLModel):
         self.status.scenario = scenario
 
         if reduce(
-                lambda a, s: a or (s.parent is scenario),
+                lambda a, s: a or (s.parent is scenario and not s.is_deleted()),
                 self.scenarios.lst,
                 False
         ):

src/View/BoundaryConditionsAdisTS/Window.py

@@ -90,8 +90,6 @@ class BoundaryConditionAdisTSWindow(PamhyrWindow):
         self.setup_table()
         self.setup_connections()
 
-        self.ui.setWindowTitle(self._title)
-
     def setup_table(self):
         self._delegate_type = ComboBoxDelegate(
             trad=self._trad,

src/View/D90AdisTS/Window.py

@@ -93,8 +93,6 @@ class D90AdisTSWindow(PamhyrWindow):
 
         self.setup_table()
 
-        self.ui.setWindowTitle(self._title)
-
     def setup_table(self):
 
         path_icons = os.path.join(self._get_ui_directory(), f"ressources")

src/View/DIFAdisTS/Window.py

@@ -91,8 +91,6 @@ class DIFAdisTSWindow(PamhyrWindow):
 
         self.setup_table()
 
-        self.ui.setWindowTitle(self._title)
-
     def setup_table(self):
 
         path_icons = os.path.join(self._get_ui_directory(), f"ressources")

src/View/InitialConditions/Window.py

@@ -107,8 +107,6 @@ class InitialConditionsWindow(PamhyrWindow):
         self.setup_connections()
         self.setub_dialogs()
 
-        self.ui.setWindowTitle(self._title)
-
     def setup_table(self):
         table = self.find(QTableView, f"tableView")
         self._delegate_rk = ComboBoxDelegate(

src/View/InitialConditionsAdisTS/Window.py

@@ -100,8 +100,6 @@ class InitialConditionsAdisTSWindow(PamhyrWindow):
 
         self.setup_table()
 
-        self.ui.setWindowTitle(self._title)
-
     def setup_table(self):
 
         path_icons = os.path.join(self._get_ui_directory(), f"ressources")

src/View/Network/Window.py

@@ -147,7 +147,7 @@ class NetworkWindow(PamhyrWindow):
         self._graph_widget.changeEdge.connect(self.update)
         self._graph_widget.changeNode.connect(self.update)
 
-        if self._study.is_editable:
+        if self._study.is_editable():
             self._nodes_model\
                 .dataChanged\
                 .connect(self._graph_widget.rename_nodes)

src/View/Scenarios/UndoCommand.py

@@ -74,11 +74,10 @@ class DeleteScenariosCommand(QUndoCommand):
             self._study.reload_from_scenario(self._scenario)
 
     def redo(self):
+        self._scenario.set_as_deleted()
         if self._reload:
             self._study.reload_from_scenario(self._scenario.parent)
 
-        self._scenario.set_as_deleted()
-
 
 class DuplicateScenariosCommand(QUndoCommand):
     def __init__(self, study):