Changes in src/sas/qtgui/Plotting/Plotter2D.py [c30822c:8db20a9] in sasview

File:

• src/sas/qtgui/Plotting/Plotter2D.py (modified) (2 diffs)

src/sas/qtgui/Plotting/Plotter2D.py

@@ -330 +330 @@
         self.manager.communicator.plotUpdateSignal.emit([new_plot])
 
+        self.manager.communicator.forcePlotDisplaySignal.emit([item, new_plot])
+
+        # Show the plot
+
     def setSlicer(self, slicer):
         """
@@ -464 +468 @@
         # check scale
         if self.scale == 'log_{10}':
-            try:
-                if  self.zmin is None  and len(output[output > 0]) > 0:
-                    zmin_temp = self.zmin
-                    output[output > 0] = numpy.log10(output[output > 0])
-                elif self.zmin <= 0:
-                    zmin_temp = self.zmin
-                    output[output > 0] = numpy.zeros(len(output))
-                    output[output <= 0] = MIN_Z
-                else:
-                    zmin_temp = self.zmin
-                    output[output > 0] = numpy.log10(output[output > 0])
-            except:
-                #Too many problems in 2D plot with scale
-                pass
+            with numpy.errstate(all='ignore'):
+                output = numpy.log10(output)
+            index = numpy.isfinite(output)
+            if not index.all():
+                cutoff = (numpy.quantile(output[index], 0.05) - numpy.log10(2) if index.any() else 0.)
+                output[output < cutoff] = cutoff
+                output[~index] = cutoff
+        vmin, vmax = None, None
 
         self.cmap = cmap