Skip to content

Commit bb828c8

Browse files
committed
final tweak
1 parent 24e8e46 commit bb828c8

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

rascal2/static/style.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,3 +455,11 @@ MultiSelectList QToolButton {
455455
padding: 0;
456456
margin: 0;
457457
}
458+
459+
/*****************************
460+
LabeledSlider Styles
461+
*****************************/
462+
463+
LabeledSlider{
464+
border: 1px solid #999;
465+
}

rascal2/widgets/project/slider_view.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ def __init__(self, draft_project, parent):
2727
main_layout = QtWidgets.QVBoxLayout()
2828
self.setLayout(main_layout)
2929

30-
accept_button = QtWidgets.QPushButton("Accept", self)
31-
accept_button.clicked.connect(self._apply_changes_from_sliders)
30+
self.accept_button = QtWidgets.QPushButton("Accept", self)
31+
self.accept_button.clicked.connect(self._apply_changes_from_sliders)
3232

3333
cancel_button = QtWidgets.QPushButton("Cancel", self)
3434
cancel_button.clicked.connect(self._cancel_changes_from_sliders)
3535

3636
button_layout = QtWidgets.QHBoxLayout()
3737
button_layout.addStretch(1)
38-
button_layout.addWidget(accept_button)
38+
button_layout.addWidget(self.accept_button)
3939
button_layout.addWidget(cancel_button)
4040
main_layout.addLayout(button_layout)
4141

@@ -66,11 +66,16 @@ def _init_parameters_for_sliders(self):
6666

6767
def _add_sliders_widgets(self):
6868
"""Add sliders to the layout."""
69-
# We are adding new sliders, so delete all previous ones. Update is done in another branch.
69+
# We are adding new sliders, so delete all previous ones.
7070
for slider in self._sliders.values():
7171
self.slider_content_layout.removeWidget(slider)
7272
slider.deleteLater()
73+
for _ in range(self.slider_content_layout.count()):
74+
w = self.slider_content_layout.takeAt(0).widget()
75+
if w is not None:
76+
w.deleteLater()
7377
self._sliders.clear()
78+
self.accept_button.setDisabled(not self.parameters)
7479

7580
if not self.parameters:
7681
no_label = QtWidgets.QLabel(
@@ -86,6 +91,7 @@ def _add_sliders_widgets(self):
8691

8792
self._sliders[name] = slider
8893
self.slider_content_layout.addWidget(slider)
94+
self.slider_content_layout.addStretch(1)
8995

9096
def update_result_and_plots(self):
9197
project = ratapi.Project()
@@ -154,7 +160,7 @@ def __init__(self, param, parent):
154160

155161
self._slider.valueChanged.connect(self._update_value)
156162
self.setFrameShape(QtWidgets.QFrame.Shape.Box)
157-
self.setFrameShadow(QtWidgets.QFrame.Shadow.Plain)
163+
self.setSizePolicy(QtWidgets.QSizePolicy.Policy.MinimumExpanding, QtWidgets.QSizePolicy.Policy.Fixed)
158164

159165
def paintEvent(self, event):
160166
# Draws tick labels

0 commit comments

Comments
 (0)