psychopy / psychopy / 6195 / 3

47%

master: 47%

push

travis-ci

Colours (#3133)

* NF: Beginnings of a colour class

* NF: Working Colour class

* ENH: Tidy up namespace, use getSpace rather than reading global regex dict

* FF: Recognise 1.0 as 1

* NF: AdvancedColor class, extends Color so that more obscured colours can be handled without slowing down basic colours

* FF: Abiguity between rgb and rgb1 was causing validation error

* ENH: Compatability for all HTML named colours

* FF: Use lists for named colours for consistency

* FF: Add alpha values to named colours

* FF: Force lower case for indices from hex values

* FF: Force lower case for checking named colours

* ENH: Round to 2dp before comparing to named colours to get approximate matches

* ENH: Better error catching and a debug mode for getSpace

* ENH: Use getter/setter pairs to create colours on access rather than on spawn

* ENH: Move class variables to global to reduce loading

* FF: Change AdvancedColor to be in line with changes to Color

* FF: Minor fixes

* FF: Default behaviour for getSpace

* ENH: Add hsv as a space, only works when sat and vib are 100 currently

* FF: hsv and hsva can now be converted from but not to

* FF: hsv and hsva now fully functional

* FF: Convert hsv units from 100 to 1

* ENH: Priority system for getSpace rather than individual catching

* ENH: Add lms conversion

* ENH: Add generic set method

* FF: Convert rgba1 to tuple

* ENH: Begin adding advanced spaces

* ENH: Setter method for rec709TF

* FF: Identification errors

* FF: Validate srgbTF colours

* ENH: Alpha support for advanced spaces

* ENH: Replace old colorspacetools with legacy versions pointing to Color and AdvancedColor

* FF: Contingency for when delta is 0

* ENH: Functions for adjusting specific aspects of the colour

* FF: Brightness should be in 0 to 1

* ENH: Return requested space of object if input to getspace is a colour object

* ENH: Printing function

* FF: Advan... (continued)

5913 of 17685 branches covered (33.44%)

23411 of 50273 relevant lines covered (46.57%)

0.47 hits per line