Changeset 3388

Timestamp:

May 15, 2018 12:24:54 PM (5 years ago)

Author:

vondreele

Message:

added Plot Colors to configuration to allow user color selection for line plots
mask plots by limits (unless Limits selected)

Location:

trunk

Files:

• GSASIIplot.py (modified) (6 diffs)
• config_example.py (modified) (1 diff)

trunk/GSASIIplot.py

@@ -2413 +2413 @@
     PickId = G2frame.PickId
     PatternId = G2frame.PatternId
-    colors=['b','g','r','c','m','k']
+    try:
+        colors = GSASIIpath.GetConfigValue('Plot_Colors').split()
+        for color in colors:
+            if color not in ['k','r','g','b','m','c']:
+                print('**** bad color code: '+str(color)+' - redo Preferences/Plot Colors ****')
+                raise Exception
+    except:
+        colors = ['b','g','r','c','m','k']
     Lines = []
     exclLines = []
     if G2frame.SinglePlot and PatternId:
-        Pattern = G2frame.GPXtree.GetItemPyData(PatternId)
+        Pattern = copy.deepcopy(G2frame.GPXtree.GetItemPyData(PatternId))
         Pattern.append(G2frame.GPXtree.GetItemText(PatternId))
         PlotList = [Pattern,]
@@ -2443 +2450 @@
         for item in choices:
             id = G2gd.GetGPXtreeItemId(G2frame,G2frame.root, item)
-            Pattern = G2frame.GPXtree.GetItemPyData(id)
+            Pattern = copy.deepcopy(G2frame.GPXtree.GetItemPyData(id))
             if len(Pattern) < 3:                    # put name on end if needed
                 Pattern.append(G2frame.GPXtree.GetItemText(id))
@@ -2546 +2553 @@
             xye0 = ma.array(xye0,mask=False)
 #            xye0.mask = False # resets mask for xye0 & Pattern[1][0](!)
+            xye0 = ma.masked_outside(xye0,limits[1][0],limits[1][1])
             for excl in excls:
                 xye0 = ma.masked_inside(xye0,excl[0],excl[1]) # sets mask on xye0 but not Pattern[1][0] !
@@ -2661 +2669 @@
                 DX = xlim[1]-xlim[0]
                 X += 0.002*offsetX*DX*N
-            Xum = ma.getdata(X) # unmasked version of X, use to plot data (only)
+            if G2frame.GPXtree.GetItemText(PickId) == 'Limits':
+                Xum = ma.getdata(X) # unmasked version of X, use for data limits (only)
+            else:
+                Xum = X[:]
+            Ibeg = np.searchsorted(X,limits[1][0])
+            Ifin = np.searchsorted(X,limits[1][1])
             if ifpicked:
                 if Page.plotStyle['sqrtPlot']:
@@ -2705 +2718 @@
                         Plot.set_ylim(bottom=np.min(np.trim_zeros(YB))/2.,top=np.max(Y)*2.)
                 if G2frame.Weight:
-                    Ibeg = np.searchsorted(X,limits[1][0])
-                    Ifin = np.searchsorted(X,limits[1][1])
                     Plot1.set_yscale("linear")                                                  
                     wtFactor = Pattern[0]['wtFactor']
@@ -2721 +2732 @@
                     elif plottype in ['SASD','REFD']:
                         Plot.set_xscale("log",nonposx='mask')
-                        Ibeg = np.searchsorted(X,limits[1][0])
-                        Ifin = np.searchsorted(X,limits[1][1])
                         Plot.set_yscale("log",nonposy='mask')
                         if G2frame.ErrorBars:

trunk/config_example.py

@@ -188 +188 @@
 '''when True, GSAS-II instprm file are shown as default; when False, old GSAS stype prm, etc files are default
 '''
+
+Plot_Colors = 'k r g b m c'
+'''The colors for line plots: use one of 'k'-black, 'r'-red, 'b'-blue, 'g'-green, 'm'-magenta, 'c'-cyan for the
+line colors in order of obs., calc., back., diff., color5 & color6 separated by spaces; 6 items required.
+'''