summaryrefslogtreecommitdiff
path: root/DockWidgets
diff options
context:
space:
mode:
Diffstat (limited to 'DockWidgets')
-rw-r--r--DockWidgets/DockWidgetCompoundSeparator.py15
-rw-r--r--DockWidgets/DockWidgetCompoundSeparator.ui2
2 files changed, 12 insertions, 5 deletions
diff --git a/DockWidgets/DockWidgetCompoundSeparator.py b/DockWidgets/DockWidgetCompoundSeparator.py
index 6de61a5..5a80f84 100644
--- a/DockWidgets/DockWidgetCompoundSeparator.py
+++ b/DockWidgets/DockWidgetCompoundSeparator.py
@@ -31,11 +31,16 @@ class DockWidgetCompoundSeparator(QDockWidget,ui_dialog):
calculationLayout = QGridLayout()
r1 = QRadioButton('Stream 1')
- r1.setChecked(True)
r1.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
r2 = QRadioButton('Stream 2')
- r2.setChecked(False)
r2.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
+ if self.obj.variables['SepStrm']['value'] == 1:
+ r1.setChecked(True)
+ r2.setChecked(False)
+ else:
+ r1.setChecked(False)
+ r2.setChecked(True)
+
lst = [r1, r2]
calculationLayout.addWidget(r1, 0, 1)
@@ -45,9 +50,11 @@ class DockWidgetCompoundSeparator(QDockWidget,ui_dialog):
combo = QComboBox()
print("CompoundSeparator combo")
for j in self.obj.SepFact_modes:
- combo.addItem(str(j))
+ combo.addItem(str(j))
+ print(self.obj.variables['SepFact_c']['value'][k])
+ combo.setCurrentText(self.obj.variables['SepFact_c']['value'][k])
combo.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
- l = QLineEdit()
+ l = QLineEdit(str(self.obj.variables['SepVal_c']['value'][k]))
l.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
calculationLayout.addWidget(QLabel(val+" :"), k+1,0, alignment=Qt.AlignLeft)
calculationLayout.addWidget(combo, k+1, 1, alignment=Qt.AlignCenter)
diff --git a/DockWidgets/DockWidgetCompoundSeparator.ui b/DockWidgets/DockWidgetCompoundSeparator.ui
index 2d9a4b2..ad9cda4 100644
--- a/DockWidgets/DockWidgetCompoundSeparator.ui
+++ b/DockWidgets/DockWidgetCompoundSeparator.ui
@@ -34,7 +34,7 @@
<x>10</x>
<y>40</y>
<width>331</width>
- <height>191</height>
+ <height>281</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout"/>