Changeset c99e717 in sasview for src/sas/sasgui

Timestamp:

Jan 26, 2018 4:39:56 AM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b6f9c9f

Parents:

e110cb0 (diff), 501712f (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.

git-author:

Adam Washington <rprospero@…> (01/26/18 04:39:56)

git-committer:

GitHub <noreply@…> (01/26/18 04:39:56)

Message:

Merge pull request #139 from rprospero/Ticket_997

Remove all instances of \text from the repo (Ticket #977)

Location:

src/sas/sasgui/perspectives

Files:

• calculator/media/resolution_calculator_help.rst (modified) (2 diffs)
• calculator/media/sas_calculator_help.rst (modified) (2 diffs)
• corfunc/media/corfunc_help.rst (modified) (2 diffs)
• fitting/basepage.py (modified) (1 diff)

src/sas/sasgui/perspectives/calculator/media/resolution_calculator_help.rst

@@ -29 +29 @@
    careful to note that distances are specified in cm!
 
-4) Enter values for the source wavelength(s), $\lambda$, and its spread (= $\text{FWHM}/\lambda$).
+4) Enter values for the source wavelength(s), $\lambda$, and its spread (= $\mathrm{FWHM}/\lambda$).
 
    For monochromatic sources, the inputs are just one value. For TOF sources,
@@ -58 +58 @@
    region near the beam block/stop
 
-   [i.e., $Q < (2 \pi \cdot \text{beam block diameter}) / (\text{sample-to-detector distance} \cdot \lambda_\text{min})$]
+   [i.e., $Q < (2 \pi \cdot w) / (d_s \cdot \lambda_\mathrm{min})$, where $w$ is the beam block diameter, $d_s$ is the sample-to-detector distance, and $\lambda_\mathrm{min}$ is the minimum wavelength.]
 
    the variance is slightly under estimated.

src/sas/sasgui/perspectives/calculator/media/sas_calculator_help.rst

@@ -88 +88 @@
 
 Now let us assume that the angles of the $\vec Q$ vector and the spin-axis ($x'$)
-to the $x$-axis are $\phi$ and $\theta_\text{up}$ respectively (see above). Then,
+to the $x$-axis are $\phi$ and $\theta_\mathrm{up}$ respectively (see above). Then,
 depending upon the polarization (spin) state of neutrons, the scattering
 length densities, including the nuclear scattering length density ($\beta_N$)
@@ -107 +107 @@
 .. math::
 
-    M_{\perp x'} &= M_{0q_x}\cos\theta_\text{up} + M_{0q_y}\sin\theta_\text{up} \\
-    M_{\perp y'} &= M_{0q_y}\cos\theta_\text{up} - M_{0q_x}\sin\theta_\text{up} \\
+    M_{\perp x'} &= M_{0q_x}\cos\theta_\mathrm{up} + M_{0q_y}\sin\theta_\mathrm{up} \\
+    M_{\perp y'} &= M_{0q_y}\cos\theta_\mathrm{up} - M_{0q_x}\sin\theta_\mathrm{up} \\
     M_{\perp z'} &= M_{0z} \\
     M_{0q_x} &= (M_{0x}\cos\phi - M_{0y}\sin\phi)\cos\phi \\

src/sas/sasgui/perspectives/corfunc/media/corfunc_help.rst

@@ -188 +188 @@
 *   Average Hard Block Thickness :math:`= L_c`
 *   Average Core Thickness :math:`= D_0`
-*   Average Interface Thickness :math:`\text{} = D_{tr}`
-*   Polydispersity :math:`= \Gamma_{\text{min}}/\Gamma_{\text{max}}`
+*   Average Interface Thickness :math:`= D_{tr}`
+*   Polydispersity :math:`= \Gamma_{\mathrm{min}}/\Gamma_{\mathrm{max}}`
 *   Local Crystallinity :math:`= L_c/L_p`
 
@@ -203 +203 @@
 *   Bound Fraction :math:`= <p>`
 *   Second Moment :math:`= \sigma`
-*   Maximum Extent :math:`= \delta_{\text{h}}`
+*   Maximum Extent :math:`= \delta_{\mathrm{h}}`
 *   Adsorbed Amount :math:`= \Gamma`
 

src/sas/sasgui/perspectives/fitting/basepage.py

@@ -2812 +2812 @@
         if self.model is not None:
             name = self.formfactorbox.GetValue()
-            _TreeLocation = 'user/models/' + name.lower()+'.html'
+            _TreeLocation = 'user/models/%s.html' % name
             _doc_viewer = DocumentationWindow(self, wx.ID_ANY, _TreeLocation,
                                               "", name + " Help")