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.

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

Fix Meta modules and add inputs to ndvi-colormap #1432

Merged
merged 7 commits into from
Jan 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 19 additions & 1 deletion src/modules/NdviColormap/info.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
{
"name": "ndvi-colormap",
"description": "Sequentially Applies NDVI and Colormap steps",
"inputs": {},
"inputs": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow. That's a big fix. Very important.

"filter": {
"type": "select",
"desc": "Filter color",
"default": "red",
"values": ["red", "blue"]
},
"colormap": {
"type": "select",
"desc": "Name of the Colormap",
"default": "default",
"values": [
"default",
"greyscale",
"stretched",
"fastie"
]
}
},
"docs-link": "https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#ndvi-colormap-module"
}
13 changes: 7 additions & 6 deletions src/util/createMetaModule.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ module.exports = function createMetaModule(mapFunction, moduleOptions) {
}
}

// map inputs to internal step options;
// use this to set defaults for internal steps
// and to expose internal settings as external meta-module parameters;
// it must return a steps object
var steps = mapFunction(options);

/* example:
function mapFunction(opt, _defaults) {
Expand All @@ -40,7 +35,13 @@ module.exports = function createMetaModule(mapFunction, moduleOptions) {
function draw(input, callback) {

var step = this;


// map inputs to internal step options;
// use this to set defaults for internal steps
// and to expose internal settings as external meta-module parameters;
// it must return a steps object
var steps = mapFunction(options);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @tech4GT can you check this change of scope? Thank you!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Linking to explanation: #1239 (comment)


var internalSequencer = ImageSequencer({ inBrowser: false, ui: false });
internalSequencer.loadImage(input.src, function onAddImage() {
internalSequencer.importJSON(steps);
Expand Down