Changeset 1706 for trunk/GSASIIctrls.py

Timestamp:

Mar 14, 2015 4:44:16 PM (8 years ago)

Author:

toby

Message:

finish with new Tutorial/Exercise? locs/links

File:

• trunk/GSASIIctrls.py (modified) (4 diffs)

trunk/GSASIIctrls.py

@@ -1481 +1481 @@
             print 'Error: help lookup failed!',event.GetEventObject()
             print 'id=',event.GetId()
-        elif helpType == 'Tutorials':
+        elif helpType == 'OldTutorials': # this will go away
             self.frame.Tutorials = True
             ShowHelp(helpType,self.frame)
-        elif helpType == 'NewTutorials': # this is just for testing
+        elif helpType == 'Tutorials': 
             dlg = OpenTutorial(self.frame)
             if dlg.ShowModal() == wx.ID_OK:
@@ -1957 +1957 @@
 ################################################################################
 G2BaseURL = "https://subversion.xray.aps.anl.gov/pyGSAS"
+# N.B. tutorialCatalog is generated by routine catalog.py, which also generates the appropriate
+# empty directories (.../MT/* .../trunk/GSASII/* *=[help,Exercises])
 tutorialCatalog = (
     # tutorial dir,      exercise dir,      web page file name                                title for page
-    ['TOF Calibration', 'TOF Calibration', 'Calibration of a TOF powder diffractometer.htm', 'Calibration of a TOF powder diffractometer'],
+
+    ['StartingGSASII', 'StartingGSASII', 'Starting GSAS.htm',
+       'Starting GSAS-II'],
+       
+    ['FitPeaks', 'FitPeaks', 'Fit Peaks.htm',
+       'Fitting individual peaks & autoindexing'],
+       
+    ['CWNeutron', 'CWNeutron', 'Neutron CW Powder Data.htm',
+       'CW Neutron Powder fit for Yttrium-Iron Garnet'],
+    ['LabData', 'LabData', 'Laboratory X.htm',
+       'Fitting laboratory X-ray powder data for fluoroapatite'],
+    ['CWCombined', 'CWCombined', 'Combined refinement.htm',
+       'Combined X-ray/CW-neutron refinement of PbSO4'],
+    ['TOF-CW Joint Refinement', 'TOF-CW Joint Refinement', 'TOF combined XN Rietveld refinement in GSAS.htm',
+       'Combined X-ray/TOF-neutron Rietveld refinement'],
+    ['SeqRefine', 'SeqRefine', 'SequentialTutorial.htm',
+       'Sequential refinement of multiple datasets'],
+    ['SeqParametric', 'SeqParametric', 'ParametricFitting.htm',
+       'Parametric Fitting and Pseudo Variables for Sequential Fits'],
+       
+    ['CFjadarite', 'CFjadarite', 'Charge Flipping in GSAS.htm',
+       'Charge Flipping structure solution for jadarite'],
+    ['CFsucrose', 'CFsucrose', 'Charge Flipping - sucrose.htm',
+       'Charge Flipping structure solution for sucrose'],
     ['TOF Charge Flipping', 'TOF Charge Flipping', 'Charge Flipping with TOF single crystal data in GSASII.htm',
-     'Charge flipping with neutron TOF single crystal data'],
-    ['TOF-CW Joint Refinement', 'TOF-CW Joint Refinement', 'TOF combined XN Rietveld refinement in GSAS.htm', 'Combined XN Rietveld refinement with TOF data'],
-    ['TOF Sequential Single Peak Fit', 'TOF Sequential Single Peak Fit', '', ''],
-    ['TOF Single Crystal Refinement', 'TOF Single Crystal Refinement', '', ''],
+       'Charge flipping with neutron TOF single crystal data'],
+    ['MCsimanneal', 'MCsimanneal', 'MCSA in GSAS.htm',
+       'Monte-Carlo simulated annealing structure'],
+
+    ['2DCalibration', '2DCalibration', 'Calibration of an area detector in GSAS.htm',
+       'Calibration of an area detector'],
+    ['2DIntegration', '2DIntegration', 'Integration of area detector data in GSAS.htm',
+       'Integration of area detector data'],
+    ['TOF Calibration', 'TOF Calibration', 'Calibration of a TOF powder diffractometer.htm',
+       'Calibration of a Neutron TOF diffractometer'],
+       
+    ['2DStrain', '2DStrain', 'Strain fitting of 2D data in GSAS-II.htm',
+       'Strain fitting of 2D data'],
+       
+    ['SAimages', 'SAimages', 'Small Angle Image Processing.htm',
+       'Image Processing of small angle x-ray data'],
+    ['SAfit', 'SAfit', 'Fitting Small Angle Scattering Data.htm',
+       'Fitting small angle x-ray data (alumina powder)'],
+    ['SAsize', 'SAsize', 'Small Angle Size Distribution.htm',
+       'Small angle x-ray data size distribution (alumina powder)'],
+    ['SAseqref', 'SAseqref', 'Sequential Refinement of Small Angle Scattering Data.htm',
+       'Sequential refinement with small angle scattering data'],
+    
+    #['TOF Sequential Single Peak Fit', 'TOF Sequential Single Peak Fit', '', ''],
+    #['TOF Single Crystal Refinement', 'TOF Single Crystal Refinement', '', ''],
     )
 if GSASIIpath.GetConfigValue('Tutorial_location'):
@@ -2012 +2058 @@
         sizer.Add(hlp,0,wx.ALIGN_RIGHT|wx.ALL)
         #======================================================================
-        # This is needed only until we get all the tutorials items moved
-        btn = wx.Button(pnl, wx.ID_ANY, "Open older tutorials") 
-        btn.Bind(wx.EVT_BUTTON, self.OpenOld)
-        sizer.Add(btn,0,wx.ALIGN_CENTRE|wx.ALL)
+        # # This is needed only until we get all the tutorials items moved
+        # btn = wx.Button(pnl, wx.ID_ANY, "Open older tutorials") 
+        # btn.Bind(wx.EVT_BUTTON, self.OpenOld)
+        # sizer.Add(btn,0,wx.ALIGN_CENTRE|wx.ALL)
         #======================================================================
         self.BrowseMode = 1
@@ -2052 +2098 @@
         self.topsizer=sizer
         self.CenterOnParent()
-    def OpenOld(self,event):
-        '''Open old tutorials. This is needed only until we get all the tutorials items moved
-        '''
-        self.EndModal(wx.ID_OK)
-        self.frame.Tutorials = True 
-        ShowHelp('Tutorials',self.frame)
+    # def OpenOld(self,event):
+    #     '''Open old tutorials. This is needed only until we get all the tutorials items moved
+    #     '''
+    #     self.EndModal(wx.ID_OK)
+    #     self.frame.Tutorials = True 
+    #     ShowHelp('Tutorials',self.frame)
     def OnModeSelect(self,event):
         '''Respond when the mode is changed