Changeset 253


Ignore:
Timestamp:
Mar 4, 2011 4:29:22 PM (11 years ago)
Author:
toby
Message:

fix mouse labeling; makefile cleaning (not done)

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimgGUI.py

    r251 r253  
    194194        msg = \
    195195        '''Select > 4 points on 1st used ring of image pattern.
    196         Click right mouse button to select point.
    197           Use left mouse button to delete point.
     196        Click left mouse button to select point.
     197          Use right mouse button to delete point.
    198198                 Press OK when done'''
    199199        dlg = wx.MessageDialog(self,msg,'Pick inner ring',wx.OK)
  • trunk/fsource/Makefile

    r201 r253  
    1 # build the compiled fortran codes needed by GSAS-II
     1# build the compiled fortran codes needed by GSAS-II with f2py
     2# This is a work in progress. The idea is that files built here are placed in
     3# the bin directory, which is empty in the svn distribution. If these files will
     4# be distributed, they should be moved to a directory named bin<os><ver> where
     5# <os> is linux, mac or win and
    26
    3 BIN = ..\\bin
     7BIN = ../bin
    48LIBS = $(BIN)/pack_f.$(SUFFIX) $(BIN)/pyspg.$(SUFFIX) $(BIN)/polymask.$(SUFFIX) $(BIN)/histogram2d.$(SUFFIX) $(BIN)/pypowder.$(SUFFIX)
    59SYMLIB := $(wildcard spsubs/*.for)
     
    913#----------------------------------------------------------------------
    1014# linux (gfortran)
    11 #GSASlib = ./libgsas.a
    1215#COMPILER=--fcompiler=gnu95
    1316#PACKCOPTS=--f77flags="-fno-range-check"
     
    1821#----------------------------------------------------------------------
    1922# mac (gfortran)
    20 #GSASlib = /Users/toby/software/work/gsas/2009Aug31/libgsas.a
    21 #COMPILER=--fcompiler=gnu95 --f90exec=/usr/local/bin/gfortran
    22 #PACKCOPTS=--f77flags="-fno-range-check"
    23 #SUFFIX=so
    24 #F2PY=f2py
    25 #MOVE=mv
    26 #DEL=\#
     23COMPILER=--fcompiler=gnu95 --f77exec=/sw/bin/gfortran
     24PACKCOPTS=--f77flags="-fno-range-check" # -static-libgfortran -static-libgcc
     25SUFFIX=so
     26F2PY=f2py
     27MOVE=mv
     28DEL=\#
     29RM=rm -f
    2730#MACFIX = install_name_tool -change
    2831#MACCOPY = cp
     
    3740#----------------------------------------------------------------------
    3841# Windows gfortran-32
    39 COMPILER=--compiler=mingw32
    40 PACKCOPTS=--f77flags="-fno-range-check"
    41 SUFFIX=pyd
    42 F2PY=f2py
    43 MOVE=copy
    44 DEL=del
     42#COMPILER=--compiler=mingw32
     43#PACKCOPTS=--f77flags="-fno-range-check"
     44#SUFFIX=pyd
     45#F2PY=f2py
     46#MOVE=copy
     47#DEL=del
    4548
    4649
     
    118121#       $(DEL) ?????.$(SUFFIX)
    119122
     123clean:
     124        $(RM) $(LIBS)
    120125
    121126# no longer in use
Note: See TracChangeset for help on using the changeset viewer.