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

- changed the FCDoubleSpinner, FCSpinner and FCEntry GUI elements to allow passing an alignemnt value: left, right or center (not yet available in the app)

Browse Source
This commit is contained in:
Marius Stanciu
2019-12-05 15:53:06 +02:00
parent 0d0f872244
commit af00a7f212
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
flatcamGUI/GUIElements.py
View File

@@ -359,12 +359,21 @@ class IntEntry(QtWidgets.QLineEdit):
class FCEntry(QtWidgets.QLineEdit):
def __init__(self, decimals=None, parent=None):
def __init__(self, decimals=None, alignment=None, parent=None):
super(FCEntry, self).__init__(parent)
self.readyToEdit = True
self.editingFinished.connect(self.on_edit_finished)
self.decimals = decimals if decimals is not None else 4
if alignment:
if alignment == 'center':
align_val = QtCore.Qt.AlignHCenter
elif alignment == 'right':
align_val = QtCore.Qt.AlignRight
else:
align_val = QtCore.Qt.AlignLeft
self.setAlignment(align_val)
def on_edit_finished(self):
self.clearFocus()
@@ -519,7 +528,7 @@ class FCSpinner(QtWidgets.QSpinBox):
returnPressed = QtCore.pyqtSignal()
def __init__(self, suffix=None, parent=None):
def __init__(self, suffix=None, alignment=None, parent=None):
super(FCSpinner, self).__init__(parent)
self.readyToEdit = True
self.editingFinished.connect(self.on_edit_finished)
@@ -528,6 +537,15 @@ class FCSpinner(QtWidgets.QSpinBox):
if suffix:
self.setSuffix(' %s' % str(suffix))
if alignment:
if alignment == 'center':
align_val = QtCore.Qt.AlignHCenter
elif alignment == 'right':
align_val = QtCore.Qt.AlignRight
else:
align_val = QtCore.Qt.AlignLeft
self.setAlignment(align_val)
self.prev_readyToEdit = True
def eventFilter(self, object, event):
@@ -594,7 +612,7 @@ class FCDoubleSpinner(QtWidgets.QDoubleSpinBox):
returnPressed = QtCore.pyqtSignal()
def __init__(self, suffix=None, parent=None):
def __init__(self, suffix=None, alignment=None, parent=None):
super(FCDoubleSpinner, self).__init__(parent)
self.readyToEdit = True
@@ -609,6 +627,15 @@ class FCDoubleSpinner(QtWidgets.QDoubleSpinBox):
if suffix:
self.setSuffix(' %s' % str(suffix))
if alignment:
if alignment == 'center':
align_val = QtCore.Qt.AlignHCenter
elif alignment == 'right':
align_val = QtCore.Qt.AlignRight
else:
align_val = QtCore.Qt.AlignLeft
self.setAlignment(align_val)
self.prev_readyToEdit = True
def on_edit_finished(self):