Changeset 4528 for trunk/GSASIIplot.py

Timestamp:

Jul 20, 2020 9:35:19 AM (3 years ago)

Author:

vondreele

Message:

change "if 'mag' ..." to "if 'magline' ..." in various places in Publish codes to allow 'mag' to be in a magnetic phase name.

File:

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

trunk/GSASIIplot.py

@@ -3404 +3404 @@
         for i,l in enumerate(Plot.lines):
             lbl = l.get_label()
-            if 'mag' in lbl:
+            if 'magline' in lbl:
                 pass
             elif lbl[1:] in plotOpt['lineList']: # item not in legend
@@ -3534 +3534 @@
         for i,l in enumerate(Plot.lines):
             lbl = l.get_label()
-            if 'mag' not in lbl: continue
+            if 'magline' not in lbl: continue
             #ax0.axvline(l.get_data()[0][0],color='0.5',dashes=(1,1))
             # vertical line
@@ -3545 +3545 @@
             fp.write(s)
         for l in Plot.texts:
-            if 'mag' not in l.get_label(): continue
+            if 'magline' not in l.get_label(): continue
             if l.xycoords[0] == 'data':
                 xpos = l.get_position()[0]
@@ -3879 +3879 @@
         for i,l in enumerate(Plot.lines):
             lbl = l.get_label()
-            if 'mag' not in lbl: continue
+            if 'magline' not in lbl: continue
             j += 1
             fp.write('WAVES /D/O mag{0}X, mag{0}\nBEGIN\n'.format(j))
@@ -3887 +3887 @@
             fp.write('X ModifyGraph lstyle(mag{0})=3,rgb(mag{0})=(0,0,0)\n'.format(j))
         for l in Plot.texts:
-            if 'mag' not in l.get_label(): continue
+            if 'magline' not in l.get_label(): continue
             if l.xycoords[0] == 'data':
                 xpos = l.get_position()[0]
@@ -3925 +3925 @@
             else:
                 lbl = l.get_label()
-            if 'mag' in lbl:
+            if 'magline' in lbl:
                 pass
             elif lbl in ('obs','calc','bkg','zero','diff'):
@@ -3956 +3956 @@
         for l in Plot.texts:
             lbl = l.get_label()
-            if 'mag' not in lbl: continue
+            if 'magline' not in lbl: continue
             if l.xycoords == 'axes fraction':
                 lbl = 'initial-mag'
@@ -4198 +4198 @@
         else:
             lbl = l.get_label()
-        if 'mag' in lbl:
+        if 'magline' in lbl:
             ax0.axvline(l.get_data()[0][0],color='0.5',dashes=(1,1))
         elif lbl in ('obs','calc','bkg','zero','diff'):
@@ -4249 +4249 @@
                 legLine.append(art[0])
     for l in Plot.texts:
-        if 'mag' not in l.get_label(): continue
+        if 'magline' not in l.get_label(): continue
         ax0.annotate(l.get_text(),
                     xy=(l.get_position()), xycoords=l.xycoords,