Merge pull request #3358 from tangentaudio/qtvcp_calc_fix

QtVcp calculator and operator value line improvements

Author: snowgoer540

docs/src/gui/qtvcp-widgets.adoc

@@ -2738,7 +2738,7 @@ It is based on PyQt's _QDialog_.
 .QtVCP `CalculatorDialog`: Calculator Dialog Widget
 image::images/qtvcp_calculator.png["QtVCP CalculatorDialog: Calculator Dialog Widget",scale="25%"]
 
-This is a dialog to *display a calculator for numeric entry*, such as origin offset.
+This is a dialog to *display a calculator for numeric entry*, such as origin offset, spindle RPM, etc.
 
 It returns the entry via `STATUS` messages using a Python `DICT`.
 
@@ -2748,12 +2748,15 @@ When using ``STATUS``'s `request-dialog` function, the default launch name is *`
 
 It is based on PyQt's _QDialog_.
 
-==== INI file options for CALCULATOR
+==== Preferences file options
 
-In the `DISPLAY` section of the INI file the following options may be set:
+In the `CALCULATOR` section of the preferences file the following options may be set:
 
-* `CALCULATOR_CONST_VALUES` - a comma-delimited list of common values you might enter, that will appear on a dedicated row of buttons at the bottom of the calculator.  e.g. setting to `0.100,-0.100` would provide two buttons for +0.100 and -0.100 which are commonly used when edge-finding on inch mills.  Up to six (6) values may be entered, beyond that the list will be truncated.  Values must be valid floating point or integer.
-* `CALCULATOR_ON_SHOW` - optionally set to `CLEAR_ALL` to issue a "Clear All" each time the calculator is shown.  This will clear any previously entered values from the last time the calculator was used and open with the display value set to `0`
+* `constValuesList` - A comma-delimited list of common values you might enter, that will appear on a dedicated row of buttons at the bottom of the calculator.  e.g. setting to `0.100, -0.100` would provide two buttons for +0.100 and -0.100 which are commonly used when edge-finding on inch mills.  Up to six (6) values may be entered, beyond that the list will be truncated.  Values must be valid floating point or integer.
+* `onShowBehavior` - A list of optional behaviors that will be triggered when the calculator dialog is shown.  Each option must be separated by a comma.
+  - `CLEAR_ALL` to issue a *Clear All* each time the calculator is shown.  This will clear any previously entered values from the last time the calculator was used and open with the display value set to `0`
+  - `FORCE_FOCUS` will force the focus to the calculator input field when the widget is shown.  This will allow a physical keyboard to provide input to the widget properly without additional clicks.  Also, it has the side-effect of selecting the current value, such that typing from a physical keyboard will replace the existing value unless the text selection is changed.
+* `acceptOnReturnKey` - If set to `True`, the calculator will accept the current value and close the dialog when the return key is pressed.  If set to `False`, the return key will be ignored and the *Apply* button must be clicked.
 
 [[sub:qtvcp:widgets:runfromlinedialog]]
 === `RunFromLine` - Run-From-Line Dialog Widget

lib/python/qtvcp/widgets/calculator.py

@@ -20,6 +20,12 @@ class Calculator(QDialog):
     def __init__(self, parent=None):
         super(Calculator, self).__init__(parent)
 
+        try:
+            self.PREFS_ = self.QTVCP_INSTANCE_.PREFS_
+            self.PREF_SECTION = 'CALCULATOR'
+        except:
+            self.PREFS_ = None
+
         self.pendingAdditiveOperator = ''
         self.pendingMultiplicativeOperator = ''
 
@@ -76,7 +82,6 @@ def __init__(self, parent=None):
         mainLayout = QGridLayout()
         mainLayout.setSizeConstraint(QLayout.SetFixedSize)
 
-        mainLayout.addWidget(self.display, 0, 0, 1, 6)
         mainLayout.addWidget(self.backspaceButton, 1, 0, 1, 1)
         mainLayout.addWidget(self.axisButton, 1, 1, 1, 2)
         mainLayout.addWidget(self.clearButton, 1, 3, 1, 1)
@@ -108,17 +113,21 @@ def __init__(self, parent=None):
         mainLayout.addWidget(self.to_mm_btn, 6, 0)
         mainLayout.addWidget(self.to_inch_btn, 6, 1)
         mainLayout.addWidget(self.tpi_btn, 6, 2)
+        
+        if self.PREFS_:
+            constValues = self.PREFS_.getpref('constValuesList', None, str, self.PREF_SECTION)
+            if constValues is not None:
+                self.constButtons = []
+                constValues = ''.join(constValues.split())
+                for value in constValues.split(',')[:6]:
+                    constButton = QPushButton(value)
+                    constButton.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
+                    constButton.clicked.connect(self.constClicked)
+                    mainLayout.addWidget(constButton, len(self.constButtons) + 1, 6)
+                    self.constButtons.append(constButton)
+
+        mainLayout.addWidget(self.display, 0, 0, 1, mainLayout.columnCount())
 
-        self.constButtons = []
-        constValues = INFO.get_error_safe_setting('DISPLAY', 'CALCULATOR_CONST_VALUES', None, warning=False)
-        if constValues is not None:
-            constValues = ''.join(constValues.split())
-            for value in constValues.split(',')[:6]:
-                constButton = QPushButton(value)
-                constButton.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
-                constButton.clicked.connect(self.constClicked)
-                mainLayout.addWidget(constButton, 7, len(self.constButtons))
-                self.constButtons.append(constButton)
 
         self.backButton = QPushButton('Back')
         self.backButton.setSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
@@ -141,6 +150,10 @@ def __init__(self, parent=None):
         self.bBox.rejected.connect(self.reject)
         self.bBox.accepted.connect(self.accept)
 
+        if self.PREFS_:
+            if self.PREFS_.getpref('acceptOnReturnKey', False, bool, self.PREF_SECTION):
+                self.display.returnPressed.connect(self.accept)
+        
         calc_layout = QVBoxLayout()
         calc_layout.addLayout(mainLayout)
         calc_layout.addWidget(self.bBox)
@@ -157,12 +170,17 @@ def __init__(self, parent=None):
         STATUS.connect('all-homed', lambda w: self.axisButton.setEnabled(True))
         STATUS.connect('not-all-homed', lambda w, data: self.axisButton.setEnabled(False))
 
-        self.behaviorOnShow = INFO.get_error_safe_setting('DISPLAY', 'CALCULATOR_ON_SHOW', None, warning=None)
+        if self.PREFS_:
+            self.behaviorOnShow = self.PREFS_.getpref('onShowBehavior', None, str, self.PREF_SECTION)
+        else:
+            self.behaviorOnShow = None
 
     def showEvent(self, event):
         if self.behaviorOnShow is not None:
-            if self.behaviorOnShow.upper() == 'CLEAR_ALL':
+            if 'CLEAR_ALL' in self.behaviorOnShow.upper():
                 self.clearAll()
+            if 'FORCE_FOCUS' in self.behaviorOnShow.upper():
+                self.display.setFocus()
 
     def digitClicked(self):
         clickedButton = self.sender()

lib/python/qtvcp/widgets/operator_value_line.py

@@ -56,27 +56,6 @@ def __init__(self, parent=None):
         STATUS.connect('all-homed', lambda w: self.setEnabled(STATUS.machine_is_on()))
         STATUS.connect('general',self.return_value)
 
-    def getSpeedText(self):
-        text = str(self.text()).strip()
-        return text
-
-
-    def keyPressEvent(self, event):
-        super(OperatorValue, self).keyPressEvent(event)
-        if event.key() == Qt.Key_Up:
-            self.increase()
-        if event.key() == Qt.Key_Down:
-            self.decrease()
-
-    def increase(self):
-        LOG.debug('increase')
-        STATUS.emit('spindle-increase')
-
-    def decrease(self):
-        LOG.debug('decrease')
-        STATUS.emit('spindle-decrease')
-
-
 class OperatorValueLine(OperatorValue):
     def __init__(self, parent=None):
         super(OperatorValueLine, self).__init__(parent)
@@ -85,25 +64,21 @@ def __init__(self, parent=None):
         self.soft_keyboard = False
         self.dialog_keyboard = False
         self.issue_mdi_on_submit = False
+        self.issue_mdi_on_return = False
         self.mdi_command_format = "M3 S{value}"
         self.pending_value = False
         self._input_panel_full = SoftInputWidget(self, 'default')
         self.installEventFilter(self)
 
         self.returnPressed.connect(self.handleReturnKey)
 
-
     def handleReturnKey(self):
         self.setFocus()
         self.setCursorPosition(len(self.text())+1)
-        if self.issue_mdi_on_submit:
+        if self.issue_mdi_on_return:
             self.pending_value = False
             self._style_polish('isPendingValue', self.pending_value)
             self.submit(self.mdi_command_format)
-        else:
-            self.pending_value = True
-            self._style_polish('isPendingValue', self.pending_value)
-
 
     def submit(self, mdi_format):
         value = str(self.text()).strip()
@@ -174,6 +149,15 @@ def reset_issue_mdi_on_submit(self):
 
     issue_mdi_on_submit_option = pyqtProperty(bool, get_issue_mdi_on_submit, set_issue_mdi_on_submit, reset_issue_mdi_on_submit)
 
+    def set_issue_mdi_on_return(self, data):
+            self.issue_mdi_on_return = data
+    def get_issue_mdi_on_return(self):
+        return self.issue_mdi_on_return
+    def reset_issue_mdi_on_return(self):
+        self.issue_mdi_on_return = False
+
+    issue_mdi_on_return_option = pyqtProperty(bool, get_issue_mdi_on_return, set_issue_mdi_on_return, reset_issue_mdi_on_return)
+
     def set_mdi_command_format(self, data):
         self.mdi_command_format = data
     def get_mdi_command_format(self):