Changeset 2637

Timestamp:

Jan 17, 2017 12:13:28 PM (5 years ago)

Author:

vondreele

Message:

fix delete data item selection to include only data items
expand the choices for stride in data selection dialog
cosmetic stuff in plots

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIctrls.py (modified) (1 diff)
• GSASIIplot.py (modified) (5 diffs)

trunk/GSASII.py

@@ -3135 +3135 @@
                 name = self.PatternTree.GetItemText(item)
                 if name not in ['Notebook','Controls','Covariance','Constraints',
-                    'Restraints','Phases','Rigid bodies'] or 'Sequential' not in name:
+                    'Restraints','Phases','Rigid bodies'] and 'Sequential' not in name:
                     if 'PWDR' in name: nItems['PWDR'] += 1
                     if 'SASD' in name: nItems['SASD'] += 1

trunk/GSASIIctrls.py

@@ -1385 +1385 @@
             tSizer.Add(togBut)
             tSizer.Add(wx.StaticText(self,label=' Set Stride:'),0,WACV)
-            numbs = [str(i+1) for i in range(10)]
+            numbs = [str(i+1) for i in range(9)]+[str(2*i+10) for i in range(6)]
             self.stride = wx.ComboBox(self,value='1',choices=numbs,style=wx.CB_READONLY|wx.CB_DROPDOWN)
             self.stride.Bind(wx.EVT_COMBOBOX,self.OnStride)

trunk/GSASIIplot.py

@@ -22 +22 @@
 import wx.glcanvas
 import matplotlib as mpl
+import matplotlib.collections as mplC
 import mpl_toolkits.mplot3d.axes3d as mp3d
 import GSASIIpath
@@ -2348 +2349 @@
     or multiple plots with waterfall and contour plots as options
     '''
-    import matplotlib.collections as mplC
     if not plotType:
         plotType = G2frame.G2plotNB.plotList[G2frame.G2plotNB.nb.GetSelection()]
     if plotType not in ['I(Q)','S(Q)','F(Q)','G(R)']:
         return
-    superMinusOne = unichr(0xaf)+unichr(0xb9)
     
     def OnPlotKeyPress(event):
@@ -2483 +2482 @@
         Plot.set_xlabel(r'r,$\AA$',fontsize=14)
         Plot.set_ylabel(r'G(r), $\AA^{-2}$',fontsize=14)
-        Plot.set_title(name)
     else:
         Plot.set_xlabel(r'$Q,\AA^{-1}$',fontsize=14)
         Plot.set_ylabel(r''+plotType,fontsize=14)
-        Plot.set_title(name)
+    Plot.set_title(name)
     colors=['b','g','r','c','m','k']
     PDFdata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'PDF Controls'))
@@ -2543 +2541 @@
         acolor = mpl.cm.get_cmap(G2frame.ContourColor)
         if XYlist.shape[0]>1:            
+            colorRange = np.arange(XYlist.shape[0])
             lines = mplC.LineCollection(XYlist,cmap=acolor)
+            lines.set_array(colorRange)
         else:
             lines = mplC.LineCollection(XYlist,color=colors[0])
-        lines.set_array(np.arange(XYlist.shape[0]))
         Plot.add_collection(lines)
         if plotType == 'G(R)':
@@ -2558 +2557 @@
         if XYlist.shape[0] > 1:
             axcb = Page.figure.colorbar(lines)
-            axcb.set_label('Run number')
+            axcb.set_label('PDF number')
         
 #    elif G2frame.Legend: