Changeset 248b918 in sasview

Timestamp:

May 13, 2011 2:35:14 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:

f22e626

Parents:

b2448a5

Message:

working on remove data

Location:

guiframe

Files:

• data_manager.py (modified) (2 diffs)
• data_panel.py (modified) (10 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (1 diff)

guiframe/data_manager.py

@@ -96 +96 @@
         ## when 2 data have the same id override the 1 st plotted
         self.time_stamp += 1
-        new_plot.id = self.time_stamp
+        new_plot.id = str(name) + str(self.time_stamp)
         ##group_id specify on which panel to plot this data
-        new_plot.group_id = self.time_stamp
+        new_plot.group_id = str(name) + str(self.time_stamp)
         new_plot.is_data = True
         new_plot.path = path
@@ -224 +224 @@
         """
         """
-        if data_id in self.stored_data.keys():
-            data_state = self.stored_data[data_id]
-            if data_state.data.name in self.data_name_dict:
-                del self.data_name_dict[data_state.data.name]
-            del self.stored_data[data_id]
+        for d_id in data_id:
+            if d_id in self.stored_data.keys():
+                data_state = self.stored_data[d_id]
+                if data_state.data.name in self.data_name_dict:
+                    del self.data_name_dict[data_state.data.name]
+                del self.stored_data[d_id]
         
         self.delete_theory(data_id, theory_id)

guiframe/data_panel.py

@@ -150 +150 @@
       
         self.sizer2 = wx.BoxSizer(wx.VERTICAL)
-        self.sizer3 = wx.FlexGridSizer(5, 2, 0, 0)
+        self.sizer3 = wx.FlexGridSizer(6, 2, 0, 0)
         self.sizer4 = wx.BoxSizer(wx.HORIZONTAL)
         self.sizer5 = wx.BoxSizer(wx.VERTICAL)
@@ -226 +226 @@
         self.enable_plot()
         self.enable_import()
-        #self.enable_remove()
+        self.enable_remove()
                
     def layout_button(self):
@@ -237 +237 @@
         self.bt_add.SetToolTipString("Load data files")
         wx.EVT_BUTTON(self, self.bt_add.GetId(), self._load_data)
-        #self.bt_remove = wx.Button(self, wx.NewId(), "Remove Data",
-        # size=(BUTTON_WIDTH, -1))
-        #self.bt_remove.SetToolTipString("Remove data from the application")
-        #wx.EVT_BUTTON(self, self.bt_remove.GetId(), self.on_remove)
+        self.bt_remove = wx.Button(self, wx.NewId(), "Remove Data",
+         size=(BUTTON_WIDTH, -1))
+        self.bt_remove.SetToolTipString("Remove data from the application")
+        wx.EVT_BUTTON(self, self.bt_remove.GetId(), self.on_remove)
         self.bt_import = wx.Button(self, wx.NewId(), "Send To",
                                     size=(BUTTON_WIDTH, -1))
@@ -272 +272 @@
         self.sizer3.AddMany([(self.bt_add),
                              ((10, 10)),
+                             (self.bt_remove),
+                             ((10, 10)),
                              (self.bt_import, 0, wx.EXPAND|wx.RIGHT, 5),
                               (self.perspective_cbox, wx.EXPAND),
@@ -283 +285 @@
         self.sizer3.AddGrowableCol(1, 1)
 
-        #self.enable_remove()
+        self.enable_remove()
         self.enable_import()
         self.enable_plot()
@@ -338 +340 @@
         self.enable_plot()
         self.enable_import()
-        #self.enable_remove()
+        self.enable_remove()
         event.Skip()
         
@@ -412 +414 @@
                                                               process.__str__())
                 self.append_theory(state_id, theory_list)
-        #self.enable_remove()
+        self.enable_remove()
         self.enable_import()
         self.enable_plot()
@@ -429 +431 @@
         self.enable_plot()
         self.enable_import()
-        #self.enable_remove()
+        self.enable_remove()
    
     def append_theory(self, state_id, theory_list):
@@ -710 +712 @@
         self.parent.remove_data(data_id=data_to_remove,
                                   theory_id=theory_to_remove)
-        #self.enable_remove()
+        self.enable_remove()
         self.enable_freeze()
         
@@ -718 +720 @@
         """
         data_id, theory_id, state_id = self.set_data_helper()
-        self.parent.set_data(data_id)
-        self.parent.set_data(data_id=state_id, theory_id=theory_id)
+        temp = data_id + state_id
+        self.parent.set_data(data_id=temp, theory_id=theory_id)
         
     def on_append_plot(self, event=None):

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -173 +173 @@
             if id in data_list.keys():
                 data = data_list[id]
-            else:
+            if id in theory_list.keys():
                 data = theory_list[id]