Changeset 1657 for trunk/GSASII.py


Ignore:
Timestamp:
Feb 16, 2015 2:46:06 PM (7 years ago)
Author:
toby
Message:

migrate help from G2grid; set instparms in Powder imports; seach for imports in data path; start on tutorial migration

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1655 r1657  
    8484
    8585__version__ = '0.2.0'
    86 G2gd.__version__ = __version__
    8786
    8887# PATCH: for Mavericks (OS X 10.9.x), wx produces an annoying warning about LucidaGrandeUI.
     
    257256        pathlist = sys.path[:]
    258257        #if path2GSAS2 not in pathlist: pathlist.append(path2GSAS2)
     258        if '.' not in pathlist: pathlist.append('.') # insert the directory where G2 is started
    259259
    260260        filelist = []
     
    12811281                if rd.repeat_instparm:
    12821282                    lastIparmfile = rd.instfile
     1283                # override any keys in read instrument parameters with ones set in import
     1284                for key in Iparm1: 
     1285                    if key in rd.instdict:
     1286                        Iparm1[key] = rd.instdict[key]
    12831287            else:
    12841288                Iparm1,Iparm2 = rd.pwdparms['Instrument Parameters']
     
    20032007            menubar.Append(menu=self.MacroMenu, title='Macro')
    20042008            self._init_Macro()
    2005         HelpMenu=G2gd.MyHelp(self,helpType='Data tree',
     2009        HelpMenu=G2G.MyHelp(self,helpType='Data tree',
    20062010            morehelpitems=[('&Tutorials','Tutorials')])
    20072011        menubar.Append(menu=HelpMenu,title='&Help')
Note: See TracChangeset for help on using the changeset viewer.