Changeset 91bdf87 in sasview

Timestamp:

Mar 23, 2011 3:27:21 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:

dfd3577

Parents:

be56c8c

Message:

working on datapanel

File:

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

guiframe/data_panel.py

@@ -23 +23 @@
 #PANEL_HEIGHT = 560
 PANEL_HEIGHT = 800
+STYLE_FLAG = wx.SUNKEN_BORDER|CT.TR_HAS_BUTTONS| CT.TR_HIDE_ROOT|\
+                    wx.WANTS_CHARS|CT.TR_HAS_VARIABLE_ROW_HEIGHT
+                    
+                    
 class DataTreeCtrl(CT.CustomTreeCtrl):
     """
@@ -29 +33 @@
     def __init__(self, parent,*args, **kwds):
         #agwstyle is introduced in wx.2.8.11
-        kwds['agwStyle']= wx.SUNKEN_BORDER|CT.TR_HAS_BUTTONS| CT.TR_HIDE_ROOT|   \
-                    wx.WANTS_CHARS|CT.TR_HAS_VARIABLE_ROW_HEIGHT
+        try:
+            kwds['agwStyle'] = STYLE_FLAG
+        except:
+            try:
+                kwds['style'] = STYLE_FLAG
+            except:
+                raise
+        
         CT.CustomTreeCtrl.__init__(self, parent, *args, **kwds)
         self.root = self.AddRoot("Available Data")
@@ -283 +293 @@
                             (self.rb_batch_mode,0, wx.ALL,5)])
       
-    def layout_data_list(self):
+    def old_layout_data_list(self):
         """
         Add a listcrtl in the panel
@@ -293 +303 @@
                                                    "THEORIES", ct_type=0)
     
-    def new_layout_data_list(self):
+    def layout_data_list(self):
         """
         Add a listcrtl in the panel
@@ -403 +413 @@
                                                           process.__str__())
             self.append_theory(state_id, theory_list)
-            
+        
    
-    def append_theory(self, state_id, theory_list):
+    def old_append_theory(self, state_id, theory_list):
         """
         append theory object under data from a state of id = state_id
@@ -422 +432 @@
                                        state_id=state_id, 
                                        theory_list=theory_list)
-    def new_append_theory(self, state_id, theory_list):
+    def append_theory(self, state_id, theory_list):
         """
         append theory object under data from a state of id = state_id
@@ -431 +441 @@
         if state_id not in self.list_cb_data.keys():
             root = self.tree_ctrl_theory.root
+            tree = self.tree_ctrl_theory
         else:
             item = self.list_cb_data[state_id]
             data_c, _, _, _, _, _ = item
             root = data_c
+            tree = self.tree_ctrl
         if root is not None:
-             self.append_theory_helper(root=root, 
+             self.append_theory_helper(tree=tree, root=root, 
                                        state_id=state_id, 
                                        theory_list=theory_list)
       
       
-    def append_theory_helper(self, root, state_id, theory_list):
+    def append_theory_helper(self, tree, root, state_id, theory_list):
         """
         """
@@ -464 +476 @@
                 if theory_id not in theory_list_ctrl:
                     #add new theory
-                    t_child = self.tree_ctrl.AppendItem(root,
+                    t_child = tree.AppendItem(root,
                                                     name, ct_type=1, data=temp)
-                    t_i_c = self.tree_ctrl.AppendItem(t_child, 'Info')
-                    i_c_c = self.tree_ctrl.AppendItem(t_i_c, 
+                    t_i_c = tree.AppendItem(t_child, 'Info')
+                    i_c_c = tree.AppendItem(t_i_c, 
                                                   'Type: %s' % theory_class)
-                    t_p_c = self.tree_ctrl.AppendItem(t_i_c, 'Process')
+                    t_p_c = tree.AppendItem(t_i_c, 'Process')
                     
                     for process in theory_data.process:
-                        i_t_c = self.tree_ctrl.AppendItem(t_p_c,
+                        i_t_c = tree.AppendItem(t_p_c,
                                                           process.__str__())
                     theory_list_ctrl[theory_id] = [t_child, 
@@ -480 +492 @@
                     #replace theory
                     t_child, i_c_c, t_p_c = theory_list_ctrl[theory_id]
-                    self.tree_ctrl.SetItemText(t_child, name) 
-                    self.tree_ctrl.SetItemPyData(t_child, temp) 
-                    self.tree_ctrl.SetItemText(i_c_c, 'Type: %s' % theory_class) 
-                    self.tree_ctrl.DeleteChildren(t_p_c) 
+                    tree.SetItemText(t_child, name) 
+                    tree.SetItemPyData(t_child, temp) 
+                    tree.SetItemText(i_c_c, 'Type: %s' % theory_class) 
+                    tree.DeleteChildren(t_p_c) 
                     for process in theory_data.process:
-                        i_t_c = self.tree_ctrl.AppendItem(t_p_c,
+                        i_t_c = tree.AppendItem(t_p_c,
                                                           process.__str__())
               
@@ -500 +512 @@
                     #    name = theory_state.model.name 
                     temp = (theory_id, theory_class, state_id)
-                    t_child = self.tree_ctrl.AppendItem(root,
+                    t_child = tree.AppendItem(root,
                             name, ct_type=1, 
                             data=(theory_data.id, theory_class, state_id))
-                    t_i_c = self.tree_ctrl.AppendItem(t_child, 'Info')
-                    i_c_c = self.tree_ctrl.AppendItem(t_i_c, 
+                    t_i_c = tree.AppendItem(t_child, 'Info')
+                    i_c_c = tree.AppendItem(t_i_c, 
                                                   'Type: %s' % theory_class)
-                    t_p_c = self.tree_ctrl.AppendItem(t_i_c, 'Process')
+                    t_p_c = tree.AppendItem(t_i_c, 'Process')
                     
                     for process in theory_data.process:
-                        i_t_c = self.tree_ctrl.AppendItem(t_p_c,
+                        i_t_c = tree.AppendItem(t_p_c,
                                                           process.__str__())
             
@@ -515 +527 @@
                 #self.list_cb_theory[data_id] = theory_list_ctrl
                 self.list_cb_theory[state_id] = theory_list_ctrl
+