Changeset 6fd4e36 in sasview for src/sas/qtgui/PlotUtilities.py

Timestamp:

Mar 28, 2017 6:53:29 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:

0268aed

Parents:

a9b568c

Message:

Chi2 display + minor refactoring

File:

• src/sas/qtgui/PlotUtilities.py (modified) (3 diffs)

src/sas/qtgui/PlotUtilities.py

@@ -1 +1 @@
 import sys
 import numpy
+import string
+
 from collections import OrderedDict
 
@@ -75 +77 @@
     # get histogram of data, all points into a bin in a way of summing
     image, xedges, yedges = numpy.histogram2d(x=qy_data,
-                                                y=qx_data,
-                                                bins=[y_bins, x_bins],
-                                                weights=data)
+                                              y=qx_data,
+                                              bins=[y_bins, x_bins],
+                                              weights=data)
     # Now, normalize the image by weights only for weights>1:
     # If weight == 1, there is only one data point in the bin so
@@ -264 +266 @@
     '''
 
-    if color is not None:
-        # Check if it's an int
-        if isinstance(color, int):
-            # Check if it's within the range
-            if 0 <= color <=6:
-                color = COLORS.values()[color]
-        # Check if it's an RGB string
-        elif isinstance(color, str):
-            # Assure the correctnes of the string
-            assert(color[0]=="#" and len(color) == 7)
-            import string
-            assert(all(c in string.hexdigits for c in color[1:]))
-        else:
-            raise AttributeError
+    if color is None:
+        return color
+
+    # Check if it's an int
+    if isinstance(color, int):
+        # Check if it's within the range
+        if 0 <= color <=6:
+            color = COLORS.values()[color]
+    # Check if it's an RGB string
+    elif isinstance(color, str):
+        # Assure the correctnes of the string
+        assert(color[0]=="#" and len(color) == 7)
+        assert(all(c in string.hexdigits for c in color[1:]))
+    else:
+        raise AttributeError
 
     return color