Compare commits

..

No commits in common. "a235f6104482473d52426a318c74105c8541471e" and "3dfbdc328ec745272aa6037f7c0b9a9c7fed81ca" have entirely different histories.

8 changed files with 14 additions and 4 deletions

View File

@ -546,8 +546,7 @@ class Study(SQLModel):
self.status.scenario = scenario self.status.scenario = scenario
if reduce( 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, self.scenarios.lst,
False False
): ):

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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