Changeset 3750

Timestamp:

Dec 3, 2018 4:12:29 PM (4 years ago)

Author:

vondreele

Message:

remove editable combobox for super space group symbol input - now read only combobox
fixes to DoMag? for wave constraints for -3 & 32(100) site symmetry

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (4 diffs)
• GSASIIspc.py (modified) (3 diffs)

trunk/GSASIIphsGUI.py

@@ -2001 +2001 @@
         def ModulatedSizer(name):
             
-#            def showSSG(msg,text,table):
-#                'Show the symmetry information, redraw window after'
-#                dlg = G2G.SGMessageBox(General,msg,text,table)
-#                dlg.CenterOnParent()
-#                dlg.ShowModal()
-#                dlg.Destroy()
-#                UpdateGeneral()
-#                
-            def OnSuperEnter(event):
-                'Close dialog after enter is pressed'
-                event.GetEventObject().Parent.EndModal(wx.ID_OK)
-                
             def OnShowSOps(event):
                 SSGData = generalData['SSGData']
@@ -2021 +2009 @@
             def OnSuperGp(event):   #for HKLF needs to reject SSgps not agreeing with modVec!
                 'Respond to selection of a modulation group'
-                Choice = []
-                if not SGData['SGFixed']:
-                    Choice = G2spc.SSChoice(SGData)
-                if len(Choice) == 0: return
-                #parent = event.GetEventObject().GetTopLevelParent()
-                parent = General
-                dlg = wx.Dialog(parent,style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
+                wx.BeginBusyCursor()
+                Choice = G2spc.SSChoice(SGData)
+                wx.EndBusyCursor()
+                dlg = wx.Dialog(General,style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
                 sizer = wx.BoxSizer(wx.VERTICAL)
-                sizer.Add(wx.StaticText(dlg,wx.ID_OK,
-                            'Select or enter a modulation group'
-                                            ),0,wx.ALIGN_CENTER)
-                
+                sizer.Add(wx.StaticText(dlg,wx.ID_OK,'Select or enter a modulation group'),0,wx.ALIGN_CENTER)
                 sizer.Add((10,10))
-#            Zstep = G2G.ValidatedTxtCtrl(drawOptions,drawingData,'Zstep',nDig=(10,2),min=0.01,max=4.0)
-                superGp = wx.ComboBox(dlg,value=generalData['SuperSg'],choices=Choice,style=wx.CB_DROPDOWN|wx.TE_PROCESS_ENTER)
-                superGp.Bind(wx.EVT_TEXT_ENTER,OnSuperEnter)
+                superGp = wx.ComboBox(dlg,value=generalData['SuperSg'],choices=Choice,style=wx.CB_DROPDOWN|wx.TE_READONLY)
                 sizer.Add(superGp)
                 sizer.Add((10,10))
@@ -2074 +2054 @@
                     # needed in case someone manually enters an invalid SSG?
                     Text = '\n'.join([E+'\nSuperspace Group entry ignored'])
-                    G2G.G2MessageBox(parent,Text,'Superspace Group Error')
+                    G2G.G2MessageBox(General,Text,'Superspace Group Error')
                 wx.CallAfter(UpdateGeneral)
                     
@@ -2092 +2072 @@
                 SpGrp += " 1'"
             modSizer.Add(wx.StaticText(General,label=' Superspace group: %s '%SpGrp),0,WACV)
-            Choice = []
             if not SGData['SGFixed']:
-                Choice = G2spc.SSChoice(SGData)
-            if len(Choice):
                 val = generalData['SuperSg']
-                if val.strip() == "": val = Choice[0]
                 superGp = wx.Button(General,wx.ID_ANY,val,size=(100,-1))
                 superGp.Bind(wx.EVT_BUTTON,OnSuperGp)

trunk/GSASIIspc.py

@@ -1437 +1437 @@
         elif SGData['SGPtGrp'] == '2/m':    #OK
             SSGOps[1][0][3,3] = SSGKl[1]
-            if gensym:
+            if 's' in gensym:
                 SSGOps[1][1][3] = 0.5
             for i in iFrac:
@@ -2891 +2891 @@
             CSI[0][5][0] = 1
             CSI[1][5][0] = 1.0
-        elif siteSym in ['-32(100)',]:
+        elif siteSym in ['-32(100)','-3',]:
             CSI[0][2][0] = 1
             CSI[1][2][0] = 1.0
@@ -2899 +2899 @@
             CSI[1][3][0] = 2.0
             CSI[1][4][0] = 1.0
-        elif siteSym in ['622','2(100)',]:
+        elif siteSym in ['622','2(100)','32(100)',]:
             CSI[0][0][0] = CSI[0][1][0] = CSI[0][3][0] = 1
             CSI[1][0][0] = 1.0