@@ -53,10 +53,12 @@ class ClickSlider(QSlider):
53
53
def __init__ (self , * args , ** kwargs ):
54
54
super (ClickSlider , self ).__init__ (* args , ** kwargs )
55
55
def mousePressEvent (self , event ):
56
- super ( ClickSlider , self ). mousePressEvent ( event )
56
+
57
57
if event .button () == Qt .LeftButton :
58
58
val = self .pixelPosToRangeValue (event .pos ())
59
59
self .setValue (val )
60
+ else :
61
+ super (ClickSlider , self ).mousePressEvent (event )
60
62
61
63
def pixelPosToRangeValue (self , pos ):
62
64
opt = QStyleOptionSlider ()
@@ -230,12 +232,12 @@ def __init__(self, rgbDimmer = 0):
230
232
# self.color_btn.clicked.connect(self.set_color)
231
233
232
234
233
- self .color_dialog = ColorPickerWidget ()
235
+ self .color_picker = ColorPickerWidget ()
234
236
235
- self .color_dialog .currentColorChanged .connect (self .colorSelected )
237
+ self .color_picker .currentColorChanged .connect (self .colorSelected )
236
238
237
239
238
- # self.color_dialog .colorSelected.connect(lambda: print("Color Changed"))
240
+ # self.color_picker .colorSelected.connect(lambda: print("Color Changed"))
239
241
240
242
241
243
self .temperature_slider = TemperatureSlider (Qt .Horizontal , self )
@@ -262,65 +264,61 @@ def __init__(self, rgbDimmer = 0):
262
264
# left_column_lo.addWidget(self.hue_slider)
263
265
# left_column_lo.addWidget(self.brighness_slider)
264
266
265
- left_column_lo .addWidget (self .color_dialog )
267
+ left_column_lo .addWidget (self .color_picker )
266
268
267
269
c = QColor (255 ,0 ,0 )
268
- self .color_dialog .setCurrentColor (c )
270
+ self .color_picker .setCurrentColor (c )
269
271
self .colorSelected (c )
270
272
273
+ print (f"width is { self .width ()} " )
274
+ self .setFixedWidth (self .color_picker .width ()/ 2 )
275
+
271
276
def on_button (self ):
272
277
self .dimmer .sendCommand (3 )
273
278
274
279
def set_temperature (self , value ):
275
- b = self .color_dialog .currentColor ().value ()
280
+ b = self .color_picker .currentColor ().value ()
276
281
k = Kelvin2RGB (value ,math .ceil (mapValue (b ,0.0 ,255.0 ,Kelvin2RGB .MIN_BRIGHTNESS ,Kelvin2RGB .MAX_BRIGHTNESS )))
277
- self .color_dialog .blockSignals (True )
278
- self .color_dialog .setCurrentColor (QColor (k .red ,k .green ,k .blue ))
279
- self .color_dialog .blockSignals (False )
282
+ self .color_picker .blockSignals (True )
283
+ self .color_picker .setCurrentColor (QColor (k .red ,k .green ,k .blue ))
284
+ self .color_picker .blockSignals (False )
280
285
self .dimmer .setTemperature (value )
281
286
self .brighness_slider .set_color (rgb_to_hex ((k .red ,k .green ,k .blue ),True ))
282
287
283
288
def set_hue (self , value ):
284
- b = self .color_dialog .currentColor ().value ()
289
+ b = self .color_picker .currentColor ().value ()
285
290
c = QColor .fromHsv (value ,255 ,b )
286
291
self .brighness_slider .set_color (rgb_to_hex ((c .red (),c .green (),c .blue ()),True ))
287
- self .color_dialog .blockSignals (True )
288
- self .color_dialog .setCurrentColor (c )
289
- self .color_dialog .blockSignals (False )
292
+ self .color_picker .blockSignals (True )
293
+ self .color_picker .setCurrentColor (c )
294
+ self .color_picker .blockSignals (False )
290
295
self .dimmer .setHue (value )
291
296
292
297
def set_brightness (self , value ):
293
298
294
299
if value > 0 :
295
- c = self .color_dialog .currentColor ()
300
+ c = self .color_picker .currentColor ()
296
301
c .setHsv (c .hue (),c .saturation (),value )
297
- self .color_dialog .blockSignals (True )
298
- self .color_dialog .setCurrentColor (c )
299
- self .color_dialog .blockSignals (False )
302
+ self .color_picker .blockSignals (True )
303
+ self .color_picker .setCurrentColor (c )
304
+ self .color_picker .blockSignals (False )
300
305
self .dimmer .setBrightness (value )
301
306
302
- # def set_color(self):
303
- # # color_dialog = QColorDialog()
304
- # self.color_dialog.show()
305
- # # self.color_dialog.currentColorChanged.connect(self.colorSelected)
306
- # # color = self.color_dialog.getColor()
307
- # # color = QColorDialog.getColor()
308
-
309
- # # if color.isValid():
310
- # # self.dimmer.setRGB(color.red(),color.green(),color.blue())
311
307
312
308
def colorSelected (self ,color ):
313
309
try :
314
310
if color .isValid ():
315
311
316
312
self .dimmer .setRGB (color .red (),color .green (),color .blue ())
313
+
317
314
self .brighness_slider .blockSignals (True )
318
315
self .hue_slider .blockSignals (True )
319
316
320
317
self .brighness_slider .setValue (color .value ())
321
- self . brighness_slider . set_color ( rgb_to_hex (( color . red (), color . green (), color . blue ()), True ))
318
+
322
319
if color .hue () > - 1 :
323
320
self .hue_slider .setValue (color .hue ())
321
+ self .brighness_slider .set_color (rgb_to_hex ((color .red (),color .green (),color .blue ()),True ))
324
322
325
323
self .brighness_slider .blockSignals (False )
326
324
self .hue_slider .blockSignals (False )
0 commit comments