Changeset 1706 for trunk/GSASIIctrls.py
- Timestamp:
- Mar 14, 2015 4:44:16 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIctrls.py
r1701 r1706 1481 1481 print 'Error: help lookup failed!',event.GetEventObject() 1482 1482 print 'id=',event.GetId() 1483 elif helpType == ' Tutorials':1483 elif helpType == 'OldTutorials': # this will go away 1484 1484 self.frame.Tutorials = True 1485 1485 ShowHelp(helpType,self.frame) 1486 elif helpType == ' NewTutorials': # this is just for testing1486 elif helpType == 'Tutorials': 1487 1487 dlg = OpenTutorial(self.frame) 1488 1488 if dlg.ShowModal() == wx.ID_OK: … … 1957 1957 ################################################################################ 1958 1958 G2BaseURL = "https://subversion.xray.aps.anl.gov/pyGSAS" 1959 # N.B. tutorialCatalog is generated by routine catalog.py, which also generates the appropriate 1960 # empty directories (.../MT/* .../trunk/GSASII/* *=[help,Exercises]) 1959 1961 tutorialCatalog = ( 1960 1962 # tutorial dir, exercise dir, web page file name title for page 1961 ['TOF Calibration', 'TOF Calibration', 'Calibration of a TOF powder diffractometer.htm', 'Calibration of a TOF powder diffractometer'], 1963 1964 ['StartingGSASII', 'StartingGSASII', 'Starting GSAS.htm', 1965 'Starting GSAS-II'], 1966 1967 ['FitPeaks', 'FitPeaks', 'Fit Peaks.htm', 1968 'Fitting individual peaks & autoindexing'], 1969 1970 ['CWNeutron', 'CWNeutron', 'Neutron CW Powder Data.htm', 1971 'CW Neutron Powder fit for Yttrium-Iron Garnet'], 1972 ['LabData', 'LabData', 'Laboratory X.htm', 1973 'Fitting laboratory X-ray powder data for fluoroapatite'], 1974 ['CWCombined', 'CWCombined', 'Combined refinement.htm', 1975 'Combined X-ray/CW-neutron refinement of PbSO4'], 1976 ['TOF-CW Joint Refinement', 'TOF-CW Joint Refinement', 'TOF combined XN Rietveld refinement in GSAS.htm', 1977 'Combined X-ray/TOF-neutron Rietveld refinement'], 1978 ['SeqRefine', 'SeqRefine', 'SequentialTutorial.htm', 1979 'Sequential refinement of multiple datasets'], 1980 ['SeqParametric', 'SeqParametric', 'ParametricFitting.htm', 1981 'Parametric Fitting and Pseudo Variables for Sequential Fits'], 1982 1983 ['CFjadarite', 'CFjadarite', 'Charge Flipping in GSAS.htm', 1984 'Charge Flipping structure solution for jadarite'], 1985 ['CFsucrose', 'CFsucrose', 'Charge Flipping - sucrose.htm', 1986 'Charge Flipping structure solution for sucrose'], 1962 1987 ['TOF Charge Flipping', 'TOF Charge Flipping', 'Charge Flipping with TOF single crystal data in GSASII.htm', 1963 'Charge flipping with neutron TOF single crystal data'], 1964 ['TOF-CW Joint Refinement', 'TOF-CW Joint Refinement', 'TOF combined XN Rietveld refinement in GSAS.htm', 'Combined XN Rietveld refinement with TOF data'], 1965 ['TOF Sequential Single Peak Fit', 'TOF Sequential Single Peak Fit', '', ''], 1966 ['TOF Single Crystal Refinement', 'TOF Single Crystal Refinement', '', ''], 1988 'Charge flipping with neutron TOF single crystal data'], 1989 ['MCsimanneal', 'MCsimanneal', 'MCSA in GSAS.htm', 1990 'Monte-Carlo simulated annealing structure'], 1991 1992 ['2DCalibration', '2DCalibration', 'Calibration of an area detector in GSAS.htm', 1993 'Calibration of an area detector'], 1994 ['2DIntegration', '2DIntegration', 'Integration of area detector data in GSAS.htm', 1995 'Integration of area detector data'], 1996 ['TOF Calibration', 'TOF Calibration', 'Calibration of a TOF powder diffractometer.htm', 1997 'Calibration of a Neutron TOF diffractometer'], 1998 1999 ['2DStrain', '2DStrain', 'Strain fitting of 2D data in GSAS-II.htm', 2000 'Strain fitting of 2D data'], 2001 2002 ['SAimages', 'SAimages', 'Small Angle Image Processing.htm', 2003 'Image Processing of small angle x-ray data'], 2004 ['SAfit', 'SAfit', 'Fitting Small Angle Scattering Data.htm', 2005 'Fitting small angle x-ray data (alumina powder)'], 2006 ['SAsize', 'SAsize', 'Small Angle Size Distribution.htm', 2007 'Small angle x-ray data size distribution (alumina powder)'], 2008 ['SAseqref', 'SAseqref', 'Sequential Refinement of Small Angle Scattering Data.htm', 2009 'Sequential refinement with small angle scattering data'], 2010 2011 #['TOF Sequential Single Peak Fit', 'TOF Sequential Single Peak Fit', '', ''], 2012 #['TOF Single Crystal Refinement', 'TOF Single Crystal Refinement', '', ''], 1967 2013 ) 1968 2014 if GSASIIpath.GetConfigValue('Tutorial_location'): … … 2012 2058 sizer.Add(hlp,0,wx.ALIGN_RIGHT|wx.ALL) 2013 2059 #====================================================================== 2014 # This is needed only until we get all the tutorials items moved2015 btn = wx.Button(pnl, wx.ID_ANY, "Open older tutorials")2016 btn.Bind(wx.EVT_BUTTON, self.OpenOld)2017 sizer.Add(btn,0,wx.ALIGN_CENTRE|wx.ALL)2060 # # This is needed only until we get all the tutorials items moved 2061 # btn = wx.Button(pnl, wx.ID_ANY, "Open older tutorials") 2062 # btn.Bind(wx.EVT_BUTTON, self.OpenOld) 2063 # sizer.Add(btn,0,wx.ALIGN_CENTRE|wx.ALL) 2018 2064 #====================================================================== 2019 2065 self.BrowseMode = 1 … … 2052 2098 self.topsizer=sizer 2053 2099 self.CenterOnParent() 2054 def OpenOld(self,event):2055 '''Open old tutorials. This is needed only until we get all the tutorials items moved2056 '''2057 self.EndModal(wx.ID_OK)2058 self.frame.Tutorials = True2059 ShowHelp('Tutorials',self.frame)2100 # def OpenOld(self,event): 2101 # '''Open old tutorials. This is needed only until we get all the tutorials items moved 2102 # ''' 2103 # self.EndModal(wx.ID_OK) 2104 # self.frame.Tutorials = True 2105 # ShowHelp('Tutorials',self.frame) 2060 2106 def OnModeSelect(self,event): 2061 2107 '''Respond when the mode is changed
Note: See TracChangeset
for help on using the changeset viewer.