Ignore:
Timestamp:
Oct 18, 2010 8:44:19 AM (14 years ago)
Author:
Jae Cho <jhjcho@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
89f3b66
Parents:
2e862a0
Message:

added kiessig fringe calculator and fixed slit length by ½ as our definition of slit length

Location:
calculatorview/perspectives/calculator
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • calculatorview/perspectives/calculator/calculator.py

    r6137b150 r74b1770  
    112112        Returns a set of menu entries for tools 
    113113        """ 
     114        kiessig_help = "This tool is to approximatly compute the " 
     115        kiessig_help += "thickness of a shell or the size of " 
     116        kiessig_help += "particles \n from the width of a Kiessig fringe." 
    114117        sld_help = "Provides computation related to Scattering Length Density" 
    115118        slit_length_help = "Provides computation related to Slit Length Density" 
     
    117120        return [("SLD Calculator", sld_help, self.on_calculate_sld), 
    118121                ("Slit Size Calculator", slit_length_help, 
    119                                 self.on_calculate_slit_size)]#, 
     122                        self.on_calculate_slit_size), 
     123                ("Kiessig Thickness Calculator",  
     124                        kiessig_help, self.on_calculate_kiessig),]#, 
    120125                #("Data Editor", data_editor_help, self.on_edit_data)] 
    121126               
     
    127132        frame = DataEditorWindow(parent=self.parent, data=[], title="Data Editor") 
    128133        frame.Show(True) 
    129          
     134 
     135    def on_calculate_kiessig(self, event): 
     136        """ 
     137        Compute the Kiessig thickness 
     138        """ 
     139        from kiessig_calculator_panel import KiessigWindow 
     140        frame = KiessigWindow() 
     141        frame.Show(True)  
     142     
     143        
    130144    def on_calculate_sld(self, event): 
    131145        """ 
  • calculatorview/perspectives/calculator/help_panel.py

    r1c779b6 r74b1770  
    115115            <li><a href ="sld_calculator_help.html" target ="showframe">SLD Calculator</a><br></li> 
    116116            <li><a href ="slit_calculator_help.html" target ="showframe">Slit Size Calculator</a><br></li> 
     117            <li><a href ="kiessig_calculator_help.html" target ="showframe">Kiessig Thickness Calculator</a><br></li> 
    117118            </ul> 
    118119            </body> 
  • calculatorview/perspectives/calculator/slit_length_calculator_panel.py

    r25a2ee3 r74b1770  
    8686            Fill the sizer containing slit size information 
    8787        """ 
    88         slit_size_txt = wx.StaticText(self, -1, 'Slit Size (FWHM): ') 
     88        slit_size_txt = wx.StaticText(self, -1, 'Slit Size (FWHM/2): ') 
    8989        self.slit_size_tcl = InterActiveOutputTextCtrl(self, -1, size=(_BOX_WIDTH,-1)) 
    9090        slit_size_hint = " Estimated full slit size" 
Note: See TracChangeset for help on using the changeset viewer.