diff --git a/src/js/modules/image/color_corrections.js b/src/js/modules/image/color_corrections.js index 1d3ce96..1a3b7ef 100644 --- a/src/js/modules/image/color_corrections.js +++ b/src/js/modules/image/color_corrections.js @@ -28,36 +28,69 @@ class Image_colorCorrections_class { preview: true, on_change: function (params, canvas_preview, w, h) { var img = canvas_preview.getImageData(0, 0, w, h); - var data = _this.do_corrections(img, params); + var data = _this.do_corrections(img, params, true); canvas_preview.putImageData(data, 0, 0); }, params: [ {name: "param1", title: "Brightness:", value: "0", range: [-100, 100]}, {name: "param2", title: "Contrast:", value: "0", range: [-100, 100]}, + {name: "param_s", title: "Saturation:", value: "0", range: [-100, 100]}, + {name: "param_h", title: "Hue:", value: "0", range: [-180, 180]}, + {}, + {name: "param_l", title: "Luminance:", value: "0", range: [-100, 100]}, {}, {name: "param_red", title: "Red channel:", value: "0", range: [-255, 255]}, {name: "param_green", title: "Green channel:", value: "0", range: [-255, 255]}, {name: "param_blue", title: "Blue channel:", value: "0", range: [-255, 255]}, - {}, - {name: "param_h", title: "Hue:", value: "0", range: [-180, 180]}, - {name: "param_s", title: "Saturation:", value: "0", range: [-100, 100]}, - {name: "param_l", title: "Luminance:", value: "0", range: [-100, 100]}, ], on_finish: function (params) { - _this.save_alpha(params); + _this.save_changes(params); }, }; this.POP.show(settings); } - save_alpha(params) { + save_changes(params) { + + /* + //non-destructive filters - todo + //multiple do_action() + do_corrections() does not work together yet. + if(params.param1 != 0) { + var params = {value: params.param1}; + var filter_id = null; + app.State.do_action( + new app.Actions.Add_layer_filter_action(null, 'brightness', params, filter_id) + ); + } + if(params.param2 != 0) { + var params = {value: params.param2}; + var filter_id = null; + app.State.do_action( + new app.Actions.Add_layer_filter_action(null, 'contrast', params, filter_id) + ); + } + if(params.param_s != 0) { + var params = {value: params.param_s}; + var filter_id = null; + app.State.do_action( + new app.Actions.Add_layer_filter_action(null, 'saturate', params, filter_id) + ); + } + if(params.param_h != 0) { + var params = {value: params.param_h}; + var filter_id = null; + app.State.do_action( + new app.Actions.Add_layer_filter_action(null, 'hue-rotate', params, filter_id) + ); + }*/ + //get canvas from layer var canvas = this.Base_layers.convert_layer_to_canvas(null, true); var ctx = canvas.getContext("2d"); //change data var img = ctx.getImageData(0, 0, canvas.width, canvas.height); - var data = this.do_corrections(img, params); + var data = this.do_corrections(img, params, true); //false? ctx.putImageData(data, 0, 0); //save @@ -66,7 +99,15 @@ class Image_colorCorrections_class { ); } - do_corrections(data, params) { + /** + * corrections (destructive) + * + * @param data + * @param params + * @param all_destructive + * @returns {*} + */ + do_corrections(data, params, all_destructive) { var param1 = params.param1; var param2 = params.param2; var param_red = params.param_red; @@ -76,14 +117,23 @@ class Image_colorCorrections_class { var param_s = params.param_s; var param_l = params.param_l; - //Brightness/Contrast - var filtered = this.ImageFilters.BrightnessContrastPhotoshop(data, param1, param2); - //RGB corrections - var filtered = this.ImageFilters.ColorTransformFilter(filtered, 1, 1, 1, 1, param_red, param_green, param_blue, 1); - //hue/saturation/luminance - var filtered = this.ImageFilters.HSLAdjustment(filtered, param_h, param_s, param_l); - return filtered; + if(all_destructive == true){ + //Brightness/Contrast + var data = this.ImageFilters.BrightnessContrastPhotoshop(data, param1, param2); + + //hue/saturation/luminance + var data = this.ImageFilters.HSLAdjustment(data, param_h, param_s, param_l); + } + else{ + //hue/saturation/luminance + var data = this.ImageFilters.HSLAdjustment(data, 0, 0, param_l); + } + + //RGB corrections + var data = this.ImageFilters.ColorTransformFilter(data, 1, 1, 1, 1, param_red, param_green, param_blue, 1); + + return data; } }