Merge branch '79'

src/gui_qt/data/valueeditwidget.py

@@ -259,10 +259,7 @@ class ValueModel(QtCore.QAbstractTableModel):
         row = idx.row()
         if role in [QtCore.Qt.DisplayRole, QtCore.Qt.EditRole]:
             val = self._data[row][idx.column()]
-            if isinstance(val, complex):
-                return f'{val.real:.8g}{val.imag:+.8g}j'
-            else:
-                return f'{val:.8g}'
+            return self.as_string(val)
 
         elif role == QtCore.Qt.BackgroundRole:
             pal = QtGui.QGuiApplication.palette()
@@ -295,11 +292,16 @@ class ValueModel(QtCore.QAbstractTableModel):
 
         if value:
             if role == QtCore.Qt.EditRole:
+                if value == self.as_string(self._data[row][col]):
+                    return True
+
                 try:
                     value = complex(value)
                 except ValueError:
                     # not a number
                     return False
+
+                value = value.real if value.imag == 0 else value
                 self._data[row][col] = value.real if value.imag == 0 else value
                 self.itemChanged.emit(col, row, str(value))
                 self.dataChanged.emit(self.index(0, 0), self.index(0, 1), [role])
@@ -368,3 +370,10 @@ class ValueModel(QtCore.QAbstractTableModel):
     def unmask(self):
         self.mask = [True] * self.total_rows
         self.dataChanged.emit(self.index(0, 0), self.index(0, 1), [ValueModel.maskRole])
+
+    @staticmethod
+    def as_string(value) -> str:
+        if isinstance(value, complex):
+            return f'{value.real:.8g}{value.imag:+.8g}j'
+        else:
+            return f'{value:.8g}'