Changeset bffa3d0 in sasview

Timestamp:

Mar 23, 2011 1:32:00 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:

5cc39f10

Parents:

72323d1

Message:

working on freeze theory

Location:

guiframe

Files:

• data_manager.py (modified) (1 diff)
• data_panel.py (modified) (3 diffs)

guiframe/data_manager.py

@@ -212 +212 @@
                         selected_theory[new_theory.id] = DataState(new_theory)
                         self.stored_data[new_theory.id] = selected_theory[new_theory.id]
-                    else:
-                        msg = "Theory with ID %s " % str(t_id)
-                        msg += "couldn't not be frozen" 
-                        raise ValueError, msg
+
         return selected_theory
                     

guiframe/data_panel.py

@@ -100 +100 @@
         """
         select_txt = wx.StaticText(self, -1, 'Selection Options')
+        select_txt.SetForegroundColour('blue')
         self.selection_cbox = wx.ComboBox(self, -1, style=wx.CB_READONLY)
         list_of_options = ['Select all Data',
@@ -290 +291 @@
         self.theory_root = self.tree_ctrl.InsertItem(self.tree_ctrl.root,0,
                                                    "THEORIES", ct_type=0)
-        
+    
+    def new_layout_data_list(self):
+        """
+        Add a listcrtl in the panel
+        """
+        tree_ctrl_label = wx.StaticText(self, -1, "Data")
+        tree_ctrl_label.SetForegroundColour('blue')
+        self.tree_ctrl = DataTreeCtrl(parent=self)
+        self.tree_ctrl.Bind(CT.EVT_TREE_ITEM_CHECKING, self.on_check_item)
+        tree_ctrl_theory_label = wx.StaticText(self, -1, "Theory")
+        tree_ctrl_theory_label.SetForegroundColour('blue')
+        self.tree_ctrl_theory = DataTreeCtrl(parent=self)
+        self.tree_ctrl_theory.Bind(CT.EVT_TREE_ITEM_CHECKING, self.on_check_item)
+        self.sizer1.Add(tree_ctrl_label, 0, wx.LEFT, 10)
+        self.sizer1.Add(self.tree_ctrl, 1, wx.EXPAND|wx.ALL, 10)
+        self.sizer1.Add(tree_ctrl_theory_label, 0,  wx.LEFT, 10)
+        self.sizer1.Add(self.tree_ctrl_theory, 1, wx.EXPAND|wx.ALL, 10)
+           
     def onContextMenu(self, event): 
         """
@@ -403 +421 @@
                                        state_id=state_id, 
                                        theory_list=theory_list)
+    def new_append_theory(self, state_id, theory_list):
+        """
+        append theory object under data from a state of id = state_id
+        replace that theory if  already displayed
+        """
+        if not theory_list:
+            return 
+        if state_id not in self.list_cb_data.keys():
+            root = self.tree_ctrl_theory.root
+        else:
+            item = self.list_cb_data[state_id]
+            data_c, _, _, _, _, _ = item
+            root = data_c
+        if root is not None:
+             self.append_theory_helper(root=root, 
+                                       state_id=state_id, 
+                                       theory_list=theory_list)
+      
       
     def append_theory_helper(self, root, state_id, theory_list):