Changeset 857d00f in sasview

Timestamp:

Aug 31, 2011 10:39:09 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:

7022fdc

Parents:

9680906d

Message:

Added axis label modif

Location:

sansguiframe/src/sans/guiframe/local_perspectives/plotting

Files:

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

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

@@ -430 +430 @@
         self._slicerpop.AppendSeparator()
         
+        id = wx.NewId()
+        self._slicerpop.Append(id, '&Modify Y Axis Label')
+        wx.EVT_MENU(self, id, self._on_yaxis_label)     
+        id = wx.NewId()
+        self._slicerpop.Append(id, '&Modify X Axis Label')
+        wx.EVT_MENU(self, id, self._on_xaxis_label)
+        self._slicerpop.AppendSeparator()
+        
         if self.position != None:
             id = wx.NewId()
@@ -437 +445 @@
             self._slicerpop.Append(id, '&Remove Text')
             wx.EVT_MENU(self, id, self._on_removetext)
+            self._slicerpop.AppendSeparator()
         id = wx.NewId()
         self._slicerpop.Append(id, '&Change Scale')
         wx.EVT_MENU(self, id, self._onProperties)
+        self._slicerpop.AppendSeparator()
         id = wx.NewId()
         self._slicerpop.Append(id, '&Reset Graph')

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

@@ -176 +176 @@
         yhi = None
         ## Update self.data2d with the current plot
-        
+        self.data2D = data
         if data.id in self.plots.keys():
             #replace
@@ -201 +201 @@
                 data._xunit = 'pixel'
                 data._yunit = 'pixel'
+        
+        # graph properties
         self.graph.xaxis(data._xaxis, data._xunit)
         self.graph.yaxis(data._yaxis, data._yunit)
+            
         data.label = self.title_label
         
@@ -211 +214 @@
             self.graph.title(data.label)
             self.graph.render(self)
+            # Set the axis labels on subplot
+            self._set_axis_labels()
             self.draw_plot()
-            
         else:
             self.graph.render(self)
@@ -221 +225 @@
             self.subplot.figure.canvas.draw_idle() 
         
-        self.data2D = data
+        
         ## store default value of zmin and zmax 
         self.default_zmin_ctl = self.zmin_2D
@@ -233 +237 @@
             else: 
                 self.toolbar.update()
-
+    def _set_axis_labels(self):
+        """
+        Set axis labels
+        """
+        data = self.data2D
+        # control axis labels from the panel itself
+        yname, yunits = data.get_yaxis()
+        if self.yaxis_label != None:
+            yname = self.yaxis_label
+            yunits = self.yaxis_unit
+        else:
+            self.yaxis_label = yname
+            self.yaxis_unit = yunits
+        xname, xunits = data.get_xaxis()
+        if self.xaxis_label != None:
+            xname = self.xaxis_label
+            xunits = self.xaxis_unit
+        else:
+            self.xaxis_label = xname
+            self.xaxis_unit = xunits
+        self.xaxis(xname, xunits, self.xaxis_font, self.xaxis_color)
+        self.yaxis(yname, yunits, self.yaxis_font, self.yaxis_color)
+        
     def onContextMenu(self, event):
         """
@@ -327 +353 @@
         
         id = wx.NewId()
+        slicerpop.Append(id, '&Modify Y Axis Label')
+        wx.EVT_MENU(self, id, self._on_yaxis_label)     
+        id = wx.NewId()
+        slicerpop.Append(id, '&Modify X Axis Label')
+        wx.EVT_MENU(self, id, self._on_xaxis_label)
+        slicerpop.AppendSeparator()
+        
+        id = wx.NewId()
         slicerpop.Append(id, '&2D Color Map')
         wx.EVT_MENU(self, id, self._onEditDetector)
+        slicerpop.AppendSeparator()
+        
         id = wx.NewId()
         slicerpop.Append(id, '&Toggle Linear/Log Scale')