Changeset 3436
- Timestamp:
- Jun 17, 2018 12:42:56 AM (5 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIddataGUI.py
r3296 r3436 126 126 if 'PWDR' in G2frame.hist and generalData['Type'] != 'magnetic': 127 127 wtSum = G2pwd.PhaseWtSum(G2frame,G2frame.hist) 128 weightFr = UseList[G2frame.hist]['Scale'][0]*generalData['Mass']/wtSum 129 scaleSizer.Add(wx.StaticText(DData,label=' Wt. fraction: %.3f'%(weightFr)),0,WACV) 128 if wtSum: 129 weightFr = UseList[G2frame.hist]['Scale'][0]*generalData['Mass']/wtSum 130 scaleSizer.Add(wx.StaticText(DData,label=' Wt. fraction: %.3f'%(weightFr)),0,WACV) 130 131 return scaleSizer 131 132 … … 795 796 def RepaintHistogramInfo(Scroll=0): 796 797 if 'phoenix' in wx.version(): 798 # if DData.__class__ is not wx._core.ScrolledWindow: 799 # # How to determine window is closed in Phoenix? 800 # return 797 801 G2frame.bottomSizer.Clear(True) 798 802 else: 803 if DData.__class__ is not wx._windows.ScrolledWindow: 804 # fix bug where this is called after the Window is deleted 805 return 799 806 G2frame.bottomSizer.DeleteWindows() 800 801 802 803 804 805 806 807 807 Indx.clear() 808 G2frame.bottomSizer = ShowHistogramInfo() 809 mainSizer.Add(G2frame.bottomSizer) 810 mainSizer.Layout() 811 G2frame.dataWindow.Refresh() 812 DData.SetVirtualSize(mainSizer.GetMinSize()) 813 DData.Scroll(0,Scroll) 814 G2frame.dataWindow.SendSizeEvent() 808 815 809 816 def ShowHistogramInfo(): -
trunk/fsource/SConstruct
r3203 r3436 95 95 FORTflags = "" 96 96 LDFLAGS = '' 97 tmpdir = None 97 98 #========================================================================================== 98 99 # configure platform dependent options here: … … 115 116 print ("Sorry, parameters for platform "+sys.platform+" are not yet defined") 116 117 sys.exit() 118 if ARGUMENTS.get('TMP'): 119 tmpdir = ARGUMENTS.get('TMP') 117 120 if FCompiler == 'gfortran': 118 121 if ARGUMENTS.get('LIBGCC', '').upper().startswith('T'): … … 185 188 LDFLAGS='string' -- string of options to be used for f2py during link step 186 189 190 TMP=<path> --- where <path> is something like /tmp sets builds to be performed 191 in that directory. 192 187 193 Note that at present, this has been tested with 32-bit python on windows and 188 Mac & 64 bit on linux. Python 3.x is not supported in GSAS-II yet. 194 Mac & 64 bit on linux. 32-bit builds with anaconda/gfortran in 32-bit Python 195 is not working, at least not when installed in 64-bits Linux/Windows. 189 196 190 197 examples: … … 255 262 F2PYflags = '--compiler=mingw32 --fcompiler=gfortran --f77flags="-fno-range-check -m64"' 256 263 elif sys.platform == "win32": 257 #if FORTflags == "": FORTflags = ' -w -O2 -m32' 264 # the next line may need to be removed. When compiling with a 32-bit machine? 265 #if FORTflags == "": FORTflags = ' -w -O2 -m32' 258 266 if F2PYflags == "": 259 267 F2PYflags = '--compiler=mingw32 --fcompiler=gfortran --f77flags="-fno-range-check"' … … 271 279 print ('Error: specify a F2PYflags value') 272 280 sys.exit() 281 if tmpdir: 282 F2PYflags += " --build-dir " + tmpdir 273 283 #========================================================================================== 274 284 # Setup build Environment
Note: See TracChangeset
for help on using the changeset viewer.