Changeset 6aad2e8 in sasview for src/sas/sasgui/perspectives/fitting/media

Timestamp:

Apr 6, 2017 10:20:15 AM (8 years ago)

Author:

wojciech

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

094b9eb, 42281cc

Parents:

a2e980b

Message:

bmp and gif files converted to png

Location:

src/sas/sasgui/perspectives/fitting/media

Files:

• M_angles_pic.bmp (deleted)
• M_angles_pic.png (added)
• batch_button_area.bmp (deleted)
• batch_button_area.png (added)
• cat_fig0.bmp (deleted)
• cat_fig0.png (added)
• cat_fig1.bmp (deleted)
• cat_fig1.png (added)
• cat_fig2.bmp (deleted)
• cat_fig2.png (added)
• dm_eq.gif (deleted)
• dm_eq.png (added)
• edit_menu.bmp (deleted)
• edit_menu.png (added)
• file_menu.bmp (deleted)
• file_menu.png (added)
• fitting_help.rst (modified) (12 diffs)
• m0x_eq.gif (deleted)
• m0x_eq.png (added)
• m0y_eq.gif (deleted)
• m0y_eq.png (added)
• m0z_eq.gif (deleted)
• m0z_eq.png (added)
• mag_help.rst (modified) (4 diffs)
• mag_vector.bmp (deleted)
• mag_vector.png (added)
• mqx.gif (deleted)
• mqx.png (added)
• mqy.gif (deleted)
• mqy.png (added)
• mxp.gif (deleted)
• mxp.png (added)
• myp.gif (deleted)
• myp.png (added)
• mzp.gif (deleted)
• mzp.png (added)
• new_model.bmp (deleted)
• new_model.png (added)
• pd_help.rst (modified) (1 diff)
• plot_button.bmp (deleted)
• plot_button.png (added)
• restore_batch_window.bmp (deleted)
• restore_batch_window.png (added)
• sld1.gif (deleted)
• sld1.png (added)
• sld2.gif (deleted)
• sld2.png (added)
• sm_help.rst (modified) (15 diffs)
• sm_image002.gif (deleted)
• sm_image002.png (added)
• sm_image003.gif (deleted)
• sm_image003.png (added)
• sm_image004.gif (deleted)
• sm_image004.png (added)
• sm_image005.gif (deleted)
• sm_image005.png (added)
• sm_image006.gif (deleted)
• sm_image006.png (added)
• sm_image007.gif (deleted)
• sm_image007.png (added)
• sm_image008.gif (deleted)
• sm_image008.png (added)
• sm_image009.gif (deleted)
• sm_image009.png (added)
• sm_image010.gif (deleted)
• sm_image010.png (added)
• sm_image011.gif (deleted)
• sm_image011.png (added)
• sm_image012.gif (deleted)
• sm_image012.png (added)
• sm_image013.gif (deleted)
• sm_image013.png (added)
• sm_image016.gif (deleted)
• sm_image016.png (added)
• sm_image017.gif (deleted)
• sm_image017.png (added)
• sm_image018.gif (deleted)
• sm_image018.png (added)
• sm_image019.gif (deleted)
• sm_image019.png (added)
• sm_image020.gif (deleted)
• sm_image020.png (added)
• sm_image021.gif (deleted)
• sm_image021.png (added)
• sm_image022.gif (deleted)
• sm_image022.png (added)
• sm_image023.gif (deleted)
• sm_image023.png (added)
• sm_image024.gif (deleted)
• sm_image024.png (added)
• sm_image025.gif (deleted)
• sm_image025.png (added)
• sm_image026.gif (deleted)
• sm_image026.png (added)
• sm_image027.gif (deleted)
• sm_image027.png (added)
• sm_image028.gif (deleted)
• sm_image028.png (added)
• sum_model.bmp (deleted)
• sum_model.png (added)
• view_button.bmp (deleted)
• view_button.png (added)
• view_data_model.bmp (deleted)
• view_data_model.png (added)

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

@@ -4 +4 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-.. |inlineimage004| image:: sm_image004.gif
-.. |inlineimage005| image:: sm_image005.gif
-.. |inlineimage008| image:: sm_image008.gif
-.. |inlineimage009| image:: sm_image009.gif
-.. |inlineimage010| image:: sm_image010.gif
-.. |inlineimage011| image:: sm_image011.gif
-.. |inlineimage012| image:: sm_image012.gif
-.. |inlineimage018| image:: sm_image018.gif
-.. |inlineimage019| image:: sm_image019.gif
+.. |inlineimage004| image:: sm_image004.png
+.. |inlineimage005| image:: sm_image005.png
+.. |inlineimage008| image:: sm_image008.png
+.. |inlineimage009| image:: sm_image009.png
+.. |inlineimage010| image:: sm_image010.png
+.. |inlineimage011| image:: sm_image011.png
+.. |inlineimage012| image:: sm_image012.png
+.. |inlineimage018| image:: sm_image018.png
+.. |inlineimage019| image:: sm_image019.png
 
 
@@ -90 +90 @@
 *View* option on the menubar, or click on the *Modify* button on the *Fit Page*.
 
-.. image:: cat_fig0.bmp
+.. image:: cat_fig0.png
 
 The categorization of all models except the user supplied Plugin Models can be
@@ -96 +96 @@
 hidden from view in the drop-down menus.
 
-.. image:: cat_fig1.bmp
+.. image:: cat_fig1.png
 
 Changing category
@@ -105 +105 @@
 to make the required changes.
 
-.. image:: cat_fig2.bmp
+.. image:: cat_fig2.png
 
 To create a category for the selected model, click the *Add* button. In order
@@ -179 +179 @@
 GUI using the *New Plugin Model Function*.
 
-.. image:: new_model.bmp
+.. image:: new_model.png
 
 When using this feature, be aware that even if your code has errors, including 
@@ -198 +198 @@
 ^^^^^^^^^^^^^^^^
 
-.. image:: sum_model.bmp
+.. image:: sum_model.png
 
 This option creates a custom Plugin Model of the form::
@@ -509 +509 @@
 at the bottom of that panel and *Send To Fitting*. A *BatchPage* will be created.
 
-.. image:: batch_button_area.bmp
+.. image:: batch_button_area.png
 
 *NB: The Batch Page can also be created by checking the Batch Mode radio button*
@@ -531 +531 @@
 will all appear on one graph.
 
-.. image:: view_button.bmp
+.. image:: view_button.png
 
 *NB: In theory, returning to the BatchPage and changing the name of the I(Q)*
@@ -567 +567 @@
 bar.
 
-.. image:: restore_batch_window.bmp
+.. image:: restore_batch_window.png
 
 Once a batch fit is completed, all model parameters are displayed but *not*
@@ -583 +583 @@
 label.
 
-.. image:: edit_menu.bmp
+.. image:: edit_menu.png
 
 *NB: If there is an existing Grid Window and another batch fit is performed,*
@@ -596 +596 @@
 *Window* menu bar. The loaded parameters will appear in a new table tab.
 
-.. image:: file_menu.bmp
+.. image:: file_menu.png
 
 *NB: Saving the Grid Window does not save any experimental data, residuals*
@@ -614 +614 @@
 but different labels and units can be entered manually.
 
-.. image:: plot_button.bmp
+.. image:: plot_button.png
 
 The *X/Y-axis Selection Range* can be edited manually. The text control box

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

@@ -4 +4 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-.. |inlineimage004| image:: sm_image004.gif
-.. |inlineimage005| image:: sm_image005.gif
-.. |inlineimage008| image:: sm_image008.gif
-.. |inlineimage009| image:: sm_image009.gif
-.. |inlineimage010| image:: sm_image010.gif
-.. |inlineimage011| image:: sm_image011.gif
-.. |inlineimage012| image:: sm_image012.gif
-.. |inlineimage018| image:: sm_image018.gif
-.. |inlineimage019| image:: sm_image019.gif
+.. |inlineimage004| image:: sm_image004.png
+.. |inlineimage005| image:: sm_image005.png
+.. |inlineimage008| image:: sm_image008.png
+.. |inlineimage009| image:: sm_image009.png
+.. |inlineimage010| image:: sm_image010.png
+.. |inlineimage011| image:: sm_image011.png
+.. |inlineimage012| image:: sm_image012.png
+.. |inlineimage018| image:: sm_image018.png
+.. |inlineimage019| image:: sm_image019.png
 
 
@@ -36 +36 @@
 scattering length.
 
-.. image:: mag_vector.bmp
+.. image:: mag_vector.png
 
 The magnetic scattering length density is then
 
-.. image:: dm_eq.gif
+.. image:: dm_eq.png
 
 where |gamma| = -1.913 is the gyromagnetic ratio, |mu|\ :sub:`B` is the
@@ -53 +53 @@
 Spin-flips    (+ -) and (- +)
 
-.. image:: M_angles_pic.bmp
+.. image:: M_angles_pic.png
 
 If the angles of the *Q* vector and the spin-axis (*x'*) to the *x*-axis are |phi|
@@ -60 +60 @@
 length density (|beta|\ :sub:`N`) are
 
-.. image:: sld1.gif
+.. image:: sld1.png
 
 when there are no spin-flips, and
 
-.. image:: sld2.gif
+.. image:: sld2.png
 
 when there are, and
 
-.. image:: mxp.gif
+.. image:: mxp.png
 
-.. image:: myp.gif
+.. image:: myp.png
 
-.. image:: mzp.gif
+.. image:: mzp.png
 
-.. image:: mqx.gif
+.. image:: mqx.png
 
-.. image:: mqy.gif
+.. image:: mqy.png
 
 Here, *M*\ :sub:`0x`, *M*\ :sub:`0y` and *M*\ :sub:`0z` are the x, y and z components
 of the magnetization vector given in the laboratory xyz frame given by
 
-.. image:: m0x_eq.gif
+.. image:: m0x_eq.png
 
-.. image:: m0y_eq.gif
+.. image:: m0y_eq.png
 
-.. image:: m0z_eq.gif
+.. image:: m0z_eq.png
 
 and the magnetization angles |theta|\ :sub:`M` and |phi|\ :sub:`M` are defined in

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

@@ -4 +4 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-.. |inlineimage004| image:: sm_image004.gif
-.. |inlineimage005| image:: sm_image005.gif
-.. |inlineimage008| image:: sm_image008.gif
-.. |inlineimage009| image:: sm_image009.gif
-.. |inlineimage010| image:: sm_image010.gif
-.. |inlineimage011| image:: sm_image011.gif
-.. |inlineimage012| image:: sm_image012.gif
-.. |inlineimage018| image:: sm_image018.gif
-.. |inlineimage019| image:: sm_image019.gif
+.. |inlineimage004| image:: sm_image004.png
+.. |inlineimage005| image:: sm_image005.png
+.. |inlineimage008| image:: sm_image008.png
+.. |inlineimage009| image:: sm_image009.png
+.. |inlineimage010| image:: sm_image010.png
+.. |inlineimage011| image:: sm_image011.png
+.. |inlineimage012| image:: sm_image012.png
+.. |inlineimage018| image:: sm_image018.png
+.. |inlineimage019| image:: sm_image019.png
 
 

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

@@ -4 +4 @@
 .. by S King, ISIS, during SasView CodeCamp-III in Feb 2015.
 
-.. |inlineimage004| image:: sm_image004.gif
-.. |inlineimage005| image:: sm_image005.gif
-.. |inlineimage008| image:: sm_image008.gif
-.. |inlineimage009| image:: sm_image009.gif
-.. |inlineimage010| image:: sm_image010.gif
-.. |inlineimage011| image:: sm_image011.gif
-.. |inlineimage012| image:: sm_image012.gif
-.. |inlineimage018| image:: sm_image018.gif
-.. |inlineimage019| image:: sm_image019.gif
+.. |inlineimage004| image:: sm_image004.png
+.. |inlineimage005| image:: sm_image005.png
+.. |inlineimage008| image:: sm_image008.png
+.. |inlineimage009| image:: sm_image009.png
+.. |inlineimage010| image:: sm_image010.png
+.. |inlineimage011| image:: sm_image011.png
+.. |inlineimage012| image:: sm_image012.png
+.. |inlineimage018| image:: sm_image018.png
+.. |inlineimage019| image:: sm_image019.png
 
 
@@ -57 +57 @@
 The slit-smeared scattering intensity is defined by
 
-.. image:: sm_image002.gif
+.. image:: sm_image002.png
 
 where *Norm* is given by
 
-.. image:: sm_image003.gif
+.. image:: sm_image003.png
 
 **[Equation 1]**
@@ -70 +70 @@
 function is described by a rectangular function, such that
 
-.. image:: sm_image006.gif
+.. image:: sm_image006.png
 
 **[Equation 2]**
@@ -76 +76 @@
 and
 
-.. image:: sm_image007.gif
+.. image:: sm_image007.png
 
 **[Equation 3]**
@@ -87 +87 @@
 This simplifies the integral in Equation 1 to
 
-.. image:: sm_image013.gif
+.. image:: sm_image013.png
 
 **[Equation 4]**
@@ -98 +98 @@
 **For** |inlineimage012| **= 0 and** |inlineimage011| **= constant.**
 
-.. image:: sm_image016.gif
+.. image:: sm_image016.png
 
 For discrete *q* values, at the *q* values of the data points and at the *q*
@@ -104 +104 @@
 intensity can be approximately calculated as
 
-.. image:: sm_image017.gif
+.. image:: sm_image017.png
 
 **[Equation 5]**
@@ -138 +138 @@
 numerical integration for the slit width. Then
 
-.. image:: sm_image020.gif
+.. image:: sm_image020.png
 
 **[Equation 7]**
@@ -158 +158 @@
 Equation 6 becomes
 
-.. image:: sm_image021.gif
+.. image:: sm_image021.png
 
 **[Equation 8]**
@@ -171 +171 @@
 Thus
 
-.. image:: sm_image022.gif
+.. image:: sm_image022.png
 
 **[Equation 9]**
@@ -182 +182 @@
 elliptical Gaussian distribution. The *A* is a normalization factor.
 
-.. image:: sm_image023.gif
+.. image:: sm_image023.png
 
 Now we consider a numerical integration where each of the bins in |theta| and *R* are
@@ -189 +189 @@
 within the bins. Then
 
-.. image:: sm_image024.gif
+.. image:: sm_image024.png
 
 **[Equation 10]**
@@ -199 +199 @@
 Then, for a polar symmetric smear
 
-.. image:: sm_image025.gif
+.. image:: sm_image025.png
 
 **[Equation 11]**
@@ -205 +205 @@
 where
 
-.. image:: sm_image026.gif
+.. image:: sm_image026.png
 
 while for a *x-y* symmetric smear
 
-.. image:: sm_image027.gif
+.. image:: sm_image027.png
 
 **[Equation 12]**
@@ -215 +215 @@
 where
 
-.. image:: sm_image028.gif
+.. image:: sm_image028.png
 
 The current version of the SasView uses Equation 11 for 2D smearing, assuming