Changeset 3582 for trunk

Timestamp:

Sep 2, 2018 5:22:52 PM (7 years ago)

Author:

toby

Message:

deal with mask being set to a single False value; fix wx.Colour in a way that works

File:

• trunk/GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIplot.py ¶

@@ -3189 +3189 @@
                 fp.write("{} {}\n".format(Plot.get_xlim()[0],0))
                 fp.write("{} {}\n".format(Plot.get_xlim()[1],0))
-            elif get_xdata().mask is None:
+            elif not ma.all(l.get_xdata().mask):
                 for x,y in zip(l.get_xdata(),l.get_ydata()):
                     fp.write("{} {}\n".format(x,y))
             else:
                 for x,y,m in zip(l.get_xdata(),l.get_ydata(),l.get_xdata().mask):
-                    if not m: 
-                        fp.write("{} {}\n".format(x,y))
+                    if not m: fp.write("{} {}\n".format(x,y))
             fp.write("&\n")
             fp.write(linedef.format("s"+str(datnum),glbl,gc,gsym,lineWid,gsiz,gmw,glinetyp))
@@ -3270 +3269 @@
         fp.write("@type xy\n")
         l = obsartist
-        for x,y,m in zip(l.get_xdata(),Pattern[1][5]*rsig,l.get_xdata().mask):
-            if not m: 
+        if ma.all(l.get_xdata().mask):
+            for x,y,m in zip(l.get_xdata(),Pattern[1][5]*rsig,l.get_xdata().mask):
+                if not m: fp.write("{} {}\n".format(x,y))
+        else:
+            for x,y in zip(l.get_xdata(),Pattern[1][5]*rsig):
                 fp.write("{} {}\n".format(x,y))
         fp.write("&\n")
         fp.write(linedef3.format("s1",'',1,0,1.0,0,0,1))
         fp.close()
+        print('file',filename,'written')
         
     def CopyRietveld2csv(Pattern,Plot,Page,filename):
@@ -3455 +3458 @@
     for lbl in list(plotOpt['lineList']) + list(plotOpt['phaseList']):
         import  wx.lib.colourselect as csel
-        color = wx.Colour([255*i for i in plotOpt['colors'][lbl]])
+        color = wx.Colour(*[int(255*i) for i in plotOpt['colors'][lbl]])
         b = csel.ColourSelect(dlg, -1, '', color)
         b.Bind(csel.EVT_COLOURSELECT, OnSelectColour)