Merge pull request #360 from zeyuyun1/master

Fixing the error that arise when using uneven width and height

Author: vidartf

.github/workflows/ci.yml

@@ -199,7 +199,7 @@ jobs:
       # explicit file installs don't support extras, skimage brings most along
       run: |
         set -eux
-        ${{ matrix.py_cmd }} -m pip install -vv nbval scikit-image ipywebrtc pytest-cov codecov
+        ${{ matrix.py_cmd }} -m pip install -vv nbval scikit-image ipywebrtc pytest-cov codecov matplotlib
     - name: Run python tests
       # remove the source directory to avoid surprises
       run: |

docs/source/conf.py

@@ -213,7 +213,7 @@ def add_scripts(app):
         for fname in ['jupyter-threejs.js']:
             if not os.path.exists(os.path.join(here, '_static', fname)):
                 logger.warn('missing javascript file: %s' % fname)
-            app.add_javascript(fname)
+            app.add_js_file(fname)
 
     def add_images(app):
         # TODO: Add all images automatically by dir

examples/Examples.ipynb

@@ -81,7 +81,7 @@
     "# Generate surface data:\n",
     "view_width = 600\n",
     "view_height = 400\n",
-    "nx, ny = (20, 20)\n",
+    "nx, ny = (24, 20)\n",
     "xmax=1\n",
     "x = np.linspace(-xmax, xmax, nx)\n",
     "y = np.linspace(-xmax, xmax, ny)\n",
@@ -91,14 +91,14 @@
     "\n",
     "\n",
     "# Generate scene objects from data:\n",
-    "surf_g = SurfaceGeometry(z=list(z[::-1].flat), \n",
+    "surf_g = SurfaceGeometry(z=list(z.flat), \n",
     "                         width=2 * xmax,\n",
     "                         height=2 * xmax,\n",
     "                         width_segments=nx - 1,\n",
     "                         height_segments=ny - 1)\n",
     "\n",
     "surf = Mesh(geometry=surf_g,\n",
-    "            material=MeshLambertMaterial(map=height_texture(z[::-1], 'YlGnBu_r')))\n",
+    "            material=MeshLambertMaterial(map=height_texture(z, 'YlGnBu_r')))\n",
     "\n",
     "surfgrid = SurfaceGrid(geometry=surf_g, material=LineBasicMaterial(color='black'),\n",
     "                       position=[0, 0, 1e-2])  # Avoid overlap by lifting grid slightly\n",
@@ -155,8 +155,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "surf_g.z = list((-z[::-1]).flat)\n",
-    "surf.material.map = height_texture(-z[::-1])"
+    "surf_g.z = list((-z).flat)\n",
+    "surf.material.map = height_texture(-z)"
    ]
   },
   {

examples/Textures.ipynb

@@ -22,10 +22,11 @@ var DataTextureModel = DataTextureBase.extend({
         }
         var data = this.convertArrayBufferModelToThree(rawData, 'data');
 
+        // ipydatawidgets uses row-major storage, so "flip" axes dims here:
         return {
             data: data,
-            width: rawData.shape[0],
-            height: rawData.shape[1],
+            width: rawData.shape[1],
+            height: rawData.shape[0],
         };
     },
 
@@ -75,9 +76,10 @@ var DataTextureModel = DataTextureBase.extend({
             var rawData = dataserializers.getArray(modelNDArray);
             rawData.data.set(imageRecord.data);
         } else {
+            // ipydatawidgets uses row-major storage, so "flip" axes dims here:
             this.set('data', ndarray(
                 imageRecord.data,
-                [imageRecord.width, imageRecord.height]
+                [imageRecord.height, imageRecord.width]
             ));
         }
     },

js/src/textures/DataTexture.js

@@ -44,7 +44,7 @@ def grid_indices_gen(nx, ny):
     """
     for x in range(nx - 1):
         for y in range(ny - 1):
-            root = x + y * ny
+            root = x + y * nx
             yield (root, root + 1, root + nx)
             yield (root + nx, root + 1, root + nx + 1)
 
@@ -78,7 +78,7 @@ def _update_surface(self):
         x = np.linspace(-self.width/2, self.width/2, nx)
         y = np.linspace(-self.height/2, self.height/2, ny)
         xx, yy = np.meshgrid(x, y)
-        z = np.array(self.z).reshape((nx, ny))
+        z = np.array(self.z).reshape(xx.shape)
 
         positions = np.dstack((xx, yy, z)).reshape(nx * ny, 3).astype(np.float32)