Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Calculators/ResolutionCalculatorPanel.py

    rfc4fec8 r170e95d  
    599599        except: 
    600600            string_split = input_string.split(',') 
    601             if len(string_split) == 2: 
    602                 str_1 = string_split[0] 
    603                 str_2 = string_split[1] 
    604                 new_numbers_list.append(float(str_1)) 
    605                 new_numbers_list.append(float(str_2)) 
    606             elif len(string_split) == 1: 
    607                 str_1 = string_split[0] 
    608                 new_numbers_list.append(float(str_1)) 
     601            if len(string_split) == 1 or len(string_split) == 2: 
     602                new_numbers_list = [float(item) for item in string_split] 
    609603            else: 
    610604                msg = "The numbers must be one or two (separated by ',')" 
     
    735729        y_val = numpy.arange(qy_max, qy_min, -dy_size) 
    736730 
     731        if len(self.plotter.ax.patches): 
     732            self.plotter.ax.patches[0].remove() 
     733 
    737734        self.drawLines() 
    738735 
Note: See TracChangeset for help on using the changeset viewer.