Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Average module editing the UI from the source #1469

Merged
merged 10 commits into from
Jan 16, 2020
Merged

Fix Average module editing the UI from the source #1469

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
72e3017
Fix Average module editing the UI from the source
root00198 Jan 12, 2020
86defbc
Merge branch 'main' into issue#1467
harshkhandeparkar Jan 12, 2020
24980dc
Merge branch 'main' into issue#1467
jywarren Jan 13, 2020
cd447f3
Merge branch 'main' into issue#1467
root00198 Jan 14, 2020
f944fda
requested changes
root00198 Jan 14, 2020
7d50a07
Merge branch 'issue#1467' of https://github.com/root00198/image-seque…
root00198 Jan 14, 2020
da23940
Delete demo.js
root00198 Jan 14, 2020
980db39
cleanup
root00198 Jan 14, 2020
9cd8dc4
Merge branch 'main' into issue#1467
jywarren Jan 16, 2020
0c364c8
Merge branch 'main' into issue#1467
jywarren Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/modules/Average/Module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('<p><b>Averages</b> (r, g, b, a): ' + sum.join(', ') + '</p>');
root00198 marked this conversation as resolved.
Show resolved Hide resolved
if(options.step.average === undefined) options.step.average = '';
root00198 marked this conversation as resolved.
Show resolved Hide resolved
options.step.average += 'rgba(' + sum.join(', ') + ')';
return pixels;
}

Expand Down
6 changes: 6 additions & 0 deletions src/modules/Average/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}