Changeset bf66f67 in sasview for sansview/perspectives

Timestamp:

Aug 4, 2010 1:52:43 PM (14 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:

210ff4f

Parents:

9e2cfee

Message:

reverse to version 3161

File:

• sansview/perspectives/fitting/hint_fitpage.py (modified) (2 diffs)

sansview/perspectives/fitting/hint_fitpage.py

@@ +1 @@
+import wx
 
-import os 
-import wx
-from wx.lib.scrolledpanel import ScrolledPanel
-from sans.guicomm.events import NewPlotEvent
 
-class HintFitPage(ScrolledPanel):
+class HintFitPage(wx.ScrolledWindow):
     """
-    This class provide general structure of  fitpanel page
+        This class provide general structure of  fitpanel page
     """
      ## Internal name for the AUI manager
-    window_name = "Loaded Data"
+    window_name = "Hint Page"
     ## Title to appear on top of the window
-    window_caption = "Loaded Data"
+    window_caption = "Hint page "
     
     def __init__(self, parent):
-        """
-        """
-        ScrolledPanel.__init__(self, parent,
-                 style=wx.FULL_REPAINT_ON_RESIZE)
-        self.SetupScrolling()
-        self.parent = parent
-        self.manager = None
+        wx.ScrolledWindow.__init__(self, parent,
+                 style= wx.FULL_REPAINT_ON_RESIZE )
+        
         msg = "right click on the data when it is highlighted "
         msg += "the select option to fit for futher options"
         self.do_layout()
         
-    def set_manager(self, manager):
-        """
-        """
-        self.manager = manager
-        
-    def set_data(self, list=[], state=None):
-        """
-        """
-        if not list:
-            return 
-        for data, path in list:
-            if data.name not in self.data_cbbox.GetItems():
-                self.data_cbbox.Insert(item=data.name, pos=0,
-                                    clientData=(data, path))
-     
-        if self.data_cbbox.GetCount() ==1:
-            self.data_cbbox.SetSelection(0)
-            self.data_cbbox.Enable()
-            self.on_select_data(event=None)
-        
     def do_layout(self):
         """
-        Draw the page 
+            Draw the page 
         """
-        self.vbox = wx.BoxSizer(wx.VERTICAL)
-        sizer1 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer2 = wx.GridBagSizer(0,0)
-        box_description = wx.StaticBox(self, -1, "Hint")
-        boxsizer = wx.StaticBoxSizer(box_description, wx.HORIZONTAL)
-        boxsizer.SetMinSize((450,100))
+        name="Hint"
+        box_description= wx.StaticBox(self, -1,name)
+        boxsizer = wx.StaticBoxSizer(box_description, wx.VERTICAL)
         msg  = "    How to link data to the control panel: \n \n"
         msg += "    First load data file from 'File' menu. \n"
@@ -61 +31 @@
         msg += "    Finally, select 'Select data for fitting' in the pop-up menu. \n"
         self.hint_txt = wx.StaticText(self, -1, msg, style=wx.ALIGN_LEFT)
-        self.data_txt = wx.StaticText(self, -1,"Loaded Data: ")
-        self.data_cbbox = wx.ComboBox(self, -1, size=(260,20))
-        self.data_cbbox.Disable()
-        wx.EVT_COMBOBOX(self.data_cbbox ,-1, self.on_select_data) 
-        
-        sizer1.Add(self.hint_txt)
-        ix = 0 
-        iy = 0
-      
-        sizer2.Add(self.data_txt, (iy, ix), (1,1),
-                    wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        ix += 1
-        sizer2.Add( self.data_cbbox, (iy, ix), (1,1),
-                    wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)
-        boxsizer.Add(sizer1)
-       
-        self.vbox.Add(boxsizer,0, wx.ALL, 10)
-        self.vbox.Add(sizer2)
+        boxsizer.Add(self.hint_txt, wx.ALL|wx.EXPAND, 20)
+        self.vbox = wx.BoxSizer(wx.VERTICAL)
+        self.vbox.Add(boxsizer )
+        self.vbox.Layout()
+        self.vbox.Fit(self) 
         self.SetSizer(self.vbox)
-       
-    def on_select_data(self, event=None):
-        """
-        """
-        n = self.data_cbbox.GetCurrentSelection()
-        data, path = self.data_cbbox.GetClientData(n)
-        if data.__class__.__name__ in ["Data1D", "Theory1D"]:
-            data = self.manager.create_fittable_data1D(data=data)
-        else:
-            data = self.manager.create_fittable_data2D(data=data)
-        self.parent.manager.add_fit_page(data=data)
-        if data !=None:
-            if hasattr(data,"title"):
-                title = str(data.title.lstrip().rstrip())
-                if title == "":
-                    title = str(data.name)
-            else:
-                title = str(data.name)
-            wx.PostEvent(self.parent.parent, NewPlotEvent(plot=data, title=title))
+        self.SetScrollbars(20,20,25,65)
+        self.Layout()
         
     def createMemento(self):
-        """
-        """
         return 
+        
+class HelpWindow(wx.Frame):
+    def __init__(self, parent, id, title):
+        wx.Frame.__init__(self, parent, id, title, size=(570, 400))
+       
+        self.page = HintFitPage(self) 
+        self.Centre()
+        self.Show(True)
  
+if __name__=="__main__":
+    app = wx.App()
+    HelpWindow(None, -1, 'HelpWindow')
+    app.MainLoop()
+