Changeset 6e75ed0 in sasview for sansguiframe/src/sans/guiframe/local_perspectives/plotting

Timestamp:

Apr 23, 2012 10:00:49 AM (13 years ago)

Author:

Robert Whitley <robert.whitley@…>

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:

2ee5c61

Parents:

3553ad2

Message:

Refs #36. Delete should be cross button and hide should be a toolbar button.

Clean up some warnings.

Location:

sansguiframe/src/sans/guiframe/local_perspectives/plotting

Files:

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

sansguiframe/src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -34 +34 @@
 from sans.guiframe.dataFitting import Data1D
 from sans.guiframe.panel_base import PanelBase
+from sans.guiframe.gui_style import GUIFRAME_ICON
 from binder import BindArtist
 
@@ -93 +94 @@
         self.Bind(wx.EVT_SIZE, self._OnReSize)
         self._add_more_tool()
-        self.parent.SetFocus() 
+        self.parent.SetFocus()
+        
         
     def get_symbol_label(self):
@@ -682 +684 @@
     def _add_more_tool(self):
         """
-        Add refresh, add/delete button in the tool bar
+        Add refresh, add/hide button in the tool bar
         """
         if self.parent.__class__.__name__ != 'ViewerFrame':
@@ -688 +690 @@
         self.toolbar.AddSeparator()
         id_delete = wx.NewId()
-        delete =  wx.ArtProvider.GetBitmap(wx.ART_DELETE, wx.ART_TOOLBAR)
-        self.toolbar.AddSimpleTool(id_delete, delete,
-                           'Delete', 'permanently Delete')
-
+        delete = wx.Bitmap(GUIFRAME_ICON.HIDE_ID_PATH, wx.BITMAP_TYPE_PNG)
+        self.toolbar.AddSimpleTool(id_delete, delete, 'Hide', 'Hide')
         self.toolbar.Realize()
-        wx.EVT_TOOL(self, id_delete,  self._on_delete)
+        wx.EVT_TOOL(self, id_delete,  self._on_hide)
         
         """
@@ -705 +705 @@
         wx.EVT_TOOL(self, id_text,  self._on_removetext)
         """
-    def _on_delete(self, event): 
-        """
-        Refreshes the plotpanel on refresh tollbar button
-        """
-        
+        
+    def _on_hide(self, event):
+        """
+        Hides the plot when button is pressed
+        """     
         if self.parent is not None:
-            wx.PostEvent(self.parent, 
-                         NewPlotEvent(group_id=self.group_id,
-                                      action="delete"))
-            
-            
+            self.parent.hide_panel(self.uid)
+            
+            

sansguiframe/src/sans/guiframe/local_perspectives/plotting/plotting.py

@@ -144 +144 @@
         """
         """
-         ## Set group ID if available
+        ## Set group ID if available
         ## Assign data properties to the new create panel
         new_panel.set_manager(self)
@@ -174 +174 @@
         self.menu.Check(event_id, IS_WIN)
         wx.EVT_MENU(self.parent, event_id, self._on_check_menu)
-
-        wx.EVT_SHOW(new_panel, self._on_close_panel)
 
         
@@ -309 +307 @@
                 new_panel = self.create_2d_panel(data, group_id)
             self.create_panel_helper(new_panel, data, group_id, title)
-      
+            
         return
 
@@ -340 +338 @@
                     pass  
         frame.Show(True)
-              
-    def _on_close_panel(self, event):
-        """
-        Update check mark on panel's show and hide event
-        """
-        event.Skip()
-        panel = event.GetEventObject()
-        id = panel.uid
-        if event.GetShow() and self.parent._mgr.GetPane(panel).IsShown():
-            try:
-                if self.menu.FindItemById(id) != None:
-                    if not self.menu.IsChecked(id):
-                        self.menu.Check(id, True)
-                        #self.menu.Enable(id, False)
-            except:
-                # when no such item; may happens after delete
-                pass
-        else:
-            try:
-                if self.menu.FindItemById(id) != None:
-                    if self.menu.IsChecked(id):
-                        self.menu.Check(id, False)
-                        #self.menu.Enable(id, True)
-            except:
-                pass