Use np.reshape function instead of .reshape method.

Author: KelSolaar

colour_visuals/daylight_locus.py

@@ -172,9 +172,12 @@ def update(self):
         lines_dl, *_ = lines_daylight_locus(self._mireds, self._method)
 
         # Daylight Locus
-        positions = np.concatenate(
-            [lines_dl["position"][:-1], lines_dl["position"][1:]], axis=1
-        ).reshape([-1, 2])
+        positions = np.reshape(
+            np.concatenate(
+                [lines_dl["position"][:-1], lines_dl["position"][1:]], axis=1
+            ),
+            (-1, 2),
+        )
 
         positions = np.hstack(
             [
@@ -184,9 +187,12 @@ def update(self):
         )
 
         if self._colour is None:
-            colour_sl = np.concatenate(
-                [lines_dl["colour"][:-1], lines_dl["colour"][1:]], axis=1
-            ).reshape([-1, 3])
+            colour_sl = np.reshape(
+                np.concatenate(
+                    [lines_dl["colour"][:-1], lines_dl["colour"][1:]], axis=1
+                ),
+                (-1, 3),
+            )
         else:
             colour_sl = np.tile(self._colour, (positions.shape[0], 1))
 

colour_visuals/diagrams.py

@@ -228,9 +228,12 @@ def update(self):
         lines_sl, lines_w = lines_spectral_locus(self._cmfs, self._labels, self._method)
 
         # Spectral Locus
-        positions = np.concatenate(
-            [lines_sl["position"][:-1], lines_sl["position"][1:]], axis=1
-        ).reshape([-1, 2])
+        positions = np.reshape(
+            np.concatenate(
+                [lines_sl["position"][:-1], lines_sl["position"][1:]], axis=1
+            ),
+            (-1, 2),
+        )
 
         positions = np.hstack(
             [
@@ -240,9 +243,12 @@ def update(self):
         )
 
         if self._colour is None:
-            colour_sl = np.concatenate(
-                [lines_sl["colour"][:-1], lines_sl["colour"][1:]], axis=1
-            ).reshape([-1, 3])
+            colour_sl = np.reshape(
+                np.concatenate(
+                    [lines_sl["colour"][:-1], lines_sl["colour"][1:]], axis=1
+                ),
+                (-1, 3),
+            )
         else:
             colour_sl = np.tile(self._colour, (positions.shape[0], 1))
 
@@ -464,13 +470,15 @@ def update(self):
             ),
             self._model,
         )
-        positions = np.concatenate([positions[:-1], positions[1:]], axis=1).reshape(
-            [-1, 3]
+        positions = np.reshape(
+            np.concatenate([positions[:-1], positions[1:]], axis=1), (-1, 3)
         )
 
         if self._colour is None:
             colour = XYZ_to_RGB(self._cmfs.values, colourspace)
-            colour = np.concatenate([colour[:-1], colour[1:]], axis=1).reshape([-1, 3])
+            colour = np.reshape(
+                np.concatenate([colour[:-1], colour[1:]], axis=1), (-1, 3)
+            )
         else:
             colour = np.tile(self._colour, (positions.shape[0], 1))
 

colour_visuals/grid.py

@@ -292,7 +292,7 @@ def update(self):
         self._grid_major = gfx.Mesh(
             gfx.Geometry(
                 positions=as_contiguous_array(positions),
-                indices=outline[..., 1].reshape([-1, 4]),
+                indices=np.reshape(outline[..., 1], (-1, 4)),
                 colors=as_contiguous_array(
                     append_channel(
                         np.tile(self._major_grid_colours, (positions.shape[0], 1)),
@@ -316,7 +316,7 @@ def update(self):
         self._grid_minor = gfx.Mesh(
             gfx.Geometry(
                 positions=as_contiguous_array(positions),
-                indices=outline[..., 1].reshape([-1, 4]),
+                indices=np.reshape(outline[..., 1], (-1, 4)),
                 colors=as_contiguous_array(
                     append_channel(
                         np.tile(self._minor_grid_colours, (positions.shape[0], 1)),

colour_visuals/planckian_locus.py

@@ -224,9 +224,12 @@ def update(self):
         )
 
         # Planckian Locus
-        positions = np.concatenate(
-            [lines_pl["position"][:-1], lines_pl["position"][1:]], axis=1
-        ).reshape([-1, 2])
+        positions = np.reshape(
+            np.concatenate(
+                [lines_pl["position"][:-1], lines_pl["position"][1:]], axis=1
+            ),
+            (-1, 2),
+        )
 
         positions = np.hstack(
             [
@@ -236,9 +239,12 @@ def update(self):
         )
 
         if self._colour is None:
-            colour_sl = np.concatenate(
-                [lines_pl["colour"][:-1], lines_pl["colour"][1:]], axis=1
-            ).reshape([-1, 3])
+            colour_sl = np.reshape(
+                np.concatenate(
+                    [lines_pl["colour"][:-1], lines_pl["colour"][1:]], axis=1
+                ),
+                (-1, 3),
+            )
         else:
             colour_sl = np.tile(self._colour, (positions.shape[0], 1))
 
@@ -255,14 +261,14 @@ def update(self):
             return
 
         # Labels
-        lines_itl = lines_l["position"].reshape([len(self._labels), 20, 2])
-        colours_itl = lines_l["colour"].reshape([len(self._labels), 20, 3])
+        lines_itl = np.reshape(lines_l["position"], (len(self._labels), 20, 2))
+        colours_itl = np.reshape(lines_l["colour"], (len(self._labels), 20, 3))
         self._iso_temperature_lines = []
         self._texts = []
         for i, label in enumerate(self._labels):
-            positions = np.concatenate(
-                [lines_itl[i][:-1], lines_itl[i][1:]], axis=1
-            ).reshape([-1, 2])
+            positions = np.reshape(
+                np.concatenate([lines_itl[i][:-1], lines_itl[i][1:]], axis=1), (-1, 2)
+            )
             positions = np.hstack(
                 [
                     positions,
@@ -271,9 +277,10 @@ def update(self):
             )
 
             if self._colour is None:
-                colour_w = np.concatenate(
-                    [colours_itl[i][:-1], colours_itl[i][1:]], axis=1
-                ).reshape([-1, 3])
+                colour_w = np.reshape(
+                    np.concatenate([colours_itl[i][:-1], colours_itl[i][1:]], axis=1),
+                    (-1, 3),
+                )
             else:
                 colour_w = np.tile(self._colour, (positions.shape[0], 1))
 

colour_visuals/pointer_gamut.py

@@ -144,9 +144,10 @@ def update(self):
         lines_b, lines_v = lines_pointer_gamut(self._method)
 
         # Boundary
-        positions = np.concatenate(
-            [lines_b["position"][:-1], lines_b["position"][1:]], axis=1
-        ).reshape([-1, 2])
+        positions = np.reshape(
+            np.concatenate([lines_b["position"][:-1], lines_b["position"][1:]], axis=1),
+            (-1, 2),
+        )
         positions = np.hstack(
             [
                 positions,
@@ -155,9 +156,10 @@ def update(self):
         )
 
         if self._colour is None:
-            colour_b = np.concatenate(
-                [lines_b["colour"][:-1], lines_b["colour"][1:]], axis=1
-            ).reshape([-1, 3])
+            colour_b = np.reshape(
+                np.concatenate([lines_b["colour"][:-1], lines_b["colour"][1:]], axis=1),
+                (-1, 3),
+            )
         else:
             colour_b = np.tile(self._colour, (positions.shape[0], 1))
 
@@ -310,21 +312,26 @@ def update(self):
         for i in range(16):
             section = np.vstack([data_pointer_gamut[i], data_pointer_gamut[i][0, ...]])
             sections.append(
-                np.concatenate([section[:-1], section[1:]], axis=1).reshape([-1, 3])
+                np.reshape(np.concatenate([section[:-1], section[1:]], axis=1), (-1, 3))
             )
 
-        positions = colourspace_model_axis_reorder(
-            XYZ_to_colourspace_model(
-                sections,
-                CCS_ILLUMINANT_POINTER_GAMUT,
+        positions = np.reshape(
+            colourspace_model_axis_reorder(
+                XYZ_to_colourspace_model(
+                    sections,
+                    CCS_ILLUMINANT_POINTER_GAMUT,
+                    self._model,
+                    **self._kwargs,
+                ),
                 self._model,
-                **self._kwargs,
             ),
-            self._model,
-        ).reshape([-1, 3])
+            (-1, 3),
+        )
 
         if self._colour is None:
-            colour = XYZ_to_plotting_colourspace(sections, illuminant).reshape([-1, 3])
+            colour = np.reshape(
+                XYZ_to_plotting_colourspace(sections, illuminant), (-1, 3)
+            )
         else:
             colour = np.tile(self._colour, (positions.shape[0], 1))
 

colour_visuals/rgb_colourspace.py

@@ -201,12 +201,15 @@ def update(self):
             plotting_colourspace.whitepoint,
         )
 
-        positions = append_channel(ij, 0).reshape([-1, 3])
+        positions = np.reshape(append_channel(ij, 0), (-1, 3))
 
         if self._colour is None:
-            colour_w = XYZ_to_RGB(
-                xy_to_XYZ(self._colourspace.whitepoint), plotting_colourspace
-            ).reshape([-1, 3])
+            colour_w = np.reshape(
+                XYZ_to_RGB(
+                    xy_to_XYZ(self._colourspace.whitepoint), plotting_colourspace
+                ),
+                (-1, 3),
+            )
         else:
             colour_w = np.tile(self._colour, (positions.shape[0], 1))
 
@@ -380,7 +383,7 @@ def update(self):
             gfx.Geometry(
                 positions=as_contiguous_array(positions),
                 normals=vertices["normal"],
-                indices=outline[..., 1].reshape([-1, 4]),
+                indices=np.reshape(outline[..., 1], (-1, 4)),
                 colors=as_contiguous_array(append_channel(colour, self._opacity)),
             ),
             (

colour_visuals/rgb_scatter.py

@@ -183,7 +183,7 @@ def RGB(self) -> NDArray:
     def RGB(self, value: ArrayLike):
         """Setter for the **self.RGB** property."""
 
-        self._RGB = as_float_array(value).reshape(-1, 3)
+        self._RGB = np.reshape(as_float_array(value), (-1, 3))
         self._RGB[self._RGB == 0] = EPSILON
 
     def update(self):

colour_visuals/rosch_macadam.py

@@ -195,13 +195,15 @@ def update(self):
             ),
             self._model,
         )
-        positions = np.concatenate([positions[:-1], positions[1:]], axis=1).reshape(
-            [-1, 3]
+        positions = np.reshape(
+            np.concatenate([positions[:-1], positions[1:]], axis=1), (-1, 3)
         )
 
         if self._colour is None:
             colour = XYZ_to_RGB(XYZ, colourspace)
-            colour = np.concatenate([colour[:-1], colour[1:]], axis=1).reshape([-1, 3])
+            colour = np.reshape(
+                np.concatenate([colour[:-1], colour[1:]], axis=1), (-1, 3)
+            )
         else:
             colour = np.tile(self._colour, (positions.shape[0], 1))