fix: erros on log-log plots - the actual fix for #264 (close #264)

setup.py

@@ -46,7 +46,7 @@
                                ],
                       },
     install_requires=["appdirs",
-                      "dclab[all]>=0.19.1",
+                      "dclab[all]>=0.20.1",
                       "fcswrite>=0.5.0",
                       "h5py>=2.8.0",
                       "imageio>=2.3.0,<2.5.0",

shapeout/analysis.py

@@ -139,14 +139,13 @@ def _complete_config(self, measurements=None):
                 for d, l, mult in defs:
                     var = d.format(kk)
                     if var not in pltng:
-                        data = mm[kk]
-                        if sc == "log":
-                            # this does not seem to be necessary (issue #264)
-                            #data = np.log(data)
-                            pass
-                        acc = l(data) * mult
+                        acc = mm.get_kde_spacing(mm[kk],
+                                                 scale=sc,
+                                                 method=l,
+                                                 feat=kk)
+                        # multiply by mult and
                         # round to make it look pretty in the GUI
-                        accr = float("{:.1e}".format(acc))
+                        accr = float("{:.1e}".format(acc * mult))
                         pltng[var] = accr
             # Check for missing min/max values and set them to zero
             for item in self.get_usable_features():

shapeout/gui/plot_common.py

@@ -8,6 +8,7 @@
 import warnings
 
 import chaco
+import dclab
 import numpy as np
 
 from dclab import isoelastics
@@ -65,12 +66,15 @@ def get_isoelastics(mm):
     return isoel
 
 
-def get_kde_kwargs(x, y, kde_type, xacc, yacc):
+def get_kde_kwargs(x, y, kde_type, xacc, yacc, xscale, yscale):
     """Copmutes optimal default KDE kwargs"""
     kde_kwargs = {}
     if kde_type == "multivariate":
         kde_kwargs["bw"] = [xacc, yacc]
     elif kde_type == "histogram":
+        # scale the x and y axes (fixes #264)
+        x = dclab.rtdc_dataset.RTDCBase._apply_scale(x, xscale, "x")
+        y = dclab.rtdc_dataset.RTDCBase._apply_scale(y, yscale, "y")
         # The histogram accuracy is scaled by 1.8 to approximately
         # match the multivariate kde.
         try:
@@ -81,12 +85,12 @@ def get_kde_kwargs(x, y, kde_type, xacc, yacc):
             biny = naninfminmaxdiff(y)/(1.8*yacc)
         except:
             biny = 5
-        binx = int(max(5, binx)) #if binx < x.size else 20
-        biny = int(max(5, biny)) #if biny < y.size else 20
+        binx = int(max(5, binx))
+        biny = int(max(5, biny))
         kde_kwargs["bins"] = [binx, biny]
     return kde_kwargs
-            
-            
+
+
 def my_log_auto_ticks(data_low, data_high,
                    bound_low, bound_high,
                    tick_interval, use_endpoints = True):

shapeout/gui/plot_scatter.py

@@ -72,7 +72,7 @@ def scatter_plot(measurement, axScatter=None, square=True, panzoom=True,
             sc_plot.plot((x_key, y_key), color="gray",
                           index_scale=scalex, value_scale=scaley)
 
-    # Display numer of events
+    # Display number of events
     elabel = ca.PlotLabel(text="",
                           component=sc_plot,
                           vjustify="bottom",
@@ -229,6 +229,8 @@ def set_scatter_data(plot, mm):
     kde_kwargs = plot_common.get_kde_kwargs(
         x=x,
         y=y,
+        xscale=scalex,
+        yscale=scaley,
         kde_type=kde_type,
         xacc=mm.config["plotting"]["kde accuracy "+xax],
         yacc=mm.config["plotting"]["kde accuracy "+yax])