Changeset 3658717e in sasview

Timestamp:

Mar 16, 2011 7:08:41 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:

20b482f

Parents:

d7f727d

Message:

working on delete file

Location:

guiframe

Files:

• data_panel.py (modified) (2 diffs)
• gui_manager.py (modified) (1 diff)
• local_perspectives/plotting/plotting.py (modified) (2 diffs)
• plugin_base.py (modified) (1 diff)

guiframe/data_panel.py

@@ -508 +508 @@
             item, _, _, _, _, _ = value
             if item.IsChecked():
-               data_id, _, state_id = self.tree_ctrl.GetItemPyData(item) 
-               data_to_plot.append(data_id)
-               if state_id not in state_to_plot:
-                   state_to_plot.append(state_id)
+                data_id, _, state_id = self.tree_ctrl.GetItemPyData(item)
+                data_to_plot.append(data_id)
+                if state_id not in state_to_plot:
+                    state_to_plot.append(state_id)
+           
         for theory_dict in self.list_cb_theory.values():
             for key, value in theory_dict.iteritems():
@@ -535 +536 @@
     def on_remove(self, event):
         """
-        remove data from application
+        Get a list of item checked and remove them from the treectrl
+        Ask the parent to remove reference to this item 
         """
         data_to_remove, theory_to_remove, _ = self.set_data_helper()
         data_key = []
         theory_key = []
-        for key, item in self.list_cb_data.iteritems():
+        #remove  data from treectrl
+        for d_key, item in self.list_cb_data.iteritems():
             data_c, d_i_c, i_c_c, p_c_c, d_p_c, t_c = item
             if data_c.IsChecked():
                 self.tree_ctrl.Delete(data_c)
-                data_key.append(key)
-                
-        for key, theory_dict in self.list_cb_theory.iteritems():
-            for  value in theory_dict.values():
+                data_key.append(d_key)
+                if d_key in self.list_cb_theory.keys():
+                    theory_list_ctrl = self.list_cb_theory[d_key]
+                    theory_to_remove += theory_list_ctrl.keys()
+        # Remove theory from treectrl       
+        for t_key, theory_dict in self.list_cb_theory.iteritems():
+            for  key, value in theory_dict.iteritems():
                 item, _, _ = value
                 if item.IsChecked():
                     self.tree_ctrl.Delete(item)
                     theory_key.append(key)
+        #Remove data and related theory references
         for key in data_key:
             del self.list_cb_data[key]
+            if key in theory_key:
+                del self.list_cb_theory[key]
+        #remove theory  references independently of data
         for key in theory_key:
-            del self.list_cb_theory[key]
+            for t_key, theory_dict in self.list_cb_theory.iteritems():
+                del theory_dict[key]
+            
         self.parent.remove_data(data_id=data_to_remove,
                                   theory_id=theory_to_remove)

guiframe/gui_manager.py

@@ -1383 +1383 @@
         else delete theory
         """
+        for plug in self.plugins:
+            plug.delete_data(data_id)
+        total_plot_list = []
+        data_list, _ = self._data_manager.get_by_id(data_id)
+        _, temp_list_theory = self._data_manager.get_by_id(theory_id)
+        total_plot_list = data_list.values()
+        for item in temp_list_theory.values():
+            theory_data, theory_state = item
+            total_plot_list.append(theory_data)
+        for new_plot in total_plot_list:
+            id = new_plot.id
+            for group_id in new_plot.list_group_id:
+                wx.PostEvent(self, NewPlotEvent(id=id,
+                                                   group_id=group_id,
+                                                   action='remove'))
         self._data_manager.delete_data(data_id=data_id, 
                                        theory_id=theory_id)
-        for plug in self.plugins:
-            plug.delete_data(data_id)
             
         

guiframe/local_perspectives/plotting/plotting.py

@@ -177 +177 @@
             raise ValueError, msg
         else:
+            if panel.group_id not in data.list_group_id:
+                data.list_group_id.append(panel.group_id)
             panel.plot_data( data)
             self.parent.show_panel(panel.uid)   
@@ -240 +242 @@
                 new_panel = self.create_2d_panel(data, group_id)
             self.create_panel_helper(new_panel, data, group_id, title)
-            
+        print "_on_plot_event", data.list_group_id
         return
    

guiframe/plugin_base.py

@@ -70 +70 @@
         return True
     
+    def is_in_use(self, data_id):
+        """
+        get a  data id and return true or false if the data 
+        is currently in use the current plugin
+        """
+        return False
+    
     def delete_data(self, data_id):
         """