Changeset fcf072d in sasview

Timestamp:

Apr 29, 2011 5:43:37 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:

dee097b

Parents:

7f59ee8e

Message:

fixed all y_lable problem for residual

Location:

guiframe/local_perspectives/plotting

Files:

• AnnulusSlicer.py (modified) (1 diff)
• SectorSlicer.py (modified) (1 diff)
• boxSlicer.py (modified) (1 diff)

guiframe/local_perspectives/plotting/AnnulusSlicer.py

@@ -160 +160 @@
         # If the data file does not tell us what the axes are, just assume...
         new_plot.xaxis("\\rm{\phi}", 'degrees')
-        if hasattr(data, "scale"):
-            if data.scale == 'linear':
-                new_plot.ytransform = 'y'
-                new_plot.yaxis("\\rm{Residuals} ", "/")
-        else:
-            new_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
+        new_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
+        if hasattr(data, "scale") and data.scale == 'linear' and \
+                self.base.data2D.name.count("Residuals") > 0:
+            new_plot.ytransform = 'y'
+            new_plot.yaxis("\\rm{Residuals} ", "/")
 
         new_plot.group_id = "AnnulusPhi" + self.base.data2D.name

guiframe/local_perspectives/plotting/SectorSlicer.py

@@ -178 +178 @@
         new_plot.xaxis("\\rm{Q}", "A^{-1}")
         new_plot.yaxis("\\rm{Intensity}", "cm^{-1}")
-        if hasattr(data, "scale") and data.scale == 'linear':
+        if hasattr(data, "scale") and data.scale == 'linear' and \
+                self.base.data2D.name.count("Residuals") > 0:
             new_plot.ytransform = 'y'
             new_plot.yaxis("\\rm{Residuals} ", "/")

guiframe/local_perspectives/plotting/boxSlicer.py

@@ -190 +190 @@
         ## If the data file does not tell us what the axes are, just assume...
         new_plot.xaxis("\\rm{Q}", "A^{-1}")
-        if hasattr(self.base.data2D, "scale"):
-            if self.base.data2D.scale == 'linear':
-                new_plot.ytransform = 'y'
-                new_plot.yaxis("\\rm{Residuals} ", "/")
-        else:
-            new_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
+        new_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
+
+        data = self.base.data2D
+        if hasattr(data, "scale") and data.scale == 'linear' and \
+                self.base.data2D.name.count("Residuals") > 0:
+            new_plot.ytransform = 'y'
+            new_plot.yaxis("\\rm{Residuals} ", "/")
+            
         new_plot.group_id = str(self.averager.__name__) + self.base.data2D.name
         #new_plot.id = str(self.averager.__name__)