test: Add data points to 3D plots

Signed-off-by: Sietze van Buuren <s.van.buuren@gmail.com>

Author: swvanbuuren

cubinterpp/main.py

@@ -63,7 +63,7 @@ def get_test_data_2d(case='standard'):
             f[5:7, 5:7] = np.array([[0.25, 0.2], [0.2, 0.25]])
             f[7:9, 7:9] = 0.5
             f = 10 * np.flip(f, axis=0) + 1
-    return x, y, f
+    return np.array(x), np.array(y), np.array(f)
 
 
 def refine_grid(x_coord, size_fine=1000, extension=0):
@@ -139,14 +139,18 @@ def main():
             refinement=46
         )
         title = interp_type.capitalize().replace('_', ' ')
-        mpg.figure(title=f'{title} interpolation', layout_type='Qt')
+        mpg.figure(title=f'{title} interpolation')
         mpg.surf(x_fine, y_fine, z_fine)
         ax = mpg.gca()
         ax.azimuth = 225
-        ax.label_fmt = '.0f'
         ax.xticks = 8
         ax.yticks = 8
         ax.zlim = [0, 8]
+        x, y, f = get_test_data_2d(case='three_bumps')
+        xp = np.repeat(x, y.size)
+        yp = np.tile(y, x.size)
+        zp = f.flatten()
+        mpg.points3(xp, yp, zp, color=(0.8, 0.1, 0.1, 1), size=3)
 
     x, y, f = get_test_data_2d(case='three_bumps')
     x_fine, y_fine = refine_grid(x, 46), refine_grid(y, 46)
@@ -155,10 +159,10 @@ def main():
     mpg.surf(x_fine, y_fine, z_fine_scipy)
     ax = mpg.gca()
     ax.azimuth = 225
-    ax.label_fmt = '.0f'
     ax.xticks = 8
     ax.yticks = 8
     ax.zlim = [0, 8]
+    mpg.points3(xp, yp, zp, color=(0.8, 0.1, 0.1, 1), size=3)
 
 
 if __name__ == '__main__':

cubinterpp/periodic_spline_2d.py

@@ -0,0 +1,60 @@
+""" Periodic spline example in 3D """
+
+import numpy as np
+import cubinterpp.cubinterpp_py as cubinterpp  # cubinterpp_py is a pybind11 module
+import mlpyqtgraph as mpg
+
+
+@mpg.plotter(projection='orthographic')
+def main():
+    """ Interpolation of a torus to demonstrate periodic splines in 2D """
+    nx, ny = 5, 5
+    tx = np.linspace(0.0, 1.0, nx)
+    ty = np.linspace(0.0, 1.0, ny)
+    # generate torus points
+    r_major = 3.0  # major radius
+    r_minor = 1.0  # minor radius
+
+    x = np.zeros((nx, ny))
+    y = np.zeros((nx, ny))
+    z = np.zeros((nx, ny))
+    for i in range(nx):
+        for j in range(ny):
+            u = 2.0 * np.pi * tx[i]
+            v = 2.0 * np.pi * ty[j]
+            x[i, j] = (r_major + r_minor * np.cos(v)) * np.cos(u)
+            y[i, j] = (r_major + r_minor * np.cos(v)) * np.sin(u)
+            z[i, j] = r_minor * np.sin(v)
+
+    # create periodic splines in 2D
+    spline_x = cubinterpp.NaturalPeriodicSpline2D(tx, ty, x)
+    spline_y = cubinterpp.NaturalPeriodicSpline2D(tx, ty, y)
+    spline_z = cubinterpp.NaturalPeriodicSpline2D(tx, ty, z)
+    # evaluate on finer grid
+    nxi, nyi = 30, 30
+    txi = np.linspace(0.0, 1.0, nxi)
+    tyi = np.linspace(0.0, 1.0, nyi)
+    x_fine = np.zeros((nxi, nyi))
+    y_fine = np.zeros((nxi, nyi))
+    z_fine = np.zeros((nxi, nyi))
+    for i in range(nxi):
+        for j in range(nyi):
+            x_fine[i, j] = spline_x.eval(txi[i], tyi[j])
+            y_fine[i, j] = spline_y.eval(txi[i], tyi[j])
+            z_fine[i, j] = spline_z.eval(txi[i], tyi[j])
+
+
+    mpg.figure(title='Periodic Spline Interpolation of a Torus')
+    mpg.surf(x_fine, y_fine, z_fine)
+    ax = mpg.gca()
+    ax.azimuth = 225
+    ax.xlim = [-4, 4]
+    ax.ylim = [-4, 4]
+    ax.zlim = [-1.5, 1.5]
+    xp = x.flatten()
+    yp = y.flatten()
+    zp = z.flatten()
+    mpg.points3(xp, yp, zp, color=(0.8, 0.1, 0.1, 1), size=5)
+
+if __name__ == '__main__':
+    main()

pyproject.toml

@@ -20,7 +20,8 @@ classifiers = [
 ]
 urls = { Homepage = "https://github.com/swvanbuuren/cubinterpp" }
 dependencies = [
-    "mlpyqtgraph==0.9.1",
+    "matplotlib>=3.10.8",
+    "mlpyqtgraph==0.11.1",
     "scipy==1.17.0",
 ]