Changeset 85a24d9 in sasview

Timestamp:

Apr 22, 2010 11:00:36 AM (15 years ago)

Author:

Gervaise Alina <gervyh@…>

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

Children:

2b0443f

Parents:

e56869f

Message:

allow htlm file to show in mac too

Files:

• calculatorview/perspectives/calculator/__init__.py (modified) (2 diffs)
• invariantview/perspectives/invariant/__init__.py (modified) (2 diffs)

calculatorview/perspectives/calculator/__init__.py

@@ -12 +12 @@
     if os.path.isdir(path):
         return path
-
     # Check for data path next to exe/zip file.
     # If we are inside a py2exe zip file, we need to go up
@@ -18 +17 @@
     # We will check if the exe and the xsf are in the same
     # directory.
-    path= os.path.dirname(__file__)
-    n_dir = 4
+    path = os.path.dirname(__file__)
+    #Look for maximum n_dir up of the current dir to find media
+    n_dir = 12
     for i in range(n_dir):
-        path,_ = os.path.split(path)
-
-    path = os.path.join(path, '', media,'calculator_media' )
-    if os.path.isdir(path):
-        return path
-    path = os.path.join(path, '', media)
-    if os.path.isdir(path):
-        return path
+        path, _ = os.path.split(path)
+        media_path = os.path.join(path, media)
+        if os.path.isdir(media_path):
+             module_media_path = os.path.join(media_path,'calculator_media')
+             if os.path.isdir(module_media_path):
+                 return module_media_path
+             return media_path
+   
     raise RuntimeError('Could not find calculator media files')
 

invariantview/perspectives/invariant/__init__.py

@@ -16 +16 @@
     # If we are inside a py2exe zip file, we need to go up
     # to get to the directory containing 
-    # the media for thsi module
+    # the media for this module
     path = os.path.dirname(__file__)
+    #Look for maximum n_dir up of the current dir to find media
     n_dir = 12
     for i in range(n_dir):
@@ -23 +24 @@
         media_path = os.path.join(path, media)
         if os.path.isdir(media_path):
-             module_media_path = os.path.join(media_path,'invariant_media' )
+             module_media_path = os.path.join(media_path,'invariant_media')
              if os.path.isdir(module_media_path):
                  return module_media_path