Changeset c5a769e in sasview

Timestamp:

May 22, 2011 1:09:02 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

022af4d

Parents:

b3de12a4

Message:

more touch: move delete plot to p_panel from data_panel…

Location:

guiframe

Files:

• data_panel.py (modified) (4 diffs)
• gui_manager.py (modified) (1 diff)
• local_perspectives/plotting/Plotter1D.py (modified) (2 diffs)
• local_perspectives/plotting/Plotter2D.py (modified) (1 diff)

guiframe/data_panel.py

@@ -255 +255 @@
         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",
+        self.bt_remove = wx.Button(self, wx.NewId(), "Delete Data",
          size=(BUTTON_WIDTH, -1))
-        self.bt_remove.SetToolTipString("Remove data from the application")
+        self.bt_remove.SetToolTipString("Delete 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",
@@ -284 +284 @@
         wx.EVT_BUTTON(self, self.bt_freeze.GetId(), self.on_freeze)
         #hide plot
-        self.bt_close_plot = wx.Button(self, wx.NewId(), "Delete Plot", 
-                                   size=(BUTTON_WIDTH, -1))
-        self.bt_freeze.SetToolTipString("Delete the plot panel on focus")
-        wx.EVT_BUTTON(self, self.bt_close_plot.GetId(), self.on_close_plot)
+        #self.bt_close_plot = wx.Button(self, wx.NewId(), "Delete Plot", 
+        #                           size=(BUTTON_WIDTH, -1))
+        #self.bt_close_plot.SetToolTipString("Delete the plot panel on focus")
+        #wx.EVT_BUTTON(self, self.bt_close_plot.GetId(), self.on_close_plot)
        
         self.cb_plotpanel = wx.ComboBox(self, -1, 
@@ -306 +306 @@
                               ((10, 10)),
                               (self.bt_freeze),
-                              ((10, 10)),
-                              (self.bt_close_plot),
+                              #((10, 10)),
+                              #(self.bt_close_plot),
                               ((10, 10))])
 
@@ -788 +788 @@
         enable remove plot button if there is a plot panel on focus
         """
-        if self.cb_plotpanel.GetCount() == 0:
-            self.bt_close_plot.Disable()
-        else:
-            self.bt_close_plot.Enable()
+        pass
+        #if self.cb_plotpanel.GetCount() == 0:
+        #    self.bt_close_plot.Disable()
+        #else:
+        #    self.bt_close_plot.Enable()
             
     def enable_remove(self):

guiframe/gui_manager.py

@@ -782 +782 @@
 
             self._popup_floating_panel(p)
-            
+  
         # Register for showing/hiding the panel
         wx.EVT_MENU(self, ID, self.on_view)
-        if p not in self.plot_panels.values():
+        if p not in self.plot_panels.values() and p.group_id != None:
             self.plot_panels[ID] = p
             if len(self.plot_panels) == 1:

guiframe/local_perspectives/plotting/Plotter1D.py

@@ -86 +86 @@
         self.canvas.set_resizing(self.resizing)
         self.Bind(wx.EVT_SIZE, self._OnReSize)
+        self._add_more_tool()
        
     def get_symbol_label(self):
@@ -484 +485 @@
                 pass    
         dlg.Destroy()
+
+    def _add_more_tool(self):
+        """
+        Add refresh button in the tool bar
+        """
+        if self.parent.__class__.__name__ != 'ViewerFrame':
+            return
+        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', 'permanently Delete')
+
+        self.toolbar.Realize()
+        wx.EVT_TOOL(self, id_delete,  self._on_delete)
+
+    def _on_delete(self, event): 
+        """
+        Refreshes the plotpanel on refresh tollbar button
+        """
+        
+        if self.parent is not None:
+            wx.PostEvent(self.parent, 
+                         NewPlotEvent(group_id=self.group_id,
+                                      action="delete"))
+            

guiframe/local_perspectives/plotting/Plotter2D.py

@@ -226 +226 @@
         slicerpop.Append(id, '&Copy to Clipboard', 'Copy to the clipboard')
         wx.EVT_MENU(self, id, self.OnCopyFigureMenu)
-        
+        slicerpop.AppendSeparator()
         # saving data
         plot = self.data2D