Skip to content

Commit ff7354c

Browse files
authored
Merge pull request #193 from Alpaca233/cicero_iris
Fix illumination/emission iris for Cicero
2 parents b2c5ae5 + 2ea267a commit ff7354c

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

software/control/widgets.py

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -761,21 +761,24 @@ def __init__(self, xlight):
761761

762762
self.dropdown_filter_slider.valueChanged.connect(self.set_filter_slider)
763763

764-
illumination_iris = self.xlight.get_illumination_iris()
765-
self.slider_illumination_iris.setValue(illumination_iris)
766-
self.spinbox_illumination_iris.setValue(illumination_iris)
767-
emission_iris = self.xlight.get_emission_iris()
768-
self.slider_emission_iris.setValue(emission_iris)
769-
self.spinbox_emission_iris.setValue(emission_iris)
770-
771-
self.slider_illumination_iris.sliderReleased.connect(lambda: self.update_illumination_iris(True))
772-
self.slider_emission_iris.sliderReleased.connect(lambda: self.update_emission_iris(True))
773-
# Update spinbox values during sliding without sending to hardware
774-
self.slider_illumination_iris.valueChanged.connect(self.spinbox_illumination_iris.setValue)
775-
self.slider_emission_iris.valueChanged.connect(self.spinbox_emission_iris.setValue)
776-
777-
self.spinbox_illumination_iris.editingFinished.connect(lambda: self.update_illumination_iris(False))
778-
self.spinbox_emission_iris.editingFinished.connect(lambda: self.update_emission_iris(False))
764+
if self.xlight.has_illumination_iris_diaphragm:
765+
illumination_iris = self.xlight.illumination_iris
766+
self.slider_illumination_iris.setValue(illumination_iris)
767+
self.spinbox_illumination_iris.setValue(illumination_iris)
768+
769+
self.slider_illumination_iris.sliderReleased.connect(lambda: self.update_illumination_iris(True))
770+
# Update spinbox values during sliding without sending to hardware
771+
self.slider_illumination_iris.valueChanged.connect(self.spinbox_illumination_iris.setValue)
772+
self.spinbox_illumination_iris.editingFinished.connect(lambda: self.update_illumination_iris(False))
773+
if self.xlight.has_emission_iris_diaphragm:
774+
emission_iris = self.xlight.emission_iris
775+
self.slider_emission_iris.setValue(emission_iris)
776+
self.spinbox_emission_iris.setValue(emission_iris)
777+
778+
self.slider_emission_iris.sliderReleased.connect(lambda: self.update_emission_iris(True))
779+
# Update spinbox values during sliding without sending to hardware
780+
self.slider_emission_iris.valueChanged.connect(self.spinbox_emission_iris.setValue)
781+
self.spinbox_emission_iris.editingFinished.connect(lambda: self.update_emission_iris(False))
779782

780783
def init_ui(self):
781784

0 commit comments

Comments
 (0)