From 550d86683da78e7abc64b6d82f1758e550afcc40 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Mon, 24 Jul 2023 17:55:51 +0200
Subject: [PATCH] SL: Propagate profile SL to point and fix SL id cnt.
---
src/Model/Geometry/Point.py | 6 ++++++
src/Model/SedimentLayer/SedimentLayer.py | 2 ++
2 files changed, 8 insertions(+)
diff --git a/src/Model/Geometry/Point.py b/src/Model/Geometry/Point.py
index cdebd17e..98d1e348 100644
--- a/src/Model/Geometry/Point.py
+++ b/src/Model/Geometry/Point.py
@@ -15,10 +15,16 @@ class Point(object):
@property
def sl(self):
+ if self._sl is None:
+ return self._profile.sl
+
return self._sl
@sl.setter
def sl(self, sl):
+ if sl == self._profile.sl:
+ self._sl = None
+
self._sl = sl
@property
diff --git a/src/Model/SedimentLayer/SedimentLayer.py b/src/Model/SedimentLayer/SedimentLayer.py
index 8099aab0..c0c34abc 100644
--- a/src/Model/SedimentLayer/SedimentLayer.py
+++ b/src/Model/SedimentLayer/SedimentLayer.py
@@ -135,6 +135,8 @@ class SedimentLayer(SQLSubModel):
else:
self.id = id
+ SedimentLayer._id_cnt = max(id, SedimentLayer._id_cnt+1)
+
def __str__(self):
return f"{self.name} ({len(self)}) - {self.comment}"
--
GitLab