Changeset 1472 for trunk/GSASIIimgGUI.py

Timestamp:

Aug 20, 2014 1:31:24 PM (9 years ago)

Author:

toby

Message:

fix wx3 bug: no wx.CB_SORT on Mac

File:

• trunk/GSASIIimgGUI.py (modified) (4 diffs)

trunk/GSASIIimgGUI.py

@@ -377 +377 @@
         comboSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Color bar '),0,WACV)
         colSel = wx.ComboBox(parent=G2frame.dataDisplay,value=data['color'],choices=colorList,
-            style=wx.CB_READONLY|wx.CB_DROPDOWN|wx.CB_SORT)
+            style=wx.CB_READONLY|wx.CB_DROPDOWN)
         colSel.Bind(wx.EVT_COMBOBOX, OnNewColorBar)
         comboSizer.Add(colSel,0,WACV)
@@ -666 +666 @@
         dataSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Bin style: Constant step bins in'),0,WACV)            
         binSel = wx.ComboBox(parent=G2frame.dataDisplay,value=data['binType'],choices=binChoice,
-            style=wx.CB_READONLY|wx.CB_DROPDOWN|wx.CB_SORT)
+            style=wx.CB_READONLY|wx.CB_DROPDOWN)
         binSel.Bind(wx.EVT_COMBOBOX, OnNewBinType)
         dataSizer.Add(binSel,0,WACV)
@@ -874 +874 @@
         comboSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Calibrant '),0,WACV)
         calSel = wx.ComboBox(parent=G2frame.dataDisplay,value=data['calibrant'],choices=calList,
-            style=wx.CB_READONLY|wx.CB_DROPDOWN|wx.CB_SORT)
+            style=wx.CB_READONLY|wx.CB_DROPDOWN)
         calSel.Bind(wx.EVT_COMBOBOX, OnNewCalibrant)
         comboSizer.Add(calSel,0,WACV)
@@ -965 +965 @@
     #end fix
     
-    colorList = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")]
-    calList = [m for m in calFile.Calibrants.keys()]
+    colorList = sorted([m for m in mpl.cm.datad.keys() if not m.endswith("_r")],key=lambda s: s.lower())
+    calList = sorted([m for m in calFile.Calibrants.keys()],key=lambda s: s.lower())
     typeList = ['PWDR - powder diffraction data','SASD - small angle scattering data',
         'REFL - reflectometry data']