From e925a9598717e7d9273b5060f81519b026949d17 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 5 Jul 2023 16:49:26 +0200
Subject: [PATCH] Model, View: Some switch to logging.
---
src/Model/Geometry/Profile.py | 6 +++++-
src/Model/Geometry/Reach.py | 9 ++++++---
src/View/ASubWindow.py | 5 ++++-
src/View/CheckList/Window.py | 1 -
src/View/Debug/Window.py | 6 +++++-
5 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/Model/Geometry/Profile.py b/src/Model/Geometry/Profile.py
index 4a1f5a5f..b0328f80 100644
--- a/src/Model/Geometry/Profile.py
+++ b/src/Model/Geometry/Profile.py
@@ -1,10 +1,14 @@
# -*- coding: utf-8 -*-
+import logging
+
from tools import timer
from Model.Geometry.Point import Point
from Model.Except import NotImplementedMethodeError
+logger = logging.getLogger()
+
class Profile(object):
_id_cnt = 0
@@ -241,7 +245,7 @@ class Profile(object):
@timer
def sort_with_indexes(self, indexes: list):
if len(self._points) != len(indexes):
- print("TODO: CRITICAL ERROR!")
+ logger.critical("Indexes list do not correspond to point list")
self._points = list(
map(
diff --git a/src/Model/Geometry/Reach.py b/src/Model/Geometry/Reach.py
index fa72c8ec..1f429be7 100644
--- a/src/Model/Geometry/Reach.py
+++ b/src/Model/Geometry/Reach.py
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
+import logging
import numpy as np
from time import time
@@ -17,6 +18,8 @@ from Model.Geometry.ProfileXYZ import ProfileXYZ
from Model.Except import FileFormatError, exception_message_box
+logger = logging.getLogger()
+
class Reach(SQLSubModel):
_sub_classes = [
ProfileXYZ,
@@ -377,7 +380,7 @@ class Reach(SQLSubModel):
@timer
def sort_with_indexes(self, indexes: list):
if len(self._profiles) != len(indexes):
- print("TODO: CRITICAL ERROR!")
+ logger.critical("Indexes list do not correspond to profile list")
self._profiles = list(
map(
@@ -424,10 +427,10 @@ class Reach(SQLSubModel):
self._status.modified()
except FileNotFoundError as e:
- print(e)
+ logger.error(e)
exception_message_box(e)
except FileFormatError as e:
- print(e)
+ logger.error(e)
e.alert()
@timer
diff --git a/src/View/ASubWindow.py b/src/View/ASubWindow.py
index 5bf0940c..13719d77 100644
--- a/src/View/ASubWindow.py
+++ b/src/View/ASubWindow.py
@@ -2,6 +2,7 @@
import os
import csv
+import logging
from io import StringIO
from datetime import datetime
@@ -26,6 +27,8 @@ from PyQt5.uic import loadUi
from Model.Except import ClipboardFormatError
+logger = logging.getLogger()
+
class WindowToolKit(object):
def __init__(self, parent=None):
super(WindowToolKit, self).__init__()
@@ -140,7 +143,7 @@ class ASubWindowFeatures(object):
try:
self.find(QLineEdit, name).setText(text)
except AttributeError as e:
- print(e)
+ logger.error(e)
def get_line_edit_text(self, name:str):
"""Get text of line edit component
diff --git a/src/View/CheckList/Window.py b/src/View/CheckList/Window.py
index 8f720e0f..d04c8913 100644
--- a/src/View/CheckList/Window.py
+++ b/src/View/CheckList/Window.py
@@ -169,7 +169,6 @@ class CheckListWindow(ASubMainWindow, ListedSubWindow):
self.close()
def reject(self):
- print("cancel")
self.end()
def accept(self):
diff --git a/src/View/Debug/Window.py b/src/View/Debug/Window.py
index 5fad77df..c02075a7 100644
--- a/src/View/Debug/Window.py
+++ b/src/View/Debug/Window.py
@@ -1,5 +1,7 @@
# -*- coding: utf-8 -*-
+import logging
+
from tools import trace, timer
from View.ASubWindow import ASubMainWindow
@@ -23,6 +25,8 @@ from PyQt5.QtWidgets import (
QProgressBar, QLabel, QTextEdit,
)
+logger = logging.getLogger()
+
_translate = QCoreApplication.translate
class ReplWindow(ASubMainWindow, ListedSubWindow):
@@ -71,7 +75,7 @@ class ReplWindow(ASubMainWindow, ListedSubWindow):
self._history_ind = 0
rich_code = "self.__debug_exec_result__ = " + code
- print(f"[DEBUG] ! {code}")
+ logger.debug(f"{code}")
try:
value = exec(rich_code)
value = self.__debug_exec_result__
--
GitLab