Changeset ec538c7 in sasview

Timestamp:

Oct 14, 2011 5:00:06 PM (13 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:

6a83ba4

Parents:

466dae7

Message:

add help for batch

Location:

fittingview/src/sans/perspectives/fitting

Files:

• help_panel.py (modified) (4 diffs)
• media/batch_button_area.bmp (added)
• media/batch_help.html (added)
• media/edit_menu.bmp (added)
• media/file_menu.bmp (added)
• media/plot_button.bmp (added)
• media/restore_batch_window.bmp (added)
• media/view_button.bmp (added)
• media/view_data_model.bmp (added)

fittingview/src/sans/perspectives/fitting/help_panel.py

@@ -6 +6 @@
 import os
 
+from wx.lib.scrolledpanel import ScrolledPanel
 
+class HelpPanel(ScrolledPanel):
+    def __init__(self, parent, **kwargs):
+        ScrolledPanel.__init__(self, parent, **kwargs)
+        self.SetupScrolling()
+        
 class HelpWindow(wx.Frame):
     """
@@ -63 +69 @@
         fitting_path = fit_path(media='media')
         
-        _html_file = {"status_bar_help.html":"Status Bar Help",
-                      "load_data_help.html":"Load a File",
-                      "simultaneous_fit_help.html":"Simultaneous Fit",
-                      "single_fit_help.html":"Single Fit",
-                      "model_use_help.html":"Model Selection",
-                      "key_help.html":"Key Combination",
-                      }
+        _html_file = [("load_data_help.html", "Load a File"),
+                      ("single_fit_help.html", "Single Fit"),
+                      ("simultaneous_fit_help.html", "Simultaneous Fit"),
+                      ("batch_help.html", "Batch Fit"),
+                      ("model_use_help.html", "Model Selection"),
+                      ("%s" % self.path, "Model Functions"),
+                      ("%s" % self.path_pd, "Polydispersion Distributions"),
+                      ("%s" % self.path_sm, "Smear Computation"),
+                      ("key_help.html", "Key Combination"),
+                      ("status_bar_help.html", "Status Bar Help"),
+                      ]
 
                     
@@ -81 +91 @@
             <ul>
             """
-        for p, title in _html_file.iteritems():
+        for (p, title) in _html_file:
             pp = os.path.join(fitting_path, p)
             page += """<li><a href ="%s" target="showframe">%s</a><br></li>""" % (pp, title)
-          
-        page += """
-            <li><a href ="%s" target="showframe">Model Functions</a><br></li>
-            <li><a href ="%s" target="showframe">Polydispersion Distributions</a><br></li>
-            <li><a href ="%s" target="showframe">Smear Computation</a><br></li>
-            </ul>
-            </body>
-            </html>""" % (self.path, self.path_pd, self.path_sm)
+        page += """</ul>
+                    </body>
+                    </html>
+                """
+        #page += """
+        #    <li><a href ="%s" target="showframe">Model Functions</a><br></li>
+        #   <li><a href ="%s" target="showframe">Polydispersion Distributions</a><br></li>
+        #    <li><a href ="%s" target="showframe">Smear Computation</a><br></li>
+        #    </ul>
+        #    </body>
+        #    </html>""" % (self.path, self.path_pd, self.path_sm)
         
         self.rhelp.SetPage(page1)
@@ -130 +143 @@
         
         self.rhelp.LoadPage(os.path.abspath(link))
+    
         
 """