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

Commit 15a2ddf

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent f18c6b4 commit 15a2ddf

File tree

2 files changed

+42
-44
lines changed

2 files changed

+42
-44
lines changed

app.py

+18-18
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ def image_data_response(image):
242242
args.get('outOfPrimaryColourspaceGamut', False)),
243243
out_of_secondary_colourspace_gamut=_bool_to_bool(
244244
args.get('outOfSecondaryColourspaceGamut', False)),
245-
out_of_pointer_gamut=_bool_to_bool(
246-
args.get('outOfPointerGamut', False)),
245+
out_of_pointer_gamut=_bool_to_bool(args.get('outOfPointerGamut',
246+
False)),
247247
saturate=_bool_to_bool(args.get('saturate', False)))
248248

249249
response = Response(json_data, status=200, mimetype='application/json')
@@ -306,8 +306,8 @@ def RGB_image_scatter_visual_response(image):
306306
args.get('outOfPrimaryColourspaceGamut', False)),
307307
out_of_secondary_colourspace_gamut=_bool_to_bool(
308308
args.get('outOfSecondaryColourspaceGamut', False)),
309-
out_of_pointer_gamut=_bool_to_bool(
310-
args.get('outOfPointerGamut', False)),
309+
out_of_pointer_gamut=_bool_to_bool(args.get('outOfPointerGamut',
310+
False)),
311311
sub_sampling=int(args.get('subSampling', 25)),
312312
saturate=_bool_to_bool(args.get('saturate', False)),
313313
)
@@ -355,8 +355,8 @@ def pointer_gamut_visual_response():
355355
"""
356356

357357
args = request.args
358-
json_data = pointer_gamut_visual(
359-
colourspace_model=args.get('colourspaceModel', COLOURSPACE_MODEL), )
358+
json_data = pointer_gamut_visual(colourspace_model=args.get(
359+
'colourspaceModel', COLOURSPACE_MODEL), )
360360

361361
response = Response(json_data, status=200, mimetype='application/json')
362362
response.headers['X-Content-Length'] = len(json_data)
@@ -377,8 +377,8 @@ def visible_spectrum_visual_response():
377377
"""
378378

379379
args = request.args
380-
json_data = visible_spectrum_visual(
381-
colourspace_model=args.get('colourspaceModel', COLOURSPACE_MODEL), )
380+
json_data = visible_spectrum_visual(colourspace_model=args.get(
381+
'colourspaceModel', COLOURSPACE_MODEL), )
382382

383383
response = Response(json_data, status=200, mimetype='application/json')
384384
response.headers['X-Content-Length'] = len(json_data)
@@ -397,16 +397,16 @@ def index():
397397
Index response.
398398
"""
399399

400-
return render_template(
401-
'index.html',
402-
colour_analysis_js=os.environ.get('COLOUR_ANALYSIS_JS',
403-
'/static/js/colour-analysis.js'),
404-
image=sorted(os.listdir(IMAGES_DIRECTORY))[0],
405-
primary_colourspace=PRIMARY_COLOURSPACE,
406-
secondary_colourspace=SECONDARY_COLOURSPACE,
407-
image_colourspace=IMAGE_COLOURSPACE,
408-
image_decoding_cctf=IMAGE_CCTF_DECODING,
409-
colourspace_model=COLOURSPACE_MODEL)
400+
return render_template('index.html',
401+
colour_analysis_js=os.environ.get(
402+
'COLOUR_ANALYSIS_JS',
403+
'/static/js/colour-analysis.js'),
404+
image=sorted(os.listdir(IMAGES_DIRECTORY))[0],
405+
primary_colourspace=PRIMARY_COLOURSPACE,
406+
secondary_colourspace=SECONDARY_COLOURSPACE,
407+
image_colourspace=IMAGE_COLOURSPACE,
408+
image_decoding_cctf=IMAGE_CCTF_DECODING,
409+
colourspace_model=COLOURSPACE_MODEL)
410410

411411

412412
@APP.after_request

colour_analysis.py

+24-26
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@
167167
'hdr-CIELAB', 'hdr-IPT'}**
168168
"""
169169

170-
DATA_POINTER_GAMUT = Lab_to_XYZ(
171-
LCHab_to_Lab(DATA_POINTER_GAMUT_VOLUME), CCS_ILLUMINANT_POINTER_GAMUT)
170+
DATA_POINTER_GAMUT = Lab_to_XYZ(LCHab_to_Lab(DATA_POINTER_GAMUT_VOLUME),
171+
CCS_ILLUMINANT_POINTER_GAMUT)
172172
"""
173173
Pointer's Gamut data converted to *CIE XYZ* tristimulus values.
174174
@@ -250,13 +250,12 @@ def XYZ_to_colourspace_model(XYZ, illuminant, model, **kwargs):
250250
Colourspace model values.
251251
"""
252252

253-
ijk = convert(
254-
XYZ,
255-
'CIE XYZ',
256-
model,
257-
illuminant=illuminant,
258-
verbose={'mode': 'Short'},
259-
**kwargs)
253+
ijk = convert(XYZ,
254+
'CIE XYZ',
255+
model,
256+
illuminant=illuminant,
257+
verbose={'mode': 'Short'},
258+
**kwargs)
260259

261260
if model == 'JzAzBz':
262261
ijk /= XYZ_to_JzAzBz([1, 1, 1])[0]
@@ -447,9 +446,10 @@ def conform_primitive_dtype(primitive):
447446
vertices, faces, outline = primitive
448447

449448
return (
450-
vertices.astype(
451-
[('position', np.float32, (3, )), ('uv', np.float32, (2, )),
452-
('normal', np.float32, (3, )), ('colour', np.float32, (4, ))]),
449+
vertices.astype([('position', np.float32, (3, )),
450+
('uv', np.float32, (2, )),
451+
('normal', np.float32, (3, )),
452+
('colour', np.float32, (4, ))]),
453453
faces.astype(np.uint32),
454454
outline.astype(np.uint32),
455455
)
@@ -582,14 +582,13 @@ def RGB_colourspace_volume_visual(colourspace=PRIMARY_COLOURSPACE,
582582
filter_RGB_colourspaces(re.escape(colourspace)).values())
583583

584584
cube = conform_primitive_dtype(
585-
primitive_cube(
586-
width_segments=segments,
587-
height_segments=segments,
588-
depth_segments=segments))
585+
primitive_cube(width_segments=segments,
586+
height_segments=segments,
587+
depth_segments=segments))
589588

590589
vertices = cube[0]['position'] + 0.5
591-
faces = colourspace_model_faces_reorder(
592-
np.reshape(cube[1], (-1, 1)), colourspace_model)
590+
faces = colourspace_model_faces_reorder(np.reshape(cube[1], (-1, 1)),
591+
colourspace_model)
593592
RGB = cube[0]['colour']
594593

595594
XYZ = RGB_to_XYZ(
@@ -762,14 +761,13 @@ def spectral_locus_visual(colourspace=PRIMARY_COLOURSPACE,
762761
colourspace_model,
763762
), colourspace_model)
764763

765-
RGB = normalise_maximum(
766-
XYZ_to_RGB(
767-
XYZ,
768-
colourspace.whitepoint,
769-
colourspace.whitepoint,
770-
colourspace.matrix_XYZ_to_RGB,
771-
),
772-
axis=-1)
764+
RGB = normalise_maximum(XYZ_to_RGB(
765+
XYZ,
766+
colourspace.whitepoint,
767+
colourspace.whitepoint,
768+
colourspace.matrix_XYZ_to_RGB,
769+
),
770+
axis=-1)
773771

774772
return buffer_geometry(position=vertices, color=RGB)
775773

0 commit comments

Comments
 (0)