bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- application wide change: introduced the precision parameters in Edit -> Preferences who will control how many decimals to use in the app parameters

Browse Source
This commit is contained in:
Marius Stanciu
2019-12-05 15:18:54 +02:00
parent 19b5f732b5
commit 0d0f872244
53 changed files with 481 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
flatcamGUI/GUIElements.py
View File

@@ -145,7 +145,7 @@ class RadioSet(QtWidgets.QWidget):
class LengthEntry(QtWidgets.QLineEdit):
def __init__(self, output_units='IN', parent=None):
def __init__(self, output_units='IN', decimals=None, parent=None):
super(LengthEntry, self).__init__(parent)
self.output_units = output_units
@@ -160,6 +160,7 @@ class LengthEntry(QtWidgets.QLineEdit):
}
self.readyToEdit = True
self.editingFinished.connect(self.on_edit_finished)
self.decimals = decimals if decimals is not None else 4
def on_edit_finished(self):
self.clearFocus()
@@ -203,8 +204,9 @@ class LengthEntry(QtWidgets.QLineEdit):
log.warning("Could not parse value in entry: %s" % str(raw))
return None
def set_value(self, val):
self.setText(str('%.4f' % val))
def set_value(self, val, decimals=None):
dec_digits = decimals if decimals is not None else self.decimals
self.setText(str('%.*f' % (dec_digits, val)))
def sizeHint(self):
default_hint_size = super(LengthEntry, self).sizeHint()
@@ -212,10 +214,11 @@ class LengthEntry(QtWidgets.QLineEdit):
class FloatEntry(QtWidgets.QLineEdit):
def __init__(self, parent=None):
def __init__(self, decimals=None, parent=None):
super(FloatEntry, self).__init__(parent)
self.readyToEdit = True
self.editingFinished.connect(self.on_edit_finished)
self.decimals = decimals if decimals is not None else 4
def on_edit_finished(self):
self.clearFocus()
@@ -251,9 +254,10 @@ class FloatEntry(QtWidgets.QLineEdit):
log.error("Could not evaluate val: %s, error: %s" % (str(raw), str(e)))
return None
def set_value(self, val):
def set_value(self, val, decimals=None):
dig_digits = decimals if decimals is not None else self.decimals
if val is not None:
self.setText("%.4f" % float(val))
self.setText("%.*f" % (dig_digits, float(val)))
else:
self.setText("")
@@ -263,10 +267,11 @@ class FloatEntry(QtWidgets.QLineEdit):
class FloatEntry2(QtWidgets.QLineEdit):
def __init__(self, parent=None):
def __init__(self, decimals=None, parent=None):
super(FloatEntry2, self).__init__(parent)
self.readyToEdit = True
self.editingFinished.connect(self.on_edit_finished)
self.decimals = decimals if decimals is not None else 4
def on_edit_finished(self):
self.clearFocus()
@@ -295,8 +300,9 @@ class FloatEntry2(QtWidgets.QLineEdit):
log.error("Could not evaluate val: %s, error: %s" % (str(raw), str(e)))
return None
def set_value(self, val):
self.setText("%.4f" % val)
def set_value(self, val, decimals=None):
dig_digits = decimals if decimals is not None else self.decimals
self.setText("%.*f" % (dig_digits, val))
def sizeHint(self):
default_hint_size = super(FloatEntry2, self).sizeHint()