Changeset 253

Timestamp:

Mar 4, 2011 4:29:22 PM (12 years ago)

Author:

toby

Message:

fix mouse labeling; makefile cleaning (not done)

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (1 diff)
• fsource/Makefile (modified) (5 diffs)

trunk/GSASIIimgGUI.py

@@ -194 +194 @@
         msg = \
         '''Select > 4 points on 1st used ring of image pattern. 
-        Click right mouse button to select point.
-          Use left mouse button to delete point. 
+        Click left mouse button to select point.
+          Use right mouse button to delete point. 
                  Press OK when done'''
         dlg = wx.MessageDialog(self,msg,'Pick inner ring',wx.OK)

trunk/fsource/Makefile

@@ -1 @@
-# build the compiled fortran codes needed by GSAS-II
+# build the compiled fortran codes needed by GSAS-II with f2py
+# This is a work in progress. The idea is that files built here are placed in 
+# the bin directory, which is empty in the svn distribution. If these files will 
+# be distributed, they should be moved to a directory named bin<os><ver> where 
+# <os> is linux, mac or win and 
 
-BIN = ..\\bin
+BIN = ../bin
 LIBS = $(BIN)/pack_f.$(SUFFIX) $(BIN)/pyspg.$(SUFFIX) $(BIN)/polymask.$(SUFFIX) $(BIN)/histogram2d.$(SUFFIX) $(BIN)/pypowder.$(SUFFIX)
 SYMLIB := $(wildcard spsubs/*.for)
@@ -9 +13 @@
 #----------------------------------------------------------------------
 # linux (gfortran)
-#GSASlib = ./libgsas.a
 #COMPILER=--fcompiler=gnu95 
 #PACKCOPTS=--f77flags="-fno-range-check"
@@ -18 +21 @@
 #----------------------------------------------------------------------
 # mac (gfortran)
-#GSASlib = /Users/toby/software/work/gsas/2009Aug31/libgsas.a
-#COMPILER=--fcompiler=gnu95 --f90exec=/usr/local/bin/gfortran
-#PACKCOPTS=--f77flags="-fno-range-check"
-#SUFFIX=so
-#F2PY=f2py
-#MOVE=mv
-#DEL=\#
+COMPILER=--fcompiler=gnu95 --f77exec=/sw/bin/gfortran
+PACKCOPTS=--f77flags="-fno-range-check" # -static-libgfortran -static-libgcc
+SUFFIX=so
+F2PY=f2py
+MOVE=mv
+DEL=\#
+RM=rm -f
 #MACFIX = install_name_tool -change 
 #MACCOPY = cp
@@ -37 +40 @@
 #----------------------------------------------------------------------
 # Windows gfortran-32
-COMPILER=--compiler=mingw32
-PACKCOPTS=--f77flags="-fno-range-check"
-SUFFIX=pyd
-F2PY=f2py
-MOVE=copy
-DEL=del
+#COMPILER=--compiler=mingw32
+#PACKCOPTS=--f77flags="-fno-range-check"
+#SUFFIX=pyd
+#F2PY=f2py
+#MOVE=copy
+#DEL=del
 
 
@@ -118 +121 @@
 #       $(DEL) ?????.$(SUFFIX)
 
+clean:
+        $(RM) $(LIBS)
 
 # no longer in use