Changeset 5d43213 in sasview

Timestamp:

Sep 3, 2018 11:16:34 AM (6 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, unittest-saveload

Children:

0cf4f84, 2e440cb, 153b75a

Parents:

d53abd2 (diff), 9bf40e7 (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:

Paul Butler <butlerpd@…> (09/03/18 11:16:34)

git-committer:

GitHub <noreply@…> (09/03/18 11:16:34)

Message:

Merge pull request #166 from SasView?/ticket-1163_plus_come_docs

Ticket 1163 plus come docs

Fixes #1163

Location:

src/sas/sasgui/perspectives/calculator

Files:

• media/slit_calculator_help.rst (modified) (1 diff)
• model_editor.py (modified) (2 diffs)

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

@@ -15 +15 @@
 
 *NOTE! Whilst it may have some more generic applicability, the calculator has
-only been tested with beam profile data from Anton-Paar SAXSess:sup:`TM` software.*
+only been tested with beam profile data from Anton-Paar SAXSess\ :sup:`TM` software.*
 
 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ

src/sas/sasgui/perspectives/calculator/model_editor.py

@@ -43 +43 @@
 if sys.platform.count("win32") > 0:
     FONT_VARIANT = 0
-    PNL_WIDTH = 450
+    PNL_WIDTH = 500
     PNL_HEIGHT = 320
 else:
     FONT_VARIANT = 1
-    PNL_WIDTH = 590
+    PNL_WIDTH = 500
     PNL_HEIGHT = 350
 M_NAME = 'Model'
@@ -495 +495 @@
         Choose the equation to use depending on whether we now have
         a sum or multiply model then create the appropriate string
+        
+        for the sum model the result will be:
+        scale_factor * (scale1 * model_1 + scale2 * model_2) + background
+        while for the multiply model it will just be:
+        scale_factor * (model_1* model_2) + background
         """
         name = ''
         if operator == '*':
             name = 'Multi'
-            factor = 'background'
+            factor_1 = ''
+            factor_2 = ''
         else:
             name = 'Sum'
-            factor = 'scale_factor'
+            factor_1 = 'scale_1 * '
+            factor_2 = 'scale_2 * '
 
         self._operator = operator
-        self.explanation = ("  Plugin_model = scale_factor * (model_1 {} "
-            "model_2) + background").format(operator)
+        self.explanation = ("  Plugin_model = scale_factor * ({}model_1 {} "
+            "{}model_2) + background").format(factor_1,operator,factor_2)
         self.explanationctr.SetLabel(self.explanation)
         self.name = name + M_NAME