Changeset 3008

Timestamp:

Aug 15, 2017 3:48:15 PM (6 years ago)

Author:

vondreele

Message:

remove print "no phases found..."
use contour colors for powder waterfall plot colors

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIdataGUI.py

@@ -4037 +4037 @@
             sub = GetGPXtreeItemId(self,self.root,'Phases')
         else:
-            print 'no phases found in GetPhaseData'
+#            print 'no phases found in GetPhaseData'
             sub = None
         if sub:
@@ -4084 +4084 @@
             sub = GetGPXtreeItemId(self,self.root,'Phases')
         else:
-            print 'no phases found in GetPhaseNames'
+#            print 'no phases found in GetPhaseNames'
             sub = None
         if sub:

trunk/GSASIIplot.py

@@ -1990 +1990 @@
             SampleList.append(G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,
                 id, 'Sample Parameters')))
+        mcolors = mpl.cm.ScalarMappable(mpl.cm.get_cmap(G2frame.ContourColor))
     lenX = 0
     Ymax = None
@@ -2245 +2246 @@
                         Plot.semilogy(X,Y,colors[N%6],picker=False,nonposy='mask')
                 else:
+                    color = 256*N/len(PlotList)
                     if 'PWDR' in plottype:
-                        Plot.plot(X,Y,colors[N%6],picker=False)
+                        Plot.plot(X,Y,color=mcolors.cmap(color),picker=False)         #colors[N%6]
                     elif plottype in ['SASD','REFD']:
-                        Plot.loglog(X,Y,colors[N%6],picker=False,nonposy='mask')
+                        Plot.loglog(X,Y,mcolors.cmap(color),picker=False,nonposy='mask')
                         Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.,top=np.max(Y)*2.)
                             
                 if G2frame.logPlot and 'PWDR' in plottype:
                     Plot.set_ylim(bottom=np.min(np.trim_zeros(Y))/2.,top=np.max(Y)*2.)
+#    if not G2frame.SinglePlot and not G2frame.Contour:
+#        axcb = mpl.colorbar.ColorbarBase(N)
+#        axcb.set_label('PDF number')
+
     if PickId and not G2frame.Contour:
         Parms,Parms2 = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,PatternId, 'Instrument Parameters'))
@@ -2649 +2655 @@
             return
         PlotList = [data[plotType],]
-        name = PlotList[0][2]
+        try:
+            name = PlotList[0][2]
+        except:
+            name = ''
     else:
         PlotList = []