Changeset 0aca693 in sasview for sansguiframe/src/sans/guiframe/local_perspectives

Timestamp:

Apr 9, 2012 11:44:49 AM (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:

8b1d759

Parents:

cce182ae

Message:

Added showing "DataInfor?" from data panel as well as from plot

Location:

sansguiframe/src/sans/guiframe/local_perspectives/plotting

Files:

• Plotter1D.py (modified) (2 diffs)
• Plotter2D.py (modified) (2 diffs)

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

@@ -410 +410 @@
                         pass
                 plot_menu.AppendSeparator()
-    
+                
+            id = wx.NewId()
+            plot_menu.Append(id, "&DataInfo", name)
+            wx.EVT_MENU(self, id, self. _onDataShow)
             id = wx.NewId()
             plot_menu.Append(id, "&Save Points as a File", name)
@@ -657 +660 @@
             self.parent.save_data1d(data, default_name)
 
+                       
+    def _onDataShow(self, evt):
+        """
+        Show the data set in text
+        
+        :param evt: Menu event
+        
+        """
+        menu = evt.GetEventObject()
+        id = evt.GetId()
+        self.set_selected_from_menu(menu, id)
+        data = self.plots[self.graph.selected_plottable]
+        default_name = data.label
+        if default_name.count('.') > 0:
+            default_name = default_name.split('.')[0]
+        #default_name += "_out"
+        if self.parent != None:
+            self.parent.show_data1d(data, default_name)
+            
     def _add_more_tool(self):
         """

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

@@ -316 +316 @@
         # saving data
         plot = self.data2D
+        id = wx.NewId()
+        name = plot.name
+        slicerpop.Append(id, "&Data Info" )
+        wx.EVT_MENU(self, id, self._onDataShow)
+
         id = wx.NewId()
         name = plot.name
@@ -761 +766 @@
             path = None
             self.parent.save_data2d(self.data2D, default_name)
-        
+            
+    def _onDataShow(self, evt):
+        """
+        Show the data set in text
+        
+        :param evt: Menu event
+        
+        """
+        menu = evt.GetEventObject()
+        id = evt.GetId()
+        self.set_selected_from_menu(menu, id)
+        data = self.plots[self.graph.selected_plottable]
+        default_name = data.label
+        if default_name.count('.') > 0:
+            default_name = default_name.split('.')[0]
+        #default_name += "_out"
+        if self.parent != None:
+            self.parent.show_data2d(data, default_name)
+