- made FCDoubleSpinner to use either comma or dot as a decimal separator
This commit is contained in:
@@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing.
|
|||||||
9.10.2019
|
9.10.2019
|
||||||
|
|
||||||
- updated the Rules Check Tool - solved some issues
|
- updated the Rules Check Tool - solved some issues
|
||||||
|
- made FCDoubleSpinner to use either comma or dot as a decimal separator
|
||||||
|
|
||||||
8.10.2019
|
8.10.2019
|
||||||
|
|
||||||
|
|||||||
@@ -565,17 +565,23 @@ class FCSpinner(QtWidgets.QSpinBox):
|
|||||||
|
|
||||||
|
|
||||||
class FCDoubleSpinner(QtWidgets.QDoubleSpinBox):
|
class FCDoubleSpinner(QtWidgets.QDoubleSpinBox):
|
||||||
def __init__(self, parent=None, decimals=None):
|
def __init__(self, parent=None):
|
||||||
super(FCDoubleSpinner, self).__init__(parent)
|
super(FCDoubleSpinner, self).__init__(parent)
|
||||||
self.readyToEdit = True
|
self.readyToEdit = True
|
||||||
|
|
||||||
if decimals:
|
|
||||||
dec = int(decimals)
|
|
||||||
else:
|
|
||||||
dec = int(4)
|
|
||||||
|
|
||||||
self.editingFinished.connect(self.on_edit_finished)
|
self.editingFinished.connect(self.on_edit_finished)
|
||||||
self.lineEdit().installEventFilter(self)
|
self.lineEdit().installEventFilter(self)
|
||||||
|
self.lineEdit().setValidator(QtGui.QRegExpValidator(QtCore.QRegExp("-?[0-9]*[.,]?[0-9]*"), self))
|
||||||
|
|
||||||
|
def valueFromText(self, p_str):
|
||||||
|
text = p_str.replace(',', '.')
|
||||||
|
try:
|
||||||
|
return float(text)
|
||||||
|
except ValueError:
|
||||||
|
return 0.0
|
||||||
|
|
||||||
|
def validate(self, p_str, p_int):
|
||||||
|
return QtGui.QValidator.Acceptable, p_str, p_int
|
||||||
|
|
||||||
def eventFilter(self, object, event):
|
def eventFilter(self, object, event):
|
||||||
if event.type() == QtCore.QEvent.MouseButtonPress:
|
if event.type() == QtCore.QEvent.MouseButtonPress:
|
||||||
|
|||||||
Reference in New Issue
Block a user