Changeset cc061c3 in sasview

Timestamp:

Mar 3, 2011 4:04:58 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:

bfa73ca

Parents:

883e5f5

Message:

working on data panel

File:

• guiframe/data_panel.py (modified) (9 diffs)

guiframe/data_panel.py

@@ -70 +70 @@
         self.layout_selection()
         self.layout_data_list()
-        self.layout_theory_list()
         self.layout_button()
         self.layout_batch()
@@ -81 +80 @@
         self.vbox  = wx.BoxSizer(wx.VERTICAL)
         self.sizer1 = wx.BoxSizer(wx.VERTICAL)
-        self.sizer1.SetMinSize((w/12, h*1/5))
-        self.sizer6 = wx.BoxSizer(wx.VERTICAL)
-        self.sizer6.SetMinSize((w/12, h*1/5))
+        self.sizer1.SetMinSize((w/12, h*2/5))
+      
         self.sizer2 = wx.BoxSizer(wx.VERTICAL)
         self.sizer3 = wx.GridBagSizer(5,5)
@@ -91 +89 @@
         self.vbox.Add(self.sizer5, 0,wx.EXPAND|wx.ALL,10)
         self.vbox.Add(self.sizer1, 0,wx.EXPAND|wx.ALL,0)
-        self.vbox.Add(self.sizer6, 0,wx.EXPAND|wx.ALL,0)
         self.vbox.Add(self.sizer2, 0,wx.EXPAND|wx.ALL,10)
         self.vbox.Add(self.sizer3, 0,wx.EXPAND|wx.ALL,10)
@@ -286 +283 @@
         self.sizer1.Add(self.tree_ctrl,1, wx.EXPAND|wx.ALL, 10)
         
-    def layout_theory_list(self):
-        """
-        Add a listcrtl in the panel
-        """
-        self.tree_ctrl_theory = DataTreeCtrl(parent=self)
-        self.tree_ctrl_theory.Bind(CT.EVT_TREE_ITEM_CHECKED, self.on_check_item)
-        self.tree_ctrl_theory.Bind(CT.EVT_TREE_ITEM_RIGHT_CLICK, self.on_right_click)
-        label = wx.StaticText(self, -1, "CREATED DATA")
-        label.SetForegroundColour('blue')
-        self.sizer6.Add(label, 0, wx.LEFT, 10)
-        self.sizer6.Add(self.tree_ctrl_theory,1, wx.EXPAND|wx.ALL, 10)
 
     def on_right_click(self, event):
@@ -350 +336 @@
             theory_list = dstate.get_theory()
             data_child = None
+            
             if theory_list:
-                for theory_id,theory in theory_list:
+                for theory_id,theory in theory_list.iteritems():
                     for item in self.list_cb_data:
                         data_id, data_class = self.tree_ctrl.GetItemPyData(item) 
@@ -358 +345 @@
                             for process in data.process:
                                 theory_child = self.tree_ctrl.FindItem(data_child,
-                                                                "Available Theories"),
+                                                                "CREATED DATA"),
                                 if theory is not None:
                                     av_theory_child =self.tree_ctrl.AppendItem(theory_child,
@@ -485 +472 @@
     ALWAYS_ON = True
     
-    def __init__(self, parent=None, owner=None, manager=None,size=(600, 800),
+    def __init__(self, parent=None, owner=None, manager=None,size=(400, 800),
                          list_of_perspective=[],list=[], *args, **kwds):
-        #kwds['size'] = size
+        kwds['size'] = size
         kwds['id'] = -1
         kwds['title']= "Loaded Data"
@@ -495 +482 @@
         self.manager = manager
         self.panel = DataPanel(parent=self, 
-                               size=size,
+                               #size=size,
                                list_of_perspective=list_of_perspective)
      
@@ -598 +585 @@
         
         window = DataFrame(list=data_list)
-        window.load_data_list(list=data_list)
+        #window.load_data_list(list=data_list)
         window.layout_perspective(list_of_perspective=list_of_perspective)
         window.Show(True)