Skip to content
This repository was archived by the owner on Nov 24, 2024. It is now read-only.

Commit 6b405d0

Browse files
KelSolaarKelSolaar
committed
Merge branch 'feature/v0.1.5' into develop
2 parents b123676 + 3ff7001 commit 6b405d0

File tree

2 files changed

+42
-40
lines changed

2 files changed

+42
-40
lines changed

‎colour_analysis.py

Lines changed: 36 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
from colour.models import (XYZ_to_colourspace_model, function_gamma,
2525
function_linear)
2626
from colour.plotting import filter_cmfs, filter_RGB_colourspaces
27-
from colour.utilities import (CaseInsensitiveMapping, first_item,
28-
normalise_maximum, tsplit, tstack)
27+
from colour.utilities import (CaseInsensitiveMapping, as_float_array,
28+
first_item, normalise_maximum, tsplit, tstack)
2929
from colour.volume import XYZ_outer_surface
3030

3131
__author__ = 'Colour Developers'
@@ -254,7 +254,7 @@ def XYZ_to_colourspace_model_normalised(XYZ, illuminant, model, **kwargs):
254254
255255
Other Parameters
256256
----------------
257-
\**kwargs : dict, optional
257+
\\**kwargs : dict, optional
258258
Keywords arguments.
259259
260260
Returns
@@ -296,13 +296,13 @@ def colourspace_model_axis_reorder(a, model=None):
296296

297297
i, j, k = tsplit(a)
298298
if model in ('CIE XYZ', ):
299-
a = tstack((k, j, i))
299+
a = tstack([k, j, i])
300300
elif model in ('CIE UCS', 'CIE UVW', 'CIE xyY'):
301-
a = tstack((j, k, i))
301+
a = tstack([j, k, i])
302302
elif model in ('CIE Lab', 'CIE LCHab', 'CIE Luv', 'CIE LCHuv', 'DIN 99',
303303
'Hunter Lab', 'Hunter Rdab', 'IPT', 'JzAzBz', 'OSA UCS',
304304
'hdr-CIELAB', 'hdr-IPT'):
305-
a = tstack((k, i, j))
305+
a = tstack([k, i, j])
306306

307307
return a
308308

@@ -381,7 +381,7 @@ def buffer_geometry(**kwargs):
381381
382382
Other Parameters
383383
----------------
384-
\**kwargs : dict, optional
384+
\\**kwargs : dict, optional
385385
Valid attributes from `BufferGeometryLoader <https://threejs.org/docs/\
386386
#api/loaders/BufferGeometryLoader>`_.
387387
@@ -412,7 +412,7 @@ def buffer_geometry(**kwargs):
412412
}
413413

414414
for attribute, values in kwargs.items():
415-
values = np.asarray(values)
415+
values = as_float_array(values)
416416
shape = values.shape
417417
dtype = values.dtype.name
418418

@@ -524,9 +524,12 @@ def create_plane(width=1,
524524
positions = np.roll(positions, shift, -1)
525525
normals = np.roll(normals, shift, -1) * sign
526526
colors = np.ravel(positions)
527-
colors = np.hstack((np.reshape(
528-
np.interp(colors, (np.min(colors), np.max(colors)), (0, 1)),
529-
positions.shape), np.ones((positions.shape[0], 1))))
527+
colors = np.hstack([
528+
np.reshape(
529+
np.interp(colors, (np.min(colors), np.max(colors)), (0, 1)),
530+
positions.shape),
531+
np.ones((positions.shape[0], 1))
532+
])
530533
colors[..., neutral_axis] = 0
531534

532535
vertices = np.zeros(positions.shape[0],
@@ -618,22 +621,25 @@ def create_box(width=1,
618621

619622
offset = 0
620623
for vertices_p, faces_p, outline_p in planes_m:
621-
positions = np.vstack((positions, vertices_p['position']))
622-
uvs = np.vstack((uvs, vertices_p['uv']))
623-
normals = np.vstack((normals, vertices_p['normal']))
624+
positions = np.vstack([positions, vertices_p['position']])
625+
uvs = np.vstack([uvs, vertices_p['uv']])
626+
normals = np.vstack([normals, vertices_p['normal']])
624627

625-
faces = np.vstack((faces, faces_p + offset))
626-
outline = np.vstack((outline, outline_p + offset))
628+
faces = np.vstack([faces, faces_p + offset])
629+
outline = np.vstack([outline, outline_p + offset])
627630
offset += vertices_p['position'].shape[0]
628631

629632
vertices = np.zeros(positions.shape[0],
630633
[('position', np.float32, 3), ('uv', np.float32, 2),
631634
('normal', np.float32, 3), ('colour', np.float32, 4)])
632635

633636
colors = np.ravel(positions)
634-
colors = np.hstack((np.reshape(
635-
np.interp(colors, (np.min(colors), np.max(colors)), (0, 1)),
636-
positions.shape), np.ones((positions.shape[0], 1))))
637+
colors = np.hstack([
638+
np.reshape(
639+
np.interp(colors, (np.min(colors), np.max(colors)), (0, 1)),
640+
positions.shape),
641+
np.ones((positions.shape[0], 1))
642+
])
637643

638644
vertices['position'] = positions
639645
vertices['uv'] = uvs
@@ -690,11 +696,9 @@ def image_data(path,
690696
"""
691697

692698
primary_colourspace = first_item(
693-
filter_RGB_colourspaces('^{0}$'.format(
694-
re.escape(primary_colourspace))))
699+
filter_RGB_colourspaces(re.escape(primary_colourspace)).values())
695700
secondary_colourspace = first_item(
696-
filter_RGB_colourspaces('^{0}$'.format(
697-
re.escape(secondary_colourspace))))
701+
filter_RGB_colourspaces(re.escape(secondary_colourspace)).values())
698702

699703
colourspace = (primary_colourspace if image_colourspace == 'Primary' else
700704
secondary_colourspace)
@@ -765,7 +769,7 @@ def RGB_colourspace_volume_visual(colourspace=PRIMARY_COLOURSPACE,
765769
"""
766770

767771
colourspace = first_item(
768-
filter_RGB_colourspaces('^{0}$'.format(re.escape(colourspace))))
772+
filter_RGB_colourspaces(re.escape(colourspace)).values())
769773

770774
cube = create_box(
771775
width_segments=segments,
@@ -841,11 +845,9 @@ def RGB_image_scatter_visual(path,
841845
"""
842846

843847
primary_colourspace = first_item(
844-
filter_RGB_colourspaces('^{0}$'.format(
845-
re.escape(primary_colourspace))))
848+
filter_RGB_colourspaces(re.escape(primary_colourspace)).values())
846849
secondary_colourspace = first_item(
847-
filter_RGB_colourspaces('^{0}$'.format(
848-
re.escape(secondary_colourspace))))
850+
filter_RGB_colourspaces(re.escape(secondary_colourspace)).values())
849851

850852
colourspace = (primary_colourspace if image_colourspace == 'Primary' else
851853
secondary_colourspace)
@@ -917,12 +919,12 @@ def spectral_locus_visual(colourspace=PRIMARY_COLOURSPACE,
917919
"""
918920

919921
colourspace = first_item(
920-
filter_RGB_colourspaces('^{0}$'.format(re.escape(colourspace))))
922+
filter_RGB_colourspaces(re.escape(colourspace)).values())
921923

922-
cmfs = first_item(filter_cmfs(cmfs))
924+
cmfs = first_item(filter_cmfs(cmfs).values())
923925
XYZ = cmfs.values
924926

925-
XYZ = np.vstack((XYZ, XYZ[0, ...]))
927+
XYZ = np.vstack([XYZ, XYZ[0, ...]])
926928

927929
vertices = colourspace_model_axis_reorder(
928930
XYZ_to_colourspace_model_normalised(
@@ -956,14 +958,14 @@ def pointer_gamut_visual(colourspace_model='CIE xyY'):
956958
for i in range(16):
957959
section = colourspace_model_axis_reorder(
958960
XYZ_to_colourspace_model_normalised(
959-
np.vstack((pointer_gamut_data[i],
960-
pointer_gamut_data[i][0, ...])),
961+
np.vstack(
962+
[pointer_gamut_data[i], pointer_gamut_data[i][0, ...]]),
961963
POINTER_GAMUT_ILLUMINANT, colourspace_model),
962964
colourspace_model)
963965

964966
vertices.append(np.array(zip(section, section[1:])))
965967

966-
vertices = np.asarray(vertices)
968+
vertices = as_float_array(vertices)
967969

968970
return buffer_geometry(position=vertices)
969971

‎templates/index.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
</div>
120120
</div>
121121

122-
<script src="https://cdn.rawgit.com/nathancahill/Split.js/master/split.min.js"></script>
122+
<script src="https://cdn.jsdelivr.net/gh/nathancahill/Split.js/split.min.js"></script>
123123
<script>
124124
Split(['#gamutView', '#imageView'], {
125125
elementStyle: function (dimension, size, gutterSize) {
@@ -131,11 +131,11 @@
131131
});
132132
</script>
133133

134-
<script src="https://cdn.rawgit.com/mrdoob/three.js/r95/build/three.min.js"></script>
135-
<script src="https://cdn.rawgit.com/mrdoob/three.js/r95/examples/js/controls/OrbitControls.js"></script>
136-
<script src="https://cdn.rawgit.com/mrdoob/three.js/r95/examples/js/controls/TrackballControls.js"></script>
137-
<script src="https://cdn.rawgit.com/mrdoob/three.js/r95/examples/js/Detector.js"></script>
138-
<script src="https://cdn.rawgit.com/dataarts/dat.gui/v0.6.5/build/dat.gui.min.js"></script>
134+
<script src="https://cdn.jsdelivr.net/gh/mrdoob/three.js@r95/build/three.min.js"></script>
135+
<script src="https://cdn.jsdelivr.net/gh/mrdoob/three.js@r95/examples/js/controls/OrbitControls.js"></script>
136+
<script src="https://cdn.jsdelivr.net/gh/mrdoob/three.js@r95/examples/js/controls/TrackballControls.js"></script>
137+
<script src="https://cdn.jsdelivr.net/gh/mrdoob/three.js@r95/examples/js/Detector.js"></script>
138+
<script src="https://cdn.jsdelivr.net/gh/dataarts/dat.gui@v0.6.5/build/dat.gui.min.js"></script>
139139
<script src="{{ colour_analysis_js }}"></script>
140140
<script type="text/javascript">
141141
if (!Detector.webgl) Detector.addGetWebGLinfo();

0 commit comments

Comments
 (0)