Changes in / [501712f:c99e717] in sasview

Files:

• installers/installer_generator.py (modified) (3 diffs)
• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (1 diff)

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