Changes in / [0a924c6:f58a13a] in sasview

File:

• src/sas/sasgui/plottools/PlotPanel.py (modified) (2 diffs)

src/sas/sasgui/plottools/PlotPanel.py

@@ -1434 +1434 @@
 
         """
-        # TODO: include mask info in plotter
         self.data = data
         self.qx_data = qx_data
@@ -1452 +1451 @@
         else:
             output = copy.deepcopy(self.data)
-        # rescale data if necessary
+        # check scale
         if self.scale == 'log_{10}':
-            with np.errstate(all='ignore'):
-                output = np.log10(output)
-            index = np.isfinite(output)
-            if not index.all():
-                cutoff = (np.min(output[index]) - np.log10(2)
-                          if index.any() else 0.)
-                output[~index] = cutoff
-        # TODO: fix handling of zmin_2D/zmax_2D in _onToggleScale
-        # For now, use default vmin/vmax from data
-        #vmin, vmax = self.zmin_2D, self.zmax_2D
-        vmin, vmax = None, None
+            try:
+                if  self.zmin_2D <= 0  and len(output[output > 0]) > 0:
+                    zmin_temp = self.zmin_2D
+                    output[output > 0] = np.log10(output[output > 0])
+                    #In log scale Negative values are not correct in general
+                    #output[output<=0] = math.log(np.min(output[output>0]))
+                elif self.zmin_2D <= 0:
+                    zmin_temp = self.zmin_2D
+                    output[output > 0] = np.zeros(len(output))
+                    output[output <= 0] = -32
+                else:
+                    zmin_temp = self.zmin_2D
+                    output[output > 0] = np.log10(output[output > 0])
+                    #In log scale Negative values are not correct in general
+                    #output[output<=0] = math.log(np.min(output[output>0]))
+            except:
+                #Too many problems in 2D plot with scale
+                pass
+
+        else:
+            zmin_temp = self.zmin_2D
         self.cmap = cmap
         if self.dimension != 3:
             #Re-adjust colorbar
             self.subplot.figure.subplots_adjust(left=0.2, right=.8, bottom=.2)
+
             im = self.subplot.imshow(output, interpolation='nearest',
                                      origin='lower',
-                                     vmin=vmin, vmax=vmax,
+                                     vmin=zmin_temp, vmax=self.zmax_2D,
                                      cmap=self.cmap,
                                      extent=(self.xmin_2D, self.xmax_2D,