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

Friction: Fix scenarios support.

scenarios
Pierre-Antoine Rouby 2024-09-16 11:40:20 +02:00
parent cd7a81d828
commit e73f76024e
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Model/Friction/Friction.py
View File

@ -207,6 +207,15 @@ class Friction(SQLSubModel):
return new
def must_be_saved(self):
ssi = self._status.scenario_id
return (
self._begin_strickler._owner_scenario == ssi
or self._end_strickler._owner_scenario == ssi
or super(Friction, self).must_be_saved()
)
def _db_save(self, execute, data=None):
if not self.must_be_saved():
return True
@ -228,7 +237,7 @@ class Friction(SQLSubModel):
"VALUES (" +
f"{self.id}, {self._db_format(self.is_deleted())}, " +
f"{ind}, {self._begin_rk}, {self._end_rk}, " +
f"{self._reach.id}, {b_s_id}, {e_s_id}" +
f"{self._reach.id}, {b_s_id}, {e_s_id}, " +
f"{self._status.scenario_id}" +
")"
)

2
src/Model/Friction/FrictionList.py
View File

@ -62,7 +62,7 @@ class FrictionList(PamhyrModelList):
reach = data["reach"]
execute(
f"DELETE FROM friction WHERE reach = {reach.id} " +
f"WHERE scenario = {self._status.scenario_id}"
f"AND scenario = {self._status.scenario_id}"
)
ok = True

2
src/View/Frictions/translate.py
View File

@ -45,5 +45,5 @@ class FrictionsTranslate(MainTranslate):
"begin_rk": _translate("Frictions", "Start (m)"),
"end_rk": _translate("Frictions", "End (m)"),
"begin_strickler": _translate("Frictions", "Start coefficient"),
"end_strickler": _translate("Frictions", "End coefficient"),
# "end_strickler": _translate("Frictions", "End coefficient"),
}