Skip to content

Commit

Permalink
Rename "colour.LIGHT_SOURCES_SDS" attribute to "colour.LIGHT_SOURCE_S…
Browse files Browse the repository at this point in the history
…DS".
  • Loading branch information
KelSolaar committed Apr 11, 2020
1 parent 4b029aa commit b9ebce4
Show file tree
Hide file tree
Showing 18 changed files with 154 additions and 153 deletions.
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ Spectral Computations

.. code-block:: python
>>> colour.sd_to_XYZ(colour.LIGHT_SOURCES_SDS['Neodimium Incandescent'])
>>> colour.sd_to_XYZ(colour.LIGHT_SOURCE_SDS['Neodimium Incandescent'])
array([ 36.94726204, 32.62076174, 13.0143849 ])
>>> sorted(colour.SPECTRAL_TO_XYZ_METHODS.keys())
['ASTM E308', 'Integration', 'astm2015']
Expand Down Expand Up @@ -424,13 +424,13 @@ Luminous Flux, Efficiency & Efficacy Computation

.. code-block:: python
>>> sd = colour.LIGHT_SOURCES_SDS['Neodimium Incandescent']
>>> sd = colour.LIGHT_SOURCE_SDS['Neodimium Incandescent']
>>> colour.luminous_flux(sd)
23807.655527367202
>>> sd = colour.LIGHT_SOURCES_SDS['Neodimium Incandescent']
>>> sd = colour.LIGHT_SOURCE_SDS['Neodimium Incandescent']
>>> colour.luminous_efficiency(sd)
0.19943935624521045
>>> sd = colour.LIGHT_SOURCES_SDS['Neodimium Incandescent']
>>> sd = colour.LIGHT_SOURCE_SDS['Neodimium Incandescent']
>>> colour.luminous_efficacy(sd)
136.21708031547874
Expand Down
10 changes: 7 additions & 3 deletions colour/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
from .colorimetry import (
ASTME308_PRACTISE_SHAPE, BANDPASS_CORRECTION_METHODS, CMFS,
DEFAULT_SPECTRAL_SHAPE, HUNTERLAB_ILLUMINANTS, ILLUMINANTS, ILLUMINANT_SDS,
LEFS, LIGHTNESS_METHODS, LIGHT_SOURCES, LIGHT_SOURCES_SDS, LMS_CMFS,
LEFS, LIGHTNESS_METHODS, LIGHT_SOURCES, LIGHT_SOURCE_SDS, LMS_CMFS,
LUMINANCE_METHODS, MULTI_SD_TO_XYZ_METHODS, MultiSpectralDistributions,
PHOTOPIC_LEFS, RGB_CMFS, SCOTOPIC_LEFS, SD_GAUSSIAN_METHODS,
SD_MULTI_LEDS_METHODS, SD_SINGLE_LED_METHODS, SD_TO_XYZ_METHODS,
Expand Down Expand Up @@ -189,7 +189,7 @@
'ASTME308_PRACTISE_SHAPE', 'BANDPASS_CORRECTION_METHODS', 'CMFS',
'DEFAULT_SPECTRAL_SHAPE', 'HUNTERLAB_ILLUMINANTS', 'ILLUMINANTS',
'ILLUMINANT_SDS', 'LEFS', 'LIGHTNESS_METHODS', 'LIGHT_SOURCES',
'LIGHT_SOURCES_SDS', 'LMS_CMFS', 'LUMINANCE_METHODS',
'LIGHT_SOURCE_SDS', 'LMS_CMFS', 'LUMINANCE_METHODS',
'MULTI_SD_TO_XYZ_METHODS', 'MultiSpectralDistributions', 'PHOTOPIC_LEFS',
'RGB_CMFS', 'SCOTOPIC_LEFS', 'SD_GAUSSIAN_METHODS',
'SD_MULTI_LEDS_METHODS', 'SD_SINGLE_LED_METHODS', 'SD_TO_XYZ_METHODS',
Expand Down Expand Up @@ -1632,7 +1632,7 @@ def __getattr__(self, attribute):
],
[
'colour.LIGHT_SOURCES_RELATIVE_SPDS',
'colour.LIGHT_SOURCES_SDS',
'colour.LIGHT_SOURCE_SDS',
],
[
'colour.MultiSpectralPowerDistribution',
Expand Down Expand Up @@ -1790,6 +1790,10 @@ def __getattr__(self, attribute):
'colour.ILLUMINANTS_SDS',
'colour.ILLUMINANT_SDS',
],
[
'colour.LIGHT_SOURCES_SDS',
'colour.LIGHT_SOURCE_SDS',
],
]

if not is_documentation_building():
Expand Down
4 changes: 2 additions & 2 deletions colour/colorimetry/datasets/light_sources/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
from __future__ import absolute_import

from .chromaticity_coordinates import LIGHT_SOURCES
from .sds import LIGHT_SOURCES_SDS
from .sds import LIGHT_SOURCE_SDS

__all__ = ['LIGHT_SOURCES', 'LIGHT_SOURCES_SDS']
__all__ = ['LIGHT_SOURCES', 'LIGHT_SOURCE_SDS']
Loading

0 comments on commit b9ebce4

Please sign in to comment.