From 609e9d39db3ec1ea5651eb58b94f01bdc22a4fee Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Fri, 7 Jul 2023 11:36:06 +0200
Subject: [PATCH] Model: Minor change.
---
src/Model/Saved.py | 8 ++++++--
src/Model/Study.py | 4 ++--
src/View/MainWindow.py | 3 +++
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/Model/Saved.py b/src/Model/Saved.py
index b11ed471..3f672731 100644
--- a/src/Model/Saved.py
+++ b/src/Model/Saved.py
@@ -1,5 +1,9 @@
# -*- coding: utf-8 -*-
+import logging
+
+logger = logging.getLogger()
+
class SavedStatus(object):
def __init__(self):
super(SavedStatus, self).__init__()
@@ -9,9 +13,9 @@ class SavedStatus(object):
return self._saved
def save(self):
- # print(" * save")
+ logger.debug("model status set as saved")
self._saved = True
def modified(self):
- # print(" * modified ...")
+ logger.debug("model status set as modified")
self._saved = False
diff --git a/src/Model/Study.py b/src/Model/Study.py
index c1005840..413838ad 100644
--- a/src/Model/Study.py
+++ b/src/Model/Study.py
@@ -74,7 +74,7 @@ class Study(SQLModel):
fdir, fname = os.path.split(self.filename)
if self._old_save_id == 0:
- old_dir = os.path.join(fdir, "__old__")
+ old_dir = os.path.join(fdir, "_PAMHYR_", "__old__")
if os.name == "nt":
old_dir = old_dir.replace("/", "\\")
@@ -87,7 +87,7 @@ class Study(SQLModel):
logger.error(e)
fname = fname + "." + str(self._old_save_id)
- filename = os.path.join(fdir, "__old__", fname)
+ filename = os.path.join(fdir, "_PAMHYR_", "__old__", fname)
shutil.copy(self.filename, filename)
self._old_save_id += 1
diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py
index d44e53f0..52dba9fc 100644
--- a/src/View/MainWindow.py
+++ b/src/View/MainWindow.py
@@ -298,6 +298,9 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
else:
self.model.filename = file_name + ".pamhyr"
+ if self.model.is_saved:
+ return
+
logger.info("Save...")
self.model.save()
--
GitLab