parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resutls: Read and display sediment results only if available.

mesh
Pierre-Antoine Rouby 2023-08-22 11:39:08 +02:00
parent bab1ce9e17
commit c1ff99797c
2 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Solver/Mage.py
View File

@ -677,8 +677,8 @@ class Mage8(Mage):
@timer @timer
def read_gra(self, study, repertory, results, qlog = None): def read_gra(self, study, repertory, results, qlog = None):
# if not study.river.has_sediment(): if not study.river.has_sediment():
# return return
logger.info(f"read_gra: Start ...") logger.info(f"read_gra: Start ...")

63
src/View/Results/Window.py
View File

@ -182,36 +182,37 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow):
) )
self.plot_h.draw() self.plot_h.draw()
self.canvas_5 = MplCanvas(width=5, height=4, dpi=100) self.canvas_5 = MplCanvas(width=5, height=4, dpi=100)
self.canvas_5.setObjectName("canvas_5") self.canvas_5.setObjectName("canvas_5")
self.plot_layout_5 = self.find(QVBoxLayout, "verticalLayout_sed_reach") self.plot_layout_5 = self.find(QVBoxLayout, "verticalLayout_sed_reach")
self.plot_layout_5.addWidget(self.canvas_5) self.plot_layout_5.addWidget(self.canvas_5)
self.plot_sed_reach = PlotSedReach( if self._study.river.has_sediment():
canvas = self.canvas_5, self.plot_sed_reach = PlotSedReach(
results = self._results, canvas = self.canvas_5,
study = self._study, results = self._results,
reach_id = 0, study = self._study,
profile_id = 0, reach_id = 0,
toolbar = None profile_id = 0,
) toolbar = None
self.plot_sed_reach.draw() )
self.plot_sed_reach.draw()
self.canvas_6 = MplCanvas(width=5, height=4, dpi=100) self.canvas_6 = MplCanvas(width=5, height=4, dpi=100)
self.canvas_6.setObjectName("canvas_6") self.canvas_6.setObjectName("canvas_6")
self.plot_layout_6 = self.find(QVBoxLayout, "verticalLayout_sed_profile") self.plot_layout_6 = self.find(QVBoxLayout, "verticalLayout_sed_profile")
self.plot_layout_6.addWidget(self.canvas_6) self.plot_layout_6.addWidget(self.canvas_6)
self.plot_sed_profile = PlotSedProfile( if self._study.river.has_sediment():
canvas = self.canvas_6, self.plot_sed_profile = PlotSedProfile(
results = self._results, canvas = self.canvas_6,
study = self._study, results = self._results,
reach_id = 0, study = self._study,
profile_id = 0, reach_id = 0,
toolbar = None profile_id = 0,
) toolbar = None
self.plot_sed_profile.draw() )
self.plot_sed_profile.draw()
def setup_connections(self): def setup_connections(self):
self.undo_sc.activated.connect(self.undo) self.undo_sc.activated.connect(self.undo)
@ -243,29 +244,37 @@ class ResultsWindow(ASubMainWindow, ListedSubWindow):
self.plot_ac.set_reach(reach_id) self.plot_ac.set_reach(reach_id)
self.plot_kpc.set_reach(reach_id) self.plot_kpc.set_reach(reach_id)
self.plot_h.set_reach(reach_id) self.plot_h.set_reach(reach_id)
self.plot_sed_reach.set_reach(reach_id)
self.plot_sed_profile.set_reach(reach_id) if self._study.river.has_sediment():
self.plot_sed_reach.set_reach(reach_id)
self.plot_sed_profile.set_reach(reach_id)
if profile_id is not None: if profile_id is not None:
self.plot_xy.set_profile(profile_id) self.plot_xy.set_profile(profile_id)
self.plot_ac.set_profile(profile_id) self.plot_ac.set_profile(profile_id)
self.plot_kpc.set_profile(profile_id) self.plot_kpc.set_profile(profile_id)
self.plot_h.set_profile(profile_id) self.plot_h.set_profile(profile_id)
self.plot_sed_reach.set_profile(profile_id)
self.plot_sed_profile.set_profile(profile_id) if self._study.river.has_sediment():
self.plot_sed_reach.set_profile(profile_id)
self.plot_sed_profile.set_profile(profile_id)
if timestamp is not None: if timestamp is not None:
self.plot_xy.set_timestamp(timestamp) self.plot_xy.set_timestamp(timestamp)
self.plot_ac.set_timestamp(timestamp) self.plot_ac.set_timestamp(timestamp)
self.plot_kpc.set_timestamp(timestamp) self.plot_kpc.set_timestamp(timestamp)
self.plot_h.set_timestamp(timestamp) self.plot_h.set_timestamp(timestamp)
self.plot_sed_reach.set_timestamp(timestamp)
self.plot_sed_profile.set_timestamp(timestamp) if self._study.river.has_sediment():
self.plot_sed_reach.set_timestamp(timestamp)
self.plot_sed_profile.set_timestamp(timestamp)
self.plot_xy.draw() self.plot_xy.draw()
self.plot_ac.draw() self.plot_ac.draw()
self.plot_kpc.draw() self.plot_kpc.draw()
self.plot_h.draw() self.plot_h.draw()
self.plot_sed_reach.draw()
self.plot_sed_profile.draw() if self._study.river.has_sediment():
self.plot_sed_reach.draw()
self.plot_sed_profile.draw()
def _set_current_reach(self): def _set_current_reach(self):