Compare commits

...

11 Commits

50 changed files with 2699 additions and 2395 deletions

View File

@ -70,8 +70,11 @@ class Data(SQLSubModel):
def _db_update(cls, execute, version, data=None):
major, minor, release = version.strip().split(".")
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute)
created = True
@ -250,6 +253,10 @@ class BoundaryConditionAdisTS(SQLSubModel):
created = False
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute)
created = True

View File

@ -73,7 +73,11 @@ class D90AdisTS(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == "0" and int(minor) <= 1:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
cls._db_create(execute)
created = True

View File

@ -72,7 +72,12 @@ class D90AdisTSSpec(SQLSubModel):
major, minor, release = version.strip().split(".")
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:
cls._db_create(execute)
created = True

View File

@ -79,7 +79,11 @@ class DIFAdisTS(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == "0" and int(minor) <= 1:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
cls._db_create(execute)
created = True

View File

@ -83,7 +83,11 @@ class DIFAdisTSSpec(SQLSubModel):
major, minor, release = version.strip().split(".")
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:
cls._db_create(execute)
created = True

View File

@ -228,9 +228,10 @@ class Friction(SQLSubModel):
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()
self._begin_strickler is not None
and (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):

View File

@ -81,7 +81,11 @@ class InitialConditionsAdisTS(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == "0" and int(minor) <= 1:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 6:
cls._db_create(execute)
created = True

View File

@ -79,8 +79,12 @@ class ICAdisTSSpec(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == 0 and minor < 1:
if int(release) < 6:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute)
created = True

View File

@ -69,7 +69,11 @@ class Data(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == "0" and int(minor) <= 1:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute)
created = True
@ -243,7 +247,11 @@ class LateralContributionAdisTS(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == "0" and int(minor) <= 1:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute)
created = True

View File

@ -97,7 +97,11 @@ class OutputRKAdists(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == "0" and int(minor) <= 1:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute)
created = True

View File

@ -34,6 +34,18 @@ from Model.BoundaryConditionsAdisTS.BoundaryConditionAdisTS import (
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):
_sub_classes = []
@ -140,7 +152,11 @@ class PollutantCharacteristics(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == "0" and int(minor) <= 1:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute)
created = True
@ -332,19 +348,21 @@ class Pollutants(SQLSubModel):
@data.setter
def data(self, data):
self._data = [PollutantCharacteristics(type=int(data[0]),
diametre=float(data[1]),
rho=float(data[2]),
porosity=float(data[3]),
cdc_riv=float(data[4]),
cdc_cas=float(data[5]),
apd=float(data[6]),
ac=float(data[7]),
bc=float(data[8]),
pollutant=self,
status=self._status
)
]
self._data = [
PollutantCharacteristics(
type=int(data[0]),
diametre=float(data[1]),
rho=float(data[2]),
porosity=float(data[3]),
cdc_riv=float(data[4]),
cdc_cas=float(data[5]),
apd=float(data[6]),
ac=float(data[7]),
bc=float(data[8]),
pollutant=self,
status=self._status
)
]
@classmethod
def _db_create(cls, execute, ext=""):
@ -368,7 +386,11 @@ class Pollutants(SQLSubModel):
major, minor, release = version.strip().split(".")
created = False
if major == "0" and int(minor) <= 1:
if major == "0" and minor == "0":
cls._db_create(execute)
created = True
if major == "0" and minor == "1":
if int(release) < 7:
cls._db_create(execute)
created = True

View File

@ -351,7 +351,7 @@ class Results(SQLSubModel):
def _db_save(self, execute, data=None):
if self._status.scenario.id != self._owner_scenario:
return
return True
pid = self._pamhyr_id
if self._solver is None:

View File

@ -34,6 +34,7 @@ class StudyStatus(object):
self._status = Status.EDIT
self._scenario = scenario
self._saved = True
self._loading = False
@property
def scenario_id(self):
@ -86,6 +87,15 @@ class StudyStatus(object):
def is_saved(self):
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):
logger.debug("model status set as saved")
self._saved = True
@ -97,6 +107,9 @@ class StudyStatus(object):
self._saved = True
def modified(self):
if self._loading:
return
if self._saved:
self.version += 1

View File

@ -573,16 +573,20 @@ class Study(SQLModel):
"scenario": scenario
}
# Load river data
river = River._db_load(
sql_exec, data=data
)
data["study"] = self
river._db_load_results(sql_exec, data=data)
self.status.start_loading()
try:
# Load river data
river = River._db_load(
sql_exec, data=data
)
data["study"] = self
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
# self._river_scenario_cache[scenario] = river
self.status.scenario = old_scenario
return river

View File

@ -202,6 +202,8 @@ class SQLSubModel(PamhyrID):
"""
if self._status is None:
return
if self._status.is_loading():
return
self._owner_scenario = self._status.scenario_id
self._status.modified()
@ -218,6 +220,8 @@ class SQLSubModel(PamhyrID):
"""
if self._status is None:
return
if self._status.is_loading():
return
self._owner_scenario = self._status.scenario_id
self._status.modified()

View File

@ -171,7 +171,7 @@ class PamhyrModelList(SQLSubModel):
lambda x: x[1],
filter(
lambda x: x[0] in indexes,
enumerate(self._lst)
enumerate(self.lst)
)
)
)

View File

@ -107,6 +107,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -167,6 +167,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -97,6 +97,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -170,6 +170,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -174,6 +174,9 @@ class D90TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -186,6 +186,9 @@ class DIFTableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -134,6 +134,9 @@ class FrictionTableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -114,6 +114,9 @@ class GeometryProfileTableModel(PamhyrTableModel):
column = index.column()
if role == Qt.EditRole:
if self.is_same_data(index, value):
return False
try:
if column == 0:
self._undo.push(

View File

@ -95,6 +95,9 @@ class GeometryReachTableModel(PamhyrTableModel):
column = index.column()
if role == Qt.EditRole and index.column() != 2:
if self.is_same_data(index, value):
return False
try:
if index.column() == 0:
self._undo.push(

View File

@ -138,6 +138,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()
@ -288,6 +291,9 @@ class ParametersTableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
if self._hs_index is None:
return QVariant()

View File

@ -169,6 +169,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()
na = self._trad['not_associated']

View File

@ -153,6 +153,9 @@ class InitialConditionTableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -188,6 +188,9 @@ class InitialConditionTableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -86,6 +86,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -197,6 +197,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -100,6 +100,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -162,6 +162,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -105,6 +105,9 @@ class NodeTableModel(PamhyrTableModel):
return False
if role == Qt.EditRole:
if self.is_same_data(index, value):
return False
try:
self._undo.push(
SetCommand(
@ -155,6 +158,9 @@ class EdgeTableModel(PamhyrTableModel):
if role != Qt.EditRole:
return QVariant()
if self.is_same_data(index, value):
return False
try:
if (self._headers[index.column()] == "node1" or
self._headers[index.column()] == "node2"):

View File

@ -149,6 +149,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()
na = self._trad['not_associated']

View File

@ -33,17 +33,68 @@ from PyQt5.QtCore import (
from PyQt5.QtWidgets import (
QTableView, QAbstractItemView, QSpinBox, QItemDelegate,
QComboBox,
)
from View.Pollutants.Edit.UndoCommand import (
SetDataCommand, PasteCommand,
)
from Model.Pollutants.Pollutants import POLLUTANT_TYPES
_translate = QCoreApplication.translate
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):
def data(self, index, role):
if role == Qt.TextAlignmentRole:
@ -58,12 +109,21 @@ class TableModel(PamhyrTableModel):
if len(self._data.data) == 0 or len(self._data.data[row]) == 0:
return QVariant()
return self._data.data[row][column]
value = 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):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -41,7 +41,7 @@ from PyQt5.QtWidgets import (
)
from View.Pollutants.Edit.Translate import EditPollutantTranslate
from View.Pollutants.Edit.Table import TableModel
from View.Pollutants.Edit.Table import TableModel, ComboBoxDelegate
_translate = QCoreApplication.translate
@ -78,6 +78,11 @@ class EditPolluantWindow(PamhyrWindow):
def setup_table(self):
table_headers = self._trad.get_dict("table_headers")
self._delegate_type = ComboBoxDelegate(
trad=self._trad,
parent=self
)
if self._study.is_editable():
editable_headers = self._trad.get_dict("table_headers")
else:
@ -88,7 +93,7 @@ class EditPolluantWindow(PamhyrWindow):
table_view=table,
table_headers=table_headers,
editable_headers=editable_headers,
delegates={},
delegates={"type": self._delegate_type},
data=self._data,
undo=self._undo_stack,
opt_data=self._study.time_system

View File

@ -74,6 +74,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -68,6 +68,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -140,6 +140,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -20,7 +20,7 @@ import tempfile
import os
from queue import Queue
from tools import trace, timer
from tools import trace, timer, logger_exception
from View.Tools.PamhyrWindow import PamhyrDialog, PamhyrWindow
@ -81,25 +81,31 @@ class SolverLogFileWindow(PamhyrWindow):
self.open_on_editor)
def setup_text(self):
with open(self._file_name, "r") as f:
for line in f:
line = line.rstrip()
self.find(QTextEdit, "textEdit").append(line)
try:
with open(self._file_name, "r") as f:
for line in f:
line = line.rstrip()
self.find(QTextEdit, "textEdit").append(line)
except Exception as e:
logger_exception(e)
def revert(self):
self.find(QTextEdit, "textEdit").clear()
self.setup_text()
def open_on_editor(self):
p = QProcess(self)
try:
p = QProcess(self)
cmd = self._config.editor
cmd = cmd.replace("@file", self._file_name)
cmd = self._config.editor
cmd = cmd.replace("@file", self._file_name)
cmd = cmd.split()
exe = cmd[0]
args = cmd[1:]
cmd = cmd.split()
exe = cmd[0]
args = cmd[1:]
p.start(
exe, args,
)
p.start(
exe, args,
)
except Exception as e:
logger_exception(e)

View File

@ -74,6 +74,9 @@ class ScenariosTableModel(PamhyrTableModel):
return False
if role == Qt.EditRole:
if self.is_same_data(index, value):
return False
try:
self._undo.push(
SetCommand(

View File

@ -65,6 +65,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -121,6 +121,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -116,6 +116,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -55,6 +55,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -79,6 +79,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -84,6 +84,9 @@ class TableModel(PamhyrTableModel):
if not index.isValid() or role != Qt.EditRole:
return False
if self.is_same_data(index, value):
return False
row = index.row()
column = index.column()

View File

@ -142,6 +142,30 @@ class PamhyrTableModel(QAbstractTableModel):
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):
raise NotImplementedMethodeError(self, self.data)

File diff suppressed because it is too large Load Diff