From 5ae545904d5e79e6f01f7dc8fbf56f2847dcda98 Mon Sep 17 00:00:00 2001 From: Naman Aggarwal <31132760+root00198@users.noreply.github.com> Date: Fri, 17 Jan 2020 00:46:51 +0530 Subject: [PATCH] Fix Average module editing the UI from the source (#1469) * Fix Average module editing the UI from the source * requested changes * Delete demo.js * cleanup Co-authored-by: Harsh Khandeparkar <34770591+HarshKhandeparkar@users.noreply.github.com> Co-authored-by: Jeffrey Warren --- examples/demo.js | 10 +++++----- src/modules/Average/Module.js | 4 ++-- src/modules/Average/info.json | 6 ++++++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/examples/demo.js b/examples/demo.js index af2a9edc..1d423b49 100644 --- a/examples/demo.js +++ b/examples/demo.js @@ -31,13 +31,13 @@ window.onload = function () { }; versionManagement.getLatestVersionNumber(function(versionNumber) { - console.log("The latest NPM version number for Image Sequencer (from GitHub) is v" + versionNumber); + console.log('The latest NPM version number for Image Sequencer (from GitHub) is v' + versionNumber); }); - console.log("The local version number for Image Sequencer is v" + versionManagement.getLocalVersionNumber()); + console.log('The local version number for Image Sequencer is v' + versionManagement.getLocalVersionNumber()); function displayVersionNumber() { - $('#version-number-text').text("Image Sequencer v" + versionManagement.getLocalVersionNumber()); - $('#version-number-top-right').text("v" + versionManagement.getLocalVersionNumber()); + $('#version-number-text').text('Image Sequencer v' + versionManagement.getLocalVersionNumber()); + $('#version-number-top-right').text('v' + versionManagement.getLocalVersionNumber()); } displayVersionNumber(); @@ -349,4 +349,4 @@ window.onload = function () { } else { insertPreview.updatePreviews('images/tulips.png', document.querySelector('#addStep')); } -}; +}; \ No newline at end of file diff --git a/src/modules/Average/Module.js b/src/modules/Average/Module.js index 577b3a71..7f2497a6 100755 --- a/src/modules/Average/Module.js +++ b/src/modules/Average/Module.js @@ -42,8 +42,8 @@ module.exports = function Average(options, UI) { // report back and store average in metadata: options.step.metadata.averages = sum; - // TODO: refactor into a new "display()" method as per https://github.com/publiclab/image-sequencer/issues/242 - if (options.step.inBrowser && options.step.ui) $(options.step.ui).find('.details').append('

Averages (r, g, b, a): ' + sum.join(', ') + '

'); + if (options.step.average === undefined) options.step.average = ''; + options.step.average += 'rgba(' + sum.join(', ') + ')'; return pixels; } diff --git a/src/modules/Average/info.json b/src/modules/Average/info.json index 16be5777..25525a78 100755 --- a/src/modules/Average/info.json +++ b/src/modules/Average/info.json @@ -3,5 +3,11 @@ "description": "Average all pixel color", "inputs": { }, + "outputs": { + "average": { + "type": "string", + "desc": "The average value of all the pixels." + } + }, "docs-link":"https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#average-module" }