Changeset df22224 in sasview for guiframe/local_perspectives

Timestamp:

Mar 15, 2011 12:43:43 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:

665c083

Parents:

504dd9f5

Message:

disable linear fit for line plot

Location:

guiframe/local_perspectives/plotting

Files:

• Plotter1D.py (modified) (4 diffs)
• plotting.py (modified) (2 diffs)

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -138 +138 @@
             self.graph.delete(data)
             data_manager = self._manager.parent.get_data_manager()
-            data_list = data_manager.get_by_id(id_list=[id])
-            data = data_list.values()[0].data
-            data.group_id.remove(self.group_id)
+            data_list, theory_list = data_manager.get_by_id(id_list=[id])
+            
+            if id in data_list.keys():
+                data = data_list[id]
+            else:
+                data = theory_list[id]
+           
             del self.plots[id]
-                 
             self.graph.render(self)
             self.subplot.figure.canvas.draw_idle()    
+            event = RemoveDataEvent(data=data)
+            wx.PostEvent(self.parent, event)
             if len(self.graph.plottables) == 0:
-                print "_onRemove: graph is empty must be destroyed"
-           
+                #onRemove: graph is empty must be the panel must be destroyed
+                self.parent.delete_panel(self.uid)
         else:
             msg = "Attempt to remove an unexisting plot with ID %s " % str(id)
@@ -217 +222 @@
             selected_plot = self.plots[self.graph.selected_plottable]
             id = self.graph.selected_plottable
-            self.remove_data_by_id( id)
-            event = RemoveDataEvent(data=selected_plot)
-            wx.PostEvent(self.parent, event)
-            self.graph.delete(selected_plot)
-            del selected_plot
-       
+            self.remove_data_by_id(id)
+            
     def onContextMenu(self, event):
         """
@@ -276 +277 @@
                 self._slicerpop.Append(id, '&Freeze', 'Freeze')
                 wx.EVT_MENU(self, id, self.onFreeze)
+            #else:
+            id = wx.NewId()
+            self._slicerpop.Append(id, '&Linear Fit')
+            wx.EVT_MENU(self, id, self.onFitting)
             id = wx.NewId()
             name = plot.name
@@ -297 +302 @@
             # Option to hide
             #TODO: implement functionality to hide a plottable (legend click)
-        id = wx.NewId()
-        self._slicerpop.Append(id, '&Linear Fit')
-        wx.EVT_MENU(self, id, self.onFitting)
+        
         
         id = wx.NewId()

guiframe/local_perspectives/plotting/plotting.py

@@ -180 +180 @@
             self.parent.show_panel(panel.uid)   
     
+    def delete_menu_item(self, name, uid):
+        """
+        """
+        #remove menu item
+        pos = self.menu.FindItem(name) 
+        if pos != -1:
+            self.menu.Delete(uid)
+        if self.menu.GetMenuItemCount() == 0:
+            self.menu.Append(DEFAULT_MENU_ITEM_ID, DEFAULT_MENU_ITEM_LABEL, 
+                             "No plot available")
+            self.menu.FindItemByPosition(0).Enable(False)
+        
     def delete_panel(self, group_id):
         """
@@ -186 +198 @@
             panel = self.plot_panels[group_id]
             #remove menu item
-            self.menu.Delete(panel.uid)
-            self.parent.delete_panel(panel.uid)
+            self.delete_menu_item(panel.window_caption, panel.uid)
             del self.plot_panels[group_id]
             return True