Merge branch 'release/v0.1.3'

Dockerfile

@@ -34,6 +34,9 @@ RUN /opt/conda/bin/conda install -y \
     matplotlib \
     scipy \
     six
+
+ARG CACHE_DATE
+
 RUN pip install \
     gunicorn \
     Flask-Caching \

app.py

@@ -19,7 +19,8 @@
     COLOURSPACE_MODEL, IMAGE_COLOURSPACE, IMAGE_DECODING_CCTF,
     PRIMARY_COLOURSPACE, RGB_colourspaces, RGB_colourspace_volume_visual,
     RGB_image_scatter_visual, SECONDARY_COLOURSPACE, colourspace_models,
-    decoding_cctfs, pointer_gamut_visual, spectral_locus_visual, image_data)
+    decoding_cctfs, image_data, pointer_gamut_visual, spectral_locus_visual,
+    visible_spectrum_visual)
 
 __author__ = 'Colour Developers'
 __copyright__ = 'Copyright (C) 2018 - Colour Developers'
@@ -32,7 +33,7 @@
 
 __major_version__ = '0'
 __minor_version__ = '1'
-__change_version__ = '2'
+__change_version__ = '3'
 __version__ = '.'.join(
     (__major_version__,
      __minor_version__,
@@ -45,7 +46,7 @@
     'colourspace_models_response', 'RGB_colourspaces_response',
     'image_data_response', 'RGB_colourspace_volume_visual_response',
     'RGB_image_scatter_visual_response', 'spectral_locus_visual_response',
-    'pointer_gamut_response', 'index', 'after_request'
+    'pointer_gamut_visual_response', 'index', 'after_request'
 ]
 
 APP = Flask(__name__)
@@ -343,7 +344,7 @@ def spectral_locus_visual_response():
 
 @APP.route('/pointer-gamut-visual')
 @CACHE.cached(timeout=CACHE_DEFAULT_TIMEOUT, query_string=True)
-def pointer_gamut_response():
+def pointer_gamut_visual_response():
     """
     Returns a *Pointer's Gamut* visual response.
 
@@ -363,6 +364,28 @@ def pointer_gamut_response():
     return response
 
 
+@APP.route('/visible-spectrum-visual')
+@CACHE.cached(timeout=CACHE_DEFAULT_TIMEOUT, query_string=True)
+def visible_spectrum_visual_response():
+    """
+    Returns the visible spectrum visual response.
+
+    Returns
+    -------
+    Response
+        visible spectrum visual response.
+    """
+
+    args = request.args
+    json_data = visible_spectrum_visual(
+        colourspace_model=args.get('colourspaceModel', COLOURSPACE_MODEL), )
+
+    response = Response(json_data, status=200, mimetype='application/json')
+    response.headers['X-Content-Length'] = len(json_data)
+
+    return response
+
+
 @APP.route('/')
 def index():
     """
@@ -400,4 +423,4 @@ def after_request(response):
 
 if __name__ == '__main__':
     with domain_range_scale(1):
-        APP.run(debug=True)
+        APP.run()

colour_analysis.py

@@ -16,7 +16,7 @@
 from collections import OrderedDict
 from werkzeug.contrib.cache import SimpleCache
 
-from colour import (Lab_to_XYZ, LCHab_to_Lab, LOG_DECODING_CURVES,
+from colour import (ILLUMINANTS, Lab_to_XYZ, LCHab_to_Lab, LOG_DECODING_CURVES,
                     POINTER_GAMUT_DATA, POINTER_GAMUT_ILLUMINANT,
                     OETFS_REVERSE, RGB_COLOURSPACES, RGB_to_RGB, RGB_to_XYZ,
                     XYZ_to_RGB, XYZ_to_JzAzBz, XYZ_to_OSA_UCS,
@@ -26,6 +26,7 @@
 from colour.plotting import filter_cmfs, filter_RGB_colourspaces
 from colour.utilities import (CaseInsensitiveMapping, first_item,
                               normalise_maximum, tsplit, tstack)
+from colour.volume import XYZ_outer_surface
 
 __author__ = 'Colour Developers'
 __copyright__ = 'Copyright (C) 2018 - Colour Developers'
@@ -43,7 +44,8 @@
     'colourspace_model_faces_reorder', 'decoding_cctfs', 'colourspace_models',
     'RGB_colourspaces', 'buffer_geometry', 'create_plane', 'create_box',
     'image_data', 'RGB_colourspace_volume_visual', 'spectral_locus_visual',
-    'RGB_image_scatter_visual', 'pointer_gamut_visual'
+    'RGB_image_scatter_visual', 'pointer_gamut_visual',
+    'visible_spectrum_visual'
 ]
 
 LINEAR_FILE_FORMATS = ('.exr', '.hdr')
@@ -963,6 +965,30 @@ def pointer_gamut_visual(colourspace_model='CIE xyY'):
 
     vertices = np.asarray(vertices)
 
-    RGB = np.ones(vertices.shape)
+    return buffer_geometry(position=vertices)
 
-    return buffer_geometry(position=vertices, color=RGB)
+
+def visible_spectrum_visual(colourspace_model='CIE xyY'):
+    """
+    Returns the visible spectrum visual geometry formatted as *JSON*.
+
+    Parameters
+    ----------
+    colourspace_model : unicode, optional
+        Colourspace model used to generate the visual geometry.
+
+    Returns
+    -------
+    unicode
+        Visible spectrum visual geometry formatted as *JSON*.
+    """
+
+    XYZ = XYZ_outer_surface()
+    vertices = colourspace_model_axis_reorder(
+        XYZ_to_colourspace_model_normalised(
+            XYZ, ILLUMINANTS['CIE 1931 2 Degree Standard Observer']['E'],
+            colourspace_model), colourspace_model)
+
+    vertices = np.array(zip(vertices, vertices[1:]))
+
+    return buffer_geometry(position=vertices)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "colour-analysis",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "Colour - Analysis",
   "private": true,
   "scripts": {

src/common.js

@@ -126,6 +126,19 @@ function isLinearFileFormat(path) {
     }
 }
 
+var saveFile = function(data, filename) {
+    var link = document.createElement('a');
+    if (typeof link.download === 'string') {
+        document.body.appendChild(link);
+        link.download = filename;
+        link.href = data;
+        link.click();
+        document.body.removeChild(link);
+    } else {
+        location.replace(uri);
+    }
+};
+
 export {
     serverRoute,
     removeObjectByName,
@@ -135,5 +148,6 @@ export {
     info,
     warning,
     loadingCallback,
-    isLinearFileFormat
+    isLinearFileFormat,
+    saveFile
 };

src/index.js

@@ -1,7 +1,7 @@
 import { GamutView } from './views/gamut-view.js';
 import { ImageView } from './views/image-view.js';
 import { updateDropdown, dropdownOptions } from './gui.js';
-import { isLinearFileFormat, info, serverRoute, warning } from './common.js';
+import { isLinearFileFormat, info, saveFile, serverRoute, warning } from './common.js';
 
 /**
  * @author Colour Developers / http://colour-science.org/
@@ -14,6 +14,7 @@ export {
     dropdownOptions,
     isLinearFileFormat,
     info,
+    saveFile,
     serverRoute,
     warning
 };

src/views/gamut-view.js

@@ -4,6 +4,7 @@ import { ColourspaceVisual } from '../visuals/colourspace-visual.js';
 import { ImageScatterVisual } from '../visuals/image-scatter-visual.js';
 import { PointerGamutVisual } from '../visuals/pointer-gamut-visual.js';
 import { SpectralLocusVisual } from '../visuals/spectral-locus-visual.js';
+import { VisibleSpectrumVisual } from '../visuals/visible-spectrum-visual.js';
 
 /**
  * @author Colour Developers / http://colour-science.org/
@@ -89,6 +90,11 @@ class GamutView extends PerspectiveView {
         this._viewAxesVisual = undefined;
 
         // The following groups are defining the rendering order.
+        this._visibleSpectrumVisualGroup = new THREE.Group();
+        this._visibleSpectrumVisualGroup.name = 'visible-spectrum-visual-group';
+        this._scene.add(this._visibleSpectrumVisualGroup);
+        this._visibleSpectrumVisual = undefined;
+
         this._spectralLocusVisualGroup = new THREE.Group();
         this._spectralLocusVisualGroup.name = 'spectral-locus-visual-group';
         this._scene.add(this._spectralLocusVisualGroup);
@@ -229,6 +235,10 @@ class GamutView extends PerspectiveView {
             this._viewAxesVisual.colourspaceModel = value;
         }
 
+        if (this._visibleSpectrumVisual != undefined) {
+            this._visibleSpectrumVisual.colourspaceModel = value;
+        }
+
         if (this._spectralLocusVisual != undefined) {
             this._spectralLocusVisual.colourspaceModel = value;
         }
@@ -262,6 +272,14 @@ class GamutView extends PerspectiveView {
         throw new Error('"viewAxesVisual" property is read only!');
     }
 
+    get visibleSpectrumVisual() {
+        return this._visibleSpectrumVisual;
+    }
+
+    set visibleSpectrumVisual(value) {
+        throw new Error('"visibleSpectrumVisual" property is read only!');
+    }
+
     get spectralLocusVisual() {
         return this._spectralLocusVisual;
     }
@@ -320,6 +338,19 @@ class GamutView extends PerspectiveView {
         this._viewAxesVisual.add();
     }
 
+    addVisibleSpectrumVisual(settings) {
+        this._visibleSpectrumVisual = new VisibleSpectrumVisual(
+            this._visibleSpectrumVisualGroup,
+            {
+                ...{
+                    colourspaceModel: this._colourspaceModel
+                },
+                ...settings
+            }
+        );
+        this._visibleSpectrumVisual.add();
+    }
+
     addSpectralLocusVisual(settings) {
         this._spectralLocusVisual = new SpectralLocusVisual(
             this._spectralLocusVisualGroup,
@@ -420,8 +451,9 @@ class GamutView extends PerspectiveView {
     isLoading() {
         return (
             this._viewAxesVisual.loading ||
-            this._pointerGamutVisual.loading ||
+            this._visibleSpectrumVisual.loading ||
             this._spectralLocusVisual.loading ||
+            this._pointerGamutVisual.loading ||
             this._secondaryColourspaceVisual.loading ||
             this._primaryColourspaceVisual.loading ||
             this._imageScatterVisual.loading ||

src/views/view.js

@@ -33,6 +33,7 @@ class View {
         this._observer.observe(this._container, {
             attributes: true
         });
+
         window.addEventListener(
             'resize',
             this.resizeToContainer.bind(this),
@@ -64,6 +65,11 @@ class View {
         throw new Error('"scene" property is read only!');
     }
 
+    capture(){
+        this.render();
+        return this._renderer.domElement.toDataURL('image/png');
+    }
+
     removeObjectByName(name) {
         removeObjectByName(this._scene, name);
     }

src/visuals/colourspace-visual.js

@@ -52,7 +52,11 @@ class ColourspaceVisual extends Visual {
 
     set uniformColour(value) {
         this._uniformColour = value;
-        this.add();
+        Object.keys(this.cache).forEach(
+            function(key) {
+                this.cache[key].material.color = new THREE.Color(value);
+            }.bind(this)
+        );
     }
 
     get uniformOpacity() {

src/visuals/image-scatter-visual.js

@@ -103,7 +103,11 @@ class ImageScatterVisual extends Visual {
 
     set uniformColour(value) {
         this._uniformColour = value;
-        this.add();
+        Object.keys(this.cache).forEach(
+            function(key) {
+                this.cache[key].material.color = new THREE.Color(value);
+            }.bind(this)
+        );
     }
 
     get uniformOpacity() {

src/visuals/pointer-gamut-visual.js

@@ -10,7 +10,7 @@ class PointerGamutVisual extends Visual {
         super(parent, { ...{ name: 'pointer-gamut-visual' }, ...settings });
 
         this._colourspaceModel = settings.colourspaceModel || 'CIE xyY';
-        this._uniformColour = settings.uniformColour || undefined;
+        this._uniformColour = settings.uniformColour || 0x4fc3f7;
         this._uniformOpacity = settings.uniformOpacity || 0.75;
     }
 
@@ -29,7 +29,11 @@ class PointerGamutVisual extends Visual {
 
     set uniformColour(value) {
         this._uniformColour = value;
-        this.add();
+        Object.keys(this.cache).forEach(
+            function(key) {
+                this.cache[key].material.color = new THREE.Color(value);
+            }.bind(this)
+        );
     }
 
     get uniformOpacity() {
@@ -54,7 +58,7 @@ class PointerGamutVisual extends Visual {
 
     create(geometry) {
         var material = new THREE.LineBasicMaterial({
-            vertexColors: THREE.VertexColors,
+            color: this._uniformColour,
             transparent: true,
             opacity: this._uniformOpacity
         });

src/visuals/spectral-locus-visual.js

@@ -39,7 +39,11 @@ class SpectralLocusVisual extends Visual {
 
     set uniformColour(value) {
         this._uniformColour = value;
-        this.add();
+        Object.keys(this.cache).forEach(
+            function(key) {
+                this.cache[key].material.color = new THREE.Color(value);
+            }.bind(this)
+        );
     }
 
     get uniformOpacity() {