Compare commits

..

No commits in common. "a78be47e2b907813608bf34d4bcfabdc225ff1e7" and "f86cd4602ca2b0bf5619f0a0f06035f8c00e8d45" have entirely different histories.

11 changed files with 40 additions and 118 deletions

View File

@ -89,12 +89,6 @@ class EditBoundaryConditionWindow(PamhyrWindow):
def setup_table(self): def setup_table(self):
table_headers = self._trad.get_dict("table_headers") table_headers = self._trad.get_dict("table_headers")
if self._study.is_editable():
editable_headers = self._trad.get_dict("table_headers")
else:
editable_headers = []
if self._data.type == "Concentration": if self._data.type == "Concentration":
self._data.header = ["time", "concentration"] self._data.header = ["time", "concentration"]
else: else:
@ -114,7 +108,7 @@ class EditBoundaryConditionWindow(PamhyrWindow):
self._table = TableModel( self._table = TableModel(
table_view=table, table_view=table,
table_headers=headers, table_headers=headers,
editable_headers=editable_headers, editable_headers=self._data.header,
delegates={ delegates={
# "time": self._delegate_time, # "time": self._delegate_time,
}, },
@ -147,7 +141,6 @@ class EditBoundaryConditionWindow(PamhyrWindow):
self.plot.draw() self.plot.draw()
def setup_connections(self): def setup_connections(self):
if self._study.is_editable():
self.find(QAction, "action_add").triggered.connect(self.add) self.find(QAction, "action_add").triggered.connect(self.add)
self.find(QAction, "action_del").triggered.connect(self.delete) self.find(QAction, "action_del").triggered.connect(self.delete)
self.find(QAction, "action_sort").triggered.connect(self.sort) self.find(QAction, "action_sort").triggered.connect(self.sort)

View File

@ -106,16 +106,11 @@ class BoundaryConditionAdisTSWindow(PamhyrWindow):
parent=self parent=self
) )
if self._study.is_editable():
editable_headers = self._trad.get_dict("table_headers")
else:
editable_headers = []
table = self.find(QTableView, f"tableView") table = self.find(QTableView, f"tableView")
self._table = TableModel( self._table = TableModel(
table_view=table, table_view=table,
table_headers=self._trad.get_dict("table_headers"), table_headers=self._trad.get_dict("table_headers"),
editable_headers=editable_headers, editable_headers=["type", "node", "pol"],
delegates={ delegates={
"type": self._delegate_type, "type": self._delegate_type,
"node": self._delegate_node, "node": self._delegate_node,
@ -142,10 +137,8 @@ class BoundaryConditionAdisTSWindow(PamhyrWindow):
self.graph_layout.addWidget(self.graph_widget) self.graph_layout.addWidget(self.graph_widget)
def setup_connections(self): def setup_connections(self):
if self._study.is_editable():
self.find(QAction, "action_add").triggered.connect(self.add) self.find(QAction, "action_add").triggered.connect(self.add)
self.find(QAction, "action_del").triggered.connect(self.delete) self.find(QAction, "action_del").triggered.connect(self.delete)
self.find(QAction, "action_edit").triggered.connect(self.edit) self.find(QAction, "action_edit").triggered.connect(self.edit)
def index_selected_row(self): def index_selected_row(self):

View File

@ -99,17 +99,12 @@ class D90AdisTSWindow(PamhyrWindow):
path_icons = os.path.join(self._get_ui_directory(), f"ressources") path_icons = os.path.join(self._get_ui_directory(), f"ressources")
if self._study.is_editable():
editable_headers = self._trad.get_dict("table_headers")
else:
editable_headers = []
table_default = self.find(QTableView, f"tableView") table_default = self.find(QTableView, f"tableView")
self._table = D90TableDefaultModel( self._table = D90TableDefaultModel(
table_view=table_default, table_view=table_default,
table_headers=self._trad.get_dict("table_headers"), table_headers=self._trad.get_dict("table_headers"),
editable_headers=editable_headers, editable_headers=["name", "d90"],
delegates={}, delegates={},
data=self._data, data=self._data,
undo=self._undo_stack, undo=self._undo_stack,
@ -129,14 +124,9 @@ class D90AdisTSWindow(PamhyrWindow):
action_add = QAction(self) action_add = QAction(self)
action_add.setIcon(QIcon(os.path.join(path_icons, f"add.png"))) action_add.setIcon(QIcon(os.path.join(path_icons, f"add.png")))
if self._study.is_editable():
action_add.triggered.connect(self.add) action_add.triggered.connect(self.add)
action_delete = QAction(self) action_delete = QAction(self)
action_delete.setIcon(QIcon(os.path.join(path_icons, f"del.png"))) action_delete.setIcon(QIcon(os.path.join(path_icons, f"del.png")))
if self._study.is_editable():
action_delete.triggered.connect(self.delete) action_delete.triggered.connect(self.delete)
toolBar.addAction(action_add) toolBar.addAction(action_add)
@ -160,15 +150,10 @@ class D90AdisTSWindow(PamhyrWindow):
mode="rk" mode="rk"
) )
if self._study.is_editable():
editable_headers_spec = self._trad.get_dict("table_headers_spec")
else:
editable_headers_spec = []
self._table_spec = D90TableModel( self._table_spec = D90TableModel(
table_view=self.table_spec, table_view=self.table_spec,
table_headers=self._trad.get_dict("table_headers_spec"), table_headers=self._trad.get_dict("table_headers_spec"),
editable_headers=editable_headers_spec, editable_headers=["name", "reach", "start_rk", "end_rk", "d90"],
delegates={ delegates={
"reach": self._delegate_reach, "reach": self._delegate_reach,
"start_rk": self._delegate_rk, "start_rk": self._delegate_rk,

View File

@ -99,11 +99,6 @@ class DIFAdisTSWindow(PamhyrWindow):
table_default = self.find(QTableView, f"tableView") table_default = self.find(QTableView, f"tableView")
if self._study.is_editable():
editable_headers = self._trad.get_dict("table_headers")
else:
editable_headers = []
self._delegate_method = ComboBoxDelegate( self._delegate_method = ComboBoxDelegate(
trad=self._trad, trad=self._trad,
data=self._study.river, data=self._study.river,
@ -115,7 +110,7 @@ class DIFAdisTSWindow(PamhyrWindow):
self._table = DIFTableDefaultModel( self._table = DIFTableDefaultModel(
table_view=table_default, table_view=table_default,
table_headers=self._trad.get_dict("table_headers"), table_headers=self._trad.get_dict("table_headers"),
editable_headers=editable_headers, editable_headers=["method", "dif", "b", "c"],
delegates={ delegates={
"method": self._delegate_method "method": self._delegate_method
}, },
@ -137,13 +132,9 @@ class DIFAdisTSWindow(PamhyrWindow):
action_add = QAction(self) action_add = QAction(self)
action_add.setIcon(QIcon(os.path.join(path_icons, f"add.png"))) action_add.setIcon(QIcon(os.path.join(path_icons, f"add.png")))
if self._study.is_editable():
action_add.triggered.connect(self.add) action_add.triggered.connect(self.add)
action_delete = QAction(self) action_delete = QAction(self)
action_delete.setIcon(QIcon(os.path.join(path_icons, f"del.png"))) action_delete.setIcon(QIcon(os.path.join(path_icons, f"del.png")))
if self._study.is_editable():
action_delete.triggered.connect(self.delete) action_delete.triggered.connect(self.delete)
toolBar.addAction(action_add) toolBar.addAction(action_add)
@ -167,15 +158,11 @@ class DIFAdisTSWindow(PamhyrWindow):
mode="rk" mode="rk"
) )
if self._study.is_editable():
editable_headers_spec = self._trad.get_dict("table_headers_spec")
else:
editable_headers_spec = []
self._table_spec = DIFTableModel( self._table_spec = DIFTableModel(
table_view=self.table_spec, table_view=self.table_spec,
table_headers=self._trad.get_dict("table_headers_spec"), table_headers=self._trad.get_dict("table_headers_spec"),
editable_headers=editable_headers_spec, editable_headers=["method", "reach", "start_rk",
"end_rk", "dif", "b", "c"],
delegates={ delegates={
"method": self._delegate_method, "method": self._delegate_method,
"reach": self._delegate_reach, "reach": self._delegate_reach,

View File

@ -108,15 +108,10 @@ class InitialConditionsAdisTSWindow(PamhyrWindow):
table_default = self.find(QTableView, f"tableView") table_default = self.find(QTableView, f"tableView")
if self._study.is_editable():
editable_headers = self._trad.get_dict("table_headers")
else:
editable_headers = []
self._table = InitialConditionTableDefaultModel( self._table = InitialConditionTableDefaultModel(
table_view=table_default, table_view=table_default,
table_headers=self._trad.get_dict("table_headers"), table_headers=self._trad.get_dict("table_headers"),
editable_headers=editable_headers, editable_headers=["name", "concentration", "eg", "em", "ed"],
delegates={}, delegates={},
data=self._data, data=self._data,
undo=self._undo_stack, undo=self._undo_stack,
@ -136,13 +131,9 @@ class InitialConditionsAdisTSWindow(PamhyrWindow):
action_add = QAction(self) action_add = QAction(self)
action_add.setIcon(QIcon(os.path.join(path_icons, f"add.png"))) action_add.setIcon(QIcon(os.path.join(path_icons, f"add.png")))
if self._study.is_editable():
action_add.triggered.connect(self.add) action_add.triggered.connect(self.add)
action_delete = QAction(self) action_delete = QAction(self)
action_delete.setIcon(QIcon(os.path.join(path_icons, f"del.png"))) action_delete.setIcon(QIcon(os.path.join(path_icons, f"del.png")))
if self._study.is_editable():
action_delete.triggered.connect(self.delete) action_delete.triggered.connect(self.delete)
toolBar.addAction(action_add) toolBar.addAction(action_add)
@ -166,15 +157,12 @@ class InitialConditionsAdisTSWindow(PamhyrWindow):
mode="rk" mode="rk"
) )
if self._study.is_editable():
editable_headers_spec = self._trad.get_dict("table_headers_spec")
else:
editable_headers_spec = []
self._table_spec = InitialConditionTableModel( self._table_spec = InitialConditionTableModel(
table_view=self.table_spec, table_view=self.table_spec,
table_headers=self._trad.get_dict("table_headers_spec"), table_headers=self._trad.get_dict("table_headers_spec"),
editable_headers=editable_headers_spec, editable_headers=["name", "reach", "start_rk",
"end_rk", "concentration",
"eg", "em", "ed", "rate"],
delegates={ delegates={
"reach": self._delegate_reach, "reach": self._delegate_reach,
"start_rk": self._delegate_rk, "start_rk": self._delegate_rk,

View File

@ -103,11 +103,6 @@ class EditLateralContributionAdisTSWindow(PamhyrWindow):
parent=self parent=self
) )
if self._study.is_editable():
editable_headers = self._trad.get_dict("table_headers")
else:
editable_headers = []
headers = {} headers = {}
table_headers = self._trad.get_dict("table_headers") table_headers = self._trad.get_dict("table_headers")
for h in self._data.header: for h in self._data.header:
@ -117,7 +112,7 @@ class EditLateralContributionAdisTSWindow(PamhyrWindow):
self._table = TableModel( self._table = TableModel(
table_view=table, table_view=table,
table_headers=headers, table_headers=headers,
editable_headers=editable_headers, editable_headers=self._data.header,
delegates={ delegates={
# "time": self._delegate_time, # "time": self._delegate_time,
}, },
@ -152,7 +147,6 @@ class EditLateralContributionAdisTSWindow(PamhyrWindow):
self.plot.draw() self.plot.draw()
def setup_connections(self): def setup_connections(self):
if self._study.is_editable():
self.find(QAction, "action_add").triggered.connect(self.add) self.find(QAction, "action_add").triggered.connect(self.add)
self.find(QAction, "action_del").triggered.connect(self.delete) self.find(QAction, "action_del").triggered.connect(self.delete)

View File

@ -92,12 +92,8 @@ class LateralContributionAdisTSWindow(PamhyrWindow):
def setup_table(self): def setup_table(self):
self._table = {} self._table = {}
self._delegate_rk = []
if self._study.is_editable(): self._delegate_rk = []
editable_headers = self._trad.get_dict("table_headers")
else:
editable_headers = []
delegate_rk = ComboBoxDelegate( delegate_rk = ComboBoxDelegate(
data=None, data=None,
@ -118,7 +114,7 @@ class LateralContributionAdisTSWindow(PamhyrWindow):
self._table = TableModel( self._table = TableModel(
table_view=table, table_view=table,
table_headers=self._trad.get_dict("table_headers"), table_headers=self._trad.get_dict("table_headers"),
editable_headers=editable_headers, editable_headers=self._trad.get_dict("table_headers"),
delegates={ delegates={
"reach": self._delegate_reach, "reach": self._delegate_reach,
"begin_rk": delegate_rk, "begin_rk": delegate_rk,
@ -150,10 +146,8 @@ class LateralContributionAdisTSWindow(PamhyrWindow):
) )
def setup_connections(self): def setup_connections(self):
if self._study.is_editable():
self.find(QAction, "action_add").triggered.connect(self.add) self.find(QAction, "action_add").triggered.connect(self.add)
self.find(QAction, "action_del").triggered.connect(self.delete) self.find(QAction, "action_del").triggered.connect(self.delete)
self.find(QAction, "action_edit").triggered.connect(self.edit) self.find(QAction, "action_edit").triggered.connect(self.edit)
table = self.find(QTableView, f"tableView") table = self.find(QTableView, f"tableView")

View File

@ -965,8 +965,7 @@ class GraphWidget(QGraphicsView):
if self.selected_new_edge_src_node() is None: if self.selected_new_edge_src_node() is None:
self.set_selected_new_edge_src_node(nodes[0]) self.set_selected_new_edge_src_node(nodes[0])
else: else:
self.add_edge(self.selected_new_edge_src_node(), self.add_edge(self.selected_new_edge_src_node(), nodes[0])
nodes[0])
# Delete nodes and edges # Delete nodes and edges
elif self._state == "del": elif self._state == "del":

View File

@ -76,18 +76,14 @@ class EditPolluantWindow(PamhyrWindow):
self.setup_table() self.setup_table()
def setup_table(self): def setup_table(self):
headers = {}
table_headers = self._trad.get_dict("table_headers") table_headers = self._trad.get_dict("table_headers")
if self._study.is_editable():
editable_headers = self._trad.get_dict("table_headers")
else:
editable_headers = []
table = self.find(QTableView, "tableView") table = self.find(QTableView, "tableView")
self._table = TableModel( self._table = TableModel(
table_view=table, table_view=table,
table_headers=table_headers, table_headers=table_headers,
editable_headers=editable_headers, editable_headers=table_headers,
delegates={}, delegates={},
data=self._data, data=self._data,
undo=self._undo_stack, undo=self._undo_stack,

View File

@ -34,14 +34,14 @@ class SetNameCommand(QUndoCommand):
self._pollutants_lst = pollutants_lst self._pollutants_lst = pollutants_lst
self._index = index self._index = index
self._old = self._pollutants_lst[self._index].name self._old = self._pollutants_lst.get(self._index).name
self._new = str(new_value) self._new = str(new_value)
def undo(self): def undo(self):
self._pollutants_lst[self._index].name = self._old self._pollutants_lst.get(self._index).name = self._old
def redo(self): def redo(self):
self._pollutants_lst[self._index].name = self._new self._pollutants_lst.get(self._index).name = self._new
class SetEnabledCommand(QUndoCommand): class SetEnabledCommand(QUndoCommand):
@ -54,10 +54,10 @@ class SetEnabledCommand(QUndoCommand):
self._new = enabled self._new = enabled
def undo(self): def undo(self):
self._pollutants_lst[self._index].enabled = self._old self._pollutants_lst.get(self._index).enabled = self._old
def redo(self): def redo(self):
self._pollutants_lst[self._index].enabled = self._new self._pollutants_lst.get(self._index).enabled = self._new
class AddCommand(QUndoCommand): class AddCommand(QUndoCommand):

View File

@ -78,16 +78,11 @@ class PollutantsWindow(PamhyrWindow):
def setup_table(self): def setup_table(self):
self._table = None self._table = None
if self._study.is_editable():
editable_headers = self._trad.get_dict("table_headers")
else:
editable_headers = []
table = self.find(QTableView, f"tableView") table = self.find(QTableView, f"tableView")
self._table = TableModel( self._table = TableModel(
table_view=table, table_view=table,
table_headers=self._trad.get_dict("table_headers"), table_headers=self._trad.get_dict("table_headers"),
editable_headers=editable_headers, editable_headers=["name"],
trad=self._trad, trad=self._trad,
data=self._study.river, data=self._study.river,
undo=self._undo_stack, undo=self._undo_stack,
@ -109,10 +104,8 @@ class PollutantsWindow(PamhyrWindow):
self._set_checkbox_state() self._set_checkbox_state()
def setup_connections(self): def setup_connections(self):
if self._study.is_editable():
self.find(QAction, "action_add").triggered.connect(self.add) self.find(QAction, "action_add").triggered.connect(self.add)
self.find(QAction, "action_delete").triggered.connect(self.delete) self.find(QAction, "action_delete").triggered.connect(self.delete)
self.find(QAction, "action_edit").triggered.connect(self.edit) self.find(QAction, "action_edit").triggered.connect(self.edit)
self.find(QAction, "action_initial_conditions" self.find(QAction, "action_initial_conditions"
).triggered.connect(self.initial_conditions) ).triggered.connect(self.initial_conditions)