Changeset 4f790d2 in sasview for src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

Timestamp:

Oct 3, 2017 3:53:10 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:

d6e5b31

Parents:

7d8bebf (diff), 170e95d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'origin/ESS_GUI_SasView250' into ESS_GUI

File:

• src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py (modified) (2 diffs)

src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

@@ -599 +599 @@
         except:
             string_split = input_string.split(',')
-            if len(string_split) == 2:
-                str_1 = string_split[0]
-                str_2 = string_split[1]
-                new_numbers_list.append(float(str_1))
-                new_numbers_list.append(float(str_2))
-            elif len(string_split) == 1:
-                str_1 = string_split[0]
-                new_numbers_list.append(float(str_1))
+            if len(string_split) == 1 or len(string_split) == 2:
+                new_numbers_list = [float(item) for item in string_split]
             else:
                 msg = "The numbers must be one or two (separated by ',')"
@@ -735 +729 @@
         y_val = numpy.arange(qy_max, qy_min, -dy_size)
 
+        if len(self.plotter.ax.patches):
+            self.plotter.ax.patches[0].remove()
+
         self.drawLines()