Changeset 7829bb7 in sasview for src


Ignore:
Timestamp:
Feb 19, 2015 6:23:45 AM (10 years ago)
Author:
smk78
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:
cbae5a2
Parents:
17e1f14 (diff), 83eff66 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://github.com/SasView/sasview.git

Location:
src/sas
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • src/sas/guiframe/config.py

    rfd5ac0d rf53cd30  
    2626# About box info 
    2727_do_aboutbox = True 
     28_do_acknowledge = True 
    2829_do_tutorial = True 
     30_acknowledgement_preamble =\ 
     31'''If you found this software useful to your work please remember to acknowledge  
     32its use in your publications as suggested below and reference the SasView website:  
     33http://www.sasview.org/index.html. Please also consider letting us know by sending us the  
     34reference to your work. This will help us to ensure the long term support and  
     35development of the software. 
     36''' 
     37_acknowledgement_publications = \ 
     38'''This work originally developed as part of the DANSE project funded by the NSF 
     39under grant DMR-0520547, and currently maintained by NIST, UMD, ORNL, ISIS, ESS  
     40and ILL. 
     41''' 
    2942_acknowledgement =  \ 
    3043'''This software was developed by the University of Tennessee as part of the 
  • src/sas/guiframe/gui_manager.py

    r707c6be rf53cd30  
    13511351            wx.EVT_MENU(self, id, self._onTutorial) 
    13521352             
     1353        if config._do_acknowledge: 
     1354            self._help_menu.AppendSeparator() 
     1355            self._help_menu.Append(id, '&Acknowledge', 'Acknowledging SasView') 
     1356            wx.EVT_MENU(self, id, self._onAcknowledge) 
     1357         
    13531358        if config._do_aboutbox: 
    13541359            self._help_menu.AppendSeparator() 
     
    20982103                self.SetStatusText(msg) 
    20992104                     
     2105    def _onAcknowledge(self, evt): 
     2106        """ 
     2107        Pop up the acknowledge dialog 
     2108         
     2109        :param evt: menu event 
     2110         
     2111        """ 
     2112        if config._do_acknowledge: 
     2113            import sas.guiframe.acknowledgebox as AcknowledgeBox 
     2114            dialog = AcknowledgeBox.DialogAcknowledge(None, -1, "") 
     2115            dialog.ShowModal() 
     2116                      
    21002117    def _onAbout(self, evt): 
    21012118        """ 
  • src/sas/perspectives/calculator/media/data_operator_help.rst

    r684fade rad4d8b4  
    3434   available operators are: 
    3535    
    36 + (for addition) 
    37 - (for subtraction),  
    38 * (for multiplication) 
    39 / (for division) 
    40 | (for combination of two data sets) 
     36 \+ (for addition) 
     37 \- (for subtraction)  
     38 \* (for multiplication) 
     39 \/ (for division) 
     40 \| (for combination of two data sets) 
    4141 
    4242   If two data sets do not match, the operation will fail and the background  
  • src/sas/perspectives/calculator/media/density_calculator_help.rst

    r054a3ad r36819ee  
    1919------ 
    2020 
    21 1) Enter the empirical formula of a molecule. For mixtures, the ratio of each  
     21 
     221) Select *Density/Volume Calculator* from the *Tool* menu on the SasView toolbar. 
     23 
     242) Enter the empirical formula of a molecule. For mixtures, the ratio of each  
    2225   of the molecules should be used, for example, (H2O)0.5(D2O)0.5. 
    2326 
    24 2) Use the input combo box to choose between molar volume or mass density and  
     273) Use the input combo box to choose between molar volume or mass density and  
    2528   then type in an input value. 
    2629 
    27 3) Click the 'Calculate' button to perform the calculation. 
     304) Click the 'Calculate' button to perform the calculation. 
    2831 
    2932.. image:: density_tutor.gif 
  • src/sas/perspectives/calculator/media/image_viewer_help.rst

    r920928f r1e01486  
    1414plot can also be resized by dragging the corner of the panel. 
    1515 
    16 Supported image formats are png, bmp, gif, or jpg. (There is currently a bug in  
    17 the tif loader) 
     16The supported input image formats are: 
     17 
     18*  BMP (bitmap format) 
     19*  GIF (graphical interchange format) 
     20*  JPG (joint photographic experts group format) 
     21*  PNG (portable network graphics format) 
     22*  TIF (tagged image format) 
    1823 
    1924.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     
    2227------ 
    2328 
    24 1. Select 'Image Viewer' under the 'Tool' menu in the menubar. 
     291) Select *Image Viewer* from the *Tool* menu on the SasView toolbar. 
    2530 
    26 2. Select a file type from the drop-box at the bottom of the file dialog panel,  
    27 choose a file of interest, and then click the 'Open' button (see the  
    28 picture below). 
     312) Select a file and then click *Open*. 
    2932 
    3033.. image:: load_image.bmp 
    3134 
    32 3. If the loading is successful, the image will be displayed. The file name  
    33 will be shown in the title bar (see the picture below). 
     35   If the loading is successful the image will be displayed. 
    3436 
    35 4. Some options such as saving, printing, and copying are available from the  
    36 menubar, or in the context-menu (by right-clicking anywhere in the plot). 
     373) To save, print, or copy the image, or to apply a grid overlay, right-click  
     38   anywhere in the plot. 
    3739 
    3840.. image:: pic_plot.bmp 
    3941 
    40 5. If the image is taken from a 2D detector, it can be converted into 2D data  
    41 where the z values are computed as  
     424. If the image is taken from a 2D detector, SasView can attempt to convert  
     43   the colour/grey scale into pseudo-intensity 2D data using  
    4244 
    43 z = (0.299 x R) + (0.587 x G) + (0.114 x B) 
     45   z = (0.299 x R) + (0.587 x G) + (0.114 x B) 
    4446 
    45 unless the picture file is formatted as 8-bit grey-scale tif. 
     47   unless the image is formatted as 8-bit grey-scale TIF. 
    4648 
    47 In the "Convert to Data" dialog, set the parameters relevant to your data and  
    48 then click the OK button. 
     495. In the *Convert to Data* dialog, set the parameters relevant to the data and  
     50   then click the OK. 
    4951 
    5052.. image:: pic_convert.bmp 
     53 
     54.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     55 
     56.. note::  This help document was last changed by Steve King, 18Feb2015 
  • src/sas/perspectives/calculator/media/kiessig_calculator_help.rst

    rec392464 r1e01486  
    33.. This is a port of the original SasView html help file to ReSTructured text 
    44.. by S King, ISIS, during SasView CodeCamp-III in Feb 2015. 
     5 
     6.. |pi| unicode:: U+03C0 
     7.. |Ang| unicode:: U+212B 
    58 
    69Kiessig Thickness Calculator Tool 
     
    1013----------- 
    1114 
    12 This tool is to approximately estimate the thickness of a layer or the  
    13 diameter of particles from the Kiessig fringe in SAS/NR data, and using the  
    14 Kiessig relation 
     15This tool is approximately estimates the thickness of a layer or the diameter  
     16of particles from the position of the Kiessig fringe/Bragg peak in NR/SAS data  
     17using the relation 
    1518 
    16 thickness = 2*Pi/fringe_width. 
     19(thickness *or* size) = 2 * |pi| / (fringe_width *or* peak position) 
    1720   
    1821.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    19  
    2022 
    2123How To 
    2224------ 
    2325 
    24 To get a rough thickness or particle size, just type the Kiessig fringe width  
    25 (in units of 1/Angstrom) and click on the 'Compute' button. Then the output  
    26 value will be show up in the 'Thickness' text box. 
     26To get a rough thickness or particle size, simply type the fringe or peak  
     27position (in units of 1/|Ang|\) and click on the *Compute* button. 
     28 
     29.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     30 
     31.. note::  This help document was last changed by Steve King, 18Feb2015 
     32 
Note: See TracChangeset for help on using the changeset viewer.