Changeset 3581


Ignore:
Timestamp:
Sep 2, 2018 4:33:03 PM (3 years ago)
Author:
toby
Message:

fix wx4 wx.Colour issue & take stab at l.get_xdata().mask not supporting iteration

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r3580 r3581  
    31893189                fp.write("{} {}\n".format(Plot.get_xlim()[0],0))
    31903190                fp.write("{} {}\n".format(Plot.get_xlim()[1],0))
     3191            elif get_xdata().mask is None:
     3192                for x,y in zip(l.get_xdata(),l.get_ydata()):
     3193                    fp.write("{} {}\n".format(x,y))
    31913194            else:
    31923195                for x,y,m in zip(l.get_xdata(),l.get_ydata(),l.get_xdata().mask):
     
    34523455    for lbl in list(plotOpt['lineList']) + list(plotOpt['phaseList']):
    34533456        import  wx.lib.colourselect as csel
    3454         color = wx.Colour(*[255*i for i in plotOpt['colors'][lbl]])
     3457        color = wx.Colour([255*i for i in plotOpt['colors'][lbl]])
    34553458        b = csel.ColourSelect(dlg, -1, '', color)
    34563459        b.Bind(csel.EVT_COLOURSELECT, OnSelectColour)
Note: See TracChangeset for help on using the changeset viewer.