Changeset 3729

Timestamp:

Nov 13, 2018 9:52:00 AM (4 years ago)

Author:

vondreele

Message:

make super group ComboBox? allow editing for nonOSX.

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (4 diffs)
• GSASIIspc.py (modified) (1 diff)
• SUBGROUPS.py (modified) (1 diff)

trunk/GSASIIphsGUI.py

@@ -1993 +1993 @@
             
         def ModulatedSizer(name):
+            
             def showSSG(General,msg,text,table,refresh):
                 'Show the symmetry information, redraw window if needed'
@@ -1999 +2000 @@
                 dlg.Destroy()
                 if refresh: UpdateGeneral()
+                
             def OnSuperGp(event):   #for HKLF needs to reject SSgps not agreeing with modVec!
                 'Respond to selection of a modulation group'
                 event.Skip()
+                refresh = True
                 try:
                     SSymbol = superGp.GetValue()
-                    refresh = True
                 except AttributeError:
                     SSymbol = superGp.GetLabel()
@@ -2021 +2023 @@
                     wx.CallLater(100,showSSG,General,msg,text,table,refresh)
                 else:
-                    # needed in case someone manually enters an invalid SG?
+                    # needed in case someone manually enters an invalid SSG?
                     text = [E+'\nSuperspace Group set to previous']
                     superGp.SetValue(generalData['SuperSg'])
@@ -2051 +2053 @@
                     Choice = [G2spc.fixGray(SGData,item) for item in Choice]
             if len(Choice):
-                # removed code that allows entries to be typed in
-                # because Bind to EVT_TEXT_ENTER caused two calls to OnSuperGp
-#                superGp = wx.ComboBox(General,value=generalData['SuperSg'],choices=Choice,style=wx.CB_DROPDOWN|wx.TE_PROCESS_ENTER)
-#                superGp.Bind(wx.EVT_TEXT_ENTER,OnSuperGp)
-                superGp = wx.ComboBox(General,value=generalData['SuperSg'],choices=Choice,style=wx.CB_DROPDOWN|wx.CB_READONLY)
-                superGp.Bind(wx.EVT_COMBOBOX,OnSuperGp)
+                i,j= wx.__version__.split('.')[0:2]
+                if int(i)+int(j)/10. > 2.8 and 'wxOSX' in wx.PlatformInfo:      #since this seems to fail on a Mac!
+                    superGp = wx.ComboBox(General,value=generalData['SuperSg'],choices=Choice,style=wx.CB_DROPDOWN|wx.CB_READONLY)
+                    superGp.Bind(wx.EVT_COMBOBOX,OnSuperGp)
+                else:
+                    superGp = wx.ComboBox(General,value=generalData['SuperSg'],choices=Choice,style=wx.CB_DROPDOWN|wx.TE_PROCESS_ENTER)
+                    superGp.Bind(wx.EVT_COMBOBOX,OnSuperGp)
+                    superGp.Bind(wx.EVT_TEXT_ENTER,OnSuperGp)
             else:
                 superGp = wx.StaticText(General,label=generalData['SuperSg'])

trunk/GSASIIspc.py

@@ -534 +534 @@
     return OpText
 
-def TextGen(SGData,reverse=False):
+def TextGen(SGData,reverse=False):      #does not always work correctly - not used anyway
     GenSym,GenFlg,BNSsym = GetGenSym(SGData)
     SGData['GenSym'] = GenSym

trunk/SUBGROUPS.py

@@ -195 +195 @@
     text,table = G2spc.SGPrint(SGData)
     OpList = G2spc.TextOps(text,table,reverse=True)
-#    GenList = G2spc.TextGen(SGData,reverse=True)
+#    OpList = G2spc.TextGen(SGData,reverse=True)
     for item in OpList:
         item += '\n'