Changeset 00323d6 in sasview


Ignore:
Timestamp:
Feb 18, 2015 3:35:24 AM (8 years ago)
Author:
butler
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:
e4d4de2
Parents:
707c6be (diff), d838715 (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

Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed
  • docs/sphinx-docs/source/user/user.rst

    r3702c12 r2b7d102  
    44.. toctree:: 
    55   :maxdepth: 1 
    6  
     6    
    77   Model Documentation <models/model_functions> 
    88    
     9   Data Formats <guiframe/data_formats_help> 
    910    
    1011   Loading Data <guiframe/data_explorer_help> 
    1112    
    1213   Plotting Data/Models <guiframe/graph_help> 
    13     
    1414    
    1515   Fitting Perspective <perspectives/fitting/fitting_help> 
     
    1919   Invariant Calculation Perspective <perspectives/invariant/invariant_help> 
    2020    
    21    
    2221   Data Operations Tool <perspectives/calculator/data_operator_help> 
    2322       
     
    3635   SANS Resolution Estimator Tool <perspectives/calculator/resolution_calculator_help> 
    3736    
    38     
    3937   Python Shell Tool <perspectives/calculator/python_shell_help> 
  • src/sas/guiframe/media/data_explorer_help.rst

    r23a9beb rc147870  
    3333 
    3434*Data Explorer* is a panel that allows the user more interactions with data.  
    35 Some functionalities provided by the Data Explorer are also available through  
    36 the context menu of plot panels or other menus of the applications.Under menu  
    37 *View*  of the menubar, Data explorer can be toggled between Show and Hide by  
    38 clicking the menu *Show/Hide Data Explorer* . 
     35Some functionalities provided by the *Data Explorer* are also available through  
     36the context menu of plot panels or other menus within the application. 
    3937 
    40 *IMPORTANT!*  When Data explorer is hidden, all the data loaded will be sent  
    41 directly to the current active application, if possible. When data Explorer is  
    42 shown data go first to the Data Explorer for the user to handle them later. 
     38Under *View* in the menu bar, *Data Explorer* can be toggled between Show and  
     39Hide by clicking *Show/Hide Data Explorer*. 
     40 
     41NOTE! When *Data Explorer* is hidden, all data loaded will be sent directly  
     42to the current active application, if possible. When *Data Explorer* is  
     43shown, data go first to the *Data Explorer*. 
    4344 
    4445.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     
    4950--------- 
    5051 
    51 To Load data, click the button *Load Data* , then select one or more (holding  
    52 Ctrl key) files to load into the application. In the list, the *Data*  will be  
    53 displayed as the name of each selected file. Expending this data by clicking  
    54 the *+*  symbol will display available information about the data such as data  
    55 title if exists. 
     52To load data, click the button *Load Data*, then select one or more (by holding  
     53the Ctrl key) files to load into the application. The name of each selected  
     54file will be listed. Clicking the *+*  symbol will display any available  
     55metadata. 
    5656 
    5757.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     
    6262---------- 
    6363 
    64 For a quick Data-info/Save/Plot/3d-plot(2d only)/Edit-mask(2d only),  
    65 high-light the data/theory, right-click, and select a proper item from the  
    66 context menu. 
     64Right-clicking on a loaded dataset (or model calculation, what SasView calls a  
     65theory) brings up a *Handy Menu* from which it is possible to access Data Info,  
     66Save the data/theory, or Plot the data/theory. 
    6767 
    6868.. image:: hand_menu.png 
     
    7575------------- 
    7676 
    77 To interact with data, check a data label and click on a button. Checking Data  
    78 make them active for the button operation. Unchecking Data labels will  
    79 deactivate them. 
     77To interact with data it must be activated. This is accomplished by checking  
     78the box next to the data label. A green tick will appear. 
    8079 
    81 There is a combo box labeled *Selection Options*  that allows to activate or  
    82 select multiple data simultaneously. 
     80Unchecking/unticking the box deactivates a data set. 
     81 
     82There is also a combo box labeled *Selection Options* from which you can  
     83activate or deactivate multiple data sets. 
    8384 
    8485.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     
    8990----------- 
    9091 
    91 Remove data button remove all reference of this data into the application. 
     92WARNING! *Remove Data* will stop any data operations currently using the  
     93selected data sets. 
    9294 
    93 *WARNING!* Remove data will stop any jobs currently using the selected data. 
     95 
     96*Remove Data* removes all reference to selected data from the application. 
    9497 
    9598.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     
    100103-------------------- 
    101104 
    102 Click on the button *Append To*  to append selected Data to a plot panel on  
    103 focus. Next to this button is a combo box containing available panels names.  
    104 Selecting a name from this combo box will set the corresponding lot panel on  
    105 focus. If not plot panel is available, the combo box and button will be  
    106 disable. 2D Data cannot be appended to any plot panels . This operation can  
     105Click on the button *Append To* to add selected data to a plot panel. Next to  
     106the button is a combo box containing the names of available plot panels.  
     107Selecting a name from this combo box will move that plot into focus. 
     108  
     109If a plot panel is not available, the combo box and button will be  
     110disabled. 
     111 
     1122D Data cannot be appended to any plot panels. This operation can  
    107113only be performed on 1D data and plot panels currently containing 1D data. 
    108114 
     
    114120--------------- 
    115121 
    116 Click on *New Plot*  button to create a new plot panel where selected data  
    117 will be plotted. 
     122Click on the *New Plot* button to create a new plot panel where the currently  
     123selected data will be plotted. 
    118124 
    119125.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     
    124130------------- 
    125131 
    126 *Freeze Theory*  button generate Data from selected theory. This operation can  
    127 only be performed when theory labels are selected. 
     132The *Freeze Theory* button generates data from the selected theory. 
     133 
     134NOTE! This operation can only be performed when theory labels are selected. 
    128135 
    129136.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     
    134141------------------- 
    135142 
    136 Click on the button *Send To*  to send Data to the current active control  
    137 page. One of the single/batch mode can be selected only for Fitting. The batch  
    138 mode provides serial (batch) fitting with one model, i.e., fitting one data by  
    139 another data. Note that only the Fitting allows more that one data to be sent. 
     143Click on the button *Send To* button to send the currently selected data to  
     144a perspective (for *Fitting*, *P(r) Inversion*, or *Invariant* calculation). 
     145  
     146The *Single*/*Batch* mode radio buttons only apply to the *Fitting* perspective. 
     147 
     148*Batch mode* provides serial (batch) fitting with one model function, that is,  
     149fitting one data set followed by another. If several data sets need to be  
     150fitted at the same time, use *Simultaneous* fitting under the *Fitting*  
     151option on the menu bar. 
  • src/sas/models/media/model_functions.rst

    r98b30b4 rcd06a5f  
    8787 
    8888 2.1 Shape-based_ Functions 
     89  
    8990 2.2 Shape-independent_ Functions 
     91  
    9092 2.3 Structure-factor_ Functions 
     93  
    9194 2.4 Customised_ Functions 
    9295 
  • src/sas/perspectives/fitting/basepage.py

    rb9a5f0e r6e653582  
    832832            infor = 'warning' 
    833833        elif flag: 
    834             msg = " Parameter values are pasted from the clipboad..." 
     834            msg = " Parameter values are pasted from the clipboard..." 
    835835            infor = "warning" 
    836836        else: 
    837             msg = "Error occured: " 
     837            msg = "Error occurred: " 
    838838            msg += "No valid parameter values to paste from the clipboard..." 
    839             infor = "error" 
    840             wx.PostEvent(self._manager.parent, 
    841                     StatusEvent(status=msg, info=infor)) 
     839            infor = "warning" 
    842840        # inform msg to wx 
    843841        wx.PostEvent(self._manager.parent, 
  • src/sas/perspectives/fitting/pagestate.py

    rd06ae30 rd838715  
    637637        report_list = [report_str, text_str, images] 
    638638        dialog = ReportDialog(report_list, None, -1, "") 
    639         dialog.ShowModal() 
     639        dialog.Show() 
    640640         
    641641    def _toXML_helper(self, thelist, element, newdoc): 
  • src/sas/perspectives/invariant/invariant_panel.py

    rb9a5f0e rd838715  
    774774        report_list = [report_html_str, report_text_str, report_img] 
    775775        dialog = ReportDialog(report_list, None, -1, "") 
    776         dialog.ShowModal() 
     776        dialog.Show() 
    777777         
    778778    def get_state_by_num(self, state_num=None): 
  • src/sas/guiframe/gui_manager.py

    r4d5c42f r707c6be  
    21642164        from documentation_window import DocumentationWindow 
    21652165         
    2166         sphinx_doc_viewer = DocumentationWindow(self, -1, "index.html") 
    2167 #        sphinx_doc_viewer.Show() 
    2168  
     2166        sphinx_doc_viewer = DocumentationWindow(self, -1, "index.html", \ 
     2167                                                "General Help") 
    21692168 
    21702169    def set_manager(self, manager): 
  • src/sas/guiframe/local_perspectives/data_loader/data_loader.py

    rb45cde3 r8729965  
    5757        Show a general help dialog.  
    5858        """ 
    59         from help_panel import  HelpWindow 
    60         frame = HelpWindow(None, -1)  
    61         if hasattr(frame, "IsIconized"): 
    62             if not frame.IsIconized(): 
    63                 try: 
    64                     icon = self.parent.GetIcon() 
    65                     frame.SetIcon(icon) 
    66                 except: 
    67                     pass   
    68         frame.Show(True) 
     59#        from documentation_window import DocumentationWindow      
     60#        _sphinx_doc_viewer = DocumentationWindow(self, -1, "/user/guiframe/ \ 
     61#            data_explorer_help.html", "DataLoader Help") 
     62#        from help_panel import  HelpWindow 
     63#        frame = HelpWindow(None, -1)  
     64#        if hasattr(frame, "IsIconized"): 
     65#            if not frame.IsIconized(): 
     66#                try: 
     67#                    icon = self.parent.GetIcon() 
     68#                    frame.SetIcon(icon) 
     69#                except: 
     70#                    pass   
     71#        frame.Show(True) 
    6972         
    7073    def populate_file_menu(self): 
Note: See TracChangeset for help on using the changeset viewer.