Changeset 6e48fd0 in sasview

Timestamp:

Aug 24, 2012 6:47:40 PM (12 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:

b82e536

Parents:

9bc37a8

Message:

data operation: added scale for 2D plot

Files:

• calculatorview/src/sans/perspectives/calculator/data_operator.py (modified) (4 diffs)
• sansguiframe/src/sans/guiframe/config.py (modified) (1 diff)

calculatorview/src/sans/perspectives/calculator/data_operator.py

@@ -639 +639 @@
         self.is_number = is_number
         self.content = content
+        self.point = None
         self.position = (0.4, 0.5)
         self.scale = 'linear'
@@ -673 +674 @@
         self.plots = {}
         self.clear()
+        self.point = plot
         try:
             self.figure.delaxes(self.figure.axes[0])
@@ -804 +806 @@
         id = wx.NewId()
         slicerpop = wx.Menu()
-        slicerpop.Append(id, '&Change Scale')
-        wx.EVT_MENU(self, id, self._onProperties)
+        data = self.point
+        if issubclass(data.__class__, Data1D):
+            slicerpop.Append(id, '&Change Scale')
+            wx.EVT_MENU(self, id, self._onProperties)
+        else:
+            slicerpop.Append(id, '&Toggle Linear/Log Scale')
+            wx.EVT_MENU(self, id, self.ontogglescale)     
         try:
             # mouse event
@@ -814 +821 @@
             pos_x, pos_y = self.toolbar.GetPositionTuple()
             pos = (pos_x, pos_y + 5)
-            
         self.PopupMenu(slicerpop, pos)
+        
+    def ontogglescale(self, event): 
+        """
+        On toggle 2d scale
+        """
+        self._onToggleScale(event)  
+        try:
+            # mpl >= 1.1.0
+            self.figure.tight_layout()
+        except:
+            self.figure.subplots_adjust(left=0.1, bottom=0.1) 
+        try:
+            self.figure.delaxes(self.figure.axes[1])
+        except:
+            pass
         
     def _onProperties(self, event):

sansguiframe/src/sans/guiframe/config.py

@@ -40 +40 @@
 _danse_logo = "images/danse_logo.png"
 _inst_logo = "images/utlogo.gif"
+_nist_logo = "images/nist_logo.png"
+_umd_logo = "images/umd_logo.png"
+_sns_logo = "images/sns_logo.png"
+_nist_url = "http://www.nist.gov/"
+_umd_url = "http://www.umd.edu/"
+_sns_url = "http://neutrons.ornl.gov/"
 _nsf_url = "http://www.nsf.gov"
 _danse_url = "http://www.cacr.caltech.edu/projects/danse/release/index.html"