upgrade value edit

Author: ArnoChenFx

NodeGraphQt/widgets/node_widgets.py

@@ -417,7 +417,7 @@ def __init__(self, parent=None, name='', label='', text='', ext="*"):
         self._ext = ext
 
     def _on_select_file(self):
-        file_path = file_dialog.getOpenFileName()
+        file_path = file_dialog.getOpenFileName(ext_filter=self._ext)
         file = file_path[0] or None
         if file:
             self.value = file

NodeGraphQt/widgets/properties.py

@@ -333,6 +333,7 @@ class _valueMenu(QtWidgets.QMenu):
 
     mouseMove = QtCore.Signal(object)
     mouseRelease = QtCore.Signal(object)
+    stepChange = QtCore.Signal()
 
     def __init__(self, parent=None):
         super(_valueMenu, self).__init__(parent)
@@ -357,6 +358,8 @@ def mouseMoveEvent(self, event):
 
         action = self.actionAt(event.pos())
         if action:
+            if action is not self.last_action:
+                self.stepChange.emit()
             self.last_action = action
             self.step = action.step
         elif self.last_action:
@@ -389,16 +392,17 @@ def __init__(self, parent=None):
         self._data_type = float
         self.setText("0")
 
-        self.pre_x = 0
+        self.pre_x = None
+        self.pre_val = None
         self._step = 1
-        self._tmp_value = 0
         self._speed = 0.1
 
         self.textChanged.connect(self._on_text_changed)
 
         self.menu = _valueMenu()
         self.menu.mouseMove.connect(self.mouseMoveEvent)
         self.menu.mouseRelease.connect(self.mouseReleaseEvent)
+        self.menu.stepChange.connect(self._reset)
         steps = [0.001, 0.01, 0.1, 1, 10, 100, 1000]
         self.menu.set_steps(steps)
 
@@ -407,25 +411,27 @@ def __init__(self, parent=None):
     def _on_text_changed(self, value):
         self.valueChanged.emit(self.value())
 
+    def _reset(self):
+        self.pre_x = None
+
     def mouseMoveEvent(self, event):
         if self.mid_state:
             if self.pre_x is None:
                 self.pre_x = event.x()
-            self.set_step(self.menu.step)
-            delta = (event.x() - self.pre_x)
-            self._tmp_value += delta * self._speed * self._step
-            if abs(self._tmp_value) > self._step:
-                value = self.value() + delta * self._step
+                self.pre_val = self.value()
+            else:
+                self.set_step(self.menu.step)
+                delta = event.x() - self.pre_x
+                value = self.pre_val + int(delta*self._speed) * self._step
                 self.setValue(value)
-                self._tmp_value = 0
-            self.pre_x = event.x()
+
+
         super(_valueEdit,self).mouseMoveEvent(event)
 
     def mousePressEvent(self, event):
         if event.button() == QtCore.Qt.MiddleButton:
             self.mid_state = True
-            self.pre_x = None
-            self._tmp_value = 0
+            self._reset()
             self.menu.exec_(QtGui.QCursor.pos())
         super(_valueEdit,self).mousePressEvent(event)
 

NodeGraphQt/widgets/viewer.py

@@ -246,6 +246,9 @@ def mousePressEvent(self, event):
         nodes = [i for i in items if isinstance(i, AbstractNodeItem)]
         pipes = [i for i in items if isinstance(i, Pipe)]
 
+        if nodes:
+            self.MMB_state = False
+
         # toggle extend node selection.
         if self.LMB_state:
             if self.SHIFT_state: