Changeset d292959 in sasview

Timestamp:

Oct 30, 2008 3:12:19 PM (16 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:

b92884a

Parents:

d7d143b0

Message:

working on help option

Location:

sansview

Files:

• doc/change_scale_help.html (moved) (moved from sansview/change_scale_help.html)
• doc/glossaryhelp.html (moved) (moved from sansview/glossaryhelp.html)
• doc/help.html (moved) (moved from sansview/help.html) (1 diff)
• doc/load_data_help.html (moved) (moved from sansview/load_data_help.html)
• doc/model_use_help.html (moved) (moved from sansview/model_use_help.html)
• doc/reset_Graph_help.html (moved) (moved from sansview/reset_Graph_help.html)
• doc/save_data_help.html (moved) (moved from sansview/save_data_help.html)
• doc/simultaneous_fit_help.html (moved) (moved from sansview/simultaneous_fit_help.html)
• doc/single_fit_help.html (moved) (moved from sansview/single_fit_help.html)
• perspectives/fitting/glossaryhelp.html (added)
• perspectives/fitting/help.html (added)
• perspectives/fitting/helpDialog.py (modified) (2 diffs)

sansview/doc/help.html

@@ -4 +4 @@
 
 <frame src="model_use_help.html">
-<frame src="load_data_help.html" 
-name="showframe">
+<frame src="load_data_help.html" name="showframe">
 
 </frameset>

sansview/perspectives/fitting/helpDialog.py

@@ -2 +2 @@
 import wx
 import wx.html as html
+import os
 
 class HelpWindow(wx.Dialog):
@@ -31 +32 @@
 
         help = html.HtmlWindow(rpanel, -1, style=wx.NO_BORDER)
-        help.LoadPage('help.html')
+        try:
+           cwd = os.path.split(__file__)[0]
+        except:
+            cwd = os.getcwd()
+       
+        
+        
+        dir = os.path.dirname(os.path.dirname(cwd))
+        filename="doc\load_data_help.html"
+        print os.path.join(dir,filename)
+        fname=os.path.join(dir,filename)
+        help.LoadPage( fname )
+        
+         
+        #print help.ToText()
        
         vbox.Add(help, 1, wx.EXPAND)