From f5e25622a788d931a6cf4ff59d35d23f24e703a9 Mon Sep 17 00:00:00 2001
From: Kenneth Lyons <ixjlyons@gmail.com>
Date: Tue, 12 Nov 2019 08:36:16 -0800
Subject: [PATCH] Validate min/max text inputs in ViewBoxMenu (#1074)

---
 .../graphicsItems/ViewBox/ViewBoxMenu.py      | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/pyqtgraph/graphicsItems/ViewBox/ViewBoxMenu.py b/pyqtgraph/graphicsItems/ViewBox/ViewBoxMenu.py
index 74a861d0..1f44bdd6 100644
--- a/pyqtgraph/graphicsItems/ViewBox/ViewBoxMenu.py
+++ b/pyqtgraph/graphicsItems/ViewBox/ViewBoxMenu.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from ...Qt import QtCore, QtGui, QT_LIB
 from ...python2_3 import asUnicode
 from ...WidgetGroup import WidgetGroup
@@ -48,8 +49,8 @@ class ViewBoxMenu(QtGui.QMenu):
             connects = [
                 (ui.mouseCheck.toggled, 'MouseToggled'),
                 (ui.manualRadio.clicked, 'ManualClicked'),
-                (ui.minText.editingFinished, 'MinTextChanged'),
-                (ui.maxText.editingFinished, 'MaxTextChanged'),
+                (ui.minText.editingFinished, 'RangeTextChanged'),
+                (ui.maxText.editingFinished, 'RangeTextChanged'),
                 (ui.autoRadio.clicked, 'AutoClicked'),
                 (ui.autoPercentSpin.valueChanged, 'AutoSpinChanged'),
                 (ui.linkCombo.currentIndexChanged, 'LinkComboChanged'),
@@ -162,14 +163,10 @@ class ViewBoxMenu(QtGui.QMenu):
     def xManualClicked(self):
         self.view().enableAutoRange(ViewBox.XAxis, False)
         
-    def xMinTextChanged(self):
+    def xRangeTextChanged(self):
         self.ctrl[0].manualRadio.setChecked(True)
-        self.view().setXRange(float(self.ctrl[0].minText.text()), float(self.ctrl[0].maxText.text()), padding=0)
+        self.view().setXRange(*self._validateRangeText(0), padding=0)
 
-    def xMaxTextChanged(self):
-        self.ctrl[0].manualRadio.setChecked(True)
-        self.view().setXRange(float(self.ctrl[0].minText.text()), float(self.ctrl[0].maxText.text()), padding=0)
-        
     def xAutoClicked(self):
         val = self.ctrl[0].autoPercentSpin.value() * 0.01
         self.view().enableAutoRange(ViewBox.XAxis, val)
@@ -194,13 +191,9 @@ class ViewBoxMenu(QtGui.QMenu):
     def yManualClicked(self):
         self.view().enableAutoRange(ViewBox.YAxis, False)
         
-    def yMinTextChanged(self):
+    def yRangeTextChanged(self):
         self.ctrl[1].manualRadio.setChecked(True)
-        self.view().setYRange(float(self.ctrl[1].minText.text()), float(self.ctrl[1].maxText.text()), padding=0)
-        
-    def yMaxTextChanged(self):
-        self.ctrl[1].manualRadio.setChecked(True)
-        self.view().setYRange(float(self.ctrl[1].minText.text()), float(self.ctrl[1].maxText.text()), padding=0)
+        self.view().setYRange(*self._validateRangeText(1), padding=0)
         
     def yAutoClicked(self):
         val = self.ctrl[1].autoPercentSpin.value() * 0.01
@@ -265,6 +258,20 @@ class ViewBoxMenu(QtGui.QMenu):
             if changed:
                 c.setCurrentIndex(0)
                 c.currentIndexChanged.emit(c.currentIndex())
+
+    def _validateRangeText(self, axis):
+        """Validate range text inputs. Return current value(s) if invalid."""
+        inputs = (self.ctrl[axis].minText.text(),
+                  self.ctrl[axis].maxText.text())
+        vals = self.view().viewRange()[axis]
+        for i, text in enumerate(inputs):
+            try:
+                vals[i] = float(text)
+            except ValueError:
+                # could not convert string to float
+                pass
+        return vals
+
         
 from .ViewBox import ViewBox