From ea3654f1f84bf85ef8f219e3fc71438f5b14c069 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 4 Oct 2023 10:35:54 +0200
Subject: [PATCH] refactoring: refacto BC.
---
src/View/BoundaryCondition/Edit/Plot.py | 18 ++++++++++--------
src/View/BoundaryCondition/Edit/Window.py | 7 +++----
src/View/MainWindow.py | 2 +-
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/View/BoundaryCondition/Edit/Plot.py b/src/View/BoundaryCondition/Edit/Plot.py
index a7815e60..e5e80c1e 100644
--- a/src/View/BoundaryCondition/Edit/Plot.py
+++ b/src/View/BoundaryCondition/Edit/Plot.py
@@ -21,7 +21,7 @@ import logging
from datetime import datetime
from tools import timer, trace
-from View.Plot.APlot import APlot
+from View.Tools.PamhyrPlot import PamhyrPlot
from PyQt5.QtCore import (
QCoreApplication
@@ -33,16 +33,18 @@ _translate = QCoreApplication.translate
logger = logging.getLogger()
-class Plot(APlot):
- def __init__(self, canvas=None, data=None,
- mode = "time", toolbar=None):
+class Plot(PamhyrPlot):
+ def __init__(self, mode = "time", data=None,
+ trad=None, canvas=None, toolbar=None,
+ parent=None):
super(Plot, self).__init__(
- canvas=canvas,
- data=data,
- toolbar=toolbar
+ canvas = canvas,
+ trad = trad,
+ data = data,
+ toolbar = toolbar,
+ parent = parent
)
- self._trad = BCETranslate()
self._table_headers = self._trad.get_dict("table_headers")
self._mode = mode
diff --git a/src/View/BoundaryCondition/Edit/Window.py b/src/View/BoundaryCondition/Edit/Window.py
index 13d277e6..5661d6bc 100644
--- a/src/View/BoundaryCondition/Edit/Window.py
+++ b/src/View/BoundaryCondition/Edit/Window.py
@@ -41,8 +41,8 @@ from PyQt5.QtWidgets import (
QHeaderView, QDoubleSpinBox, QVBoxLayout,
)
-from View.Plot.MplCanvas import MplCanvas
-from View.Plot.PamhyrToolbar import PamhyrPlotToolbar
+from View.Tools.Plot.PamhyrCanvas import MplCanvas
+from View.Tools.Plot.PamhyrToolbar import PamhyrPlotToolbar
from View.BoundaryCondition.Edit.translate import BCETranslate
from View.BoundaryCondition.Edit.UndoCommand import SetMetaDataCommand
@@ -122,8 +122,6 @@ class EditBoundaryConditionWindow(PamhyrWindow):
parent = parent
)
- self.ui.setWindowTitle(self._title)
-
self.setup_table()
self.setup_plot()
self.setup_data()
@@ -183,6 +181,7 @@ class EditBoundaryConditionWindow(PamhyrWindow):
canvas = self.canvas,
data = self._data,
mode = self._study.time_system,
+ trad = self._trad,
toolbar = self.toolbar,
)
self.plot.draw()
diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py
index 8162807e..266dc321 100644
--- a/src/View/MainWindow.py
+++ b/src/View/MainWindow.py
@@ -45,7 +45,7 @@ from View.Study.Window import NewStudyWindow
from View.About.Window import AboutWindow
from View.Network.Window import NetworkWindow
from View.Geometry.Window import GeometryWindow
-# from View.BoundaryCondition.Window import BoundaryConditionWindow
+from View.BoundaryCondition.Window import BoundaryConditionWindow
# from View.LateralContribution.Window import LateralContributionWindow
# from View.InitialConditions.Window import InitialConditionsWindow
# from View.Stricklers.Window import StricklersWindow
--
GitLab