Changeset 0261bc1 in sasview for src/sas/qtgui/Utilities/GuiUtils.py

Timestamp:

Nov 20, 2017 5:55:30 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

f1ec901

Parents:

6a3e1fe

Message:

Added unit tests for recent functionality

File:

• src/sas/qtgui/Utilities/GuiUtils.py (modified) (8 diffs)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -271 +271 @@
     """
     def __init__(self, parent=None):
-        super(QtGui.QStandardItem, self).__init__()
+        super(HashableStandardItem, self).__init__()
 
     def __hash__(self):
@@ -277 +277 @@
         #return hash(self.__init__)
         return 0
+
+    def clone(self):
+        ''' Assure __hash__ is cloned as well'''
+        clone = super(HashableStandardItem, self).clone()
+        clone.__hash__ = self.__hash__
+        return clone
 
 
@@ -561 +567 @@
     with open(path,'w') as out:
         has_errors = True
-        if data.dy is None or not data.dy:
+        if data.dy is None or not data.dy.any():
             has_errors = False
         # Sanity check
@@ -571 +577 @@
                 has_errors = False
         if has_errors:
-            if data.dx is not None and data.dx:
+            if data.dx is not None and data.dx.any():
                 out.write("<X>   <Y>   <dY>   <dX>\n")
             else:
@@ -580 +586 @@
         for i in range(len(data.x)):
             if has_errors:
-                if data.dx is not None and data.dx:
+                if data.dx is not None and data.dx.any():
                     if  data.dx[i] is not None:
                         out.write("%g  %g  %g  %g\n" % (data.x[i],
@@ -857 +863 @@
         return value[0]
     else:
-        raise ValueError
+        raise TypeError
 
 class DoubleValidator(QtGui.QDoubleValidator):
@@ -867 +873 @@
         Return invalid for commas
         """
-        if (',' in input):
+        if input is not None and ',' in input:
             return (QtGui.QValidator.Invalid, input, pos)
         return super(DoubleValidator, self).validate(input, pos)
@@ -875 +881 @@
         Correct (remove) potential preexisting content
         """
-        QtGui.QDoubleValidator.fixup(input)
+        super(DoubleValidator, self).fixup(input)
         input = input.replace(",", "")