Compare commits

..

No commits in common. "7b88d955e5ec636bf4af8b741e6204e7cc73f8db" and "efa16837d80acb00fb3d2ac6092d7fdb25061999" have entirely different histories.

7 changed files with 15 additions and 32 deletions

View File

@ -365,9 +365,3 @@ class Friction(SQLSubModel):
# self.end_strickler.medium]) # self.end_strickler.medium])
return minor, medium return minor, medium
def update_rks(self, begin_rk, end_rk):
self._begin_rk = begin_rk
self._end_rk = end_rk
self.modified()

View File

@ -967,9 +967,3 @@ class Reach(SQLSubModel):
break break
return global_index return global_index
def update_rks(self, rks):
for rk, profile in zip(rks, self.profiles):
profile.rk = rk
self.modified()

View File

@ -70,8 +70,7 @@ class Data(SQLSubModel):
created = False created = False
if major == "0" and int(minor) < 2: if major == "0" and int(minor) < 2:
if cls.is_table_exists( if cls.is_table_exists(execute, "lateral_contribution_data_adists"):
execute, "lateral_contribution_data_adists"):
cls._db_update_to_0_2_0(execute, data) cls._db_update_to_0_2_0(execute, data)
else: else:
cls._db_create(execute) cls._db_create(execute)

View File

@ -349,16 +349,10 @@ class Results(SQLSubModel):
f"AND result = {pid}" f"AND result = {pid}"
) )
def _is_valid(self):
return "timestamps" in self._meta_data
def _db_save(self, execute, data=None): def _db_save(self, execute, data=None):
if self._status.scenario.id != self._owner_scenario: if self._status.scenario.id != self._owner_scenario:
return True return True
if not self._is_valid():
return False
pid = self._pamhyr_id pid = self._pamhyr_id
if self._solver is None: if self._solver is None:
solver_name = self.get("solver_name") solver_name = self.get("solver_name")

View File

@ -247,13 +247,14 @@ class UpdateRKCommand(QUndoCommand):
self._new_end_rk = None self._new_end_rk = None
def undo(self): def undo(self):
for rk, profile in zip(self._rks, self._reach.profiles):
self._reach.update_rks(self._rks) profile.rk = rk
for begin_rk, end_rk, friction in zip(self._begin_rk, for begin_rk, end_rk, friction in zip(self._begin_rk,
self._end_rk, self._end_rk,
self._frictions): self._frictions):
friction.update_rks(begin_rk, end_rk) friction.begin_rk = begin_rk
friction.end_rk = end_rk
def redo(self): def redo(self):
if self._new_rks is None: if self._new_rks is None:
@ -263,12 +264,13 @@ class UpdateRKCommand(QUndoCommand):
**self._data **self._data
) )
self._reach.update_rks(self._new_rks) for rk, profile in zip(self._new_rks, self._reach.profiles):
profile.rk = rk
for begin_rk, end_rk, friction in zip(self._new_begin_rk, for begin_rk, end_rk, friction in zip(self._new_begin_rk,
self._new_end_rk, self._new_end_rk,
self._frictions): self._frictions):
friction.update_rks(begin_rk, end_rk) friction.begin_rk = begin_rk
friction.end_rk = end_rk
class MeshingCommand(QUndoCommand): class MeshingCommand(QUndoCommand):

View File

@ -53,10 +53,10 @@ class ParamTranslate(MainTranslate):
self._sub_dict["names"] = { self._sub_dict["names"] = {
"all_init_time": "all_init_time":
_translate("SolverParameters", _translate("SolverParameters",
"Initial time (jjj:hh:mm:ss)"), "Initial time (jj:hh:mm:ss)"),
"all_final_time": "all_final_time":
_translate("SolverParameters", _translate("SolverParameters",
"Final time (jjj:hh:mm:ss)"), "Final time (jj:hh:mm:ss)"),
"all_timestep": "all_timestep":
_translate("SolverParameters", _translate("SolverParameters",
"Timestep (second)"), "Timestep (second)"),

View File

@ -3785,13 +3785,13 @@ Cette fonctionnalité nécessite un bief muni d'une géométrie.</translation>
</message> </message>
<message> <message>
<location filename="../View/SolverParameters/translate.py" line="55"/> <location filename="../View/SolverParameters/translate.py" line="55"/>
<source>Initial time (jjj:hh:mm:ss)</source> <source>Initial time (jj:hh:mm:ss)</source>
<translation>Temps initial (jjj:hh:mm:ss)</translation> <translation>Temps initial (jj:hh:mm:ss)</translation>
</message> </message>
<message> <message>
<location filename="../View/SolverParameters/translate.py" line="58"/> <location filename="../View/SolverParameters/translate.py" line="58"/>
<source>Final time (jjj:hh:mm:ss)</source> <source>Final time (jj:hh:mm:ss)</source>
<translation>Temps final (jjj:hh:mm:ss)</translation> <translation>Temps final (jj:hh:mm:ss)</translation>
</message> </message>
<message> <message>
<location filename="../View/SolverParameters/translate.py" line="61"/> <location filename="../View/SolverParameters/translate.py" line="61"/>