From 568be94e56955a73269e705cdc9f8a724e542f64 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Wed, 3 May 2023 11:48:49 +0200
Subject: [PATCH] BC: Reorganize edit window.
---
.../BoundaryCondition/BoundaryConditionWindow.py | 11 ++---------
.../Window.py} | 6 ++++--
src/View/BoundaryCondition/translate.py | 13 +++++++++++++
3 files changed, 19 insertions(+), 11 deletions(-)
rename src/View/BoundaryCondition/{EditBoundaryConditionWindow.py => Edit/Window.py} (87%)
create mode 100644 src/View/BoundaryCondition/translate.py
diff --git a/src/View/BoundaryCondition/BoundaryConditionWindow.py b/src/View/BoundaryCondition/BoundaryConditionWindow.py
index de56722d..3c763118 100644
--- a/src/View/BoundaryCondition/BoundaryConditionWindow.py
+++ b/src/View/BoundaryCondition/BoundaryConditionWindow.py
@@ -31,18 +31,11 @@ from Model.BoundaryCondition.BoundaryConditionTypes import (
NotDefined, PonctualContribution,
TimeOverZ, TimeOverDebit, ZOverDebit
)
-from View.BoundaryCondition.EditBoundaryConditionWindow import EditBoundaryConditionWindow
+from View.BoundaryCondition.translate import long_types
+from View.BoundaryCondition.Edit.Window import EditBoundaryConditionWindow
_translate = QCoreApplication.translate
-long_types = {
- "ND": _translate("BoundaryCondition", "Not defined"),
- "PC": _translate("BoundaryCondition", "Ponctual contribution"),
- "TZ": _translate("BoundaryCondition", "Time over Z"),
- "TD": _translate("BoundaryCondition", "Time over Debit"),
- "ZD": _translate("BoundaryCondition", "Z over Debit"),
-}
-
table_headers = {
"name": _translate("BoundaryCondition", "Name"),
"type": _translate("BoundaryCondition", "Type"),
diff --git a/src/View/BoundaryCondition/EditBoundaryConditionWindow.py b/src/View/BoundaryCondition/Edit/Window.py
similarity index 87%
rename from src/View/BoundaryCondition/EditBoundaryConditionWindow.py
rename to src/View/BoundaryCondition/Edit/Window.py
index 3695d260..895ac1b6 100644
--- a/src/View/BoundaryCondition/EditBoundaryConditionWindow.py
+++ b/src/View/BoundaryCondition/Edit/Window.py
@@ -12,6 +12,8 @@ from PyQt5.QtWidgets import (
QFileDialog, QTableView, QAbstractItemView,
)
+from View.BoundaryCondition.translate import long_types
+
_translate = QCoreApplication.translate
class EditBoundaryConditionWindow(ASubMainWindow, ListedSubWindow):
@@ -31,8 +33,8 @@ class EditBoundaryConditionWindow(ASubMainWindow, ListedSubWindow):
else _translate("BoundaryCondition", "Not associate"))
title = (
_translate("BoundaryCondition", self._title) +
- f"{self._data.name} " +
- f"({self._data.name} - {node_name})"
+ f" - {self._data.name} " +
+ f"({long_types[self._data.bctype]} - {node_name})"
)
self.ui.setWindowTitle(title)
else:
diff --git a/src/View/BoundaryCondition/translate.py b/src/View/BoundaryCondition/translate.py
new file mode 100644
index 00000000..bcd1be54
--- /dev/null
+++ b/src/View/BoundaryCondition/translate.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+from PyQt5.QtCore import QCoreApplication
+
+_translate = QCoreApplication.translate
+
+long_types = {
+ "ND": _translate("BoundaryCondition", "Not defined"),
+ "PC": _translate("BoundaryCondition", "Ponctual contribution"),
+ "TZ": _translate("BoundaryCondition", "Time over Z"),
+ "TD": _translate("BoundaryCondition", "Time over Debit"),
+ "ZD": _translate("BoundaryCondition", "Z over Debit"),
+}
--
GitLab