Changeset 4529 for trunk/GSASIIplot.py

Timestamp:

Jul 20, 2020 5:53:17 PM (3 years ago)

Author:

toby

Message:

add show option to publish plot

File:

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

trunk/GSASIIplot.py

@@ -268 +268 @@
 plotOpt['width'] = 8.
 plotOpt['height'] = 6.
+plotOpt['Show'] = {}
 plotOpt['legend'] = {}
 plotOpt['colors'] = {}
@@ -3591 +3592 @@
                 gmw = 0
                 lineWid = float(plotOpt['lineWid'])
+            if not plotOpt['Show'].get(lbl,True): continue
             if plotOpt['legend'].get(lbl):
                 glbl = lbl
@@ -3619 +3621 @@
             mkwid = float(plotOpt['tickWid'])
             if sum(c) == 4.0: continue # white: ignore
+            if not plotOpt['Show'].get(lbl,True): continue
             if plotOpt['legend'].get(lbl):
                 # invisible data point for 
@@ -3732 +3735 @@
         for i,l in enumerate(Plot.lines):
             lbl = l.get_label()
+            if not plotOpt['Show'].get(lbl[1:],True): continue
             if plotOpt['legend'].get(lbl[1:]):
                 legends.append((InameDict[lbl[1:]],lbl[1:]))
@@ -3853 +3857 @@
         for i,l in enumerate(Plot.lines):
             lbl = l.get_label()
+            if not plotOpt['Show'].get(lbl,True): continue
             if l in Page.tickDict.values():
                 c = plotOpt['colors'].get(lbl,l.get_color())
@@ -4014 +4019 @@
     if plotOpt['initNeeded']: Initialize()
     GetColors()            
-    dlg = wx.Dialog(G2frame.plotFrame,
+    dlg = wx.Dialog(G2frame.plotFrame,title="Publication plot creation",
                 style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER)
     vbox = wx.BoxSizer(wx.VERTICAL)
@@ -4086 +4091 @@
                                    style=wx.ALIGN_CENTER,OnLeave=RefreshPlot)
         gsizer.Add(val,0,wx.ALL)
+    gsizer.Add(wx.StaticText(dlg,wx.ID_ANY,'Show'),0,wx.ALL)
+    for lbl in list(plotOpt['lineList']) + list(plotOpt['phaseList'] ):
+        if lbl not in plotOpt['Show']:
+            plotOpt['Show'][lbl] = True
+        ch = G2G.G2CheckBox(dlg,'',plotOpt['Show'],lbl,RefreshPlot)
+        gsizer.Add(ch,0,wx.ALL|wx.ALIGN_CENTER)
     gsizer.Add(wx.StaticText(dlg,wx.ID_ANY,'Include in legend'),0,wx.ALL)
     for lbl in list(plotOpt['lineList']) + list(plotOpt['phaseList'] ):
@@ -4201 +4212 @@
             ax0.axvline(l.get_data()[0][0],color='0.5',dashes=(1,1))
         elif lbl in ('obs','calc','bkg','zero','diff'):
+            if not plotOpt['Show'].get(lbl,True): continue
             marker = l.get_marker()
             lineWid = l.get_lw()
@@ -4231 +4243 @@
                 legLine.append(art[0])
         elif l in Page.tickDict.values():
+            if not plotOpt['Show'].get(lbl,True): continue
             c = plotOpt['colors'].get(lbl,l.get_color())
             #siz = l.get_markersize()