Changeset e55e7a6 in sasview

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:

• guiframe/local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)
• plottools/RangeDialog.py (added)
• guiframe/media/data_explorer_help.rst (modified) (2 diffs)
• perspectives/fitting/media/fitting_help.rst (modified) (3 diffs)
• perspectives/fitting/media/pd_help.rst (modified) (2 diffs)
• perspectives/invariant/media/invariant_help.rst (modified) (4 diffs)
• perspectives/pr/media/pr_help.rst (modified) (2 diffs)

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -671 +671 @@
         self._slicerpop.AppendSeparator()
         wx_id = ids.next()
+        self._slicerpop.Append(wx_id, '&Set Graph Range')
+        wx.EVT_MENU(self, wx_id, self.onSetRange)
+        wx_id = ids.next()
         self._slicerpop.Append(wx_id, '&Reset Graph Range')
         wx.EVT_MENU(self, wx_id, self.onResetGraph)
@@ -687 +690 @@
         self.PopupMenu(self._slicerpop, pos)
 
+    def onSetRange(self, event):
+        # Display dialog
+        # self.subplot.set_xlim((low, high))
+        # self.subplot.set_ylim((low, high))
+        from sas.sasgui.plottools.RangeDialog import RangeDialog
+        d = RangeDialog(self, -1)
+        xlim = self.subplot.get_xlim()
+        ylim = self.subplot.get_ylim()
+        d.SetXRange(xlim)
+        d.SetYRange(ylim)
+        if d.ShowModal() == wx.ID_OK:
+            x_range = d.GetXRange()
+            y_range = d.GetYRange()
+            if x_range is not None and y_range is not None:
+                self.subplot.set_xlim(x_range)
+                self.subplot.set_ylim(y_range)
+                self.subplot.figure.canvas.draw_idle()
+        d.Destroy()
+
     def onFreeze(self, event):
         """

src/sas/sasgui/guiframe/media/data_explorer_help.rst

@@ -20 +20 @@
 
 *NOTE! When* Data Explorer *is hidden, all data loaded will be sent directly 
-to the current active analysis perspective, if possible. When* Data Explorer *is
+to the current active analysis, if possible. When* Data Explorer *is
 shown, data go first to the* Data Explorer.
 
@@ -116 +116 @@
 
 Click on the *Send To* button to send the currently selected data to one of the
-perspectives (for *Fitting*, *P(r) Inversion*, or *Invariant* calculation).
+available types of analysis (*Fitting*, *P(r) Inversion*, or *Invariant* calculation).
  
-The *Single*/*Batch* mode radio buttons only apply to the *Fitting* perspective.
+The *Single*/*Batch* mode radio buttons only apply to *Fitting*.
 
 *Batch mode* provides serial (batch) fitting with one model function, that is, 

src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

@@ -15 +15 @@
 
 
-Fitting Perspective
-===================
+Fitting
+=======
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
@@ -24 +24 @@
 
 To fit some data you must first load some data, activate one or more data sets,
-send those data sets to the fitting perspective, and select a model to fit to
-each data set.
+send those data sets to fitting, and select a model to fit to each data set.
 
 Instructions on how to load and activate data are in the section :ref:`Loading_data`.
@@ -331 +330 @@
 This mode fits one data set.
 
-When data is sent to the fitting perspective it is plotted in a graph window as
-markers.
+When data is sent to the fitting it is plotted in a graph window as markers.
 
 If 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

@@ -105 +105 @@
 
 The median value for the distribution will be the value given for the respective
-size parameter in the *Fitting Perspective*, for example, radius = 60.
+size parameter in the *FitPage*, for example, radius = 60.
 
 The polydispersity is given by |sigma|
@@ -172 +172 @@
 
 SasView only uses these array values during the computation, therefore any mean
-value of the parameter represented by *x* present in the *Fitting Perspective*
+value of the parameter represented by *x* present in the *FitPage*
 will be ignored.
 

src/sas/sasgui/perspectives/invariant/media/invariant_help.rst

@@ -4 +4 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-Invariant Calculation Perspective
-=================================
+Invariant Calculation
+=====================
 
 Description
@@ -45 +45 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-Using the perspective
----------------------
+Using invariant analysis
+------------------------
 
 1) Select *Invariant* from the *Analysis* menu on the SasView toolbar.
@@ -53 +53 @@
 
 3) Select a dataset and use the *Send To* button on the *Data Explorer* to load 
-   the dataset into the *Invariant* perspective.
+   the dataset into the *Invariant* panel.
 
-4) Use the *Customised Input* boxes on the *Invariant* perspective to subtract 
+4) Use the *Customised Input* boxes on the *Invariant* panel to subtract 
    any background, specify the contrast (i.e. difference in SLDs - this must be 
    specified for the eventual value of Q*\  to be on an absolute scale), or to 
@@ -73 +73 @@
 
 8) If the value of Q*\  calculated with the extrapolated regions is invalid, a 
-   red warning will appear at the top of the *Invariant* perspective panel.
+   red warning will appear at the top of the *Invariant* panel.
 
    The details of the calculation are available by clicking the *Details* 

src/sas/sasgui/perspectives/pr/media/pr_help.rst

@@ -4 +4 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-P(r) Inversion Perspective
-==========================
+P(r) Calculation
+================
 
 Description
@@ -32 +32 @@
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
 
-Using the perspective
----------------------
+Using P(r) inversion
+--------------------
 
 The user must enter