Changeset 3436

Timestamp:

Jun 17, 2018 12:42:56 AM (3 years ago)

Author:

toby

Message:

fix phase fraction with no included phases; repaint after; put TMP dir option into scons

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (2 diffs)
• fsource/SConstruct (modified) (5 diffs)

trunk/GSASIIddataGUI.py

@@ -126 +126 @@
         if 'PWDR' in G2frame.hist and generalData['Type'] != 'magnetic':
             wtSum = G2pwd.PhaseWtSum(G2frame,G2frame.hist)
-            weightFr = UseList[G2frame.hist]['Scale'][0]*generalData['Mass']/wtSum
-            scaleSizer.Add(wx.StaticText(DData,label=' Wt. fraction: %.3f'%(weightFr)),0,WACV)
+            if wtSum:
+                weightFr = UseList[G2frame.hist]['Scale'][0]*generalData['Mass']/wtSum
+                scaleSizer.Add(wx.StaticText(DData,label=' Wt. fraction: %.3f'%(weightFr)),0,WACV)
         return scaleSizer
         
@@ -795 +796 @@
     def RepaintHistogramInfo(Scroll=0):
         if 'phoenix' in wx.version():
+#            if DData.__class__ is  not wx._core.ScrolledWindow:
+#                # How to determine window is closed in Phoenix? 
+#                return
             G2frame.bottomSizer.Clear(True)
         else:
+            if DData.__class__ is  not wx._windows.ScrolledWindow:
+                # fix bug where this is called after the Window is deleted
+                return
             G2frame.bottomSizer.DeleteWindows()
-            Indx.clear()
-            G2frame.bottomSizer = ShowHistogramInfo()
-            mainSizer.Add(G2frame.bottomSizer)
-            mainSizer.Layout()
-            G2frame.dataWindow.Refresh()
-            DData.SetVirtualSize(mainSizer.GetMinSize())
-            DData.Scroll(0,Scroll)
-            G2frame.dataWindow.SendSizeEvent()
+        Indx.clear()
+        G2frame.bottomSizer = ShowHistogramInfo()
+        mainSizer.Add(G2frame.bottomSizer)
+        mainSizer.Layout()
+        G2frame.dataWindow.Refresh()
+        DData.SetVirtualSize(mainSizer.GetMinSize())
+        DData.Scroll(0,Scroll)
+        G2frame.dataWindow.SendSizeEvent()
         
     def ShowHistogramInfo():

trunk/fsource/SConstruct

@@ -95 +95 @@
 FORTflags = ""
 LDFLAGS = ''
+tmpdir = None
 #==========================================================================================
 # configure platform dependent options here: 
@@ -115 +116 @@
     print ("Sorry, parameters for platform "+sys.platform+" are not yet defined")
     sys.exit()
+if ARGUMENTS.get('TMP'):
+   tmpdir = ARGUMENTS.get('TMP')
 if FCompiler == 'gfortran':
     if ARGUMENTS.get('LIBGCC', '').upper().startswith('T'):
@@ -185 +188 @@
 LDFLAGS='string'   -- string of options to be used for f2py during link step
 
+TMP=<path> --- where <path> is something like /tmp sets builds to be performed
+   in that directory. 
+
 Note that at present, this has been tested with 32-bit python on windows and
-Mac & 64 bit on linux. Python 3.x is not supported in GSAS-II yet.
+Mac & 64 bit on linux. 32-bit builds with anaconda/gfortran in 32-bit Python
+is not working, at least not when installed in 64-bits Linux/Windows. 
 
 examples:
@@ -255 +262 @@
             F2PYflags = '--compiler=mingw32 --fcompiler=gfortran --f77flags="-fno-range-check -m64"'
     elif sys.platform == "win32":
-        #if FORTflags == "": FORTflags = ' -w -O2 -m32'
+        # the next line may need to be removed. When compiling with a 32-bit machine?
+        #if FORTflags == "": FORTflags = ' -w -O2 -m32'
         if F2PYflags == "":
             F2PYflags = '--compiler=mingw32 --fcompiler=gfortran --f77flags="-fno-range-check"'
@@ -271 +279 @@
         print ('Error: specify a F2PYflags value')
         sys.exit()
+if tmpdir:
+    F2PYflags += " --build-dir " + tmpdir
 #==========================================================================================
 # Setup build Environment