mirror of https://gitlab.com/pamhyr/pamhyr2
Compare commits
No commits in common. "7aa0cf4361a3b57a5e8d76778624481f93aafa66" and "a235f6104482473d52426a318c74105c8541471e" have entirely different histories.
7aa0cf4361
...
a235f61044
|
|
@ -70,11 +70,8 @@ class Data(SQLSubModel):
|
||||||
def _db_update(cls, execute, version, data=None):
|
def _db_update(cls, execute, version, data=None):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
created = False
|
created = False
|
||||||
if major == "0" and minor == "0":
|
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
if major == "0" and minor == "0":
|
||||||
if int(release) < 7:
|
if int(release) < 7:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
@ -253,10 +250,6 @@ class BoundaryConditionAdisTS(SQLSubModel):
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
if major == "0" and minor == "0":
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
|
||||||
if int(release) < 7:
|
if int(release) < 7:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
|
||||||
|
|
@ -73,11 +73,7 @@ class D90AdisTS(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
if major == "0" and int(minor) <= 1:
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
|
||||||
if int(release) < 6:
|
if int(release) < 6:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
|
||||||
|
|
@ -72,12 +72,7 @@ class D90AdisTSSpec(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
|
if major == 0 and minor < 1:
|
||||||
if major == "0" and minor == "0":
|
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
|
||||||
if int(release) < 6:
|
if int(release) < 6:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
|
||||||
|
|
@ -79,11 +79,7 @@ class DIFAdisTS(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
if major == "0" and int(minor) <= 1:
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
|
||||||
if int(release) < 6:
|
if int(release) < 6:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
|
||||||
|
|
@ -83,11 +83,7 @@ class DIFAdisTSSpec(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
if major == 0 and minor < 1:
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
|
||||||
if int(release) < 6:
|
if int(release) < 6:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
|
||||||
|
|
@ -228,10 +228,9 @@ class Friction(SQLSubModel):
|
||||||
ssi = self._status.scenario_id
|
ssi = self._status.scenario_id
|
||||||
|
|
||||||
return (
|
return (
|
||||||
self._begin_strickler is not None
|
self._begin_strickler._owner_scenario == ssi
|
||||||
and (self._begin_strickler._owner_scenario == ssi
|
|
||||||
# or self._end_strickler._owner_scenario == ssi
|
# or self._end_strickler._owner_scenario == ssi
|
||||||
or super(Friction, self).must_be_saved())
|
or super(Friction, self).must_be_saved()
|
||||||
)
|
)
|
||||||
|
|
||||||
def _db_save(self, execute, data=None):
|
def _db_save(self, execute, data=None):
|
||||||
|
|
|
||||||
|
|
@ -81,11 +81,7 @@ class InitialConditionsAdisTS(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
if major == "0" and int(minor) <= 1:
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
|
||||||
if int(release) < 6:
|
if int(release) < 6:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
|
||||||
|
|
@ -79,12 +79,8 @@ class ICAdisTSSpec(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
if major == 0 and minor < 1:
|
||||||
cls._db_create(execute)
|
if int(release) < 6:
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
|
||||||
if int(release) < 7:
|
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,11 +69,7 @@ class Data(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
if major == "0" and int(minor) <= 1:
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
|
||||||
if int(release) < 7:
|
if int(release) < 7:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
@ -247,11 +243,7 @@ class LateralContributionAdisTS(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
if major == "0" and int(minor) <= 1:
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
|
||||||
if int(release) < 7:
|
if int(release) < 7:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
|
||||||
|
|
@ -97,11 +97,7 @@ class OutputRKAdists(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
if major == "0" and int(minor) <= 1:
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
|
||||||
if int(release) < 7:
|
if int(release) < 7:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
|
||||||
|
|
@ -34,18 +34,6 @@ from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import (
|
||||||
|
|
||||||
logger = logging.getLogger()
|
logger = logging.getLogger()
|
||||||
|
|
||||||
# Types de polluants: indice -> nom du type
|
|
||||||
POLLUTANT_TYPES = {
|
|
||||||
0: "Soluté",
|
|
||||||
1: "Particules sphériques",
|
|
||||||
2: "Galets lisses",
|
|
||||||
3: "Sable naturel",
|
|
||||||
4: "Sable concassé",
|
|
||||||
5: "Cylindres longs",
|
|
||||||
6: "Limon, particules cohésives",
|
|
||||||
7: "Flocs"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class PollutantCharacteristics(SQLSubModel):
|
class PollutantCharacteristics(SQLSubModel):
|
||||||
_sub_classes = []
|
_sub_classes = []
|
||||||
|
|
@ -152,11 +140,7 @@ class PollutantCharacteristics(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
if major == "0" and int(minor) <= 1:
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
|
||||||
if int(release) < 7:
|
if int(release) < 7:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
@ -348,9 +332,7 @@ class Pollutants(SQLSubModel):
|
||||||
|
|
||||||
@data.setter
|
@data.setter
|
||||||
def data(self, data):
|
def data(self, data):
|
||||||
self._data = [
|
self._data = [PollutantCharacteristics(type=int(data[0]),
|
||||||
PollutantCharacteristics(
|
|
||||||
type=int(data[0]),
|
|
||||||
diametre=float(data[1]),
|
diametre=float(data[1]),
|
||||||
rho=float(data[2]),
|
rho=float(data[2]),
|
||||||
porosity=float(data[3]),
|
porosity=float(data[3]),
|
||||||
|
|
@ -386,11 +368,7 @@ class Pollutants(SQLSubModel):
|
||||||
major, minor, release = version.strip().split(".")
|
major, minor, release = version.strip().split(".")
|
||||||
created = False
|
created = False
|
||||||
|
|
||||||
if major == "0" and minor == "0":
|
if major == "0" and int(minor) <= 1:
|
||||||
cls._db_create(execute)
|
|
||||||
created = True
|
|
||||||
|
|
||||||
if major == "0" and minor == "1":
|
|
||||||
if int(release) < 7:
|
if int(release) < 7:
|
||||||
cls._db_create(execute)
|
cls._db_create(execute)
|
||||||
created = True
|
created = True
|
||||||
|
|
|
||||||
|
|
@ -351,7 +351,7 @@ class Results(SQLSubModel):
|
||||||
|
|
||||||
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
|
||||||
|
|
||||||
pid = self._pamhyr_id
|
pid = self._pamhyr_id
|
||||||
if self._solver is None:
|
if self._solver is None:
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,6 @@ class StudyStatus(object):
|
||||||
self._status = Status.EDIT
|
self._status = Status.EDIT
|
||||||
self._scenario = scenario
|
self._scenario = scenario
|
||||||
self._saved = True
|
self._saved = True
|
||||||
self._loading = False
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def scenario_id(self):
|
def scenario_id(self):
|
||||||
|
|
@ -87,15 +86,6 @@ class StudyStatus(object):
|
||||||
def is_saved(self):
|
def is_saved(self):
|
||||||
return self._saved
|
return self._saved
|
||||||
|
|
||||||
def is_loading(self):
|
|
||||||
return self._loading
|
|
||||||
|
|
||||||
def start_loading(self):
|
|
||||||
self._loading = True
|
|
||||||
|
|
||||||
def stop_loading(self):
|
|
||||||
self._loading = False
|
|
||||||
|
|
||||||
def save(self):
|
def save(self):
|
||||||
logger.debug("model status set as saved")
|
logger.debug("model status set as saved")
|
||||||
self._saved = True
|
self._saved = True
|
||||||
|
|
@ -107,9 +97,6 @@ class StudyStatus(object):
|
||||||
self._saved = True
|
self._saved = True
|
||||||
|
|
||||||
def modified(self):
|
def modified(self):
|
||||||
if self._loading:
|
|
||||||
return
|
|
||||||
|
|
||||||
if self._saved:
|
if self._saved:
|
||||||
self.version += 1
|
self.version += 1
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -573,20 +573,16 @@ class Study(SQLModel):
|
||||||
"scenario": scenario
|
"scenario": scenario
|
||||||
}
|
}
|
||||||
|
|
||||||
self.status.start_loading()
|
|
||||||
try:
|
|
||||||
# Load river data
|
# Load river data
|
||||||
river = River._db_load(
|
river = River._db_load(
|
||||||
sql_exec, data=data
|
sql_exec, data=data
|
||||||
)
|
)
|
||||||
data["study"] = self
|
data["study"] = self
|
||||||
river._db_load_results(sql_exec, data=data)
|
river._db_load_results(sql_exec, data=data)
|
||||||
finally:
|
|
||||||
self.status.stop_loading()
|
|
||||||
self.status.scenario = old_scenario
|
|
||||||
|
|
||||||
# FIXME: Disable scenario cache to save memory usage
|
# FIXME: Disable scenario cache to save memory usage
|
||||||
# self._river_scenario_cache[scenario] = river
|
# self._river_scenario_cache[scenario] = river
|
||||||
|
self.status.scenario = old_scenario
|
||||||
|
|
||||||
return river
|
return river
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -202,8 +202,6 @@ class SQLSubModel(PamhyrID):
|
||||||
"""
|
"""
|
||||||
if self._status is None:
|
if self._status is None:
|
||||||
return
|
return
|
||||||
if self._status.is_loading():
|
|
||||||
return
|
|
||||||
|
|
||||||
self._owner_scenario = self._status.scenario_id
|
self._owner_scenario = self._status.scenario_id
|
||||||
self._status.modified()
|
self._status.modified()
|
||||||
|
|
@ -220,8 +218,6 @@ class SQLSubModel(PamhyrID):
|
||||||
"""
|
"""
|
||||||
if self._status is None:
|
if self._status is None:
|
||||||
return
|
return
|
||||||
if self._status.is_loading():
|
|
||||||
return
|
|
||||||
|
|
||||||
self._owner_scenario = self._status.scenario_id
|
self._owner_scenario = self._status.scenario_id
|
||||||
self._status.modified()
|
self._status.modified()
|
||||||
|
|
|
||||||
|
|
@ -171,7 +171,7 @@ class PamhyrModelList(SQLSubModel):
|
||||||
lambda x: x[1],
|
lambda x: x[1],
|
||||||
filter(
|
filter(
|
||||||
lambda x: x[0] in indexes,
|
lambda x: x[0] in indexes,
|
||||||
enumerate(self.lst)
|
enumerate(self._lst)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -107,9 +107,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -167,9 +167,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -97,9 +97,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -170,9 +170,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -174,9 +174,6 @@ class D90TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -186,9 +186,6 @@ class DIFTableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -134,9 +134,6 @@ class FrictionTableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -114,9 +114,6 @@ class GeometryProfileTableModel(PamhyrTableModel):
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
if role == Qt.EditRole:
|
if role == Qt.EditRole:
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if column == 0:
|
if column == 0:
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
|
|
|
||||||
|
|
@ -95,9 +95,6 @@ class GeometryReachTableModel(PamhyrTableModel):
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
if role == Qt.EditRole and index.column() != 2:
|
if role == Qt.EditRole and index.column() != 2:
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if index.column() == 0:
|
if index.column() == 0:
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
|
|
|
||||||
|
|
@ -138,9 +138,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
@ -291,9 +288,6 @@ class ParametersTableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
if self._hs_index is None:
|
if self._hs_index is None:
|
||||||
return QVariant()
|
return QVariant()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -169,9 +169,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
na = self._trad['not_associated']
|
na = self._trad['not_associated']
|
||||||
|
|
|
||||||
|
|
@ -153,9 +153,6 @@ class InitialConditionTableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -188,9 +188,6 @@ class InitialConditionTableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,9 +86,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -197,9 +197,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -100,9 +100,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -162,9 +162,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -105,9 +105,6 @@ class NodeTableModel(PamhyrTableModel):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if role == Qt.EditRole:
|
if role == Qt.EditRole:
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
SetCommand(
|
SetCommand(
|
||||||
|
|
@ -158,9 +155,6 @@ class EdgeTableModel(PamhyrTableModel):
|
||||||
if role != Qt.EditRole:
|
if role != Qt.EditRole:
|
||||||
return QVariant()
|
return QVariant()
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if (self._headers[index.column()] == "node1" or
|
if (self._headers[index.column()] == "node1" or
|
||||||
self._headers[index.column()] == "node2"):
|
self._headers[index.column()] == "node2"):
|
||||||
|
|
|
||||||
|
|
@ -149,9 +149,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
na = self._trad['not_associated']
|
na = self._trad['not_associated']
|
||||||
|
|
|
||||||
|
|
@ -33,68 +33,17 @@ from PyQt5.QtCore import (
|
||||||
|
|
||||||
from PyQt5.QtWidgets import (
|
from PyQt5.QtWidgets import (
|
||||||
QTableView, QAbstractItemView, QSpinBox, QItemDelegate,
|
QTableView, QAbstractItemView, QSpinBox, QItemDelegate,
|
||||||
QComboBox,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
from View.Pollutants.Edit.UndoCommand import (
|
from View.Pollutants.Edit.UndoCommand import (
|
||||||
SetDataCommand, PasteCommand,
|
SetDataCommand, PasteCommand,
|
||||||
)
|
)
|
||||||
|
|
||||||
from Model.Pollutants.Pollutants import POLLUTANT_TYPES
|
|
||||||
|
|
||||||
_translate = QCoreApplication.translate
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
logger = logging.getLogger()
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
class ComboBoxDelegate(QItemDelegate):
|
|
||||||
def __init__(self, type_dict=None, trad=None, parent=None):
|
|
||||||
super(ComboBoxDelegate, self).__init__(parent)
|
|
||||||
|
|
||||||
self._type_dict = type_dict if type_dict else POLLUTANT_TYPES
|
|
||||||
self._trad = trad
|
|
||||||
self.editor = None
|
|
||||||
|
|
||||||
def createEditor(self, parent, option, index):
|
|
||||||
self.editor = QComboBox(parent)
|
|
||||||
|
|
||||||
# Ajouter les items du dictionnaire
|
|
||||||
for key in sorted(self._type_dict.keys()):
|
|
||||||
display_text = self._type_dict[key]
|
|
||||||
self.editor.addItem(display_text, userData=key)
|
|
||||||
|
|
||||||
self.editor.currentTextChanged.connect(self.currentItemChanged)
|
|
||||||
return self.editor
|
|
||||||
|
|
||||||
def setEditorData(self, editor, index):
|
|
||||||
"""Affiche la valeur courante"""
|
|
||||||
current_value = index.data(Qt.DisplayRole) # C'est la string
|
|
||||||
|
|
||||||
# Trouve l'index du combobox qui correspond au texte affiché
|
|
||||||
current_index = editor.findText(current_value)
|
|
||||||
if current_index >= 0:
|
|
||||||
editor.setCurrentIndex(current_index)
|
|
||||||
|
|
||||||
def setModelData(self, editor, model, index):
|
|
||||||
"""Récupère l'index (la clé) et le stocke dans le modèle"""
|
|
||||||
# Récupère la clé (userData) du combobox
|
|
||||||
selected_index = editor.currentData()
|
|
||||||
model.setData(index, selected_index)
|
|
||||||
editor.close()
|
|
||||||
editor.deleteLater()
|
|
||||||
|
|
||||||
def updateEditorGeometry(self, editor, option, index):
|
|
||||||
r = QRect(option.rect)
|
|
||||||
if self.editor and self.editor.windowFlags() & Qt.Popup:
|
|
||||||
if editor.parent() is not None:
|
|
||||||
r.setTopLeft(self.editor.parent().mapToGlobal(r.topLeft()))
|
|
||||||
editor.setGeometry(r)
|
|
||||||
|
|
||||||
@pyqtSlot()
|
|
||||||
def currentItemChanged(self):
|
|
||||||
self.commitData.emit(self.sender())
|
|
||||||
|
|
||||||
|
|
||||||
class TableModel(PamhyrTableModel):
|
class TableModel(PamhyrTableModel):
|
||||||
def data(self, index, role):
|
def data(self, index, role):
|
||||||
if role == Qt.TextAlignmentRole:
|
if role == Qt.TextAlignmentRole:
|
||||||
|
|
@ -109,21 +58,12 @@ class TableModel(PamhyrTableModel):
|
||||||
if len(self._data.data) == 0 or len(self._data.data[row]) == 0:
|
if len(self._data.data) == 0 or len(self._data.data[row]) == 0:
|
||||||
return QVariant()
|
return QVariant()
|
||||||
|
|
||||||
value = self._data.data[row][column]
|
return self._data.data[row][column]
|
||||||
|
|
||||||
# Si c'est la colonne "type", convertir l'indice en string
|
|
||||||
if self._headers[column] == "type":
|
|
||||||
return POLLUTANT_TYPES.get(int(value), str(value))
|
|
||||||
|
|
||||||
return value
|
|
||||||
|
|
||||||
def setData(self, index, value, role=Qt.EditRole):
|
def setData(self, index, value, role=Qt.EditRole):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ from PyQt5.QtWidgets import (
|
||||||
)
|
)
|
||||||
|
|
||||||
from View.Pollutants.Edit.Translate import EditPollutantTranslate
|
from View.Pollutants.Edit.Translate import EditPollutantTranslate
|
||||||
from View.Pollutants.Edit.Table import TableModel, ComboBoxDelegate
|
from View.Pollutants.Edit.Table import TableModel
|
||||||
|
|
||||||
_translate = QCoreApplication.translate
|
_translate = QCoreApplication.translate
|
||||||
|
|
||||||
|
|
@ -78,11 +78,6 @@ class EditPolluantWindow(PamhyrWindow):
|
||||||
def setup_table(self):
|
def setup_table(self):
|
||||||
table_headers = self._trad.get_dict("table_headers")
|
table_headers = self._trad.get_dict("table_headers")
|
||||||
|
|
||||||
self._delegate_type = ComboBoxDelegate(
|
|
||||||
trad=self._trad,
|
|
||||||
parent=self
|
|
||||||
)
|
|
||||||
|
|
||||||
if self._study.is_editable():
|
if self._study.is_editable():
|
||||||
editable_headers = self._trad.get_dict("table_headers")
|
editable_headers = self._trad.get_dict("table_headers")
|
||||||
else:
|
else:
|
||||||
|
|
@ -93,7 +88,7 @@ class EditPolluantWindow(PamhyrWindow):
|
||||||
table_view=table,
|
table_view=table,
|
||||||
table_headers=table_headers,
|
table_headers=table_headers,
|
||||||
editable_headers=editable_headers,
|
editable_headers=editable_headers,
|
||||||
delegates={"type": self._delegate_type},
|
delegates={},
|
||||||
data=self._data,
|
data=self._data,
|
||||||
undo=self._undo_stack,
|
undo=self._undo_stack,
|
||||||
opt_data=self._study.time_system
|
opt_data=self._study.time_system
|
||||||
|
|
|
||||||
|
|
@ -74,9 +74,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -68,9 +68,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -140,9 +140,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ import tempfile
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from queue import Queue
|
from queue import Queue
|
||||||
from tools import trace, timer, logger_exception
|
from tools import trace, timer
|
||||||
|
|
||||||
from View.Tools.PamhyrWindow import PamhyrDialog, PamhyrWindow
|
from View.Tools.PamhyrWindow import PamhyrDialog, PamhyrWindow
|
||||||
|
|
||||||
|
|
@ -81,20 +81,16 @@ class SolverLogFileWindow(PamhyrWindow):
|
||||||
self.open_on_editor)
|
self.open_on_editor)
|
||||||
|
|
||||||
def setup_text(self):
|
def setup_text(self):
|
||||||
try:
|
|
||||||
with open(self._file_name, "r") as f:
|
with open(self._file_name, "r") as f:
|
||||||
for line in f:
|
for line in f:
|
||||||
line = line.rstrip()
|
line = line.rstrip()
|
||||||
self.find(QTextEdit, "textEdit").append(line)
|
self.find(QTextEdit, "textEdit").append(line)
|
||||||
except Exception as e:
|
|
||||||
logger_exception(e)
|
|
||||||
|
|
||||||
def revert(self):
|
def revert(self):
|
||||||
self.find(QTextEdit, "textEdit").clear()
|
self.find(QTextEdit, "textEdit").clear()
|
||||||
self.setup_text()
|
self.setup_text()
|
||||||
|
|
||||||
def open_on_editor(self):
|
def open_on_editor(self):
|
||||||
try:
|
|
||||||
p = QProcess(self)
|
p = QProcess(self)
|
||||||
|
|
||||||
cmd = self._config.editor
|
cmd = self._config.editor
|
||||||
|
|
@ -107,5 +103,3 @@ class SolverLogFileWindow(PamhyrWindow):
|
||||||
p.start(
|
p.start(
|
||||||
exe, args,
|
exe, args,
|
||||||
)
|
)
|
||||||
except Exception as e:
|
|
||||||
logger_exception(e)
|
|
||||||
|
|
|
||||||
|
|
@ -74,9 +74,6 @@ class ScenariosTableModel(PamhyrTableModel):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if role == Qt.EditRole:
|
if role == Qt.EditRole:
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self._undo.push(
|
self._undo.push(
|
||||||
SetCommand(
|
SetCommand(
|
||||||
|
|
|
||||||
|
|
@ -65,9 +65,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -121,9 +121,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -116,9 +116,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,9 +55,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,9 +79,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -84,9 +84,6 @@ class TableModel(PamhyrTableModel):
|
||||||
if not index.isValid() or role != Qt.EditRole:
|
if not index.isValid() or role != Qt.EditRole:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if self.is_same_data(index, value):
|
|
||||||
return False
|
|
||||||
|
|
||||||
row = index.row()
|
row = index.row()
|
||||||
column = index.column()
|
column = index.column()
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -142,30 +142,6 @@ class PamhyrTableModel(QAbstractTableModel):
|
||||||
|
|
||||||
return QVariant()
|
return QVariant()
|
||||||
|
|
||||||
def is_same_data(self, index, value):
|
|
||||||
current = self.data(index, Qt.ItemDataRole.DisplayRole)
|
|
||||||
if isinstance(current, QVariant):
|
|
||||||
current = current.value()
|
|
||||||
|
|
||||||
if str(current) == str(value):
|
|
||||||
return True
|
|
||||||
|
|
||||||
if hasattr(value, "display_name"):
|
|
||||||
if str(current) == str(value.display_name()):
|
|
||||||
return True
|
|
||||||
|
|
||||||
if hasattr(value, "name"):
|
|
||||||
if str(current) == str(value.name):
|
|
||||||
return True
|
|
||||||
|
|
||||||
try:
|
|
||||||
return (
|
|
||||||
float(str(current).replace(",", ".")) ==
|
|
||||||
float(str(value).replace(",", "."))
|
|
||||||
)
|
|
||||||
except (TypeError, ValueError):
|
|
||||||
return False
|
|
||||||
|
|
||||||
def data(self, index, role):
|
def data(self, index, role):
|
||||||
raise NotImplementedMethodeError(self, self.data)
|
raise NotImplementedMethodeError(self, self.data)
|
||||||
|
|
||||||
|
|
|
||||||
5120
src/lang/fr.ts
5120
src/lang/fr.ts
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue