Changeset b6f9c9f in sasview

Timestamp:

Jan 29, 2018 10:41:19 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:

ef63dd9, 6f4a7c17, 9d8d52c

Parents:

c99e717 (diff), f1d48e9 (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@…> (01/29/18 10:41:19)

git-committer:

GitHub <noreply@…> (01/29/18 10:41:19)

Message:

Merge pull request #140 from rprospero/Ticket_997

Take Angsgtrom symbol out of mathrm

Files:

• docs/sphinx-docs/source/conf.py (modified) (1 diff)
• installers/installer_generator.py (modified) (3 diffs)
• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (1 diff)

docs/sphinx-docs/source/conf.py

@@ -224 +224 @@
 \newcommand{\lt}{<}              % HTML needs \lt rather than <
 \newcommand{\gt}{>}              % HTML needs \gt rather than >
-\renewcommand{\AA}{\mathrm{\r{A}}} % Allow \AA in math mode
+\renewcommand{\AA}{\text{\r{A}}} % Allow \AA in math mode
 \DeclareUnicodeCharacter {212B} {\AA}                  % Angstrom
 \DeclareUnicodeCharacter {00B7} {\ensuremath{\cdot}}   % cdot

installers/installer_generator.py

@@ -9 +9 @@
 import sys
 import string
+
+is_64bit = sys.maxsize > 2**32
 
 root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -25 +27 @@
 AppSupportURL = local_config._homepage
 AppUpdatesURL = local_config._homepage
+ArchitecturesInstallIn64BitMode = 'x64'
 ChangesEnvironment = 'true'
 DefaultDirName = os.path.join("{pf}" , AppName+Dev)
@@ -343 +346 @@
     TEMPLATE += "AppSupportURL=%s\n" % str(AppSupportURL)
     TEMPLATE += "AppUpdatesURL=%s \n" % str(AppUpdatesURL)
+    if is_64bit:
+        TEMPLATE += "ArchitecturesInstallIn64BitMode=%s \n" % str(ArchitecturesInstallIn64BitMode)
     TEMPLATE += "ChangesEnvironment=%s \n" % str(ChangesEnvironment)
     TEMPLATE += "DefaultDirName=%s\n" % str(DefaultDirName)

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")