Commit 254f0d0e authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

Friction: Forbidden duplicate window.

Showing with 42 additions and 17 deletions
+42 -17
......@@ -68,7 +68,7 @@ class FrictionsWindow(ASubMainWindow, ListedSubWindow):
self.setup_title(title)
super(FrictionsWindow, self).__init__(
name=self._title, ui="Frictions", parent=parent
name=title, ui="Frictions", parent=parent
)
self.setup_sc()
......@@ -246,9 +246,17 @@ class FrictionsWindow(ASubMainWindow, ListedSubWindow):
self._table.redo()
def edit_stricklers(self):
self.strick = StricklersWindow(
study = self._study,
config = self.parent.conf,
parent = self
strick = self.sub_win_filter_first(
"Stricklers",
contain = []
)
self.strick.show()
if strick is None:
strick = StricklersWindow(
study = self._study,
config = self.parent.conf,
parent = self
)
strick.show()
else:
strick.activateWindow()
......@@ -494,21 +494,38 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
lateral.activateWindow()
def open_stricklers(self):
strick = StricklersWindow(
study = self.model,
config = self.conf,
parent = self
strick = self.sub_win_filter_first(
"Stricklers",
contain = []
)
strick.show()
if strick is None:
strick = StricklersWindow(
study = self.model,
config = self.conf,
parent = self
)
strick.show()
else:
strick.activateWindow()
def open_frictions(self):
if (self.model is not None and
self.model.river.has_current_reach()):
frictions = FrictionsWindow(
study = self.model,
parent = self
frictions = self.sub_win_filter_first(
"Frictions",
contain = [self.model.river.current_reach().name]
)
frictions.show()
if frictions is None:
frictions = FrictionsWindow(
study = self.model,
parent = self
)
frictions.show()
else:
frictions.activateWindow()
else:
self.msg_select_reach()
......
......@@ -51,7 +51,7 @@ logger = logging.getLogger()
class StricklersWindow(ASubMainWindow, ListedSubWindow):
def __init__(self, title="Stricklers", study=None, config=None, parent=None):
title = title + " - " + study.name
self._title = title + " - " + study.name
super(StricklersWindow, self).__init__(
name=title, ui="Stricklers", parent=parent
......@@ -64,7 +64,7 @@ class StricklersWindow(ASubMainWindow, ListedSubWindow):
self.setup_table()
self.setup_connections()
self.ui.setWindowTitle(title)
self.ui.setWindowTitle(self._title)
def setup_sc(self):
self._undo_stack = QUndoStack()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment