Changeset ca58654 in sasview

Timestamp:

Jan 19, 2012 2:47:10 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:

e25d908

Parents:

4310dbb

Message:

set 2D z log scale from natural log to 10 log

File:

• plottools/src/danse/common/plottools/PlotPanel.py (modified) (8 diffs)

plottools/src/danse/common/plottools/PlotPanel.py

@@ -117 +117 @@
     """
     def __init__(self, parent, id=-1, xtransform=None,
-                  ytransform=None, scale='log', 
+                  ytransform=None, scale='log_{10}', 
                   color=None, dpi=None, **kwargs):
         """
@@ -226 +226 @@
         # for 2D scale
         if scale != 'linear':
-            scale = 'log'
+            scale = 'log_{10}'
         self.scale = scale
         self.data = None
@@ -1402 +1402 @@
         zmin_2D_temp = self.zmin_2D
         zmax_2D_temp = self.zmax_2D
-        if self.scale == 'log':
+        if self.scale == 'log_{10}':
             self.scale = 'linear'
             if not self.zmin_2D is None:
-                zmin_2D_temp = math.exp(self.zmin_2D)
+                zmin_2D_temp = math.pow(10, self.zmin_2D)
             if not self.zmax_2D is None:
-                zmax_2D_temp = math.exp(self.zmax_2D)
+                zmax_2D_temp = math.pow(10, self.zmax_2D)
         else:
-            self.scale = 'log'
+            self.scale = 'log_{10}'
             if not self.zmin_2D is None:
                 # min log value: no log(negative)
@@ -1415 +1415 @@
                     zmin_2D_temp = -32
                 else:
-                    zmin_2D_temp = math.log(self.zmin_2D)
+                    zmin_2D_temp = math.log10(self.zmin_2D)
             if not self.zmax_2D is None:
-                zmax_2D_temp = math.log(self.zmax_2D)
+                zmax_2D_temp = math.log10(self.zmax_2D)
                  
         self.image(data=self.data, qx_data=self.qx_data, 
@@ -1450 +1450 @@
             output = copy.deepcopy(self.data)
         # check scale
-        if self.scale == 'log':
+        if self.scale == 'log_{10}':
             try:
                 if  self.zmin_2D  <= 0  and  len(output[output > 0]) > 0:
                     zmin_temp = self.zmin_2D 
-                    output[output>0] = numpy.log(output[output>0])
+                    output[output>0] = numpy.log10(output[output>0])
                     #In log scale Negative values are not correct in general
                     #output[output<=0] = math.log(numpy.min(output[output>0]))
@@ -1463 +1463 @@
                 else: 
                     zmin_temp = self.zmin_2D
-                    output[output>0] = numpy.log(output[output>0])
+                    output[output>0] = numpy.log10(output[output>0])
                     #In log scale Negative values are not correct in general
                     #output[output<=0] = math.log(numpy.min(output[output>0]))
@@ -1479 +1479 @@
             im = self.subplot.imshow(output, interpolation='nearest', 
                                      origin='lower',
-                                     vmin=zmin_temp, vmax=self.zmax_2D,
-                                     cmap=self.cmap, 
-                                     extent=(self.xmin_2D, self.xmax_2D,
-                                                self.ymin_2D, self.ymax_2D))
+                                     #vmin=zmin_temp, vmax=self.zmax_2D,
+                                     cmap=self.cmap)#, 
+                                     #extent=(self.xmin_2D, self.xmax_2D,
+                                     #           self.ymin_2D, self.ymax_2D))
             cbax = self.subplot.figure.add_axes([0.84,0.2,0.02,0.7])
         else:
@@ -1513 +1513 @@
             cb =self.subplot.figure.colorbar(im, cax=cbax)
         cb.update_bruteforce(im)
-        cb.set_label(self.scale)
+        cb.set_label('$' + self.scale + '$')
         
         #if self.dimension != 3: