From bccbc41fe822479f203902c337022ed69a227a65 Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr> Date: Tue, 25 Jul 2023 16:53:37 +0200 Subject: [PATCH] SL: Minor fixes. --- src/Model/SedimentLayer/SedimentLayer.py | 7 ++++++- src/View/SedimentLayers/Reach/SLDialog.py | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Model/SedimentLayer/SedimentLayer.py b/src/Model/SedimentLayer/SedimentLayer.py index 20af62fd..c4e92621 100644 --- a/src/Model/SedimentLayer/SedimentLayer.py +++ b/src/Model/SedimentLayer/SedimentLayer.py @@ -143,7 +143,12 @@ class SedimentLayer(SQLSubModel): SedimentLayer._id_cnt = max(id, SedimentLayer._id_cnt+1) def __str__(self): - return f"{self.name} ({len(self)}) - {self.comment}" + s = f"{self.name} ({len(self)})" + + if self.comment != "": + s += f" - {self.comment}" + + return s def __len__(self): return len(self._layers) diff --git a/src/View/SedimentLayers/Reach/SLDialog.py b/src/View/SedimentLayers/Reach/SLDialog.py index ed4d3248..ce1e9794 100644 --- a/src/View/SedimentLayers/Reach/SLDialog.py +++ b/src/View/SedimentLayers/Reach/SLDialog.py @@ -46,6 +46,9 @@ class SLDialog(ASubWindow, ListedSubWindow): @property def sl(self): + if self.value == _translate("SedimentLayers", "Not defined"): + return None + return next( filter( lambda sl: str(sl) == self.value, -- GitLab