Changeset 2895 for branch/2frame/GSASIIphsGUI.py

Timestamp:

Jul 2, 2017 7:27:09 PM (6 years ago)

Author:

toby

Message:

merge trunk changes to 2984

File:

• branch/2frame/GSASIIphsGUI.py (modified) (7 diffs)

branch/2frame/GSASIIphsGUI.py

@@ -444 +444 @@
 used (not recommended when alpha >> 120 or << 60, due to correlation.)
 
+For standard settings of space groups, space group numbers (1-230) can alternately
+be entered.
+
 GSAS-II will accept non-standard settings of space groups. For example, space
 group "P -1" can be set to include face centering, using symbol "F -1" and "P 1 1 21/a"
@@ -452 +455 @@
 '''
                 dlg = G2G.SingleStringDialog(General,'Get Space Group',
-                    '  Input the space group with spaces between axial fields  \n  (e.g. p 21/c, P 63/m m c, P 4/m m m',
+                    '  Input the space group with spaces between axial fields  \n  (e.g. p 21/c, P 63/m m c, P 4/m m m) or enter a space\n  group number between 1 and 230.',
                     value=generalData['SGData']['SpGrp'],help=helptext)
                 if not dlg.Show():
@@ -458 +461 @@
                     return
                 else:
-                    Flds = dlg.GetValue().split()
-                    dlg.Destroy()
-                #get rid of extra spaces between fields first
-                for fld in Flds: fld = fld.strip()
-                SpcGp = ' '.join(Flds)
+                    try:
+                        # has a space group number been input?
+                        spcnum = int(dlg.GetValue())
+                        if 1 <= spcnum <= 230:
+                            SpcGp = G2spc.spgbyNum[spcnum]
+                        else:
+                            msg = 'Space Group Error'
+                            Style = wx.ICON_EXCLAMATION
+                            wx.MessageBox('Invalid space group number',caption=msg,style=Style)
+                            return
+                    except:
+                        #get rid of extra spaces between fields first
+                        Flds = dlg.GetValue().split()
+                        for fld in Flds: fld = fld.strip()
+                        SpcGp = ' '.join(Flds)
+                    finally:
+                        dlg.Destroy()
                 # try a lookup on the user-supplied name
                 SpGrpNorm = G2spc.StandardizeSpcName(SpcGp)
@@ -481 +496 @@
                     SGTxt.SetLabel(generalData['SGData']['SpGrp'])
                     msg = 'Space Group Information'
-                    G2gd.SGMessageBox(General,msg,text,table).Show()
+                    G2G.SGMessageBox(General,msg,text,table).Show()
                 if generalData['Type'] == 'magnetic':
                     Nops = len(SGData['SGOps'])*len(SGData['SGCen'])
@@ -884 +899 @@
                     generalData['SuperSg'] = SSymbol
                     msg = 'Superspace Group Information'
-                    G2gd.SGMessageBox(General,msg,text,table).Show()
+                    G2G.SGMessageBox(General,msg,text,table).Show()
                 else:
                     text = [E+'\nSuperspace Group set to previous']
@@ -5708 +5723 @@
                     copyDict[name] = sourceDict[name][1]
             elif name in ['Size','Mustrain']:
-                copyDict[name] = [sourceDict[name][0],sourceDict[name][2],sourceDict[name][4]]
+                copyDict[name] = [sourceDict[name][0],sourceDict[name][2],sourceDict[name][5]]
             elif name == 'Pref.Ori.':
                 copyDict[name] = [sourceDict[name][0],sourceDict[name][2]]
@@ -5749 +5764 @@
                             data['Histograms'][item][name][0] = copy.deepcopy(copyDict[name][0])
                             data['Histograms'][item][name][2] = copy.deepcopy(copyDict[name][1])
-                            data['Histograms'][item][name][4] = copy.deepcopy(copyDict[name][2])
+                            data['Histograms'][item][name][5] = copy.deepcopy(copyDict[name][2])
                         elif name == 'Pref.Ori.':
                             data['Histograms'][item][name][0] = copy.deepcopy(copyDict[name][0])