mirror of https://gitlab.com/pamhyr/pamhyr2
HS: Basic: Fix display.
parent
a072a28929
commit
ec2a1da6b6
|
|
@ -558,12 +558,12 @@ class Mage(CommandLineSolver):
|
||||||
if not hs.enabled:
|
if not hs.enabled:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if hs.input_rk is None:
|
if hs.input_section is None:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
f.write(
|
f.write(
|
||||||
'* ouvrage au pk ' +
|
'* ouvrage au pk ' +
|
||||||
f"{float(hs.input_rk):>12.1f}" + ' ' +
|
f"{float(hs.input_section.rk):>12.1f}" + ' ' +
|
||||||
hs.name + '\n'
|
hs.name + '\n'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -590,7 +590,7 @@ class Mage(CommandLineSolver):
|
||||||
|
|
||||||
f.write(
|
f.write(
|
||||||
f"{sin_dict[bhs._type]} " +
|
f"{sin_dict[bhs._type]} " +
|
||||||
f"{reach_id} {float(hs.input_rk):>12.3f} " +
|
f"{reach_id} {float(hs.input_section.rk):>12.3f} " +
|
||||||
f"{param_str} {name}\n"
|
f"{param_str} {name}\n"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -160,9 +160,9 @@ class BasicHydraulicStructuresWindow(PamhyrWindow):
|
||||||
self.plot_layout.addWidget(self.canvas)
|
self.plot_layout.addWidget(self.canvas)
|
||||||
|
|
||||||
reach = self._hs.input_reach
|
reach = self._hs.input_reach
|
||||||
profile_rk = self._hs.input_rk
|
profile = self._hs.input_section
|
||||||
if profile_rk is not None:
|
if profile is not None:
|
||||||
profiles = reach.reach.get_profiles_from_rk(float(profile_rk))
|
profiles = reach.reach.get_profiles_from_rk(float(profile.rk))
|
||||||
else:
|
else:
|
||||||
profiles = None
|
profiles = None
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue