- in GUI element FCDoubleSpinner fixed an range issue
This commit is contained in:
parent
26ac43bd2e
commit
3430d86dba
|
@ -13,6 +13,7 @@ CHANGELOG for FlatCAM beta
|
|||
- in CNCJob UI Autolevelling - added a save dialog for the probing GCode
|
||||
- added a new GUI element, a DoubleSlider
|
||||
- in CNCJob UI Autolevelling - GRBL controller - Control: trying to add DoubleSlider + DoubleSpinner combo controls
|
||||
- in GUI element FCDoubleSpinner fixed an range issue
|
||||
|
||||
21.08.2020
|
||||
|
||||
|
|
|
@ -946,6 +946,9 @@ class FCDoubleSlider(QtWidgets.QSlider):
|
|||
def value(self):
|
||||
return float(super(FCDoubleSlider, self).value()) / self._multi
|
||||
|
||||
def get_value(self):
|
||||
return self.value()
|
||||
|
||||
def setMinimum(self, value):
|
||||
return super(FCDoubleSlider, self).setMinimum(value * self._multi)
|
||||
|
||||
|
@ -961,9 +964,12 @@ class FCDoubleSlider(QtWidgets.QSlider):
|
|||
def set_value(self, value):
|
||||
super(FCDoubleSlider, self).setValue(int(value * self._multi))
|
||||
|
||||
def set_precision(self, decimals):
|
||||
self._multi = 10 ** decimals
|
||||
|
||||
def set_range(self, min, max):
|
||||
self.blockSignals(True)
|
||||
self.setRange(min, max)
|
||||
self.setRange(min * self._multi, max * self._multi)
|
||||
self.blockSignals(False)
|
||||
|
||||
|
||||
|
|
|
@ -2281,7 +2281,7 @@ class CNCObjectUI(ObjectUI):
|
|||
self.jog_step_entry = FCSliderWithDoubleSpinner()
|
||||
self.jog_step_entry.set_precision(self.decimals)
|
||||
self.jog_step_entry.setSingleStep(0.1)
|
||||
self.jog_step_entry.set_range(0, 99999.9999)
|
||||
self.jog_step_entry.set_range(0, 500)
|
||||
|
||||
grbl_ctrl2_grid.addWidget(self.jog_step_label, 0, 0)
|
||||
grbl_ctrl2_grid.addWidget(self.jog_step_entry, 0, 1)
|
||||
|
@ -2295,7 +2295,7 @@ class CNCObjectUI(ObjectUI):
|
|||
self.jog_fr_entry = FCSliderWithDoubleSpinner()
|
||||
self.jog_fr_entry.set_precision(self.decimals)
|
||||
self.jog_fr_entry.setSingleStep(10)
|
||||
self.jog_fr_entry.set_range(0, 99999.9999)
|
||||
self.jog_fr_entry.set_range(0, 10000)
|
||||
|
||||
grbl_ctrl2_grid.addWidget(self.jog_fr_label, 1, 0)
|
||||
grbl_ctrl2_grid.addWidget(self.jog_fr_entry, 1, 1)
|
||||
|
|
Loading…
Reference in New Issue