Changeset 5356

Timestamp:

Oct 24, 2022 1:45:40 PM (5 months ago)

Author:

toby

Message:

minor cell merge fmt and NIST*LATTICE build changes

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (3 diffs)
• exports/G2export_CIF.py (modified) (1 diff)
• fsource/SConstruct (modified) (3 diffs)

trunk/GSASIIctrlGUI.py

@@ -6058 +6058 @@
         [['m3','m3m'],[" Unit cell: a = "],["{:.5f}"],[0]],
         [['3R','3mR'],[" a = ",u" \u03B1 = "],["{:.5f}","{:.3f}"],[0,3]],
-        [['3','3m1','31m','6/m','6/mmm','4/m','4/mmm'],[" a = "," c = "],
-             ["{:.5f}","{:.5f}"],[0,2]],
+        [['3','3m1','31m','6/m','6/mmm','4/m','4/mmm'],
+             [" a = "," c = ",u" \u03B3 = "],
+             ["{:.5f}","{:.5f}","{:.3f}"],[0,2,-5]],
         [['mmm'],[" a = "," b = "," c = "],["{:.5f}","{:.5f}","{:.5f}"],
             [0,1,2]],
@@ -6083 +6084 @@
             break
     for txt,fmt,indx in zip(*useGUI[1:]):
-        col = 1+2*indx
+        col = 1+2*abs(indx)
         cellrow = row
-        if editAllowed and indx > 2:
+        if editAllowed and abs(indx) > 2:
             cellrow = row + 1
-            col = 1+2*(indx-3)
+            col = 1+2*(abs(indx)-3)
         cellSizer.Add(wx.StaticText(frame,label=txt),(cellrow,col))
-        if editAllowed:
+        if editAllowed and indx >= 0:
             Fmt = (10,5)
             if '.3' in fmt: Fmt = (10,3) 
@@ -6097 +6098 @@
             cellList.append(cellVal.GetId())
         else:
-            cellSizer.Add(wx.StaticText(frame,label=fmt.format(cell[indx])),(cellrow,col+1))
+            cellSizer.Add(wx.StaticText(frame,label=fmt.format(cell[abs(indx)])),(cellrow,col+1))
     #volume
     volCol = 13

trunk/exports/G2export_CIF.py

@@ -4592 +4592 @@
             pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER)
         dlg.CenterOnParent()
-        import imp
-        imp.reload(G2G)
+        # import imp
+        # print('reloading ',G2G)
+        # imp.reload(G2G)
         def onChange(*args,**kwargs):
-            #wx.CallAfter(showMergeMag)
             wx.CallLater(100,showMergeMag)
         def showMergeMag():

trunk/fsource/SConstruct

@@ -382 +382 @@
         installcmd = "copy $TARGET " + InstallLoc
     else:
-        installcmd = "cp $TARGET " + InstallLoc
+        installcmd = "cp -p $TARGET " + InstallLoc
     return [cmd, installcmd]
 env.Append(BUILDERS = {'nist' : Builder(generator = generate_nist)},)
@@ -423 +423 @@
     filename = str(lib[0])
 
-# NIST*LATTICE programs
-for src in 'LATTIC.f','convcell.f':
-    target = os.path.splitext(src)[0] + EXEsuffix
-    out = env.nist(target,src)
-    Clean(out, target)
-    Depends(target, NISTlib) # make sure library is rebuilt if old
-
 # find modules that need to be built
 modlist = []
@@ -439 +432 @@
     Depends(target, liblist) # make sure libraries are rebuilt if old
     modlist.append(out[0].name)
+
+# NIST*LATTICE programs
+for src in 'LATTIC.f','convcell.f':
+    target = os.path.splitext(src)[0] + EXEsuffix
+    out = env.nist(target,src)
+    Clean(out, target)
+    Depends(target, NISTlib) # make sure library is rebuilt if old    
 #==========================================================================================
 # all done with setup, show the user the options and let scons do the work