Changeset 6db811e in sasview

Timestamp:

Jan 31, 2011 1:30:11 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:

8994b6b

Parents:

0663dfb1

Message:

add data loading panel

Location:

guiframe

Files:

• data_manager.py (modified) (1 diff)
• data_panel.py (modified) (6 diffs)
• gui_manager.py (modified) (6 diffs)
• plugin_base.py (modified) (1 diff)

guiframe/data_manager.py

@@ -88 +88 @@
         """
         """
-        #for id in 
+        if data_id in self.stored_data:
+            del self.stored_data[data_id]
+        if data_id in self._selected_data:
+            del self._selected_data
+            
     def delete_by_id(self, id_list=None):
         """

guiframe/data_panel.py

@@ -25 +25 @@
     Check list control to be used for Data Panel
     """
-    def __init__(self, parent, size=(PANEL_WIDTH, 200), *args, **kwds):
+    def __init__(self, parent,*args, **kwds):
         kwds['style']= wx.SUNKEN_BORDER|CT.TR_HAS_BUTTONS| CT.TR_HIDE_ROOT|   \
                     CT.TR_HAS_VARIABLE_ROW_HEIGHT|wx.WANTS_CHARS
-        kwds['size'] = size
         CT.CustomTreeCtrl.__init__(self, parent, *args, **kwds)
         self.root = self.AddRoot("Available Data")
@@ -61 +60 @@
         self.owner = None
         self.do_layout()
-        #self._default_data1d = Data1D()
-        #self._default_data1d.set_default_data()
-        #self._default_data2d = Data2D()
-        #self._default_data2d.set_default_data()
-        #data_list =[]
-        #data_list.append((self._default_data1d, None,None, None))
-        #data_list.append((self._default_data2d, None,None, None))
-        #if self.manager is not None:
-        #    self.manager.set_loaded_data(data_list)
-        #    list = self.manager.get_selected_data()
-        #    self.load_data_list(list)
+       
     def do_layout(self):
+        """
+        """
         self.define_panel_structure()
         self.layout_selection()
@@ -83 +74 @@
         Define the skeleton of the panel
         """
-        print self.parent.GetSize(), self.GetSize()
         w, h = self.parent.GetSize()
         self.vbox  = wx.BoxSizer(wx.VERTICAL)
         self.sizer1 = wx.BoxSizer(wx.VERTICAL)
+        self.sizer1.SetMinSize((w/12, h/2))
         self.sizer2 = wx.BoxSizer(wx.VERTICAL)
         self.sizer3 = wx.GridBagSizer(5,5)
         self.sizer4 = wx.BoxSizer(wx.HORIZONTAL)
         self.sizer5 = wx.BoxSizer(wx.HORIZONTAL)
-        self.sizer3.SetMinSize((w-60, -1))
+        #self.sizer3.SetMinSize((w-60, -1))
         
         self.vbox.Add(self.sizer5, 0,wx.EXPAND|wx.ALL,10)
@@ -127 +118 @@
         box_description_2= wx.StaticBox(self, -1, "Set Active Perspective")
         self.boxsizer_2 = wx.StaticBoxSizer(box_description_2, wx.HORIZONTAL)
-        self.boxsizer_2.SetMinSize((w-60, -1))
         self.sizer_perspective = wx.GridBagSizer(5,5)
         self.boxsizer_2.Add(self.sizer_perspective)
@@ -175 +165 @@
         option = self.selection_cbox.GetValue()
         if option == 'Select all Data':
-            #for item in self.tree_ctrl.
-            print "_on_selection_type"
+            print "on select"
+            
     def on_set_active_perspective(self, event):
         """
@@ -252 +242 @@
         Add a listcrtl in the panel
         """
-        w, h = self.GetSize()
-        self.tree_ctrl = DataTreeCtrl(parent=self, size=(w-10, -1))
+        self.tree_ctrl = DataTreeCtrl(parent=self)
         self.tree_ctrl.Bind(CT.EVT_TREE_ITEM_CHECKED, self.on_check_item)
         self.tree_ctrl.Bind(CT.EVT_TREE_ITEM_RIGHT_CLICK, self.on_right_click)
-        self.sizer1.Add(self.tree_ctrl,0, wx.EXPAND|wx.ALL, 20)
+        self.sizer1.Add(self.tree_ctrl,1, wx.EXPAND|wx.ALL, 20)
 
     def on_right_click(self, event):

guiframe/gui_manager.py

@@ -129 +129 @@
         self._data_panel = DataPanel(parent=self)
         if self.panel_on_focus is not None:
-            self._data_panel.set_panel_on_focus(self.panel_on_focus.window_name)
+            self._data_panel.set_panel_on_focus(self.panel_on_focus.window_caption)
         # Check for update
         #self._check_update(None)
@@ -314 +314 @@
         style = self.__gui_style & (GUIFRAME.MANAGER_ON)
         if self._data_panel is not None  and (p == self._data_panel):
-            panel_width_min = self._window_width * 4/25 
+            panel_width_min = self._window_width * 2/25 
             return panel_width_min, panel_height_min
         if hasattr(p, "CENTER_PANE") and p.CENTER_PANE:
             style = self.__gui_style & (GUIFRAME.PLOTTING_ON|GUIFRAME.MANAGER_ON)
             if style == (GUIFRAME.PLOTTING_ON|GUIFRAME.MANAGER_ON):
-                panel_width_min = self._window_width * 13/25 
+                panel_width_min = self._window_width * 17/25 
             return panel_width_min, panel_height_min
         return panel_width_min, panel_height_min
@@ -678 +678 @@
             if plug.can_load_data():
                 plug.load_data(event)
-        self.show_data_panel(event=None)
-        print "_load_data"
-                
+        style = self.__gui_style & GUIFRAME.MANAGER_ON
+        if style == GUIFRAME.MANAGER_ON:
+            self.show_data_panel(event=None)
+        
     def _load_folder(self, event):
         """
@@ -689 +690 @@
             if plug.can_load_data():
                 plug.load_folder(event)
-        self.show_data_panel(event=None)
+        style = self.__gui_style & GUIFRAME.MANAGER_ON
+        if style == GUIFRAME.MANAGER_ON:
+            self.show_data_panel(event=None)
                 
     def _on_status_event(self, evt):
@@ -1089 +1092 @@
         for new_plot in data_list:
             if append:
-                if self.panel_on_focus is None:
+                if self.panel_on_focus is None or \
+                    not self.enable_add_data(new_plot):
                     message = "cannot append plot. No plot panel on focus!"
                     message += "please click on any available plot to set focus"
@@ -1121 +1125 @@
                                        theory_id=theory_id, 
                                        delete_all=delete_all)
+        for plug in self.plugins:
+            plug.delete_data(data_id)
+            
         
     def set_current_perspective(self, perspective):

guiframe/plugin_base.py

@@ -58 +58 @@
         return True
     
+    def delete_data(self, data_id):
+        """
+        Delete all references of data which id are in data_list. 
+        """
+        
     def load_data(self, event):
         """