Changeset 2647

Timestamp:

Jan 19, 2017 1:33:35 PM (6 years ago)

Author:

vondreele

Message:

put stride above select all & toggle buttons in G2fileselection dialog - more logical OrderBox?
changes in ISFG plots

Location:

trunk

Files:

• GSASIIctrls.py (modified) (2 diffs)
• GSASIIplot.py (modified) (4 diffs)

trunk/GSASIIctrls.py

@@ -1381 +1381 @@
         if toggle:
             tSizer = wx.FlexGridSizer(cols=2,hgap=5,vgap=5)
+            tSizer.Add(wx.StaticText(self,label=' Set Stride:'),0,WACV)
+            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)
+            tSizer.Add(self.stride,0,WACV)
             setBut = wx.Button(self,wx.ID_ANY,'Set All')
             setBut.Bind(wx.EVT_BUTTON,self._SetAll)
@@ -1387 +1392 @@
             togBut.Bind(wx.EVT_BUTTON,self._ToggleAll)
             tSizer.Add(togBut)
-            tSizer.Add(wx.StaticText(self,label=' Set Stride:'),0,WACV)
-            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)
-            tSizer.Add(self.stride,0,WACV)
             self.rangeBut = wx.ToggleButton(self,wx.ID_ANY,'Set Range')
             self.rangeBut.Bind(wx.EVT_TOGGLEBUTTON,self.SetRange)

trunk/GSASIIplot.py

@@ -2396 +2396 @@
                     G2frame.PDFselections = None
             dlg.Destroy()
-            newPlot = True
         elif event.key == 's':
             choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
@@ -2544 +2543 @@
         Plot.set_ylim(Ymin-dy,Ymax+dy)
         acolor = mpl.cm.get_cmap(G2frame.ContourColor)
+        wx.BeginBusyCursor()
         if XYlist.shape[0]>1:
             if G2frame.Waterfall:
@@ -2556 +2556 @@
                     Plot.add_collection(line)
                 axcb = Page.figure.colorbar(line)
-                axcb.set_label('Intensity')
+                axcb.set_label(plotType)
             else:   #ok
                 lines = mplC.LineCollection(XYlist,cmap=acolor)
@@ -2575 +2575 @@
                 line = mplC.LineCollection(XYlist,color=colors[0])
                 Plot.add_collection(line)
+        wx.EndBusyCursor()
         if plotType == 'G(R)':
             Xb = [0.,2.5]