From dcc6e2df2d3ba1864a60151f50b8336f839e82c6 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Mon, 7 Aug 2023 16:03:32 +0200
Subject: [PATCH] Network: Fix window duplication prohibition mechanism.
---
src/View/MainWindow.py | 10 ++++++----
src/View/Network/Window.py | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py
index afb2de1e..d5508a10 100644
--- a/src/View/MainWindow.py
+++ b/src/View/MainWindow.py
@@ -490,10 +490,12 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
Returns:
Nothing
"""
- if (self.model is not None and
- not self.sub_win_exists("River network")):
- self.network = NetworkWindow(model=self.model, parent=self)
- self.network.show()
+ if self.model is not None:
+ if not self.sub_win_exists("River network"):
+ self.network = NetworkWindow(model=self.model, parent=self)
+ self.network.show()
+ else:
+ self.network.activateWindow()
def open_geometry(self):
"""Open geometry window
diff --git a/src/View/Network/Window.py b/src/View/Network/Window.py
index 7099cea5..05051862 100644
--- a/src/View/Network/Window.py
+++ b/src/View/Network/Window.py
@@ -50,7 +50,7 @@ class NetworkWindow(ASubMainWindow):
self.setup_title()
super(NetworkWindow, self).__init__(
- name=self._title, ui="Network", parent=parent
+ name=title, ui="Network", parent=parent
)
self.ui.setWindowTitle(self._title)
--
GitLab