Merge branch 'release/v0.1.5'

Author: KelSolaar

README.rst

@@ -29,7 +29,7 @@ Run
     -e COLOUR_ANALYSIS_JS=https://gitcdn.link/repo/colour-science/colour-analysis-three.js/master/dist/colour-analysis.js \
     -e COLOUR_ANALYSIS_POSITION_DTYPE=Float16 \
     -e COLOUR_ANALYSIS_COLOUR_DTYPE=Float16 \
-    -v $IMAGES_DIRECTORY:/home/colour-analysis/static/images
+    -v $IMAGES_DIRECTORY:/home/colour-analysis/static/images \
     -p 8020:5000 colourscience/colour-analysis
 
 Development

app.py

@@ -33,7 +33,7 @@
 
 __major_version__ = '0'
 __minor_version__ = '1'
-__change_version__ = '4'
+__change_version__ = '5'
 __version__ = '.'.join(
     (__major_version__,
      __minor_version__,

colour_analysis.py

@@ -24,8 +24,8 @@
 from colour.models import (XYZ_to_colourspace_model, function_gamma,
                            function_linear)
 from colour.plotting import filter_cmfs, filter_RGB_colourspaces
-from colour.utilities import (CaseInsensitiveMapping, first_item,
-                              normalise_maximum, tsplit, tstack)
+from colour.utilities import (CaseInsensitiveMapping, as_float_array,
+                              first_item, normalise_maximum, tsplit, tstack)
 from colour.volume import XYZ_outer_surface
 
 __author__ = 'Colour Developers'
@@ -254,7 +254,7 @@ def XYZ_to_colourspace_model_normalised(XYZ, illuminant, model, **kwargs):
 
     Other Parameters
     ----------------
-    \**kwargs : dict, optional
+    \\**kwargs : dict, optional
         Keywords arguments.
 
     Returns
@@ -296,13 +296,13 @@ def colourspace_model_axis_reorder(a, model=None):
 
     i, j, k = tsplit(a)
     if model in ('CIE XYZ', ):
-        a = tstack((k, j, i))
+        a = tstack([k, j, i])
     elif model in ('CIE UCS', 'CIE UVW', 'CIE xyY'):
-        a = tstack((j, k, i))
+        a = tstack([j, k, i])
     elif model in ('CIE Lab', 'CIE LCHab', 'CIE Luv', 'CIE LCHuv', 'DIN 99',
                    'Hunter Lab', 'Hunter Rdab', 'IPT', 'JzAzBz', 'OSA UCS',
                    'hdr-CIELAB', 'hdr-IPT'):
-        a = tstack((k, i, j))
+        a = tstack([k, i, j])
 
     return a
 
@@ -381,7 +381,7 @@ def buffer_geometry(**kwargs):
 
     Other Parameters
     ----------------
-    \**kwargs : dict, optional
+    \\**kwargs : dict, optional
         Valid attributes from `BufferGeometryLoader <https://threejs.org/docs/\
 #api/loaders/BufferGeometryLoader>`_.
 
@@ -524,9 +524,12 @@ def create_plane(width=1,
     positions = np.roll(positions, shift, -1)
     normals = np.roll(normals, shift, -1) * sign
     colors = np.ravel(positions)
-    colors = np.hstack((np.reshape(
-        np.interp(colors, (np.min(colors), np.max(colors)), (0, 1)),
-        positions.shape), np.ones((positions.shape[0], 1))))
+    colors = np.hstack([
+        np.reshape(
+            np.interp(colors, (np.min(colors), np.max(colors)), (0, 1)),
+            positions.shape),
+        np.ones((positions.shape[0], 1))
+    ])
     colors[..., neutral_axis] = 0
 
     vertices = np.zeros(positions.shape[0],
@@ -618,22 +621,25 @@ def create_box(width=1,
 
     offset = 0
     for vertices_p, faces_p, outline_p in planes_m:
-        positions = np.vstack((positions, vertices_p['position']))
-        uvs = np.vstack((uvs, vertices_p['uv']))
-        normals = np.vstack((normals, vertices_p['normal']))
+        positions = np.vstack([positions, vertices_p['position']])
+        uvs = np.vstack([uvs, vertices_p['uv']])
+        normals = np.vstack([normals, vertices_p['normal']])
 
-        faces = np.vstack((faces, faces_p + offset))
-        outline = np.vstack((outline, outline_p + offset))
+        faces = np.vstack([faces, faces_p + offset])
+        outline = np.vstack([outline, outline_p + offset])
         offset += vertices_p['position'].shape[0]
 
     vertices = np.zeros(positions.shape[0],
                         [('position', np.float32, 3), ('uv', np.float32, 2),
                          ('normal', np.float32, 3), ('colour', np.float32, 4)])
 
     colors = np.ravel(positions)
-    colors = np.hstack((np.reshape(
-        np.interp(colors, (np.min(colors), np.max(colors)), (0, 1)),
-        positions.shape), np.ones((positions.shape[0], 1))))
+    colors = np.hstack([
+        np.reshape(
+            np.interp(colors, (np.min(colors), np.max(colors)), (0, 1)),
+            positions.shape),
+        np.ones((positions.shape[0], 1))
+    ])
 
     vertices['position'] = positions
     vertices['uv'] = uvs
@@ -690,11 +696,9 @@ def image_data(path,
     """
 
     primary_colourspace = first_item(
-        filter_RGB_colourspaces('^{0}$'.format(
-            re.escape(primary_colourspace))))
+        filter_RGB_colourspaces(re.escape(primary_colourspace)).values())
     secondary_colourspace = first_item(
-        filter_RGB_colourspaces('^{0}$'.format(
-            re.escape(secondary_colourspace))))
+        filter_RGB_colourspaces(re.escape(secondary_colourspace)).values())
 
     colourspace = (primary_colourspace if image_colourspace == 'Primary' else
                    secondary_colourspace)
@@ -765,7 +769,7 @@ def RGB_colourspace_volume_visual(colourspace=PRIMARY_COLOURSPACE,
     """
 
     colourspace = first_item(
-        filter_RGB_colourspaces('^{0}$'.format(re.escape(colourspace))))
+        filter_RGB_colourspaces(re.escape(colourspace)).values())
 
     cube = create_box(
         width_segments=segments,
@@ -841,11 +845,9 @@ def RGB_image_scatter_visual(path,
     """
 
     primary_colourspace = first_item(
-        filter_RGB_colourspaces('^{0}$'.format(
-            re.escape(primary_colourspace))))
+        filter_RGB_colourspaces(re.escape(primary_colourspace)).values())
     secondary_colourspace = first_item(
-        filter_RGB_colourspaces('^{0}$'.format(
-            re.escape(secondary_colourspace))))
+        filter_RGB_colourspaces(re.escape(secondary_colourspace)).values())
 
     colourspace = (primary_colourspace if image_colourspace == 'Primary' else
                    secondary_colourspace)
@@ -917,12 +919,12 @@ def spectral_locus_visual(colourspace=PRIMARY_COLOURSPACE,
     """
 
     colourspace = first_item(
-        filter_RGB_colourspaces('^{0}$'.format(re.escape(colourspace))))
+        filter_RGB_colourspaces(re.escape(colourspace)).values())
 
-    cmfs = first_item(filter_cmfs(cmfs))
+    cmfs = first_item(filter_cmfs(cmfs).values())
     XYZ = cmfs.values
 
-    XYZ = np.vstack((XYZ, XYZ[0, ...]))
+    XYZ = np.vstack([XYZ, XYZ[0, ...]])
 
     vertices = colourspace_model_axis_reorder(
         XYZ_to_colourspace_model_normalised(
@@ -956,14 +958,14 @@ def pointer_gamut_visual(colourspace_model='CIE xyY'):
     for i in range(16):
         section = colourspace_model_axis_reorder(
             XYZ_to_colourspace_model_normalised(
-                np.vstack((pointer_gamut_data[i],
-                           pointer_gamut_data[i][0, ...])),
+                np.vstack(
+                    [pointer_gamut_data[i], pointer_gamut_data[i][0, ...]]),
                 POINTER_GAMUT_ILLUMINANT, colourspace_model),
             colourspace_model)
 
-        vertices.append(np.array(zip(section, section[1:])))
+        vertices.append(list(zip(section, section[1:])))
 
-    vertices = np.asarray(vertices)
+    vertices = as_float_array(vertices)
 
     return buffer_geometry(position=vertices)
 
@@ -989,6 +991,6 @@ def visible_spectrum_visual(colourspace_model='CIE xyY'):
             XYZ, ILLUMINANTS['CIE 1931 2 Degree Standard Observer']['E'],
             colourspace_model), colourspace_model)
 
-    vertices = np.array(zip(vertices, vertices[1:]))
+    vertices = as_float_array(list(zip(vertices, vertices[1:])))
 
     return buffer_geometry(position=vertices)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "colour-analysis",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Colour - Analysis",
   "private": true,
   "scripts": {

package.json

@@ -119,7 +119,7 @@
         </div>
     </div>
 
-    <script src="https://cdn.rawgit.com/nathancahill/Split.js/master/split.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/nathancahill/[email protected]/split.min.js"></script>
     <script>
         Split(['#gamutView', '#imageView'], {
             elementStyle: function (dimension, size, gutterSize) {
@@ -131,11 +131,11 @@
         });
     </script>
 
-    <script src="https://cdn.rawgit.com/mrdoob/three.js/r95/build/three.min.js"></script>
-    <script src="https://cdn.rawgit.com/mrdoob/three.js/r95/examples/js/controls/OrbitControls.js"></script>
-    <script src="https://cdn.rawgit.com/mrdoob/three.js/r95/examples/js/controls/TrackballControls.js"></script>
-    <script src="https://cdn.rawgit.com/mrdoob/three.js/r95/examples/js/Detector.js"></script>
-    <script src="https://cdn.rawgit.com/dataarts/dat.gui/v0.6.5/build/dat.gui.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/mrdoob/three.js@r95/build/three.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/mrdoob/three.js@r95/examples/js/controls/OrbitControls.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/mrdoob/three.js@r95/examples/js/controls/TrackballControls.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/mrdoob/three.js@r95/examples/js/Detector.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/dataarts/dat.gui@v0.6.5/build/dat.gui.min.js"></script>
     <script src="{{ colour_analysis_js }}"></script>
     <script type="text/javascript">
         if (!Detector.webgl) Detector.addGetWebGLinfo();