Skip to content

Commit 393a378

Browse files
committed
Adjusted rangeslider height
1 parent bf32a44 commit 393a378

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

analogconf_ui.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,8 @@ def rawValueCb(self, str):
111111

112112
# create min/max boxes or sliders
113113
def setChannels(self,channels : int):
114+
if channels == self.channels:
115+
return
114116
self.channels = channels
115117

116118
if self.manual_tune:
@@ -123,13 +125,13 @@ def setChannels(self,channels : int):
123125

124126
rawProgressBar = QProgressBar(self)
125127
rawProgressBar.setRange(-32768, 32767)
126-
rawProgressBar.setFixedHeight(QtRangeSlider.HEIGHT//2)
128+
rawProgressBar.setFixedHeight(QtRangeSlider.HEIGHT-4)
127129
rawProgressBar.setTextVisible(False)
128130

129131
self.tune_list.append([rangeSlider,rawProgressBar])
130-
self.tuneBoxLayout.addItem(QSpacerItem(QtRangeSlider.TRACK_PADDING,0,QSizePolicy.Policy.Fixed) ,i+start_row,0)
132+
self.tuneBoxLayout.addItem(QSpacerItem(QtRangeSlider.TRACK_PADDING,1,QSizePolicy.Policy.Fixed,QSizePolicy.Policy.Minimum) ,i+start_row,0)
131133
self.tuneBoxLayout.addWidget(rawProgressBar,i+start_row,1)
132-
self.tuneBoxLayout.addItem(QSpacerItem(QtRangeSlider.TRACK_PADDING,0,QSizePolicy.Policy.Fixed) ,i+start_row,2)
134+
self.tuneBoxLayout.addItem(QSpacerItem(QtRangeSlider.TRACK_PADDING,1,QSizePolicy.Policy.Fixed,QSizePolicy.Policy.Minimum) ,i+start_row,2)
133135
self.tuneBoxLayout.addWidget(rangeSlider,i+start_row,0,1,2)
134136
#rangeSlider.setValue(0x7fff)
135137
self.register_callback(self.classname,"min",lambda v,slider=rangeSlider : slider.set_left_thumb_value(v+0x7fff) ,self.instance,adr=i,conversion=int)

qrangeslider.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ class QtRangeSlider(QWidget):
3232
* left_thumb_value_changed (int)
3333
* right_thumb_value_changed (int)
3434
"""
35-
HEIGHT = 30
35+
HEIGHT = 21
3636
WIDTH = 120
3737
THUMB_WIDTH = 5
38-
THUMB_HEIGHT = 16
38+
THUMB_HEIGHT = 15
3939
TRACK_HEIGHT = 2
4040
FILL_HEIGHT = 10
4141
TRACK_COLOR = QColor(0xc7, 0xc7, 0xc7,127)
@@ -52,7 +52,7 @@ def __init__(self, parent, right_value, left_thumb_value=0, right_thumb_value=No
5252

5353
self.setSizePolicy(
5454
QSizePolicy.Policy.Expanding,
55-
QSizePolicy.Policy.Fixed
55+
QSizePolicy.Policy.MinimumExpanding
5656
)
5757
self.setMinimumWidth(self.WIDTH)
5858
self.setMinimumHeight(self.HEIGHT)
@@ -109,7 +109,7 @@ def __draw_value(self, canvas_width, canvas_height, painter):
109109
available_width = canvas_width - 2 * self.TRACK_PADDING
110110
x1 = self.TRACK_PADDING#self._left_thumb.value / self._right_value * available_width + self.TRACK_PADDING
111111
x2 = self._value / self._right_value * available_width + self.TRACK_PADDING
112-
rect = QRect(round(x1), self._canvas_height // 2 - self.FILL_HEIGHT // 2, \
112+
rect = QRect(round(x1), canvas_height // 2 - self.FILL_HEIGHT // 2, \
113113
round(x2) - round(x1), self.FILL_HEIGHT)
114114
painter.fillRect(rect, brush)
115115

0 commit comments

Comments
 (0)