Changeset 698a734 in sasview

Timestamp:

Apr 21, 2010 10:40:43 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:

d520f1b

Parents:

a4f3984

Message:

working on bundle html files

Files:

• calculatorview/perspectives/calculator/__init__.py (modified) (1 diff)
• calculatorview/perspectives/calculator/help_panel.py (modified) (1 diff)
• invariantview/perspectives/invariant/__init__.py (modified) (1 diff)
• invariantview/perspectives/invariant/help_panel.py (modified) (1 diff)
• sansview/media/sld_calculator_help.html (deleted)
• sansview/setup_exe.py (modified) (2 diffs)

calculatorview/perspectives/calculator/__init__.py

@@ -1 +1 @@
 PLUGIN_ID = "Calculator plug-in 1.0"
 from calculator import *
+
+import os
+from distutils.filelist import findall
+
+def get_data_path(media):
+    """
+    """
+    # Check for data path in the package
+    path = os.path.join(os.path.dirname(__file__), media)
+    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
+    # two levels to get to the directory containing the exe
+    # We will check if the exe and the xsf are in the same
+    # directory.
+    path= os.path.dirname(__file__)
+    n_dir = 4
+    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
+    raise RuntimeError('Could not find calculator media files')
+
+def data_files():
+    """
+    Return the data files associated with media calculator.
+    
+    The format is a list of (directory, [files...]) pairs which can be
+    used directly in setup(...,data_files=...) for setup.py.
+
+    """
+    data_files =[]
+    path = get_data_path(media="media")
+    for f in findall(path):
+        data_files.append(('media/calculator_media', [f]))
+    return data_files

calculatorview/perspectives/calculator/help_panel.py

@@ -99 +99 @@
         self.rhelp = html.HtmlWindow(rpanel, -1, style=wx.NO_BORDER, 
                                      size=(500,-1))
-        path = os.getcwd()
-        self.path= os.path.join(os.path.split(path)[0],"calculatorview",
-                            "media","sld_calculator_help.html")
+        import sans.perspectives.calculator as calculator
+        path = calculator.get_data_path(media='media')
+        self.path= os.path.join(path,"sld_calculator_help.html")
        
         self.rhelp.LoadPage(self.path)

invariantview/perspectives/invariant/__init__.py

@@ -1 +1 @@
 PLUGIN_ID = "Invariant plug-in 1.0"
 from invariant import *
+
+import os
+from distutils.filelist import findall
+
+def get_data_path(media):
+    """
+    """
+    # Check for data path in the package
+    path = os.path.join(os.path.dirname(__file__), media)
+    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
+    # two levels to get to the directory containing the exe
+    # We will check if the exe and the xsf are in the same
+    # directory.
+    path= os.path.dirname(__file__)
+    n_dir = 4
+    for i in range(n_dir):
+        path,_ = os.path.split(path)
+
+    path = os.path.join(path, '', media,'invariant_media' )
+    if os.path.isdir(path):
+        return path
+    path = os.path.join(path, '', media)
+    if os.path.isdir(path):
+        return path
+    raise RuntimeError('Could not find invariant media files')
+
+def data_files():
+    """
+    Return the data files associated with media invariant.
+    
+    The format is a list of (directory, [files...]) pairs which can be
+    used directly in setup(...,data_files=...) for setup.py.
+
+    """
+    data_files =[]
+    path = get_data_path(media="media")
+    for f in findall(path):
+        data_files.append(('media/invariant_media', [f]))
+    return data_files

invariantview/perspectives/invariant/help_panel.py

@@ -78 +78 @@
         self.rhelp = html.HtmlWindow(rpanel, -1, style=wx.NO_BORDER, 
                                      size=(500,-1))
-        path = os.getcwd()
-        self.path= os.path.join(os.path.split(path)[0],"invariantview",
-                            "media","invariant_help.html")
-       
+        import sans.perspectives.invariant as invariant
+        path = invariant.get_data_path(media='media')
+        self.path= os.path.join(path,"invariant_help.html")
+     
         self.rhelp.LoadPage(self.path)
         page="""<html>

sansview/setup_exe.py

@@ -15 +15 @@
 
 import os, sys
-    
+
 from distutils.core import setup
 from distutils.filelist import findall
@@ -67 +67 @@
 import periodictable
 import logging
-
 data_files += periodictable.data_files()
 
+import sans.perspectives.calculator as calculator
+data_files += calculator.data_files()
+
+import sans.perspectives.invariant as invariant
+data_files += invariant.data_files()
 
 for f in matplotlibdata: