Procházet zdrojové kódy

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

Marius Stanciu před 6 roky
rodič
revize
af00a7f212
2 změnil soubory, kde provedl 31 přidání a 3 odebrání
  1. 1 0
      README.md
  2. 30 3
      flatcamGUI/GUIElements.py

+ 1 - 0
README.md

@@ -16,6 +16,7 @@ CAD program, and create G-Code for Isolation routing.
 - Properties Tool - added a new parameter, the copper area which show the area of the copper features for the Gerber objects
 - Copper Thieving Tool - added a default value for the mask clearance when generating pattern plating mask
 - application wide change: introduced the precision parameters in Edit -> Preferences who will control how many decimals to use in the app parameters
+- changed the FCDoubleSpinner, FCSpinner and FCEntry GUI elements to allow passing an alignemnt value: left, right or center (not yet available in the app)
 
 4.12.2019 
 

+ 30 - 3
flatcamGUI/GUIElements.py

@@ -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):