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

Geometry: Fix profiles list sorting.

setup.py
Pierre-Antoine Rouby 2023-11-21 14:24:31 +01:00
parent e400980103
commit edf744eee1
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Geometry/Reach.py
View File

@ -134,6 +134,10 @@ class Reach(SQLSubModel):
return self._profiles return self._profiles
@profiles.setter
def profiles(self, profiles):
self._profiles = profiles
def get_profiles_from_kp(self, kp): def get_profiles_from_kp(self, kp):
return list( return list(
filter( filter(

2
src/Solver/Mage.py
View File

@ -197,7 +197,7 @@ class Mage(CommandLineSolver):
) )
# Profile header line # Profile header line
wfile.write(f"{num}{c1}{c2}{t} {kp} {name} {sediment}\n") wfile.write(f"{num}{c1}{c2}{t} {kp} {pname} {sediment}\n")
def _export_ST_point_line(self, wfile, files, point): def _export_ST_point_line(self, wfile, files, point):
x = f"{point.x:<12f}"[0:12] x = f"{point.x:<12f}"[0:12]

10
src/View/RunSolver/Window.py
View File

@ -215,12 +215,18 @@ class SolverLogWindow(PamhyrWindow):
if self._solver.log_file() != "": if self._solver.log_file() != "":
self.find(QAction, "action_log_file").setEnabled(True) self.find(QAction, "action_log_file").setEnabled(True)
# Get results self._update_get_results()
self._update_logs_all()
def _update_get_results(self):
if self._results is None: if self._results is None:
self._results = self._solver.results( self._results = self._solver.results(
self._study, self._workdir, qlog=self._output) self._study, self._workdir, qlog=self._output
)
self._parent.set_results(self._solver, self._results) self._parent.set_results(self._solver, self._results)
def _update_logs_all(self):
while self._output.qsize() != 0: while self._output.qsize() != 0:
s = self._output.get() s = self._output.get()
if type(s) is str and "[ERROR]" in s: if type(s) is str and "[ERROR]" in s: