Changeset e55e7a6 in sasview


Ignore:
Timestamp:
Aug 16, 2016 12:29:10 PM (8 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:
6bb4edd, 8096b446
Parents:
b64b87c (diff), 8b138bd (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/sasgui
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

    re63cf11 r895c9cb  
    671671        self._slicerpop.AppendSeparator() 
    672672        wx_id = ids.next() 
     673        self._slicerpop.Append(wx_id, '&Set Graph Range') 
     674        wx.EVT_MENU(self, wx_id, self.onSetRange) 
     675        wx_id = ids.next() 
    673676        self._slicerpop.Append(wx_id, '&Reset Graph Range') 
    674677        wx.EVT_MENU(self, wx_id, self.onResetGraph) 
     
    687690        self.PopupMenu(self._slicerpop, pos) 
    688691 
     692    def onSetRange(self, event): 
     693        # Display dialog 
     694        # self.subplot.set_xlim((low, high)) 
     695        # self.subplot.set_ylim((low, high)) 
     696        from sas.sasgui.plottools.RangeDialog import RangeDialog 
     697        d = RangeDialog(self, -1) 
     698        xlim = self.subplot.get_xlim() 
     699        ylim = self.subplot.get_ylim() 
     700        d.SetXRange(xlim) 
     701        d.SetYRange(ylim) 
     702        if d.ShowModal() == wx.ID_OK: 
     703            x_range = d.GetXRange() 
     704            y_range = d.GetYRange() 
     705            if x_range is not None and y_range is not None: 
     706                self.subplot.set_xlim(x_range) 
     707                self.subplot.set_ylim(y_range) 
     708                self.subplot.figure.canvas.draw_idle() 
     709        d.Destroy() 
     710 
    689711    def onFreeze(self, event): 
    690712        """ 
  • src/sas/sasgui/guiframe/media/data_explorer_help.rst

    rd85c194 rb64b87c  
    2020 
    2121*NOTE! When* Data Explorer *is hidden, all data loaded will be sent directly  
    22 to the current active analysis perspective, if possible. When* Data Explorer *is 
     22to the current active analysis, if possible. When* Data Explorer *is 
    2323shown, data go first to the* Data Explorer. 
    2424 
     
    116116 
    117117Click on the *Send To* button to send the currently selected data to one of the 
    118 perspectives (for *Fitting*, *P(r) Inversion*, or *Invariant* calculation). 
     118available types of analysis (*Fitting*, *P(r) Inversion*, or *Invariant* calculation). 
    119119  
    120 The *Single*/*Batch* mode radio buttons only apply to the *Fitting* perspective. 
     120The *Single*/*Batch* mode radio buttons only apply to *Fitting*. 
    121121 
    122122*Batch mode* provides serial (batch) fitting with one model function, that is,  
  • src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

    r20846be rb64b87c  
    1515 
    1616 
    17 Fitting Perspective 
    18 =================== 
     17Fitting 
     18======= 
    1919 
    2020.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     
    2424 
    2525To fit some data you must first load some data, activate one or more data sets, 
    26 send those data sets to the fitting perspective, and select a model to fit to 
    27 each data set. 
     26send those data sets to fitting, and select a model to fit to each data set. 
    2827 
    2928Instructions on how to load and activate data are in the section :ref:`Loading_data`. 
     
    331330This mode fits one data set. 
    332331 
    333 When data is sent to the fitting perspective it is plotted in a graph window as 
    334 markers. 
     332When data is sent to the fitting it is plotted in a graph window as markers. 
    335333 
    336334If a graph does not appear, or a graph window appears but is empty, then the data 
  • src/sas/sasgui/perspectives/fitting/media/pd_help.rst

    r7805458 rb64b87c  
    105105 
    106106The median value for the distribution will be the value given for the respective 
    107 size parameter in the *Fitting Perspective*, for example, radius = 60. 
     107size parameter in the *FitPage*, for example, radius = 60. 
    108108 
    109109The polydispersity is given by |sigma| 
     
    172172 
    173173SasView only uses these array values during the computation, therefore any mean 
    174 value of the parameter represented by *x* present in the *Fitting Perspective* 
     174value of the parameter represented by *x* present in the *FitPage* 
    175175will be ignored. 
    176176 
  • src/sas/sasgui/perspectives/invariant/media/invariant_help.rst

    r70305bd2 rb64b87c  
    44.. by S King, ISIS, during SasView CodeCamp-III in Feb 2015. 
    55 
    6 Invariant Calculation Perspective 
    7 ================================= 
     6Invariant Calculation 
     7===================== 
    88 
    99Description 
     
    4545.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    4646 
    47 Using the perspective 
    48 --------------------- 
     47Using invariant analysis 
     48------------------------ 
    4949 
    50501) Select *Invariant* from the *Analysis* menu on the SasView toolbar. 
     
    5353 
    54543) Select a dataset and use the *Send To* button on the *Data Explorer* to load  
    55    the dataset into the *Invariant* perspective. 
     55   the dataset into the *Invariant* panel. 
    5656 
    57 4) Use the *Customised Input* boxes on the *Invariant* perspective to subtract  
     574) Use the *Customised Input* boxes on the *Invariant* panel to subtract  
    5858   any background, specify the contrast (i.e. difference in SLDs - this must be  
    5959   specified for the eventual value of Q*\  to be on an absolute scale), or to  
     
    7373 
    74748) If the value of Q*\  calculated with the extrapolated regions is invalid, a  
    75    red warning will appear at the top of the *Invariant* perspective panel. 
     75   red warning will appear at the top of the *Invariant* panel. 
    7676 
    7777   The details of the calculation are available by clicking the *Details*  
  • src/sas/sasgui/perspectives/pr/media/pr_help.rst

    r7805458 rb64b87c  
    44.. by S King, ISIS, during SasView CodeCamp-III in Feb 2015. 
    55 
    6 P(r) Inversion Perspective 
    7 ========================== 
     6P(r) Calculation 
     7================ 
    88 
    99Description 
     
    3232.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    3333 
    34 Using the perspective 
    35 --------------------- 
     34Using P(r) inversion 
     35-------------------- 
    3636 
    3737The user must enter 
Note: See TracChangeset for help on using the changeset viewer.