ref: fix deprecation warnings

Author: paulmueller

CHANGELOG

@@ -3,6 +3,7 @@
  - fix: persist feature selection in QuickView when switching data slots (#206)
  - fix: show correct progress during data export (#138)
  - docs: properly employ license GPL-3.0-or-later
+ - ref: fix deprecation warnings
  - setup: bump dclab to 0.63.0
 2.21.5
  - fix: disable table graphs widget when an image-type table is shown

shapeout2/gui/pipeline_plot.py

@@ -4,7 +4,7 @@
 import warnings
 
 import dclab
-from dclab import kde_contours
+from dclab.kde import contours as kdec
 import numpy as np
 from PyQt6 import uic, QtCore, QtGui, QtWidgets
 import pyqtgraph as pg
@@ -620,7 +620,7 @@ def compute_contours(plot_state, rtdc_ds):
         warnings.warn("Contour not possible; spacing may be too large!",
                       ContourSpacingTooLarge)
         return []
-    plev = kde_contours.get_quantile_levels(
+    plev = kdec.get_quantile_levels(
         density=density,
         x=x,
         y=y,
@@ -633,7 +633,7 @@ def compute_contours(plot_state, rtdc_ds):
         # make sure that the contour levels are not at the boundaries
         if not (np.allclose(level, 0, atol=1e-12, rtol=0)
                 or np.allclose(level, 1, atol=1e-12, rtol=0)):
-            cc = kde_contours.find_contours_level(
+            cc = kdec.find_contours_level(
                 density, x=x, y=y, level=level)
             contours.append(cc)
     return contours

shapeout2/plot_cache.py

@@ -1,4 +1,6 @@
 """Facilitate caching of plot data"""
+from dclab.kde import KernelDensityEstimator
+
 from . import util
 
 
@@ -18,7 +20,8 @@ def get_contour_data(rtdc_ds, xax, yax, xacc, yacc, xscale, yscale,
         x, y, den = cache_data[shash]
     else:
         # compute scatter plot data
-        x, y, den = rtdc_ds.get_kde_contour(
+        kde_instance = KernelDensityEstimator(rtdc_ds=rtdc_ds)
+        x, y, den = kde_instance.get_contour(
             xax=xax,
             yax=yax,
             xacc=xacc,