Changeset 318b5bbb in sasview for fittingview/src/sans/perspectives/fitting/help_panel.py

Timestamp:

Dec 18, 2012 8:55:24 AM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

6550b64

Parents:

0203ade

Message:

Added polarization and magnetic stuffs

File:

• fittingview/src/sans/perspectives/fitting/help_panel.py (modified) (7 diffs)

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

@@ -17 +17 @@
     """
     """
-    def __init__(self, parent, id, title='Fitting Help', pageToOpen=None):
-        wx.Frame.__init__(self, parent, id, title, size=(850, 530))
+    def __init__(self, parent, id, title='Fitting Help', pageToOpen=None, size=(850, 540)):
+        wx.Frame.__init__(self, parent, id, title, size=size)
         """
         contains help info
         """
         self.Show(False)
-        self.SetTitle('Fitting Help')
+        self.SetTitle(title) 
         from sans.perspectives.fitting import get_data_path as fit_path
         fitting_path = fit_path(media='media')
@@ -30 +30 @@
             self.SetIcon(wx.Icon(ico_file, wx.BITMAP_TYPE_ICO))
         splitter = MultiSplitterWindow(self, style=wx.SP_LIVE_UPDATE)
-        rpanel = wx.Panel(splitter, -1)
-        lpanel = wx.Panel(splitter, -1, style=wx.BORDER_SUNKEN)
+        self.rpanel = wx.Panel(splitter, -1)
+        self.lpanel = wx.Panel(splitter, -1, style=wx.BORDER_SUNKEN)
         
         vbox = wx.BoxSizer(wx.VERTICAL)
-        header = wx.Panel(rpanel, -1)
+        header = wx.Panel(self.rpanel, -1)
         header.SetBackgroundColour('#6666FF')
         header.SetForegroundColour('WHITE')
@@ -47 +47 @@
        
         vboxl= wx.BoxSizer(wx.VERTICAL)
-        headerl = wx.Panel(lpanel, -1, size=(-1, 20))
+        headerl = wx.Panel(self.lpanel, -1, size=(-1, 20))
        
         headerl.SetBackgroundColour('#6666FF')
@@ -59 +59 @@
         headerl.SetSizer(hboxl)
         vboxl.Add(headerl, 0, wx.EXPAND)
-        self.lhelp = html.HtmlWindow(lpanel, -1, style=wx.NO_BORDER)
-        self.rhelp = html.HtmlWindow(rpanel, -1, style=wx.NO_BORDER,
+        self.lhelp = html.HtmlWindow(self.lpanel, -1, style=wx.NO_BORDER)
+        self.rhelp = html.HtmlWindow(self.rpanel, -1, style=wx.NO_BORDER, 
                                      size=(500, -1))
 
@@ -74 +74 @@
         self.path_pd = os.path.join(path, "pd_help.html")
         self.path_sm = os.path.join(path, "smear_computation.html")
-       
+        self.path_mag = os.path.join(path, "polar_mag_help.html")
+        
         _html_file = [("load_data_help.html", "Load a File"),
                       ("single_fit_help.html", "Single Fit"),
@@ -85 +86 @@
                       ("%s" % self.path_pd, "Polydispersion Distributions"),
                       ("%s" % self.path_sm, "Smear Computation"),
+                      ("%s" % self.path_mag, "Polarization/Magnetic Scattering"),
                       ("key_help.html", "Key Combination"),
                       ("status_bar_help.html", "Status Bar Help"),
@@ -118 +120 @@
         vbox.Add(self.rhelp, 1, wx.EXPAND)
         vboxl.Add(self.lhelp, 1, wx.EXPAND)
-        rpanel.SetSizer(vbox)
-        lpanel.SetSizer(vboxl)
-        lpanel.SetFocus()
+        self.rpanel.SetSizer(vbox)
+        self.lpanel.SetSizer(vboxl)
+        self.lpanel.SetFocus()
         
         vbox1 = wx.BoxSizer(wx.HORIZONTAL)
         vbox1.Add(splitter, 1, wx.EXPAND)
-        splitter.AppendWindow(lpanel, 200)
-        splitter.AppendWindow(rpanel)
+        splitter.AppendWindow(self.lpanel, 200)
+        splitter.AppendWindow(self.rpanel)
         self.SetSizer(vbox1)