diff --git a/src/Model/InitialConditions/InitialConditions.py b/src/Model/InitialConditions/InitialConditions.py index f54c287fdf9d96aca74f8a82d8ba9fa1f9508902..976cd61e94e36ffa36f902b2a22e8cd0f805a79f 100644 --- a/src/Model/InitialConditions/InitialConditions.py +++ b/src/Model/InitialConditions/InitialConditions.py @@ -14,8 +14,8 @@ class Data(object): self._kp = 0.0 self._flow = 0.0 - self._cote = 0.0 - self._tiran = 0.0 + self._elevation = 0.0 + self._draft = 0.0 def __getitem__(self, key): val = None @@ -28,10 +28,10 @@ class Data(object): val = self._kp elif key == "flow": val = self._flow - elif key == "cote": - val = self._cote - elif key == "tiran": - val = self._tiran + elif key == "elevation": + val = self._elevation + elif key == "draft": + val = self._draft return val @@ -44,10 +44,10 @@ class Data(object): self._kp = float(value) elif key == "flow": self._flow = float(value) - elif key == "cote": - self._cote = float(value) - elif key == "tiran": - self._tiran = float(value) + elif key == "elevation": + self._elevation = float(value) + elif key == "draft": + self._draft = float(value) self._status.modified() diff --git a/src/View/InitialConditions/Window.py b/src/View/InitialConditions/Window.py index 9e3048ed0cbf61058e169bb1187275e53b829764..cb7970facca45e4ddbf4230161d0f2fec51271ec 100644 --- a/src/View/InitialConditions/Window.py +++ b/src/View/InitialConditions/Window.py @@ -31,6 +31,7 @@ from View.InitialConditions.UndoCommand import ( from View.InitialConditions.Table import TableModel from View.Plot.MplCanvas import MplCanvas +from View.Geometry.PlotXY import PlotXY from View.InitialConditions.translate import * _translate = QCoreApplication.translate @@ -86,27 +87,27 @@ class InitialConditionsWindow(ASubMainWindow, ListedSubWindow): def setup_graph(self): print("TODO") - # self.canvas_1 = MplCanvas(width=5, height=4, dpi=100) - # self.canvas_1.setObjectName("canvas_1") - # self.plot_layout_1 = self.find(QVBoxLayout, "verticalLayout_1") - # self.plot_layout_1.addWidget(self.canvas_1) - - # self.plot = PlotXY( - # canvas = self.canvas_1, - # data = None, - # toolbar = None, - # ) - - # self.canvas_2 = MplCanvas(width=5, height=4, dpi=100) - # self.canvas_2.setObjectName("canvas_2") - # self.plot_layout_2 = self.find(QVBoxLayout, "verticalLayout_2") - # self.plot_layout_2.addWidget(self.canvas_2) - - # self.plot = PlotXY( - # canvas = self.canvas_2, - # data = None, - # toolbar = None, - # ) + self.canvas_1 = MplCanvas(width=5, height=4, dpi=100) + self.canvas_1.setObjectName("canvas_1") + self.plot_layout_1 = self.find(QVBoxLayout, "verticalLayout_1") + self.plot_layout_1.addWidget(self.canvas_1) + + self.plot = PlotXY( + canvas = self.canvas_1, + data = None, + toolbar = None, + ) + + self.canvas_2 = MplCanvas(width=5, height=4, dpi=100) + self.canvas_2.setObjectName("canvas_2") + self.plot_layout_2 = self.find(QVBoxLayout, "verticalLayout_2") + self.plot_layout_2.addWidget(self.canvas_2) + + self.plot = PlotXY( + canvas = self.canvas_2, + data = None, + toolbar = None, + ) def setup_connections(self): self.find(QAction, "action_add").triggered.connect(self.add) diff --git a/src/View/InitialConditions/translate.py b/src/View/InitialConditions/translate.py index ea88dff3beb3569712b14bc5f48fc3d2834b37a2..6805b64b29c9e52bb80baa4ea62e38f786ec564a 100644 --- a/src/View/InitialConditions/translate.py +++ b/src/View/InitialConditions/translate.py @@ -9,6 +9,6 @@ table_headers = { "comment": _translate("LateralContribution", "Comment"), "kp": _translate("LateralContribution", "KP (m)"), "flow": _translate("LateralContribution", "Flow (m³/s)"), - "cote": _translate("LateralContribution", "Cote (m)"), - "tiran": _translate("LateralContribution", "Tiran (m)") + "elevation": _translate("LateralContribution", "Elevation (m)"), + "draft": _translate("LateralContribution", "Draft (m)") }