Changeset 481476c in sasview

Timestamp:

Apr 17, 2017 4:00:40 PM (8 years ago)

Author:

GitHub <noreply@…>

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

Children:

b636dfc5

Parents:

e5cbbce (diff), 72100ee (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 Kienzle <pkienzle@…> (04/17/17 16:00:40)

git-committer:

GitHub <noreply@…> (04/17/17 16:00:40)

Message:

Merge pull request #91 from SasView?/fitting-plugin-doc-typo

fix typo in fitting/plugin.rst

Location:

src/sas/sasgui

Files:

• perspectives/fitting/media/plugin.rst (modified) (1 diff)
• guiframe/gui_manager.py (modified) (1 diff)

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

@@ -538 +538 @@
     sin, cos, tan, asin, acos, atan:
         Trigonometry functions and inverses, operating on radians.
-    sinh, cos, tanh, asinh, acosh, atanh:
+    sinh, cosh, tanh, asinh, acosh, atanh:
         Hyperbolic trigonometry functions.
     atan2(y,x):

src/sas/sasgui/guiframe/gui_manager.py

@@ -2129 +2129 @@
                 if "SAS_OPENCL" in line:
                     if sas_opencl:
-                        new_config_lines.append("SAS_OPENCL = \""+sas_opencl+"\"")
+                        new_config_lines.append("SAS_OPENCL = \"" + sas_opencl
+                                                + "\"\n")
                     else:
-                        new_config_lines.append("SAS_OPENCL = None")
+                        new_config_lines.append("SAS_OPENCL = \"None\"\n")
                 else:
                     new_config_lines.append(line)