From cbc249299cc20b802c13208ebfac352b321d4508 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Thu, 4 May 2023 17:31:25 +0200
Subject: [PATCH] BC: Split tabWidget and graph display.
---
.../BoundaryConditionWindow.py | 6 +-
src/View/ui/BoundaryConditions.ui | 74 ++++++++++---------
2 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/src/View/BoundaryCondition/BoundaryConditionWindow.py b/src/View/BoundaryCondition/BoundaryConditionWindow.py
index d8ad1362..38b9e6b1 100644
--- a/src/View/BoundaryCondition/BoundaryConditionWindow.py
+++ b/src/View/BoundaryCondition/BoundaryConditionWindow.py
@@ -69,7 +69,7 @@ class BoundaryConditionWindow(ASubMainWindow, ListedSubWindow):
self.paste_sc = QShortcut(QKeySequence.Paste, self)
def setup_table(self):
- table = self.find(QTableView, "tableView")
+ table = self.find(QTableView, "tableView_liquid")
self._table = TableModel(
data = self._study.river,
undo = self._undo_stack
@@ -119,13 +119,13 @@ class BoundaryConditionWindow(ASubMainWindow, ListedSubWindow):
def index_selected_row(self):
- table = self.find(QTableView, "tableView")
+ table = self.find(QTableView, "tableView_liquid")
return table.selectionModel()\
.selectedRows()[0]\
.row()
def index_selected_rows(self):
- table = self.find(QTableView, "tableView")
+ table = self.find(QTableView, "tableView_liquid")
return list(
# Delete duplicate
set(
diff --git a/src/View/ui/BoundaryConditions.ui b/src/View/ui/BoundaryConditions.ui
index 7f4ea44c..602a1887 100644
--- a/src/View/ui/BoundaryConditions.ui
+++ b/src/View/ui/BoundaryConditions.ui
@@ -25,43 +25,47 @@
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <widget class="QTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>0</number>
+ <widget class="QSplitter" name="splitter">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <widget class="QWidget" name="tab">
- <attribute name="title">
- <string>Liquid</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QSplitter" name="splitter">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <widget class="QTableView" name="tableView"/>
- <widget class="QWidget" name="verticalLayoutWidget">
- <layout class="QVBoxLayout" name="verticalLayout"/>
- </widget>
- </widget>
- </item>
- </layout>
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
+ <number>0</number>
+ </property>
+ <widget class="QWidget" name="tab">
+ <attribute name="title">
+ <string>Liquid</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QTableView" name="tableView_liquid"/>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_2">
+ <attribute name="title">
+ <string>Solid</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QTableView" name="tableView_solid"/>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_3">
+ <attribute name="title">
+ <string>Suspenssion</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
+ <widget class="QTableView" name="tableView_suspenssion"/>
+ </item>
+ </layout>
+ </widget>
</widget>
- <widget class="QWidget" name="tab_2">
- <attribute name="title">
- <string>Solid</string>
- </attribute>
- </widget>
- <widget class="QWidget" name="tab_3">
- <attribute name="title">
- <string>Suspension</string>
- </attribute>
+ <widget class="QWidget" name="verticalLayoutWidget">
+ <layout class="QVBoxLayout" name="verticalLayout"/>
</widget>
</widget>
</item>
--
GitLab