Skip to content

Commit

Permalink
overflow error fix
Browse files Browse the repository at this point in the history
  • Loading branch information
IlgarLunin committed Sep 16, 2019
1 parent d3c2e94 commit 64c9f63
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 24 deletions.
8 changes: 4 additions & 4 deletions PyFlow/Packages/PyFlowBase/Factories/PinInputWidgetFactory.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,10 @@ def setWidgetValue(self, val):
self.le.setText(str(val))


class EnumInputWIdget(InputWidgetSingle):
"""docstring for EnumInputWIdget."""
class EnumInputWidget(InputWidgetSingle):
"""docstring for EnumInputWidget."""
def __init__(self, parent=None, **kwds):
super(EnumInputWIdget, self).__init__(parent=parent, **kwds)
super(EnumInputWidget, self).__init__(parent=parent, **kwds)
values = []
if PinSpecifires.VALUE_LIST in kwds["pinAnnotations"]:
values = kwds["pinAnnotations"][PinSpecifires.VALUE_LIST]
Expand Down Expand Up @@ -296,7 +296,7 @@ def getInputWidget(dataType, dataSetter, defaultValue, widgetVariant=DEFAULT_WID
elif widgetVariant == "PathWidget":
return PathInputWidget(dataSetCallback=dataSetter, defaultValue=defaultValue, **kwds)
elif widgetVariant == "EnumWidget":
return EnumInputWIdget(dataSetCallback=dataSetter, defaultValue=defaultValue, **kwds)
return EnumInputWidget(dataSetCallback=dataSetter, defaultValue=defaultValue, **kwds)
elif widgetVariant == "ObjectPathWIdget":
return ObjectPathWIdget(dataSetCallback=dataSetter, defaultValue=defaultValue, **kwds)
if dataType == 'BoolPin':
Expand Down
33 changes: 13 additions & 20 deletions PyFlow/UI/Widgets/QtSliders.py
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ def __init__(self, parent=None, decimals=3, *args, **kwargs):
self.valueChanged.connect(self.emitDoubleValueChanged)

def setDecimals(self, decimals):
self._multi = clamp(10 ** decimals, 1, 323)
self._multi = 10 ** decimals

def emitDoubleValueChanged(self):
value = float(super(doubleSlider, self).value()) / self._multi
Expand Down Expand Up @@ -450,22 +450,17 @@ def __init__(self, parent, type="float", style=0, name=None, *args):
self.sld.setMinimumHeight(h)
self.input.setMaximumHeight(h)
self.input.setMinimumHeight(h)
self.stypeSheetType = style
if self.stypeSheetType == 0:
self.styleSheetType = style
if self.styleSheetType == 0:
self.layout().setSpacing(0)
self.sld.setStyleSheet(editableStyleSheet(
).getSliderStyleSheet("sliderStyleSheetA"))
elif self.stypeSheetType == 1:
self.sld.setStyleSheet(editableStyleSheet(
).getSliderStyleSheet("sliderStyleSheetB"))
self.sld.setStyleSheet(editableStyleSheet().getSliderStyleSheet("sliderStyleSheetA"))
elif self.styleSheetType == 1:
self.sld.setStyleSheet(editableStyleSheet().getSliderStyleSheet("sliderStyleSheetB"))
if self.type == "int":
self.sld.valueChanged.connect(
lambda: self.setValue(self.sld.value()))
self.sld.valueChanged.connect(lambda: self.setValue(self.sld.value()))
else:
self.sld.doubleValueChanged.connect(
lambda: self.setValue(self.sld.value()))
self.input.editingFinished.connect(
lambda: self.setValue(self.input.value()))
self.sld.doubleValueChanged.connect(lambda: self.setValue(self.sld.value()))
self.input.editingFinished.connect(lambda: self.setValue(self.input.value()))
self._value = 0.0
self._dispMin = 0.0
self._dispMax = 1.0
Expand All @@ -476,11 +471,11 @@ def __init__(self, parent, type="float", style=0, name=None, *args):
self.setValue(0.5)

def update(self):
if self.stypeSheetType == 0:
if self.styleSheetType == 0:
self.layout().setSpacing(0)
self.sld.setStyleSheet(editableStyleSheet(
).getSliderStyleSheet("sliderStyleSheetA"))
elif self.stypeSheetType == 1:
elif self.styleSheetType == 1:
self.sld.setStyleSheet(editableStyleSheet(
).getSliderStyleSheet("sliderStyleSheetB"))
super(pyf_Slider, self).update()
Expand All @@ -506,11 +501,9 @@ def value(self):
def setValue(self, value):
if value >= self.minimum and value <= self.maximum:
if value > self._dispMax:
self.setDisplayMaximum(
min(self.maximum, value * 2))
self.setDisplayMaximum(min(self.maximum, value * 2))
if value < self._dispMin:
self.setDisplayMinimun(
max(self.minimum, value * 2))
self.setDisplayMinimun(max(self.minimum, value * 2))
self.sld.setValue(value)
self._value = self.sld.value()
self.input.setValue(self.value())
Expand Down

0 comments on commit 64c9f63

Please sign in to comment.