Skip to content

Commit 88df921

Browse files
author
unknown
committed
Merge branch 'feature/v0.4.7' into develop
2 parents 6341ee8 + d5f3923 commit 88df921

File tree

2 files changed

+145
-139
lines changed

2 files changed

+145
-139
lines changed

‎README.rst

Lines changed: 75 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,6 @@ Most of the objects are available from the ``colour`` namespace:
313313
Automatic Colour Conversion Graph - ``colour.graph``
314314
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
315315
316-
Starting with version *0.3.14*, **Colour** implements an automatic colour
317-
conversion graph enabling easier colour conversions.
318-
319316
.. image:: https://colour.readthedocs.io/en/develop/_static/Examples_Colour_Automatic_Conversion_Graph.png
320317
321318
.. code-block:: python
@@ -332,7 +329,7 @@ conversion graph enabling easier colour conversions.
332329
* "sd_to_XYZ" --> "XYZ_to_sRGB" *
333330
* *
334331
===============================================================================
335-
array([ 0.45675795, 0.30986982, 0.24861924])
332+
array([ 0.49034776, 0.30185875, 0.23587685])
336333
337334
.. code-block:: python
338335
@@ -360,8 +357,7 @@ Chromatic Adaptation - ``colour.adaptation``
360357
361358
.. code-block:: text
362359
363-
array([ 0.2533053 , 0.13765138, 0.01543307])
364-
360+
array([ 0.25331034, 0.13765286, 0.01543185])
365361
366362
.. code-block:: python
367363
@@ -413,15 +409,15 @@ Colour Appearance Models - ``colour.appearance``
413409
414410
.. code-block:: text
415411
416-
CAM_Specification_CIECAM02(J=34.434525727858997, C=67.365010921125943, h=22.279164147957065, s=62.81485585332716, Q=177.47124941102123, M=70.024939419291414, H=2.6896085344238898, HC=None)
412+
CAM_Specification_CIECAM02(J=34.434525727858997, C=67.365010921125915, h=22.279164147957076, s=62.814855853327131, Q=177.47124941102123, M=70.024939419291385, H=2.689608534423904, HC=None)
417413
418414
.. code-block:: python
419415
420416
colour.XYZ_to_CIECAM16(XYZ, XYZ_w, L_A, Y_b)
421417
422418
.. code-block:: text
423419
424-
CAM_Specification_CIECAM16(J=34.434525727858997, C=67.365010921125943, h=22.279164147957065, s=62.81485585332716, Q=177.47124941102123, M=70.024939419291414, H=2.6896085344238898, HC=None)
420+
CAM_Specification_CIECAM16(J=33.880368498111686, C=69.444353357408033, h=19.510887327451748, s=64.03612114840314, Q=176.03752758512178, M=72.18638534116765, H=399.52975599115319, HC=None)
425421
426422
.. code-block:: python
427423
@@ -433,27 +429,27 @@ Colour Appearance Models - ``colour.appearance``
433429
434430
.. code-block:: python
435431
436-
colour.XYZ_to_Hellwig2022(XYZ, XYZ_w, L_A)
432+
colour.XYZ_to_Hellwig2022(XYZ, XYZ_w, L_A, Y_b)
437433
438434
.. code-block:: text
439435
440-
CAM_Specification_Hellwig2022(J=33.880368498111686, C=40.347043294550311, h=19.510887327451748, s=117.38555017188679, Q=45.34489577734751, M=53.228355383108031, H=399.52975599115319, HC=None)
436+
CAM_Specification_Hellwig2022(J=33.880368498111686, C=37.579419116276348, h=19.510887327451748, s=109.33343382561695, Q=45.34489577734751, M=49.577131618021212, H=399.52975599115319, HC=None, J_HK=39.41741758094139, Q_HK=52.755585941150315)
441437
442438
.. code-block:: python
443439
444440
colour.XYZ_to_Kim2009(XYZ, XYZ_w, L_A)
445441
446442
.. code-block:: text
447443
448-
CAM_Specification_Kim2009(J=19.879918542450902, C=55.839055250876946, h=22.013388165090046, s=112.97979354939129, Q=36.309026130161449, M=46.346415858227864, H=2.3543198369639931, HC=None)
444+
CAM_Specification_Kim2009(J=19.879918542450937, C=55.83905525087696, h=22.013388165090031, s=112.9797935493912, Q=36.309026130161513, M=46.346415858227871, H=2.3543198369639753, HC=None)
449445
450446
.. code-block:: python
451447
452448
colour.XYZ_to_ZCAM(XYZ, XYZ_w, L_A, Y_b)
453449
454450
.. code-block:: text
455451
456-
CAM_Specification_ZCAM(J=38.347186278956357, C=21.12138989208518, h=33.711578931095197, s=81.444585609489536, Q=76.986725284523772, M=42.403805833900506, H=0.45779200212219573, HC=None, V=43.623590687423544, K=43.20894953152817, W=34.829588380192149)
452+
CAM_Specification_ZCAM(J=38.347186278956357, C=21.121389892085183, h=33.711578931095183, s=81.444585609489536, Q=76.986725284523772, M=42.403805833900513, H=0.45779200212217158, HC=None, V=43.623590687423551, K=43.20894953152817, W=34.829588380192149)
457453
458454
Colour Blindness - ``colour.blindness``
459455
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -462,7 +458,7 @@ Colour Blindness - ``colour.blindness``
462458
463459
import numpy as np
464460
465-
cmfs = colour.LMS_CMFS["Stockman & Sharpe 2 Degree Cone Fundamentals"]
461+
cmfs = colour.colorimetry.MSDS_CMFS_LMS["Stockman & Sharpe 2 Degree Cone Fundamentals"]
466462
colour.msds_cmfs_anomalous_trichromacy_Machado2009(cmfs, np.array([15, 0, 0]))[450]
467463
468464
.. code-block:: text
@@ -495,7 +491,7 @@ Colour Correction - ``colour characterisation``
495491
496492
.. code-block:: text
497493
498-
array([ 0.1806237 , 0.07234791, 0.07848845])
494+
array([ 0.18147565, 0.08609354, 0.08569274])
499495
500496
.. code-block:: python
501497
@@ -694,17 +690,17 @@ Blackbody Spectral Radiance Computation
694690
695691
.. code-block:: text
696692
697-
SpectralDistribution([[ 3.60000000e+02, 6.65427827e+12],
698-
[ 3.61000000e+02, 6.70960528e+12],
699-
[ 3.62000000e+02, 6.76482512e+12],
693+
SpectralDistribution([[ 360. , 6654.27827064],
694+
[ 361. , 6709.60527925],
695+
[ 362. , 6764.82512152],
700696
...
701-
[ 7.78000000e+02, 1.06068004e+13],
702-
[ 7.79000000e+02, 1.05903327e+13],
703-
[ 7.80000000e+02, 1.05738520e+13]],
704-
interpolator=SpragueInterpolator,
705-
interpolator_args={},
706-
extrapolator=Extrapolator,
707-
extrapolator_args={'right': None, 'method': 'Constant', 'left': None})
697+
[ 778. , 10606.80038243],
698+
[ 779. , 10590.33272593],
699+
[ 780. , 10573.85196369]],
700+
SpragueInterpolator,
701+
{},
702+
Extrapolator,
703+
{'method': 'Constant', 'left': None, 'right': None})
708704
709705
Dominant, Complementary Wavelength & Colour Purity Computation
710706
**************************************************************
@@ -828,7 +824,7 @@ Luminous Flux, Efficiency & Efficacy Computation
828824
829825
.. code-block:: text
830826
831-
23807.655527367202
827+
23807.655527367198
832828
833829
.. code-block:: python
834830
@@ -897,6 +893,8 @@ Colour Difference - ``colour.difference``
897893
'CIE 2000',
898894
'CMC',
899895
'DIN99',
896+
'HyAB',
897+
'HyCH',
900898
'ITP',
901899
'cie1976',
902900
'cie1994',
@@ -1413,7 +1411,6 @@ RGB Colourspaces
14131411
'prophoto',
14141412
'sRGB']
14151413
1416-
14171414
OETFs
14181415
*****
14191416
@@ -1436,7 +1433,6 @@ OETFs
14361433
'ITU-T H.273 Log Sqrt',
14371434
'SMPTE 240M']
14381435
1439-
14401436
EOTFs
14411437
*****
14421438
@@ -1467,7 +1463,6 @@ OOTFs
14671463
14681464
['ITU-R BT.2100 HLG', 'ITU-R BT.2100 PQ']
14691465
1470-
14711466
Log Encoding / Decoding
14721467
***********************
14731468
@@ -1480,9 +1475,9 @@ Log Encoding / Decoding
14801475
['ACEScc',
14811476
'ACEScct',
14821477
'ACESproxy',
1483-
'Apple Log Profile',
14841478
'ARRI LogC3',
14851479
'ARRI LogC4',
1480+
'Apple Log Profile',
14861481
'Canon Log',
14871482
'Canon Log 2',
14881483
'Canon Log 3',
@@ -1521,17 +1516,19 @@ CCTFs Encoding / Decoding
15211516
['ACEScc',
15221517
'ACEScct',
15231518
'ACESproxy',
1524-
'Apple Log Profile',
1519+
'ARIB STD-B67',
15251520
'ARRI LogC3',
15261521
'ARRI LogC4',
1527-
'ARIB STD-B67',
1522+
'Apple Log Profile',
1523+
'Blackmagic Film Generation 5',
15281524
'Canon Log',
15291525
'Canon Log 2',
15301526
'Canon Log 3',
15311527
'Cineon',
15321528
'D-Log',
15331529
'DCDM',
15341530
'DICOM GSDF',
1531+
'DaVinci Intermediate',
15351532
'ERIMM RGB',
15361533
'F-Log',
15371534
'F-Log2',
@@ -1545,9 +1542,15 @@ CCTFs Encoding / Decoding
15451542
'ITU-R BT.2100 PQ',
15461543
'ITU-R BT.601',
15471544
'ITU-R BT.709',
1545+
'ITU-T H.273 IEC 61966-2',
1546+
'ITU-T H.273 Log',
1547+
'ITU-T H.273 Log Sqrt',
1548+
'ITU-T H.273 ST.428-1',
1549+
'L-Log',
15481550
'Log2',
15491551
'Log3G10',
15501552
'Log3G12',
1553+
'N-Log',
15511554
'PLog',
15521555
'Panalog',
15531556
'ProPhoto RGB',
@@ -1704,21 +1707,21 @@ Optical Phenomena - ``colour.phenomena``
17041707
17051708
.. code-block:: python
17061709
1707-
colour.rayleigh_scattering_sd()
1710+
colour.sd_rayleigh_scattering()
17081711
17091712
.. code-block:: text
17101713
1711-
SpectralDistribution([[ 3.60000000e+02, 5.99101337e-01],
1712-
[ 3.61000000e+02, 5.92170690e-01],
1713-
[ 3.62000000e+02, 5.85341006e-01],
1714+
SpectralDistribution([[ 3.60000000e+02, 5.60246579e-01],
1715+
[ 3.61000000e+02, 5.53748137e-01],
1716+
[ 3.62000000e+02, 5.47344692e-01],
17141717
...
1715-
[ 7.78000000e+02, 2.55208377e-02],
1716-
[ 7.79000000e+02, 2.53887969e-02],
1717-
[ 7.80000000e+02, 2.52576106e-02]],
1718-
interpolator=SpragueInterpolator,
1719-
interpolator_args={},
1720-
extrapolator=Extrapolator,
1721-
extrapolator_args={'right': None, 'method': 'Constant', 'left': None})
1718+
[ 7.78000000e+02, 2.37790178e-02],
1719+
[ 7.79000000e+02, 2.36559421e-02],
1720+
[ 7.80000000e+02, 2.35336632e-02]],
1721+
SpragueInterpolator,
1722+
{},
1723+
Extrapolator,
1724+
{'method': 'Constant', 'left': None, 'right': None})
17221725
17231726
Light Quality - ``colour.quality``
17241727
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1732,7 +1735,7 @@ Colour Fidelity Index
17321735
17331736
.. code-block:: text
17341737
1735-
70.120825477833037
1738+
70.120824401428848
17361739
17371740
.. code-block:: python
17381741
@@ -1751,7 +1754,7 @@ Colour Quality Scale
17511754
17521755
.. code-block:: text
17531756
1754-
64.111703163816699
1757+
64.111822015662824
17551758
17561759
.. code-block:: python
17571760
@@ -1770,7 +1773,7 @@ Colour Rendering Index
17701773
17711774
.. code-block:: text
17721775
1773-
64.233724121664807
1776+
64.233724121664793
17741777
17751778
Academy Spectral Similarity Index (SSI)
17761779
***************************************
@@ -1797,17 +1800,17 @@ Reflectance Recovery
17971800
17981801
.. code-block:: text
17991802
1800-
SpectralDistribution([[ 3.60000000e+02, 8.40144095e-02],
1801-
[ 3.65000000e+02, 8.41264236e-02],
1802-
[ 3.70000000e+02, 8.40057597e-02],
1803-
...
1804-
[ 7.70000000e+02, 4.46743012e-01],
1805-
[ 7.75000000e+02, 4.46817187e-01],
1806-
[ 7.80000000e+02, 4.46857696e-01]],
1807-
SpragueInterpolator,
1808-
{},
1809-
Extrapolator,
1810-
{'method': 'Constant', 'left': None, 'right': None})
1803+
SpectralDistribution([[ 3.60000000e+02, 8.52694330e-02],
1804+
[ 3.65000000e+02, 8.52203359e-02],
1805+
[ 3.70000000e+02, 8.52841304e-02],
1806+
...
1807+
[ 7.70000000e+02, 4.46546872e-01],
1808+
[ 7.75000000e+02, 4.46638451e-01],
1809+
[ 7.80000000e+02, 4.46641739e-01]],
1810+
SpragueInterpolator,
1811+
{},
1812+
Extrapolator,
1813+
{'method': 'Constant', 'left': None, 'right': None})
18111814
18121815
.. code-block:: python
18131816
@@ -1847,19 +1850,19 @@ Camera RGB Sensitivities Recovery
18471850
18481851
.. code-block:: text
18491852
1850-
RGB_CameraSensitivities([[ 4.00000000e+02, 7.22815777e-03, 9.22506480e-03,
1851-
-9.88368972e-03],
1852-
[ 4.10000000e+02, -8.50457609e-03, 1.12777480e-02,
1853-
3.86248655e-03],
1854-
[ 4.20000000e+02, 4.58191132e-02, 7.15520948e-02,
1855-
4.04068293e-01],
1853+
RGB_CameraSensitivities([[ 4.00000000e+02, 7.04378461e-03, 9.21260449e-03,
1854+
-7.64080878e-03],
1855+
[ 4.10000000e+02, -8.76715607e-03, 1.12726694e-02,
1856+
6.37434190e-03],
1857+
[ 4.20000000e+02, 4.58126856e-02, 7.18000418e-02,
1858+
4.00001696e-01],
18561859
...
1857-
[ 6.80000000e+02, 4.08276173e-02, 5.55290476e-03,
1858-
1.39907862e-03],
1859-
[ 6.90000000e+02, -3.71437574e-03, 2.50935640e-03,
1860-
3.97652622e-04],
1861-
[ 7.00000000e+02, -5.62256563e-03, 1.56433970e-03,
1862-
5.84726936e-04]],
1860+
[ 6.80000000e+02, 4.00195568e-02, 5.55512389e-03,
1861+
1.36794925e-03],
1862+
[ 6.90000000e+02, -4.32240535e-03, 2.49731193e-03,
1863+
3.80303275e-04],
1864+
[ 7.00000000e+02, -6.00395414e-03, 1.54678227e-03,
1865+
5.40394352e-04]],
18631866
['red', 'green', 'blue'],
18641867
SpragueInterpolator,
18651868
{},
@@ -1875,7 +1878,7 @@ Correlated Colour Temperature Computation Methods - ``colour.temperature``
18751878
18761879
.. code-block:: text
18771880
1878-
array([ 6.50751282e+03, 3.22335875e-03])
1881+
array([ 6.50747479e+03, 3.22334634e-03])
18791882
18801883
.. code-block:: python
18811884
@@ -1986,7 +1989,7 @@ Blackbody
19861989
.. code-block:: python
19871990
19881991
blackbody_sds = [
1989-
colour.sd_blackbody(i, colour.SpectralShape(0, 10000, 10))
1992+
colour.sd_blackbody(i, colour.SpectralShape(1, 10001, 10))
19901993
for i in range(1000, 15000, 1000)
19911994
]
19921995
plot_multi_sds(
@@ -2023,8 +2026,8 @@ Luminous Efficiency
20232026
plot_multi_sds(
20242027
(
20252028
sd_mesopic_luminous_efficiency_function,
2026-
colour.PHOTOPIC_LEFS["CIE 1924 Photopic Standard Observer"],
2027-
colour.SCOTOPIC_LEFS["CIE 1951 Scotopic Standard Observer"],
2029+
colour.colorimetry.SDS_LEFS_PHOTOPIC["CIE 1924 Photopic Standard Observer"],
2030+
colour.colorimetry.SDS_LEFS_SCOTOPIC["CIE 1951 Scotopic Standard Observer"],
20282031
),
20292032
y_label="Luminous Efficiency",
20302033
legend_location="upper right",

0 commit comments

Comments
 (0)