eessppeelllloo/image-sequencer
1
0
Fork 0
mirror of https://github.com/publiclab/image-sequencer.git synced 2025-12-12 19:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into stable

Browse Source
This commit is contained in:
jywarren
2019-05-23 15:25:42 -04:00
parent 506a238c83 8751211967
commit 9ca869fd79
216 changed files with 5398 additions and 5117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.eslintrc.js Normal file
View File

@@ -0,0 +1,23 @@
module.exports = {
'env': {
'browser': true,
'commonjs': true,
'es6': true,
'node': true
},
'extends': 'eslint:recommended',
'globals': {
'Atomics': 'readonly',
'SharedArrayBuffer': 'readonly'
},
'parserOptions': {
'ecmaVersion': 2018
},
'rules': {
'indent': ['error',2],
'linebreak-style': ['error','unix'],
'quotes': ['error','single'],
'semi': ['error','always'],
'no-undef': 0
}
};

6
.travis.yml
View File

@@ -1,6 +1,6 @@
sudo: required
language: node_js
node_js:
- '6'
- '8'
- '10'
env:
@@ -26,6 +26,10 @@ addons:
packages:
- g++-4.8
- xvfb # for tape-run
before_install:
- sudo apt-get update
- sudo apt-get install xserver-xorg-dev libxext-dev libxi-dev
- sudo apt-get install -y build-essential libxi-dev libglu1-mesa-dev libglew-dev pkg-config libglu1-mesa-dev freeglut3-dev mesa-common-dev
install:
- export DISPLAY=':99.0' # for tape-run
- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & # for tape-run

56
Gruntfile.js
View File

@@ -1,76 +1,76 @@
module.exports = function(grunt) {
grunt.loadNpmTasks("grunt-browserify");
grunt.loadNpmTasks("grunt-contrib-uglify-es");
grunt.loadNpmTasks("grunt-browser-sync");
grunt.loadNpmTasks('grunt-browserify');
grunt.loadNpmTasks('grunt-contrib-uglify-es');
grunt.loadNpmTasks('grunt-browser-sync');
require("matchdep")
.filterDev("grunt-*")
require('matchdep')
.filterDev('grunt-*')
.forEach(grunt.loadNpmTasks);
grunt.initConfig({
pkg: grunt.file.readJSON("package.json"),
pkg: grunt.file.readJSON('package.json'),
watch: {
options: {
livereload: true
},
source: {
files: ["src/**/*", "Gruntfile.js", "examples/lib/*", "examples/demo.js"],
tasks: ["compile"]
files: ['src/**/*', 'Gruntfile.js', 'examples/lib/*', 'examples/demo.js'],
tasks: ['compile']
}
},
browserify: {
core: {
src: ["src/ImageSequencer.js"],
dest: "dist/image-sequencer.js"
src: ['src/ImageSequencer.js'],
dest: 'dist/image-sequencer.js'
},
ui: {
src: ["examples/demo.js"],
dest: "dist/image-sequencer-ui.js"
src: ['examples/demo.js'],
dest: 'dist/image-sequencer-ui.js'
},
prodcore: {
src: ["src/ImageSequencer.js"],
dest: "dist/image-sequencer.brow.js"
src: ['src/ImageSequencer.js'],
dest: 'dist/image-sequencer.brow.js'
},
produi: {
src: ["examples/demo.js"],
dest: "dist/image-sequencer-ui.brow.js"
src: ['examples/demo.js'],
dest: 'dist/image-sequencer-ui.brow.js'
}
},
uglify: {
core: {
src: ["./dist/image-sequencer.js"],
dest: "./dist/image-sequencer.min.js"
src: ['./dist/image-sequencer.js'],
dest: './dist/image-sequencer.min.js'
},
ui: {
src: ['dist/image-sequencer-ui.js'],
dest: 'dist/image-sequencer-ui.min.js'
},
prodcore: {
src: ["dist/image-sequencer.brow.js"],
dest: "dist/image-sequencer.js"
src: ['dist/image-sequencer.brow.js'],
dest: 'dist/image-sequencer.js'
},
produi: {
src: ["dist/image-sequencer-ui.brow.js"],
dest: "dist/image-sequencer-ui.js"
src: ['dist/image-sequencer-ui.brow.js'],
dest: 'dist/image-sequencer-ui.js'
}
},
browserSync: {
dev: {
options: {
watchTask: true,
server: "./"
server: './'
}
}
}
});
/* Default (development): Watch files and build on change. */
grunt.registerTask("default", ["watch"]);
grunt.registerTask("build", ["browserify:core", "browserify:ui", "uglify:core", "uglify:ui"]);
grunt.registerTask("serve", ["browserify:core", "browserify:ui", "browserSync", "watch"]);
grunt.registerTask("compile", ["browserify:core", "browserify:ui"]);
grunt.registerTask("production", ["browserify:prodcore", "browserify:produi", "uglify:prodcore", "uglify:produi"]);
grunt.registerTask('default', ['watch']);
grunt.registerTask('build', ['browserify:core', 'browserify:ui', 'uglify:core', 'uglify:ui']);
grunt.registerTask('serve', ['browserify:core', 'browserify:ui', 'browserSync', 'watch']);
grunt.registerTask('compile', ['browserify:core', 'browserify:ui']);
grunt.registerTask('production', ['browserify:prodcore', 'browserify:produi', 'uglify:prodcore', 'uglify:produi']);
};

64
examples/demo.js
View File

@@ -12,14 +12,14 @@ window.onload = function() {
// Load information of all modules (Name, Inputs, Outputs)
var modulesInfo = sequencer.modulesInfo();
var addStepSelect = $("#addStep select");
addStepSelect.html("");
var addStepSelect = $('#addStep select');
addStepSelect.html('');
// Add modules to the addStep dropdown
for (var m in modulesInfo) {
if (modulesInfo[m] && modulesInfo[m].name)
addStepSelect.append(
'<option value="' + m + '">' + modulesInfo[m].name + "</option>"
'<option value="' + m + '">' + modulesInfo[m].name + '</option>'
);
}
// Null option
@@ -46,7 +46,7 @@ window.onload = function() {
$(':root').animate({scrollTop: 0});
}
$('#move-up').on("click",topFunction);
$('#move-up').on('click',topFunction);
// UI for each step:
@@ -59,48 +59,48 @@ window.onload = function() {
if (urlHash.getUrlHashParameter('src')) {
sequencer.loadImage(urlHash.getUrlHashParameter('src'), ui.onLoad);
} else {
sequencer.loadImage("images/tulips.png", ui.onLoad);
sequencer.loadImage('images/tulips.png', ui.onLoad);
}
var resetSequence = function(){
var r=confirm("Do you want to reset the sequence?");
var r=confirm('Do you want to reset the sequence?');
if (r)
window.location = "/";
}
window.location = '/';
};
$("#addStep select").on("change", ui.selectNewStepUi);
$("#addStep #add-step-btn").on("click", ui.addStepUi);
$("#resetButton").on("click",resetSequence);
$('#addStep select').on('change', ui.selectNewStepUi);
$('#addStep #add-step-btn').on('click', ui.addStepUi);
$('#resetButton').on('click',resetSequence);
//Module button radio selection
$('.radio-group .radio').on("click", function() {
$('.radio-group .radio').on('click', function() {
$(this).parent().find('.radio').removeClass('selected');
$(this).addClass('selected');
newStep = $(this).attr('data-value');
//$("#addStep option[value=" + newStep + "]").attr('selected', 'selected');
$("#addStep select").val(newStep);
$('#addStep select').val(newStep);
ui.selectNewStepUi(newStep);
ui.addStepUi(newStep);
$(this).removeClass('selected');
});
$('#download-btn').click(function() {
$('.step-thumbnail:last()').trigger("click");
$('.step-thumbnail:last()').trigger('click');
return false;
});
function displayMessageOnSaveSequence(){
$(".savesequencemsg").fadeIn();
$('.savesequencemsg').fadeIn();
setTimeout(function() {
$(".savesequencemsg").fadeOut();
$('.savesequencemsg').fadeOut();
}, 1000);
}
$('body').on('click', 'button.remove', ui.removeStepUi);
$('#save-seq').click(() => {
var result = window.prompt("Please give a name to your sequence... (Saved sequence will only be available in this browser).");
var result = window.prompt('Please give a name to your sequence... (Saved sequence will only be available in this browser).');
if(result){
result = result + " (local)";
result = result + ' (local)';
sequencer.saveSequence(result, sequencer.toString());
sequencer.loadModules();
displayMessageOnSaveSequence();
@@ -118,11 +118,11 @@ window.onload = function() {
var button = event.target;
button.disabled = true;
button.innerHTML='<i class="fa fa-circle-o-notch fa-spin"></i>'
button.innerHTML='<i class="fa fa-circle-o-notch fa-spin"></i>';
try {
// Select all images from previous steps
var imgs = document.getElementsByClassName("step-thumbnail");
var imgs = document.getElementsByClassName('step-thumbnail');
var imgSrcs = [];
@@ -135,7 +135,7 @@ window.onload = function() {
'gifHeight': imgs[0].height,
'images': imgSrcs,
'frameDuration': 7,
}
};
gifshot.createGIF(options, function(obj) {
if (!obj.error) {
@@ -143,21 +143,21 @@ window.onload = function() {
var image = obj.image;
var animatedImage = document.createElement('img');
animatedImage.id = "gif_element";
animatedImage.id = 'gif_element';
animatedImage.src = image;
var modal = $('#js-download-gif-modal');
$("#js-download-as-gif-button").one("click", function() {
$('#js-download-as-gif-button').one('click', function() {
// Trigger download
download(image, "index.gif", "image/gif");
download(image, 'index.gif', 'image/gif');
// Close modal
modal.modal('hide');
})
});
var gifContainer = document.getElementById("js-download-modal-gif-container");
var gifContainer = document.getElementById('js-download-modal-gif-container');
// Clear previous results
gifContainer.innerHTML = '';
@@ -186,16 +186,16 @@ window.onload = function() {
// image selection and drag/drop handling from examples/lib/imageSelection.js
sequencer.setInputStep({
dropZoneSelector: "#dropzone",
fileInputSelector: "#fileInput",
takePhotoSelector: "#take-photo",
dropZoneSelector: '#dropzone',
fileInputSelector: '#fileInput',
takePhotoSelector: '#take-photo',
onLoad: function onFileReaderLoad(progress) {
var reader = progress.target;
var step = sequencer.steps[0];
var util= intermediateHtmlStepUi(sequencer);
step.output.src = reader.result;
sequencer.run({ index: 0 });
if(typeof step.options !=="undefined")
if(typeof step.options !=='undefined')
step.options.step.imgElement.src = reader.result;
else
step.imgElement.src = reader.result;
@@ -206,7 +206,7 @@ window.onload = function() {
var step = sequencer.steps[0];
step.output.src = url;
sequencer.run({ index: 0 });
if(typeof step.options !=="undefined")
if(typeof step.options !=='undefined')
step.options.step.imgElement.src = url;
else
step.imgElement.src = url;
@@ -220,6 +220,6 @@ window.onload = function() {
if (urlHash.getUrlHashParameter('src')) {
insertPreview.updatePreviews(urlHash.getUrlHashParameter('src'),'#addStep');
} else {
insertPreview.updatePreviews("images/tulips.png",'#addStep');
insertPreview.updatePreviews('images/tulips.png','#addStep');
}
};

2
examples/images/IS-QR.js
View File

File diff suppressed because one or more lines are too long

2
examples/images/test.gif.js
View File

File diff suppressed because one or more lines are too long

2
examples/images/test.png.js
View File

File diff suppressed because one or more lines are too long

10
examples/lib/cache.js
View File

@@ -4,11 +4,11 @@ var setupCache = function() {
.then(function(registration) {
const installingWorker = registration.installing;
installingWorker.onstatechange = () => {
console.log(installingWorker)
console.log(installingWorker);
if (installingWorker.state === 'installed') {
location.reload();
}
}
};
console.log('Registration successful, scope is:', registration.scope);
})
.catch(function(error) {
@@ -19,12 +19,12 @@ var setupCache = function() {
if ('serviceWorker' in navigator) {
caches.keys().then(function(cacheNames) {
cacheNames.forEach(function(cacheName) {
$("#clear-cache").append(" " + cacheName);
$('#clear-cache').append(' ' + cacheName);
});
});
}
$("#clear-cache").click(function() {
$('#clear-cache').click(function() {
if ('serviceWorker' in navigator) {
caches.keys().then(function(cacheNames) {
cacheNames.forEach(function(cacheName) {
@@ -34,6 +34,6 @@ var setupCache = function() {
}
location.reload();
});
}
};
module.exports = setupCache;

44
examples/lib/defaultHtmlSequencerUi.js
View File

@@ -2,50 +2,50 @@ var urlHash = require('./urlHash.js');
function DefaultHtmlSequencerUi(_sequencer, options) {
options = options || {};
var addStepSel = options.addStepSel = options.addStepSel || "#addStep";
var removeStepSel = options.removeStepSel = options.removeStepSel || "button.remove";
var selectStepSel = options.selectStepSel = options.selectStepSel || "#selectStep";
var addStepSel = options.addStepSel = options.addStepSel || '#addStep';
var removeStepSel = options.removeStepSel = options.removeStepSel || 'button.remove';
var selectStepSel = options.selectStepSel = options.selectStepSel || '#selectStep';
function onLoad() {
importStepsFromUrlHash();
if ($('#selectStep').val()==='none')
$(addStepSel + " #add-step-btn").prop("disabled", true);
$(addStepSel + ' #add-step-btn').prop('disabled', true);
handleSaveSequence();
}
// look up needed steps from Url Hash:
function importStepsFromUrlHash() {
var hash = urlHash.getUrlHashParameter("steps");
var hash = urlHash.getUrlHashParameter('steps');
if (hash) {
_sequencer.importString(hash);
_sequencer.run({ index: 0 });
}
urlHash.setUrlHashParameter("steps", sequencer.toString());
urlHash.setUrlHashParameter('steps', sequencer.toString());
}
function selectNewStepUi() {
var m = $(addStepSel + " select").val();
var m = $(addStepSel + ' select').val();
if(!m) m = arguments[0];
$(addStepSel + " .info").html(_sequencer.modulesInfo(m).description);
$(addStepSel + " #add-step-btn").prop("disabled", false);
$(addStepSel + ' .info').html(_sequencer.modulesInfo(m).description);
$(addStepSel + ' #add-step-btn').prop('disabled', false);
}
function removeStepUi() {
var index = $(removeStepSel).index(this) + 1;
sequencer.removeSteps(index).run({ index: index - 1 });
// remove from URL hash too
urlHash.setUrlHashParameter("steps", sequencer.toString());
urlHash.setUrlHashParameter('steps', sequencer.toString());
//disable save-sequence button if all steps are removed
handleSaveSequence();
}
function addStepUi() {
if ($(addStepSel + " select").val() == "none") return;
if ($(addStepSel + ' select').val() == 'none') return;
var newStepName;
if(typeof arguments[0] !== "string")
newStepName = $(addStepSel + " select option").html().toLowerCase();
else newStepName = arguments[0]
if(typeof arguments[0] !== 'string')
newStepName = $(addStepSel + ' select option').html().toLowerCase();
else newStepName = arguments[0];
/*
@@ -56,28 +56,28 @@ function DefaultHtmlSequencerUi(_sequencer, options) {
var sequenceLength = 1;
if (sequencer.sequences[newStepName]) {
sequenceLength = sequencer.sequences[newStepName].length;
} else if (sequencer.modules[newStepName][1]["length"]) {
sequenceLength = sequencer.modules[newStepName][1]["length"];
} else if (sequencer.modules[newStepName][1]['length']) {
sequenceLength = sequencer.modules[newStepName][1]['length'];
}
_sequencer
.addSteps(newStepName, options)
.run({ index: _sequencer.steps.length - sequenceLength - 1 });
$(addStepSel + " .info").html("Select a new module to add to your sequence.");
$(addStepSel + " select").val("none");
$(addStepSel + ' .info').html('Select a new module to add to your sequence.');
$(addStepSel + ' select').val('none');
//enable save-sequence button if disabled initially
handleSaveSequence();
// add to URL hash too
urlHash.setUrlHashParameter("steps", _sequencer.toString())
urlHash.setUrlHashParameter('steps', _sequencer.toString());
}
function handleSaveSequence(){
var stepCount=sequencer.steps.length;
if(stepCount<2)
$(" #save-seq").prop("disabled", true);
$(' #save-seq').prop('disabled', true);
else
$(" #save-seq").prop("disabled", false);
$(' #save-seq').prop('disabled', false);
}
return {
@@ -86,7 +86,7 @@ function DefaultHtmlSequencerUi(_sequencer, options) {
selectNewStepUi: selectNewStepUi,
removeStepUi: removeStepUi,
addStepUi: addStepUi
}
};
}
module.exports = DefaultHtmlSequencerUi;

130
examples/lib/defaultHtmlStepUi.js
View File

@@ -16,8 +16,8 @@ var mapHtmlTypes = require('./mapHtmltypes');
function DefaultHtmlStepUi(_sequencer, options) {
options = options || {};
var stepsEl = options.stepsEl || document.querySelector("#steps");
var selectStepSel = options.selectStepSel = options.selectStepSel || "#selectStep";
var stepsEl = options.stepsEl || document.querySelector('#steps');
var selectStepSel = options.selectStepSel = options.selectStepSel || '#selectStep';
function onSetup(step, stepOptions) {
if (step.options && step.options.description)
@@ -39,7 +39,7 @@ function DefaultHtmlStepUi(_sequencer, options) {
<div class="row step">\
<div class="col-md-4 details container-fluid">\
<div class="cal collapse in"><p>' +
'<i>' + (step.description || "") + '</i>' +
'<i>' + (step.description || '') + '</i>' +
'</p></div>\
</div>\
<div class="col-md-8 cal collapse in step-column">\
@@ -65,10 +65,10 @@ function DefaultHtmlStepUi(_sequencer, options) {
var util = intermediateHtmlStepUi(_sequencer, step);
var parser = new DOMParser();
step.ui = parser.parseFromString(step.ui, "text/html");
step.ui = step.ui.querySelector("div.container-fluid");
step.linkElements = step.ui.querySelectorAll("a");
step.imgElement = step.ui.querySelector("a img.img-thumbnail");
step.ui = parser.parseFromString(step.ui, 'text/html');
step.ui = step.ui.querySelector('div.container-fluid');
step.linkElements = step.ui.querySelectorAll('a');
step.imgElement = step.ui.querySelector('a img.img-thumbnail');
if (_sequencer.modulesInfo().hasOwnProperty(step.name)) {
var inputs = _sequencer.modulesInfo(step.name).inputs;
@@ -77,16 +77,16 @@ function DefaultHtmlStepUi(_sequencer, options) {
for (var paramName in merged) {
var isInput = inputs.hasOwnProperty(paramName);
var html = "";
var html = '';
var inputDesc = isInput ? mapHtmlTypes(inputs[paramName]) : {};
if (!isInput) {
html += '<span class="output"></span>';
} else if (inputDesc.type.toLowerCase() == "select") {
} else if (inputDesc.type.toLowerCase() == 'select') {
html += '<select class="form-control target" name="' + paramName + '">';
for (var option in inputDesc.values) {
html += "<option>" + inputDesc.values[option] + "</option>";
html += '<option>' + inputDesc.values[option] + '</option>';
}
html += "</select>";
html += '</select>';
} else {
let paramVal = step.options[paramName] || inputDesc.default;
html =
@@ -97,9 +97,9 @@ function DefaultHtmlStepUi(_sequencer, options) {
'" value="' +
paramVal +
'" placeholder ="' +
(inputDesc.placeholder || "");
(inputDesc.placeholder || '');
if (inputDesc.type.toLowerCase() == "range") {
if (inputDesc.type.toLowerCase() == 'range') {
html +=
'"min="' +
inputDesc.min +
@@ -112,76 +112,76 @@ function DefaultHtmlStepUi(_sequencer, options) {
else html += '">';
}
var div = document.createElement("div");
div.className = "row";
div.setAttribute("name", paramName);
var div = document.createElement('div');
div.className = 'row';
div.setAttribute('name', paramName);
var description = inputs[paramName].desc || paramName;
div.innerHTML =
"<div class='det cal collapse in'>\
<label for='" +
'<div class=\'det cal collapse in\'>\
<label for=\'' +
paramName +
"'>" +
'\'>' +
description +
"</label>\
" +
'</label>\
' +
html +
"\
</div>";
step.ui.querySelector("div.details").appendChild(div);
'\
</div>';
step.ui.querySelector('div.details').appendChild(div);
}
$(step.ui.querySelector("div.panel-footer")).append(
$(step.ui.querySelector('div.panel-footer')).append(
'<div class="cal collapse in"><button type="submit" class="btn btn-sm btn-default btn-save" disabled = "true" >Apply</button> <small style="padding-top:2px;">Press apply to see changes</small></div>'
);
$(step.ui.querySelector("div.panel-footer")).prepend(
$(step.ui.querySelector('div.panel-footer')).prepend(
'<button class="pull-right btn btn-default btn-sm insert-step" >\
<span class="insert-text"><i class="fa fa-plus"></i> Insert Step</span><span class="no-insert-text" style="display:none">Close</span>\
</button>'
);
}
if (step.name != "load-image") {
if (step.name != 'load-image') {
step.ui
.querySelector("div.trash-container")
.querySelector('div.trash-container')
.prepend(
parser.parseFromString(tools, "text/html").querySelector("div")
parser.parseFromString(tools, 'text/html').querySelector('div')
);
$(step.ui.querySelectorAll(".remove")).on('click', function() {notify('Step Removed','remove-notification')});
$(step.ui.querySelectorAll(".insert-step")).on('click', function() { util.insertStep(step.ID) });
$(step.ui.querySelectorAll('.remove')).on('click', function() {notify('Step Removed','remove-notification');});
$(step.ui.querySelectorAll('.insert-step')).on('click', function() { util.insertStep(step.ID); });
// Insert the step's UI in the right place
if (stepOptions.index == _sequencer.steps.length) {
stepsEl.appendChild(step.ui);
$("#steps .step-container:nth-last-child(1) .insert-step").prop('disabled',true);
if($("#steps .step-container:nth-last-child(2)"))
$("#steps .step-container:nth-last-child(2) .insert-step").prop('disabled',false);
$('#steps .step-container:nth-last-child(1) .insert-step').prop('disabled',true);
if($('#steps .step-container:nth-last-child(2)'))
$('#steps .step-container:nth-last-child(2) .insert-step').prop('disabled',false);
} else {
stepsEl.insertBefore(step.ui, $(stepsEl).children()[stepOptions.index]);
}
}
else {
$("#load-image").append(step.ui);
$('#load-image').append(step.ui);
}
$(step.ui.querySelector(".toggle")).on("click", () => {
$(step.ui.querySelector('.toggle')).on('click', () => {
$(step.ui.querySelector('.toggleIcon')).toggleClass('rotated');
$(step.ui.querySelectorAll(".cal")).collapse('toggle');
$(step.ui.querySelectorAll('.cal')).collapse('toggle');
});
$(step.imgElement).on("mousemove", _.debounce(() => imageHover(step), 150));
$(step.imgElement).on('mousemove', _.debounce(() => imageHover(step), 150));
function saveOptions(e) {
e.preventDefault();
if (optionsChanged){
$(step.ui.querySelector("div.details"))
.find("input,select")
$(step.ui.querySelector('div.details'))
.find('input,select')
.each(function(i, input) {
$(input)
.data('initValue', $(input).val())
.data('hasChangedBefore', false);
step.options[$(input).attr("name")] = $(input).val();
step.options[$(input).attr('name')] = $(input).val();
});
_sequencer.run({ index: step.index - 1 });
// modify the url hash
urlHash.setUrlHashParameter("steps", _sequencer.toString())
urlHash.setUrlHashParameter('steps', _sequencer.toString());
// disable the save button
$(step.ui.querySelector('.btn-save')).prop('disabled', true);
optionsChanged = false;
@@ -215,31 +215,31 @@ function DefaultHtmlStepUi(_sequencer, options) {
$(this).data('initValue'),
$(this).data('hasChangedBefore')
)
)
})
})
);
});
});
$('input[type="range"]').on('input', function() {
$(this).next().html($(this).val());
})
});
}
function onDraw(step) {
$(step.ui.querySelector(".load")).show();
$(step.ui.querySelector("img")).hide();
$(step.ui.querySelectorAll(".load-spin")).show();
$(step.ui.querySelector('.load')).show();
$(step.ui.querySelector('img')).hide();
$(step.ui.querySelectorAll('.load-spin')).show();
}
function onComplete(step) {
$(step.ui.querySelector("img")).show();
$(step.ui.querySelectorAll(".load-spin")).hide();
$(step.ui.querySelector(".load")).hide();
$(step.ui.querySelector('img')).show();
$(step.ui.querySelectorAll('.load-spin')).hide();
$(step.ui.querySelector('.load')).hide();
step.imgElement.src = (step.name == "load-image") ? step.output.src : step.output;
var imgthumbnail = step.ui.querySelector(".img-thumbnail");
step.imgElement.src = (step.name == 'load-image') ? step.output.src : step.output;
var imgthumbnail = step.ui.querySelector('.img-thumbnail');
for (let index = 0; index < step.linkElements.length; index++) {
if (step.linkElements[index].contains(imgthumbnail))
step.linkElements[index].href = step.imgElement.src;
@@ -247,13 +247,13 @@ function DefaultHtmlStepUi(_sequencer, options) {
// TODO: use a generalized version of this
function fileExtension(output) {
return output.split("/")[1].split(";")[0];
return output.split('/')[1].split(';')[0];
}
for (let index = 0; index < step.linkElements.length; index++) {
step.linkElements[index].download = step.name + "." + fileExtension(step.imgElement.src);
step.linkElements[index].target = "_blank";
step.linkElements[index].download = step.name + '.' + fileExtension(step.imgElement.src);
step.linkElements[index].target = '_blank';
}
// fill inputs with stored step options
@@ -262,11 +262,11 @@ function DefaultHtmlStepUi(_sequencer, options) {
var outputs = _sequencer.modulesInfo(step.name).outputs;
for (var i in inputs) {
if (step.options[i] !== undefined) {
if (inputs[i].type.toLowerCase() === "input")
if (inputs[i].type.toLowerCase() === 'input')
$(step.ui.querySelector('div[name="' + i + '"] input'))
.val(step.options[i])
.data('initValue', step.options[i]);
if (inputs[i].type.toLowerCase() === "select")
if (inputs[i].type.toLowerCase() === 'select')
$(step.ui.querySelector('div[name="' + i + '"] select'))
.val(step.options[i])
.data('initValue', step.options[i]);
@@ -295,13 +295,13 @@ function DefaultHtmlStepUi(_sequencer, options) {
var xPos = e.pageX - offset.left;
var yPos = e.pageY - offset.top;
var myData = context.getImageData(xPos, yPos, 1, 1);
img[0].title = "rgb: " +myData.data[0]+","+ myData.data[1]+","+myData.data[2];//+ rgbdata;
img[0].title = 'rgb: ' +myData.data[0]+','+ myData.data[1]+','+myData.data[2];//+ rgbdata;
});
}
function onRemove(step) {
step.ui.remove();
$("#steps .step-container:nth-last-child(1) .insert-step").prop('disabled',true);
$('#steps .step-container:nth-last-child(1) .insert-step').prop('disabled',true);
$('div[class*=imgareaselect-]').remove();
}
@@ -314,7 +314,7 @@ function DefaultHtmlStepUi(_sequencer, options) {
var notification = document.createElement('span');
notification.innerHTML = ' <i class="fa fa-info-circle" aria-hidden="true"></i> ' + msg ;
notification.id = id;
notification.classList.add("notification");
notification.classList.add('notification');
$('body').append(notification);
}
@@ -331,13 +331,13 @@ function DefaultHtmlStepUi(_sequencer, options) {
onDraw: onDraw,
notify: notify,
imageHover: imageHover
}
};
}
if(typeof window === "undefined"){
if(typeof window === 'undefined'){
module.exports={
DefaultHtmlStepUi: DefaultHtmlStepUi
}
};
}
module.exports = DefaultHtmlStepUi;

34
examples/lib/insertPreview.js
View File

@@ -3,11 +3,11 @@ function generatePreview(previewStepName, customValues, path, selector) {
var previewSequencer = ImageSequencer();
function insertPreview(src) {
var img = document.createElement('img');
img.classList.add('img-thumbnail')
img.classList.add('img-thumbnail');
img.classList.add('no-border');
img.src = src;
$(img).css("max-width", "200%");
$(img).css("transform", "translateX(-20%)");
$(img).css('max-width', '200%');
$(img).css('transform', 'translateX(-20%)');
$(selector + ' .radio-group').find('div').each(function() {
if ($(this).find('div').attr('data-value') === previewStepName) {
$(this).find('div').append(img);
@@ -16,7 +16,7 @@ function generatePreview(previewStepName, customValues, path, selector) {
}
function loadPreview() {
if (previewStepName === "crop") {
if (previewStepName === 'crop') {
previewSequencer.addSteps(previewStepName, customValues).run(insertPreview);
}
else {
@@ -30,19 +30,19 @@ function generatePreview(previewStepName, customValues, path, selector) {
$(selector+' img').remove();
var previewSequencerSteps = {
"resize": "125%",
"brightness": "175",
"saturation": "0.5",
"rotate": 90,
"contrast": 90,
"crop": {
"x": 0,
"y": 0,
"w": "(50%)",
"h": "(50%)",
"noUI": true
}
'resize': '125%',
'brightness': '175',
'saturation': '0.5',
'rotate': 90,
'contrast': 90,
'crop': {
'x': 0,
'y': 0,
'w': '(50%)',
'h': '(50%)',
'noUI': true
}
};
Object.keys(previewSequencerSteps).forEach(function (step, index) {
generatePreview(step, Object.values(previewSequencerSteps)[index], src, selector);
@@ -52,4 +52,4 @@ function generatePreview(previewStepName, customValues, path, selector) {
module.exports = {
generatePreview : generatePreview,
updatePreviews : updatePreviews
}
};

40
examples/lib/intermediateHtmlStepUi.js
View File

@@ -66,35 +66,35 @@ function IntermediateHtmlStepUi(_sequencer, step, options) {
function selectNewStepUi() {
var insertSelect = $(step.ui.querySelector('.insert-step-select'))
var insertSelect = $(step.ui.querySelector('.insert-step-select'));
var m = insertSelect.val();
$(step.ui.querySelector('.insertDiv .info')).html(_sequencer.modulesInfo(m).description);
$(step.ui.querySelector('.insertDiv .add-step-btn')).prop("disabled", false);
$(step.ui.querySelector('.insertDiv .add-step-btn')).prop('disabled', false);
}
var toggleDiv = function(callback = function(){}){
$(step.ui.querySelector('.insertDiv')).collapse('toggle');
if ($(step.ui.querySelector('.insert-text')).css('display') != "none"){
$(step.ui.querySelector('.insert-text')).fadeToggle(200, function(){$(step.ui.querySelector('.no-insert-text')).fadeToggle(200, callback)})
if ($(step.ui.querySelector('.insert-text')).css('display') != 'none'){
$(step.ui.querySelector('.insert-text')).fadeToggle(200, function(){$(step.ui.querySelector('.no-insert-text')).fadeToggle(200, callback);});
}
else {
$(step.ui.querySelector('.no-insert-text')).fadeToggle(200, function(){$(step.ui.querySelector('.insert-text')).fadeToggle(200, callback)})
}
$(step.ui.querySelector('.no-insert-text')).fadeToggle(200, function(){$(step.ui.querySelector('.insert-text')).fadeToggle(200, callback);});
}
};
insertStep = function (id) {
var modulesInfo = _sequencer.modulesInfo();
var parser = new DOMParser();
var addStepUI = stepUI();
addStepUI = parser.parseFromString(addStepUI, "text/html").querySelector("div")
addStepUI = parser.parseFromString(addStepUI, 'text/html').querySelector('div');
if ($(step.ui.querySelector('.insertDiv')).length > 0){
toggleDiv();
}
else {
step.ui
.querySelector("div.step")
.querySelector('div.step')
.insertAdjacentElement('afterend',
addStepUI
);
@@ -103,15 +103,15 @@ function IntermediateHtmlStepUi(_sequencer, step, options) {
});
}
$(step.ui.querySelector('.insertDiv .close-insert-box')).off('click').on('click', function(){toggleDiv(function(){})});
$(step.ui.querySelector('.insertDiv .close-insert-box')).off('click').on('click', function(){toggleDiv(function(){});});
var insertStepSelect = $(step.ui.querySelector('.insert-step-select'));
insertStepSelect.html("");
insertStepSelect.html('');
// Add modules to the insertStep dropdown
for (var m in modulesInfo) {
if (modulesInfo[m] !== undefined)
insertStepSelect.append(
'<option value="' + m + '">' + modulesInfo[m].name + "</option>"
'<option value="' + m + '">' + modulesInfo[m].name + '</option>'
);
}
insertStepSelect.selectize({
@@ -120,7 +120,7 @@ function IntermediateHtmlStepUi(_sequencer, step, options) {
$(step.ui.querySelector('.inserDiv .add-step-btn')).prop('disabled', true);
insertStepSelect.append('<option value="" disabled selected>Select a Module</option>');
$(step.ui.querySelector('.insertDiv .radio-group .radio')).on("click", function () {
$(step.ui.querySelector('.insertDiv .radio-group .radio')).on('click', function () {
$(this).parent().find('.radio').removeClass('selected');
$(this).addClass('selected');
newStep = $(this).attr('data-value');
@@ -130,34 +130,34 @@ function IntermediateHtmlStepUi(_sequencer, step, options) {
$(this).removeClass('selected');
});
insertStepSelect.on('change', selectNewStepUi);
$(step.ui.querySelector('.insertDiv .add-step-btn')).on('click', function () { insert(id) });
}
$(step.ui.querySelector('.insertDiv .add-step-btn')).on('click', function () { insert(id); });
};
function insert(id) {
options = options || {};
var insertStepSelect = $(step.ui.querySelector('.insert-step-select'));
if (insertStepSelect.val() == "none") return;
if (insertStepSelect.val() == 'none') return;
var newStepName = insertStepSelect.val()
var newStepName = insertStepSelect.val();
toggleDiv();
var sequenceLength = 1;
if (sequencer.sequences[newStepName]) {
sequenceLength = sequencer.sequences[newStepName].length;
} else if (sequencer.modules[newStepName][1]["length"]) {
sequenceLength = sequencer.modules[newStepName][1]["length"];
} else if (sequencer.modules[newStepName][1]['length']) {
sequenceLength = sequencer.modules[newStepName][1]['length'];
}
_sequencer
.insertSteps(id + 1, newStepName).run({ index: id });
// add to URL hash too
urlHash.setUrlHashParameter("steps", _sequencer.toString());
urlHash.setUrlHashParameter('steps', _sequencer.toString());
}
return {
insertStep
}
};
}
module.exports = IntermediateHtmlStepUi;

2
examples/lib/urlHash.js
View File

@@ -46,4 +46,4 @@ module.exports = {
setUrlHashParameter: setUrlHashParameter,
getUrlHashParameters: getUrlHashParameters,
setUrlHashParameters: setUrlHashParameters
}
};

2
examples/sw.js
View File

@@ -25,7 +25,7 @@ self.addEventListener('fetch', function(event) {
caches.open(staticCacheName).then(function(cache) {
return cache.match(event.request).then(function (response) {
return response || fetch(event.request).then(function(response) {
if(event.request.method == "GET")
if(event.request.method == 'GET')
cache.put(event.request, response.clone());
return response;
});

50
index.js
View File

@@ -2,13 +2,13 @@
require('./src/ImageSequencer');
sequencer = ImageSequencer({ ui: false });
var fs = require('fs')
var fs = require('fs');
var program = require('commander');
var utils = require('./src/CliUtils')
var utils = require('./src/CliUtils');
var saveSequence = require('./src/cli/saveSequence.js')
var installModule = require('./src/cli/installModule.js')
var sequencerSteps = require('./src/cli/sequencerSteps.js')
var saveSequence = require('./src/cli/saveSequence.js');
var installModule = require('./src/cli/installModule.js');
var sequencerSteps = require('./src/cli/sequencerSteps.js');
function exit(message) {
console.error(message);
@@ -16,39 +16,39 @@ function exit(message) {
}
program
.version("0.1.0")
.option("-i, --image [PATH/URL]", "Input image URL")
.option("-s, --step [step-name]", "Name of the step to be added.")
.option("-o, --output [PATH]", "Directory where output will be stored.")
.option("-b, --basic", "Basic mode outputs only final image")
.option("-c, --config [Object]", "Options for the step")
.option("--save-sequence [string]", "Name space separated with Stringified sequence")
.option('--install-module [string]', "Module name space seaprated npm package name")
.version('0.1.0')
.option('-i, --image [PATH/URL]', 'Input image URL')
.option('-s, --step [step-name]', 'Name of the step to be added.')
.option('-o, --output [PATH]', 'Directory where output will be stored.')
.option('-b, --basic', 'Basic mode outputs only final image')
.option('-c, --config [Object]', 'Options for the step')
.option('--save-sequence [string]', 'Name space separated with Stringified sequence')
.option('--install-module [string]', 'Module name space seaprated npm package name')
.parse(process.argv);
if (program.saveSequence) saveSequence(program, sequencer)
if (program.saveSequence) saveSequence(program, sequencer);
else if (program.installModule) installModule(program, sequencer)
else if (program.installModule) installModule(program, sequencer);
else {
// Parse step into an array to allow for multiple steps.
if (!program.step) exit("No steps passed");
program.step = program.step.split(" ");
if (!program.step) exit('No steps passed');
program.step = program.step.split(' ');
// User must input an image.
if (!program.image) exit("Can't read file.");
if (!program.image) exit('Can\'t read file.');
// User must input an image.
fs.access(program.image, function(err) {
if (err) exit("Can't read file.");
if (err) exit('Can\'t read file.');
});
// User must input a step. If steps exist, check that every step is a valid step.
if (!program.step || !(utils.validateSteps(program.step, sequencer)))
exit("Please ensure all steps are valid.");
exit('Please ensure all steps are valid.');
// If there's no user defined output directory, select a default directory.
program.output = program.output || "./output/";
program.output = program.output || './output/';
// Set sequencer to log module outputs, if any.
sequencer.setUI({
@@ -57,7 +57,7 @@ else {
step.info = sequencer.modulesInfo(step.name);
for (var output in step.info.outputs) {
console.log("[" + program.step + "]: " + output + " = " + step[output]);
console.log('[' + program.step + ']: ' + output + ' = ' + step[output]);
}
},
notify: function(msg) {
@@ -68,8 +68,8 @@ else {
// Finally, if everything is alright, load the image, add the steps and run the sequencer.
sequencer.loadImages(program.image, function() {
console.warn(
"\x1b[33m%s\x1b[0m",
"Please wait \n output directory generated will be empty until the execution is complete"
'\x1b[33m%s\x1b[0m',
'Please wait \n output directory generated will be empty until the execution is complete'
);
//Generate the Output Directory
@@ -82,7 +82,7 @@ else {
outputFilename = null;
}
sequencerSteps(program, sequencer, outputFilename)
sequencerSteps(program, sequencer, outputFilename);
});

1895
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

27
package.json
View File

@@ -5,11 +5,17 @@
"main": "src/ImageSequencer.js",
"scripts": {
"debug": "TEST=true node ./index.js -i ./examples/images/monarch.png -s invert",
"test": "TEST=true istanbul cover tape test/core/*.js test/core/ui/user-interface.js test/core/modules/canvas-resize.js test/core/modules/QR.js test/core/modules/crop.js | tap-spec; browserify test/core/modules/image-sequencer.js test/core/modules/chain.js test/core/modules/meta-modules.js test/core/modules/replace.js test/core/modules/import-export.js test/core/modules/run.js test/core/modules/dynamic-imports.js test/core/util/parse-input.js test/core/modules/benchmark.js| tape-run --render=\"tap-spec\"",
"test": "TEST=true istanbul cover tape test/core/*.js test/core/ui/user-interface.js test/core/modules/*.js | tap-spec; browserify test/core/sequencer/image-sequencer.js test/core/sequencer/chain.js test/core/sequencer/meta-modules.js test/core/sequencer/replace.js test/core/sequencer/import-export.js test/core/sequencer/run.js test/core/sequencer/dynamic-imports.js test/core/util/*.js test/core/sequencer/benchmark.js | tape-run --render=\"tap-spec\"",
"test-ui": "jasmine test/spec/*.js",
"setup": "npm i && npm i -g grunt grunt-cli && grunt build",
"start": "grunt serve"
},
"lint-staged": {
"*.js": [
"./node_modules/.bin/eslint --fix",
"git add"
]
},
"repository": {
"type": "git",
"url": "git+https://github.com/publiclab/image-sequencer.git"
@@ -24,17 +30,20 @@
"url": "https://github.com/publiclab/image-sequencer/issues"
},
"dependencies": {
"base64-img": "^1.0.4",
"bootstrap": "~3.4.0",
"buffer": "~5.2.1",
"commander": "^2.11.0",
"data-uri-to-buffer": "^2.0.0",
"downloadjs": "^1.4.7",
"eslint": "^5.16.0",
"fisheyegl": "^0.1.2",
"font-awesome": "~4.7.0",
"geotiff": "^1.0.0-beta.6",
"get-pixels": "~3.3.0",
"gifshot": "^0.4.5",
"glfx": "0.0.4",
"gpu.js": "^2.0.0-rc.12",
"image-sequencer-invert": "^1.0.0",
"imagejs": "0.0.9",
"imgareaselect": "git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2",
@@ -44,7 +53,6 @@
"jsqr": "^1.1.1",
"lodash": "^4.17.11",
"ndarray": "^1.0.18",
"ndarray-gaussian-filter": "^1.0.0",
"ora": "^3.0.0",
"pace": "0.0.4",
"puppeteer": "^1.14.0",
@@ -56,26 +64,37 @@
"webgl-distort": "0.0.2"
},
"devDependencies": {
"base64-img": "^1.0.4",
"@babel/core": "^7.4.3",
"@babel/plugin-proposal-object-rest-spread": "^7.4.3",
"@babel/plugin-syntax-object-rest-spread": "^7.2.0",
"babelify": "^10.0.0",
"browserify": "16.2.3",
"eslint": "^5.16.0",
"grunt": "^1.0.3",
"grunt-browser-sync": "^2.2.0",
"grunt-browserify": "^5.0.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-uglify-es": "^3.3.0",
"grunt-contrib-watch": "^1.1.0",
"husky": "^2.2.0",
"image-filter-core": "~2.0.2",
"image-filter-threshold": "~2.0.1",
"jasmine-core": "^3.3.0",
"jasmine-jquery": "^2.1.1",
"jasmine-spec-reporter": "^4.2.1",
"lint-staged": "^8.1.6",
"looks-same": "^7.0.0",
"matchdep": "^2.0.0",
"tap-spec": "^5.0.0",
"tape": "^4.9.2",
"tape-run": "^5.0.0",
"tape-run": "^6.0.0",
"uglify-es": "^3.3.7"
},
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"homepage": "https://sequencer.publiclab.org",
"bin": {
"sequencer": "./index.js"

50
spec/defaultHtmlSequencerUi.spec.js
View File

@@ -1,42 +1,42 @@
describe('Default sequencer HTML', function() {
var DefaultHtmlSequencerUi = require('../examples/lib/defaultHtmlSequencerUi')
var sequencer = require('../src/ImageSequencer')()
var DefaultHtmlSequencerUi = require('../examples/lib/defaultHtmlSequencerUi');
var sequencer = require('../src/ImageSequencer')();
var defaultHtmlSequencerUi;
beforeEach(()=>{
defaultHtmlSequencerUi = new DefaultHtmlSequencerUi(sequencer)
defaultHtmlSequencerUi = new DefaultHtmlSequencerUi(sequencer);
spyOn(defaultHtmlSequencerUi,'onLoad')
spyOn(defaultHtmlSequencerUi,'selectNewStepUi')
spyOn(defaultHtmlSequencerUi,'removeStepUi')
spyOn(defaultHtmlSequencerUi,'addStepUi')
spyOn(defaultHtmlSequencerUi,'importStepsFromUrlHash')
spyOn(defaultHtmlSequencerUi,'onLoad');
spyOn(defaultHtmlSequencerUi,'selectNewStepUi');
spyOn(defaultHtmlSequencerUi,'removeStepUi');
spyOn(defaultHtmlSequencerUi,'addStepUi');
spyOn(defaultHtmlSequencerUi,'importStepsFromUrlHash');
defaultHtmlSequencerUi.onLoad()
defaultHtmlSequencerUi.selectNewStepUi()
defaultHtmlSequencerUi.addStepUi()
defaultHtmlSequencerUi.removeStepUi()
defaultHtmlSequencerUi.importStepsFromUrlHash()
})
defaultHtmlSequencerUi.onLoad();
defaultHtmlSequencerUi.selectNewStepUi();
defaultHtmlSequencerUi.addStepUi();
defaultHtmlSequencerUi.removeStepUi();
defaultHtmlSequencerUi.importStepsFromUrlHash();
});
it('load default ui', function() {
expect(defaultHtmlSequencerUi.onLoad).toHaveBeenCalled()
})
expect(defaultHtmlSequencerUi.onLoad).toHaveBeenCalled();
});
it('select step ui', function() {
expect(defaultHtmlSequencerUi.selectNewStepUi).toHaveBeenCalled()
})
expect(defaultHtmlSequencerUi.selectNewStepUi).toHaveBeenCalled();
});
it('add step ui', function() {
expect(defaultHtmlSequencerUi.addStepUi).toHaveBeenCalled()
})
expect(defaultHtmlSequencerUi.addStepUi).toHaveBeenCalled();
});
it('remove step ui', function() {
expect(defaultHtmlSequencerUi.removeStepUi).toHaveBeenCalled()
})
expect(defaultHtmlSequencerUi.removeStepUi).toHaveBeenCalled();
});
it('import options from url', function() {
expect(defaultHtmlSequencerUi.importStepsFromUrlHash).toHaveBeenCalled()
})
})
expect(defaultHtmlSequencerUi.importStepsFromUrlHash).toHaveBeenCalled();
});
});

68
spec/defaultHtmlStepUi.spec.js
View File

@@ -1,61 +1,61 @@
var { JSDOM } = require('jsdom');
var DOM = new JSDOM(`<body></body>`);
var DOM = new JSDOM('<body></body>');
global.document = DOM.window.document;
describe('Sequencer step HTML', function() {
var DefaultHtmlStepUi = require('../examples/lib/defaultHtmlStepUi')
var sequencer = require('../src/ImageSequencer')()
var DefaultHtmlStepUi = require('../examples/lib/defaultHtmlStepUi');
var sequencer = require('../src/ImageSequencer')();
var defaultHtmlStepUi;
var step = 'brightness'
var step = 'brightness';
var options = {
name: "Brightness",
description: "Change the brightness of the image by given percent value"
}
name: 'Brightness',
description: 'Change the brightness of the image by given percent value'
};
// options = JSON.parse(options)
beforeEach(()=>{
defaultHtmlStepUi = new DefaultHtmlStepUi(sequencer)
defaultHtmlStepUi = new DefaultHtmlStepUi(sequencer);
spyOn(defaultHtmlStepUi,'getPreview')
spyOn(defaultHtmlStepUi,'onSetup')
spyOn(defaultHtmlStepUi,'onComplete')
spyOn(defaultHtmlStepUi,'onDraw')
spyOn(defaultHtmlStepUi,'onRemove')
spyOn(defaultHtmlStepUi,'notify')
spyOn(defaultHtmlStepUi,'getPreview');
spyOn(defaultHtmlStepUi,'onSetup');
spyOn(defaultHtmlStepUi,'onComplete');
spyOn(defaultHtmlStepUi,'onDraw');
spyOn(defaultHtmlStepUi,'onRemove');
spyOn(defaultHtmlStepUi,'notify');
defaultHtmlStepUi.getPreview()
defaultHtmlStepUi.onSetup(step,options)
defaultHtmlStepUi.onComplete(step)
defaultHtmlStepUi.onDraw(step)
defaultHtmlStepUi.onRemove(step)
defaultHtmlStepUi.notify('Step removed','remove-notification')
})
defaultHtmlStepUi.getPreview();
defaultHtmlStepUi.onSetup(step,options);
defaultHtmlStepUi.onComplete(step);
defaultHtmlStepUi.onDraw(step);
defaultHtmlStepUi.onRemove(step);
defaultHtmlStepUi.notify('Step removed','remove-notification');
});
it('result preview ui', function() {
expect(defaultHtmlStepUi.getPreview).toHaveBeenCalled()
})
expect(defaultHtmlStepUi.getPreview).toHaveBeenCalled();
});
it('load initial setup ui', function() {
expect(defaultHtmlStepUi.onSetup).toHaveBeenCalledWith(step,options)
})
expect(defaultHtmlStepUi.onSetup).toHaveBeenCalledWith(step,options);
});
it('load completion ui', function() {
expect(defaultHtmlStepUi.onComplete).toHaveBeenCalledWith(step)
})
expect(defaultHtmlStepUi.onComplete).toHaveBeenCalledWith(step);
});
it('draw step ui', function() {
expect(defaultHtmlStepUi.onDraw).toHaveBeenCalledWith(step)
})
expect(defaultHtmlStepUi.onDraw).toHaveBeenCalledWith(step);
});
it('remove step ui', function() {
expect(defaultHtmlStepUi.onRemove).toHaveBeenCalledWith(step)
})
expect(defaultHtmlStepUi.onRemove).toHaveBeenCalledWith(step);
});
it('notification ui', function() {
expect(defaultHtmlStepUi.notify).toHaveBeenCalledWith('Step removed','remove-notification')
})
expect(defaultHtmlStepUi.notify).toHaveBeenCalledWith('Step removed','remove-notification');
});
})
});

28
spec/insertPreview.spec.js
View File

@@ -1,26 +1,26 @@
describe('Preview UI HTML', function() {
var InsertPreview = require('../examples/lib/insertPreview')
var sequencer = require('../src/ImageSequencer')()
var InsertPreview = require('../examples/lib/insertPreview');
var sequencer = require('../src/ImageSequencer')();
var insertPreview;
var options = { brightness: 50 }
var options = { brightness: 50 };
beforeEach(()=>{
insertPreview = InsertPreview
insertPreview = InsertPreview;
spyOn(insertPreview,'generatePreview')
spyOn(insertPreview,'updatePreviews')
spyOn(insertPreview,'generatePreview');
spyOn(insertPreview,'updatePreviews');
insertPreview.generatePreview('brightness',options,'src','selector')
insertPreview.updatePreviews('src','selector')
})
insertPreview.generatePreview('brightness',options,'src','selector');
insertPreview.updatePreviews('src','selector');
});
it('generate preview ui', function() {
expect(insertPreview.generatePreview).toHaveBeenCalledWith('brightness',options,'src','selector')
})
expect(insertPreview.generatePreview).toHaveBeenCalledWith('brightness',options,'src','selector');
});
it('update preview ui', function() {
expect(insertPreview.updatePreviews).toHaveBeenCalledWith('src','selector')
})
expect(insertPreview.updatePreviews).toHaveBeenCalledWith('src','selector');
});
})
});

18
spec/intermediateHtmlStepUi.spec.js
View File

@@ -1,19 +1,19 @@
describe('Intermediate step HTML', function() {
var IntermediateHtmlStepUi = require('../examples/lib/intermediateHtmlStepUi')
var sequencer = require('../src/ImageSequencer')()
var IntermediateHtmlStepUi = require('../examples/lib/intermediateHtmlStepUi');
var sequencer = require('../src/ImageSequencer')();
var intermediateHtmlStepUi;
beforeEach(()=>{
intermediateHtmlStepUi = new IntermediateHtmlStepUi(sequencer)
intermediateHtmlStepUi = new IntermediateHtmlStepUi(sequencer);
spyOn(intermediateHtmlStepUi,'insertStep')
spyOn(intermediateHtmlStepUi,'insertStep');
intermediateHtmlStepUi.insertStep()
})
intermediateHtmlStepUi.insertStep();
});
it('insert step ui', function() {
expect(intermediateHtmlStepUi.insertStep).toHaveBeenCalled()
})
expect(intermediateHtmlStepUi.insertStep).toHaveBeenCalled();
});
})
});

42
spec/urlHash.spec.js
View File

@@ -1,40 +1,40 @@
describe('URL manipulation methods', function() {
var UrlHash = require('../examples/lib/urlHash')
var UrlHash = require('../examples/lib/urlHash');
var urlHash;
var params = {
module: 'brightness',
brightness: 50
}
};
beforeEach(()=>{
urlHash = UrlHash
urlHash = UrlHash;
spyOn(urlHash,'getUrlHashParameters')
spyOn(urlHash,'getUrlHashParameter')
spyOn(urlHash,'setUrlHashParameters')
spyOn(urlHash,'setUrlHashParameter')
spyOn(urlHash,'getUrlHashParameters');
spyOn(urlHash,'getUrlHashParameter');
spyOn(urlHash,'setUrlHashParameters');
spyOn(urlHash,'setUrlHashParameter');
urlHash.getUrlHashParameters()
urlHash.getUrlHashParameter('module')
urlHash.setUrlHashParameters(params)
urlHash.setUrlHashParameter('module','brightness')
})
urlHash.getUrlHashParameters();
urlHash.getUrlHashParameter('module');
urlHash.setUrlHashParameters(params);
urlHash.setUrlHashParameter('module','brightness');
});
it('gets url hash params from window hash', function() {
expect(urlHash.getUrlHashParameters).toHaveBeenCalled()
})
expect(urlHash.getUrlHashParameters).toHaveBeenCalled();
});
it('gets url hash param from params object', function() {
expect(urlHash.getUrlHashParameter).toHaveBeenCalledWith('module')
})
expect(urlHash.getUrlHashParameter).toHaveBeenCalledWith('module');
});
it('accepts param object and sets url hash params', function() {
expect(urlHash.setUrlHashParameters).toHaveBeenCalledWith(params)
})
expect(urlHash.setUrlHashParameters).toHaveBeenCalledWith(params);
});
it('accepts param key-value pair and sets url hash params', function() {
expect(urlHash.setUrlHashParameter).toHaveBeenCalledWith('module','brightness')
})
expect(urlHash.setUrlHashParameter).toHaveBeenCalledWith('module','brightness');
});
})
});

10
src/CliUtils.js
View File

@@ -1,4 +1,4 @@
var fs = require('fs')
var fs = require('fs');
/*
* This function checks if the directory exists, if not it creates one on the given path
@@ -10,9 +10,9 @@ function makedir(path,callback){
if(err) callback(err);
callback();
});
else callback()
else callback();
});
};
}
// Takes an array of steps and checks if they are valid steps for the sequencer.
function validateSteps(steps, sequencer) {
@@ -37,7 +37,7 @@ function validateConfig(config_, options_) {
for (var input in options_) {
if (!config_[options_[input]]) {
console.error(
"\x1b[31m%s\x1b[0m",
'\x1b[31m%s\x1b[0m',
`Options Object does not have the required details "${
options_[input]
}" not specified. Fallback case activated`
@@ -55,4 +55,4 @@ module.exports = exports = {
makedir: makedir,
validateSteps: validateSteps,
validateConfig: validateConfig
}
};

16
src/ExportBin.js
View File

@@ -2,7 +2,7 @@ var fs = require('fs');
var getDirectories = function(rootDir, cb) {
fs.readdir(rootDir, function(err, files) {
var dirs = [];
if (typeof (files) == "undefined" || files.length == 0) {
if (typeof (files) == 'undefined' || files.length == 0) {
cb(dirs);
return [];
}
@@ -21,15 +21,15 @@ var getDirectories = function(rootDir, cb) {
}
}
});
}
};
module.exports = function ExportBin(dir = "./output/", ref, basic, filename) {
module.exports = function ExportBin(dir = './output/', ref, basic, filename) {
// If user did not give an output filename so we can continue without doing anything
dir = (dir[dir.length - 1] == "/") ? dir : dir + "/";
dir = (dir[dir.length - 1] == '/') ? dir : dir + '/';
if (ref.options.inBrowser) return false;
fs.access(dir, function(err) {
if (err) console.error(err)
if (err) console.error(err);
});
if (filename && basic) {
var steps = ref.steps;
@@ -53,17 +53,17 @@ module.exports = function ExportBin(dir = "./output/", ref, basic, filename) {
var datauri = steps.slice(-1)[0].output.src;
var ext = steps.slice(-1)[0].output.format;
var buffer = require('data-uri-to-buffer')(datauri);
fs.writeFile(root + "image" + "_" + (steps.length - 1) + "." + ext, buffer, function() { });
fs.writeFile(root + 'image' + '_' + (steps.length - 1) + '.' + ext, buffer, function() { });
}
else {
for (var i in steps) {
var datauri = steps[i].output.src;
var ext = steps[i].output.format;
var buffer = require('data-uri-to-buffer')(datauri);
fs.writeFile(root + "image" + "_" + i + "." + ext, buffer, function() { });
fs.writeFile(root + 'image' + '_' + i + '.' + ext, buffer, function() { });
}
}
});
});
}
}
};

48
src/FormatInput.js
View File

@@ -1,5 +1,5 @@
function objTypeOf(object){
return Object.prototype.toString.call(object).split(" ")[1].slice(0,-1)
return Object.prototype.toString.call(object).split(' ')[1].slice(0,-1);
}
function getPrimitive(object){
@@ -7,13 +7,13 @@ function getPrimitive(object){
}
function makeArray(input) {
return (objTypeOf(input)=="Array")?input:[input];
return (objTypeOf(input)=='Array')?input:[input];
}
function copy(a) {
if (!typeof(a) == "object") return a;
if (objTypeOf(a) == "Array") return a.slice();
if (objTypeOf(a) == "Object") {
if (!typeof(a) == 'object') return a;
if (objTypeOf(a) == 'Array') return a.slice();
if (objTypeOf(a) == 'Object') {
var b = {};
for (var v in a) {
b[v] = copy(a[v]);
@@ -26,58 +26,58 @@ function copy(a) {
function formatInput(args,format,images) {
var json_q = {};
var format_i = format;
if (format == "+")
if (format == '+')
format = ['string_a', 'o_object'];
else if (format == "-")
else if (format == '-')
format = ['number_a'];
else if (format == "^")
else if (format == '^')
format = ['number', 'string', 'o_object'];
else if (format == "r")
else if (format == 'r')
format = ['o_number'];
else if (format == "l")
else if (format == 'l')
format = ['string','o_function'];
if(format[format.length-1] == "o_object") {
if(objTypeOf(args[args.length-1]) != "Object")
if(format[format.length-1] == 'o_object') {
if(objTypeOf(args[args.length-1]) != 'Object')
args.push({});
}
else if (format[format.length-1] == "o_number") {
if(typeof(args[args.length-1]) != "number" && objTypeOf(args[0])!="Object")
else if (format[format.length-1] == 'o_number') {
if(typeof(args[args.length-1]) != 'number' && objTypeOf(args[0])!='Object')
args.push(1);
}
else if (format[format.length-1] == "o_function") {
if(objTypeOf(args[args.length-1]) != "Function" && objTypeOf(args[0])!="Object")
else if (format[format.length-1] == 'o_function') {
if(objTypeOf(args[args.length-1]) != 'Function' && objTypeOf(args[0])!='Object')
args.push(function(){});
}
if(args.length == format.length) {//making of arrays
for (var i in format) {
if (format[i].substr(format[i].length-2,2)=="_a")
if (format[i].substr(format[i].length-2,2)=='_a')
args[i] = makeArray(args[i]);
}
}
if (args.length == 1 ) {
if(format_i == "r") json_q = {0:copy(args[0])};
else if(format_i == "-") {
if(format_i == 'r') json_q = {0:copy(args[0])};
else if(format_i == '-') {
json_q=[];
json_q= copy(args[0]);
}
}
else if (format_i == "r" ) {
else if (format_i == 'r' ) {
for (var img in args[0]) json_q = {0:args[0]};
}
else if (format_i == "l") {
else if (format_i == 'l') {
json_q = {
image: args[0],
callback: args[1]
}
};
}
else {
json_q = [];
if(format_i == "+") {
if(format_i == '+') {
for(var s in args[0]) {
json_q.push({
name: args[0][s],
@@ -87,7 +87,7 @@ function formatInput(args,format,images) {
}
if(format_i == "^") {
if(format_i == '^') {
var size = this.steps.length;
var index = args[0];
index = (index==size)?index:index%size;

82
src/ImageSequencer.js
View File

@@ -1,29 +1,29 @@
if (typeof window !== 'undefined') { isBrowser = true }
else { var isBrowser = false }
if (typeof window !== 'undefined') { isBrowser = true; }
else { var isBrowser = false; }
require('./util/getStep.js');
ImageSequencer = function ImageSequencer(options) {
var sequencer = (this.name == "ImageSequencer") ? this : this.sequencer;
var sequencer = (this.name == 'ImageSequencer') ? this : this.sequencer;
options = options || {};
options.inBrowser = options.inBrowser === undefined ? isBrowser : options.inBrowser;
options.sequencerCounter = 0;
function objTypeOf(object) {
return Object.prototype.toString.call(object).split(" ")[1].slice(0, -1)
return Object.prototype.toString.call(object).split(' ')[1].slice(0, -1);
}
function log(color, msg) {
if (options.ui != "none") {
if (options.ui != 'none') {
if (arguments.length == 1) console.log(arguments[0]);
else if (arguments.length == 2) console.log(color, msg);
}
}
function copy(a) {
if (!typeof (a) == "object") return a;
if (objTypeOf(a) == "Array") return a.slice();
if (objTypeOf(a) == "Object") {
if (!typeof (a) == 'object') return a;
if (objTypeOf(a) == 'Array') return a.slice();
if (objTypeOf(a) == 'Object') {
var b = {};
for (var v in a) {
b[v] = copy(a[v]);
@@ -34,7 +34,7 @@ ImageSequencer = function ImageSequencer(options) {
}
function makeArray(input) {
return (objTypeOf(input) == "Array") ? input : [input];
return (objTypeOf(input) == 'Array') ? input : [input];
}
var image,
@@ -64,15 +64,15 @@ ImageSequencer = function ImageSequencer(options) {
// else if (options.imageUrl) loadImage(imageUrl);
function addSteps() {
var this_ = (this.name == "ImageSequencer") ? this : this.sequencer;
var this_ = (this.name == 'ImageSequencer') ? this : this.sequencer;
var args = [];
var json_q = {};
for (var arg in arguments) { args.push(copy(arguments[arg])); }
json_q = formatInput.call(this_, args, "+");
json_q = formatInput.call(this_, args, '+');
inputlog.push({ method: "addSteps", json_q: copy(json_q) });
inputlog.push({ method: 'addSteps', json_q: copy(json_q) });
for (var j in json_q)
require("./AddStep")(this_, json_q[j].name, json_q[j].o);
require('./AddStep')(this_, json_q[j].name, json_q[j].o);
return this;
}
@@ -89,31 +89,31 @@ ImageSequencer = function ImageSequencer(options) {
function removeSteps() {
var indices;
var this_ = (this.name == "ImageSequencer") ? this : this.sequencer;
var this_ = (this.name == 'ImageSequencer') ? this : this.sequencer;
var args = [];
for (var arg in arguments) args.push(copy(arguments[arg]));
var json_q = formatInput.call(this_, args, "-");
inputlog.push({ method: "removeSteps", json_q: copy(json_q) });
var json_q = formatInput.call(this_, args, '-');
inputlog.push({ method: 'removeSteps', json_q: copy(json_q) });
indices = json_q.sort(function(a, b) { return b - a });
indices = json_q.sort(function(a, b) { return b - a; });
for (var i in indices)
removeStep(this_, indices[i]);
return this;
}
function insertSteps() {
var this_ = (this.name == "ImageSequencer") ? this : this.sequencer;
var args = []
var this_ = (this.name == 'ImageSequencer') ? this : this.sequencer;
var args = [];
for (var arg in arguments) args.push(arguments[arg]);
var json_q = formatInput.call(this_, args, "^");
inputlog.push({ method: "insertSteps", json_q: copy(json_q) });
var json_q = formatInput.call(this_, args, '^');
inputlog.push({ method: 'insertSteps', json_q: copy(json_q) });
var details = json_q;
details = details.sort(function(a, b) { return b.index - a.index });
details = details.sort(function(a, b) { return b.index - a.index; });
for (var i in details)
require("./InsertStep")(this_, details[i].index, details[i].name, details[i].o);
require('./InsertStep')(this_, details[i].index, details[i].name, details[i].o);
return this;
}
@@ -124,21 +124,21 @@ ImageSequencer = function ImageSequencer(options) {
config = config || { mode: 'no-arg' };
if (config.index) index = config.index;
if (config.mode != "no-arg" && typeof config != 'function') {
if (config.mode != 'no-arg' && typeof config != 'function') {
if (config.progressObj) progressObj = config.progressObj;
delete arguments['0'];
}
var this_ = (this.name == "ImageSequencer") ? this : this.sequencer;
var this_ = (this.name == 'ImageSequencer') ? this : this.sequencer;
var args = [];
for (var arg in arguments) args.push(copy(arguments[arg]));
var callback = function() { };
for (var arg in args)
if (objTypeOf(args[arg]) == "Function")
if (objTypeOf(args[arg]) == 'Function')
callback = args.splice(arg, 1)[0]; //callback is formed
var json_q = formatInput.call(this_, args, "r");
var json_q = formatInput.call(this_, args, 'r');
require('./Run')(this_, json_q, callback, index, progressObj);
@@ -147,19 +147,19 @@ ImageSequencer = function ImageSequencer(options) {
function loadImages() {
var args = [];
var prevSteps = this.getSteps().slice(1).map(step=>step.options.name)
var prevSteps = this.getSteps().slice(1).map(step=>step.options.name);
var sequencer = this;
sequencer.image = arguments[0];
for (var arg in arguments) args.push(copy(arguments[arg]));
var json_q = formatInput.call(this, args, "l");
var json_q = formatInput.call(this, args, 'l');
if(this.getSteps().length!=0){
this.options.sequencerCounter = 0;
inputlog = [];
this.steps = [];
}
inputlog.push({ method: "loadImages", json_q: copy(json_q) });
inputlog.push({ method: 'loadImages', json_q: copy(json_q) });
var ret = {
name: "ImageSequencer Wrapper",
name: 'ImageSequencer Wrapper',
sequencer: this,
addSteps: this.addSteps,
removeSteps: this.removeSteps,
@@ -170,11 +170,11 @@ ImageSequencer = function ImageSequencer(options) {
};
function loadPrevSteps(ref){
if(prevSteps.length!=0){
ref.addSteps(prevSteps)
ref.addSteps(prevSteps);
prevSteps=[];
}
}
require('./ui/LoadImage')(sequencer, "image", json_q.image, function() {
require('./ui/LoadImage')(sequencer, 'image', json_q.image, function() {
loadPrevSteps(sequencer);
json_q.callback.call(ret);
});
@@ -198,11 +198,11 @@ ImageSequencer = function ImageSequencer(options) {
var exportBin = function(dir, basic, filename) {
return require('./ExportBin')(dir, this, basic, filename);
}
};
function modulesInfo(name) {
var modulesdata = {}
if (name == "load-image") return {};
var modulesdata = {};
if (name == 'load-image') return {};
if (arguments.length == 0) {
for (var modulename in this.modules) {
modulesdata[modulename] = modules[modulename][1];
@@ -253,7 +253,7 @@ ImageSequencer = function ImageSequencer(options) {
return;
}
var mods = fs.readFileSync('./src/Modules.js').toString();
mods = mods.substr(0, mods.length - 1) + " '" + name + "': require('" + path + "'),\n}";
mods = mods.substr(0, mods.length - 1) + ' \'' + name + '\': require(\'' + path + '\'),\n}';
fs.writeFileSync('./src/Modules.js', mods);
}
@@ -283,11 +283,11 @@ ImageSequencer = function ImageSequencer(options) {
this.sequences = require('./SavedSequences.json');
}
var str = require('./Strings.js')(this.steps, modulesInfo, addSteps, copy)
var str = require('./Strings.js')(this.steps, modulesInfo, addSteps, copy);
return {
//literals and objects
name: "ImageSequencer",
name: 'ImageSequencer',
options: options,
inputlog: inputlog,
modules: modules,
@@ -331,7 +331,7 @@ ImageSequencer = function ImageSequencer(options) {
copy: copy,
setInputStep: require('./ui/SetInputStep')(sequencer)
}
};
}
};
module.exports = ImageSequencer;

4
src/InsertStep.js
View File

@@ -7,7 +7,7 @@ function InsertStep(ref, index, name, o) {
}
if (ref.detectStringSyntax(name)) {
return ref.stringToSteps(name)
return ref.stringToSteps(name);
}
function insertStep(index, name, o_) {
@@ -43,7 +43,7 @@ function InsertStep(ref, index, name, o) {
let step = stepsArray[i];
ref.insertSteps(index + Number.parseInt(i), step['name'], step['options']);
}
}
};
// Tell UI that a step has been set up.
o = o || {};

2
src/Modules.js
View File

@@ -42,4 +42,4 @@ module.exports = {
'tint': require('./modules/Tint'),
'webgl-distort': require('./modules/WebglDistort'),
'white-balance': require('./modules/WhiteBalance')
}
};

8
src/ReplaceImage.js
View File

@@ -33,19 +33,19 @@ function ReplaceImage(ref,selector,steps,options) {
}
var base64 = btoa(raw);
var dataURL="data:image/"+ext+";base64," + base64;
var dataURL='data:image/'+ext+';base64,' + base64;
make(dataURL);
};
if(url.substr(0,11).toLowerCase()!="data:image/") xmlHTTP.send();
if(url.substr(0,11).toLowerCase()!='data:image/') xmlHTTP.send();
else make(url);
function make(url) {
tempSequencer.loadImage(url, function(){
// this.addSteps(steps).run({stop:function(){}},function(out){
var sequence = this.addSteps(steps)
var sequence = this.addSteps(steps);
if (ref.detectStringSyntax(steps))
sequence = this.stringToSteps(steps)
sequence = this.stringToSteps(steps);
sequence.run({stop:function(){}},function(out){
img.src = out;
});

8
src/Run.js
View File

@@ -5,7 +5,7 @@ function Run(ref, json_q, callback, ind, progressObj) {
function drawStep(drawarray, pos) {
if (pos == drawarray.length && drawarray[pos - 1] !== undefined) {
if (ref.objTypeOf(callback) == "Function" && ref.steps.slice(-1)[0].output) {
if (ref.objTypeOf(callback) == 'Function' && ref.steps.slice(-1)[0].output) {
var steps = ref.steps;
var out = steps[steps.length - 1].output.src;
callback(out);
@@ -25,7 +25,7 @@ function Run(ref, json_q, callback, ind, progressObj) {
};
step.getIndex = function getIndex() {
return i;
}
};
for (var util in getStepUtils) {
if (getStepUtils.hasOwnProperty(util)) {
@@ -73,8 +73,8 @@ function Run(ref, json_q, callback, ind, progressObj) {
else if (json_q[0] == 0) json_q[0]++;
var prevstep = ref.steps[json_q[0] - 1];
while (
typeof prevstep == "undefined" ||
typeof prevstep.output == "undefined"
typeof prevstep == 'undefined' ||
typeof prevstep.output == 'undefined'
) {
prevstep = ref.steps[--json_q[0] - 1];
}

2
src/RunToolkit.js
View File

@@ -11,4 +11,4 @@ module.exports = function(input) {
input.dataUriToBuffer = dataUriToBuffer;
input.savePixels = savePixels;
return input;
}
};

44
src/Strings.js
View File

@@ -1,44 +1,44 @@
module.exports = function(steps, modulesInfo, addSteps, copy) {
// Genates a CLI string for the current sequence
function toCliString() {
var cliStringSteps = `"`, cliOptions = {};
var cliStringSteps = '"', cliOptions = {};
for (var step in this.steps) {
var name = (typeof this.steps[step].options !== "undefined")? this.steps[step].options.name : this.steps[step].name
if (name !== "load-image"){
var name = (typeof this.steps[step].options !== 'undefined')? this.steps[step].options.name : this.steps[step].name;
if (name !== 'load-image'){
cliStringSteps += `${name} `;
}
for (var inp in modulesInfo(name).inputs) {
cliOptions[inp] = this.steps[step].options[inp];
}
}
cliStringSteps = cliStringSteps.substr(0, cliStringSteps.length - 1) + `"`;
return `sequencer -i [PATH] -s ${cliStringSteps} -d '${JSON.stringify(cliOptions)}'`
cliStringSteps = cliStringSteps.substr(0, cliStringSteps.length - 1) + '"';
return `sequencer -i [PATH] -s ${cliStringSteps} -d '${JSON.stringify(cliOptions)}'`;
}
// Checks if input is a string of comma separated module names
function detectStringSyntax(str) {
let result = (str.includes(',') || str.includes('{')) ? true : false
return result
let result = (str.includes(',') || str.includes('{')) ? true : false;
return result;
}
// Parses input string and returns array of module names
function parseStringSyntax(str) {
let stringifiedNames = str.replace(/\s/g, '')
let moduleNames = stringifiedNames.split(',')
return moduleNames
let stringifiedNames = str.replace(/\s/g, '');
let moduleNames = stringifiedNames.split(',');
return moduleNames;
}
// imports string of comma separated module names to sequencer steps
function stringToSteps(str) {
let sequencer = this;
let names = []
if (this.name != "ImageSequencer")
let names = [];
if (this.name != 'ImageSequencer')
sequencer = this.sequencer;
if (detectStringSyntax(str))
names = stringToJSON(str)
names = stringToJSON(str);
names.forEach(function eachStep(stepObj) {
sequencer.addSteps(stepObj.name, stepObj.options)
})
sequencer.addSteps(stepObj.name, stepObj.options);
});
}
// Strigifies the current sequence
@@ -96,7 +96,7 @@ module.exports = function(steps, modulesInfo, addSteps, copy) {
if (str.indexOf(bracesStrings[0]) === -1) { // if there are no settings specified
var moduleName = str.substr(0);
stepSettings = "";
stepSettings = '';
} else {
var moduleName = str.substr(0, str.indexOf(bracesStrings[0]));
stepSettings = str.slice(str.indexOf(bracesStrings[0]) + 1, -1);
@@ -112,20 +112,20 @@ module.exports = function(steps, modulesInfo, addSteps, copy) {
settingName,
settingValue
];
if (!!settingName) accumulator[settingName] = settingValue;
if (settingName) accumulator[settingName] = settingValue;
return accumulator;
}, {});
return {
name: moduleName,
options: stepSettings
}
};
}
// imports a string into the sequencer steps
function importString(str) {
let sequencer = this;
if (this.name != "ImageSequencer")
if (this.name != 'ImageSequencer')
sequencer = this.sequencer;
var stepsFromString = stringToJSON(str);
stepsFromString.forEach(function eachStep(stepObj) {
@@ -136,7 +136,7 @@ module.exports = function(steps, modulesInfo, addSteps, copy) {
// imports a array of JSON steps into the sequencer steps
function importJSON(obj) {
let sequencer = this;
if (this.name != "ImageSequencer")
if (this.name != 'ImageSequencer')
sequencer = this.sequencer;
obj.forEach(function eachStep(stepObj) {
sequencer.addSteps(stepObj.name, stepObj.options);
@@ -155,5 +155,5 @@ module.exports = function(steps, modulesInfo, addSteps, copy) {
stringToJSONstep: stringToJSONstep,
importString: importString,
importJSON: importJSON
}
}
};
};

14
src/cli/installModule.js
View File

@@ -1,17 +1,17 @@
var childProcess = require('child_process')
var childProcess = require('child_process');
var Spinner = require('ora');
module.exports = function (program, sequencer) {
console.log(
"\x1b[33m%s\x1b[0m",
"Please wait while your Module is being Installed...\nThis may take a while!"
'\x1b[33m%s\x1b[0m',
'Please wait while your Module is being Installed...\nThis may take a while!'
);
var params = program.installModule.split(' ');
var spinner = Spinner("Now Installing...").start();
childProcess.execSync(`npm i ${params[1]}`)
var spinner = Spinner('Now Installing...').start();
childProcess.execSync(`npm i ${params[1]}`);
sequencer.saveNewModule(params[0], params[1]);
sequencer.loadNewModule(params[0], require(params[1]));
spinner.stop();
console.log("\x1b[32m%s\x1b[0m", "Your module was installed successfully!!");
}
console.log('\x1b[32m%s\x1b[0m', 'Your module was installed successfully!!');
};

4
src/cli/saveSequence.js
View File

@@ -2,6 +2,6 @@ module.exports = function (program, sequencer) {
var params = program.saveSequence.split(' ');
sequencer.saveSequence(params[0], params[1]);
console.log("\x1b[32m", "Your sequence was saved successfully!!");
console.log('\x1b[32m', 'Your sequence was saved successfully!!');
}
};

34
src/cli/sequencerSteps.js
View File

@@ -1,13 +1,13 @@
var Spinner = require('ora');
var readlineSync = require('readline-sync');
var utils = require('../CliUtils')
var utils = require('../CliUtils');
module.exports = function (program, sequencer, outputFilename) {
utils.makedir(program.output, () => {
console.log('Files will be exported to "' + program.output + '"');
if (program.basic)
console.log("Basic mode is enabled, outputting only final image");
console.log('Basic mode is enabled, outputting only final image');
// Iterate through the steps and retrieve their inputs.
program.step.forEach(function(step) {
@@ -15,7 +15,7 @@ module.exports = function (program, sequencer, outputFilename) {
// If inputs exists, print to console.
if (Object.keys(options).length) {
console.log("[" + step + "]: Inputs");
console.log('[' + step + ']: Inputs');
}
// If inputs exists, print them out with descriptions.
@@ -23,9 +23,9 @@ module.exports = function (program, sequencer, outputFilename) {
// The array below creates a variable number of spaces. This is done with (length + 1).
// The extra 4 that makes it (length + 5) is to account for the []: characters
console.log(
new Array(step.length + 5).join(" ") +
new Array(step.length + 5).join(' ') +
input +
": " +
': ' +
options[input].desc
);
});
@@ -33,18 +33,18 @@ module.exports = function (program, sequencer, outputFilename) {
if (program.config) {
try {
var config = JSON.parse(program.config);
console.log(`The parsed options object: `, config);
console.log('The parsed options object: ', config);
} catch (e) {
console.error(
"\x1b[31m%s\x1b[0m",
`Options(Config) is not a not valid JSON Fallback activate`
'\x1b[31m%s\x1b[0m',
'Options(Config) is not a not valid JSON Fallback activate'
);
program.config = false;
console.log(e);
}
}
if (program.config && utils.validateConfig(config, options)) {
console.log("Now using Options object");
console.log('Now using Options object');
Object.keys(options).forEach(function(input) {
options[input] = config[input];
});
@@ -52,15 +52,15 @@ module.exports = function (program, sequencer, outputFilename) {
// If inputs exist, iterate through them and prompt for values.
Object.keys(options).forEach(function(input) {
var value = readlineSync.question(
"[" +
'[' +
step +
"]: Enter a value for " +
']: Enter a value for ' +
input +
" (" +
' (' +
options[input].type +
", default: " +
', default: ' +
options[input].default +
"): "
'): '
);
options[input] = value;
});
@@ -71,7 +71,7 @@ module.exports = function (program, sequencer, outputFilename) {
var spinnerObj = { succeed: () => { }, stop: () => { } };
if (!process.env.TEST)
spinnerObj = Spinner("Your Image is being processed..").start();
spinnerObj = Spinner('Your Image is being processed..').start();
// Run the sequencer.
sequencer.run({ progressObj: spinnerObj }, function() {
@@ -81,8 +81,8 @@ module.exports = function (program, sequencer, outputFilename) {
//check if spinner was not overriden stop it
if (!spinnerObj.overrideFlag) {
spinnerObj.succeed();
console.log(`\nDone!!`);
console.log('\nDone!!');
}
});
});
}
};

8
src/modules/AddQR/Module.js
View File

@@ -2,7 +2,7 @@ module.exports = function AddQR(options, UI) {
var defaults = require('./../../util/getDefaults.js')(require('./info.json'));
options.size = options.size || defaults.size;
options.qrCodeString = options.qrCodeString || "https://github.com/publiclab/image-sequencer";
options.qrCodeString = options.qrCodeString || 'https://github.com/publiclab/image-sequencer';
var output;
getPixels = require('get-pixels');
@@ -38,7 +38,7 @@ module.exports = function AddQR(options, UI) {
inBrowser: options.inBrowser,
callback: callback
});
})
});
}
@@ -47,5 +47,5 @@ module.exports = function AddQR(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

30
src/modules/AddQR/QR.js
View File

@@ -1,10 +1,10 @@
module.exports = exports = function (options, pixels, oldPixels, callback) {
var QRCode = require('qrcode')
var QRCode = require('qrcode');
QRCode.toDataURL(options.qrCodeString, function (err, url) {
var getPixels = require("get-pixels");
var getPixels = require('get-pixels');
getPixels(url, function (err, qrPixels) {
if (err) {
console.log("Bad image path", image);
console.log('Bad image path', image);
}
var imagejs = require('imagejs');
@@ -12,7 +12,7 @@ module.exports = exports = function (options, pixels, oldPixels, callback) {
bitmap._data.data = qrPixels.data;
var resized = bitmap.resize({
width: options.size, height: options.size,
algorithm: "bicubicInterpolation"
algorithm: 'bicubicInterpolation'
});
qrPixels.data = resized._data.data;
@@ -26,23 +26,23 @@ module.exports = exports = function (options, pixels, oldPixels, callback) {
for (var m = 0; m < width; m++) {
for (var n = 0; n < height; n++) {
if (m >= xe && n >= ye) {
pixels.set(m, n, 0, qrPixels.get(m - xe, n - ye, 0))
pixels.set(m, n, 1, qrPixels.get(m - xe, n - ye, 1))
pixels.set(m, n, 2, qrPixels.get(m - xe, n - ye, 2))
pixels.set(m, n, 3, qrPixels.get(m - xe, n - ye, 3))
pixels.set(m, n, 0, qrPixels.get(m - xe, n - ye, 0));
pixels.set(m, n, 1, qrPixels.get(m - xe, n - ye, 1));
pixels.set(m, n, 2, qrPixels.get(m - xe, n - ye, 2));
pixels.set(m, n, 3, qrPixels.get(m - xe, n - ye, 3));
}
else {
pixels.set(m, n, 0, oldPixels.get(m, n, 0))
pixels.set(m, n, 1, oldPixels.get(m, n, 1))
pixels.set(m, n, 2, oldPixels.get(m, n, 2))
pixels.set(m, n, 3, oldPixels.get(m, n, 3))
pixels.set(m, n, 0, oldPixels.get(m, n, 0));
pixels.set(m, n, 1, oldPixels.get(m, n, 1));
pixels.set(m, n, 2, oldPixels.get(m, n, 2));
pixels.set(m, n, 3, oldPixels.get(m, n, 3));
}
}
}
callback();
})
})
}
});
});
};

2
src/modules/AddQR/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

8
src/modules/Average/Module.js
View File

@@ -31,7 +31,7 @@ module.exports = function Average(options, UI) {
sum[2] = Math.floor(sum[2] / divisor);
sum[3] = Math.floor(sum[3] / divisor);
i = 0
i = 0;
while (i < pixels.data.length) {
pixels.data[i++] = sum[0];
pixels.data[i++] = sum[1];
@@ -43,7 +43,7 @@ module.exports = function Average(options, UI) {
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>");
if (options.step.inBrowser && options.step.ui) $(options.step.ui).find('.details').append('<p><b>Averages</b> (r, g, b, a): ' + sum.join(', ') + '</p>');
return pixels;
}
@@ -70,5 +70,5 @@ module.exports = function Average(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Average/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

10
src/modules/Blend/Module.js
View File

@@ -16,12 +16,12 @@ module.exports = function Dynamic(options, UI, util) {
var step = this;
// convert to runnable code:
if (typeof options.func === "string") eval('options.func = ' + options.func);
if (typeof options.func === 'string') eval('options.func = ' + options.func);
var getPixels = require('get-pixels');
// convert offset as string to int
if (typeof options.offset === "string") options.offset = parseInt(options.offset);
if (typeof options.offset === 'string') options.offset = parseInt(options.offset);
// save first image's pixels
var priorStep = this.getStep(options.offset);
@@ -44,7 +44,7 @@ module.exports = function Dynamic(options, UI, util) {
p.get(x, y, 1),
p.get(x, y, 2),
p.get(x, y, 3)
)
);
}
function output(image, datauri, mimetype) {
@@ -71,5 +71,5 @@ module.exports = function Dynamic(options, UI, util) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Blend/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

118
src/modules/Blur/Blur.js
View File

@@ -1,84 +1,62 @@
module.exports = exports = function(pixels, blur) {
let kernel = kernelGenerator(blur, 1), oldpix = require('lodash').cloneDeep(pixels);
kernel = flipKernel(kernel);
let kernel = kernelGenerator(blur),
pixs = {
r: [],
g: [],
b: [],
};
for (let i = 0; i < pixels.shape[0]; i++) {
for (let j = 0; j < pixels.shape[1]; j++) {
let neighboutPos = getNeighbouringPixelPositions([i, j]);
let acc = [0.0, 0.0, 0.0, 0.0];
for (let a = 0; a < kernel.length; a++) {
for (let b = 0; b < kernel.length; b++) {
acc[0] += (oldpix.get(neighboutPos[a][b][0], neighboutPos[a][b][1], 0) * kernel[a][b]);
acc[1] += (oldpix.get(neighboutPos[a][b][0], neighboutPos[a][b][1], 1) * kernel[a][b]);
acc[2] += (oldpix.get(neighboutPos[a][b][0], neighboutPos[a][b][1], 2) * kernel[a][b]);
acc[3] += (oldpix.get(neighboutPos[a][b][0], neighboutPos[a][b][1], 3) * kernel[a][b]);
for (let y = 0; y < pixels.shape[1]; y++){
pixs.r.push([]);
pixs.g.push([]);
pixs.b.push([]);
for (let x = 0; x < pixels.shape[0]; x++){
pixs.r[y].push(pixels.get(x, y, 0));
pixs.g[y].push(pixels.get(x, y, 1));
pixs.b[y].push(pixels.get(x, y, 2));
}
}
pixels.set(i, j, 0, acc[0]);
pixels.set(i, j, 1, acc[1]);
pixels.set(i, j, 2, acc[2]);
const convolve = require('../_nomodule/gpuUtils').convolve;
const conPix = convolve([pixs.r, pixs.g, pixs.b], kernel);
for (let y = 0; y < pixels.shape[1]; y++){
for (let x = 0; x < pixels.shape[0]; x++){
pixels.set(x, y, 0, Math.max(0, Math.min(conPix[0][y][x], 255)));
pixels.set(x, y, 1, Math.max(0, Math.min(conPix[1][y][x], 255)));
pixels.set(x, y, 2, Math.max(0, Math.min(conPix[2][y][x], 255)));
}
}
return pixels;
//Generates a 5x5 Gaussian kernel
function kernelGenerator(sigma = 1) {
let kernel = [],
sum = 0;
//Generates a 3x3 Gaussian kernel
function kernelGenerator(sigma, size) {
if (sigma == 0) sigma += 0.05;
/*
Trying out a variable radius kernel not working as of now
*/
// const coeff = (1.0/(2.0*Math.PI*sigma*sigma))
// const expCoeff = -1 * (1.0/2.0 * sigma * sigma)
// let e = Math.E
// let result = []
// for(let i = -1 * size;i<=size;i++){
// let arr = []
// for(let j= -1 * size;j<=size;j++){
// arr.push(coeff * Math.pow(e,expCoeff * ((i * i) + (j*j))))
// }
// result.push(arr)
// }
// let sum = result.reduce((sum,val)=>{
// return val.reduce((sumInner,valInner)=>{
// return sumInner+valInner
// })
// })
// result = result.map(arr=>arr.map(val=>(val + 0.0)/(sum + 0.0)))
const s = 2 * Math.pow(sigma, 2);
// return result
return [
[2.0 / 159.0, 4.0 / 159.0, 5.0 / 159.0, 4.0 / 159.0, 2.0 / 159.0],
[4.0 / 159.0, 9.0 / 159.0, 12.0 / 159.0, 9.0 / 159.0, 4.0 / 159.0],
[5.0 / 159.0, 12.0 / 159.0, 15.0 / 159.0, 12.0 / 159.0, 5.0 / 159.0],
[4.0 / 159.0, 9.0 / 159.0, 12.0 / 159.0, 9.0 / 159.0, 4.0 / 159.0],
[2.0 / 159.0, 4.0 / 159.0, 5.0 / 159.0, 4.0 / 159.0, 2.0 / 159.0]
];
}
function getNeighbouringPixelPositions(pixelPosition) {
let x = pixelPosition[0], y = pixelPosition[1], result = [];
for (let i = -2; i <= 2; i++) {
let arr = [];
for (let j = -2; j <= 2; j++)
arr.push([x + i, y + j]);
result.push(arr);
}
return result;
}
function flipKernel(kernel) {
let result = [];
for (let i = kernel.length - 1; i >= 0; i--) {
let arr = [];
for (let j = kernel[i].length - 1; j >= 0; j--) {
arr.push(kernel[i][j]);
}
result.push(arr);
}
return result;
for (let y = -2; y <= 2; y++) {
kernel.push([]);
for (let x = -2; x <= 2; x++) {
let r = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
kernel[y + 2].push(Math.exp(-(r / s)));
sum += kernel[y + 2][x + 2];
}
}
for (let x = 0; x < 5; x++){
for (let y = 0; y < 5; y++){
kernel[y][x] = (kernel[y][x] / sum);
}
}
return kernel;
}
};

5
src/modules/Blur/Module.js
View File

@@ -5,6 +5,7 @@ module.exports = function Blur(options, UI) {
var defaults = require('./../../util/getDefaults.js')(require('./info.json'));
options.blur = options.blur || defaults.blur;
options.blur = parseFloat(options.blur);
var output;
function draw(input, callback, progressObj) {
@@ -40,5 +41,5 @@ module.exports = function Blur(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Blur/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

2
src/modules/Blur/info.json
View File

@@ -8,7 +8,7 @@
"default": 2,
"min": 0,
"max": 5,
"step": 0.25
"step": 0.05
}
},
"docs-link":"https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#blur-module"

6
src/modules/Brightness/Module.js
View File

@@ -21,7 +21,7 @@ module.exports = function Brightness(options, UI) {
For eg. progressObj = new SomeProgressModule()
*/
var step = this, val = (options.brightness) / 100.0;;
var step = this, val = (options.brightness) / 100.0;
function changePixel(r, g, b, a) {
@@ -53,5 +53,5 @@ module.exports = function Brightness(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Brightness/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

4
src/modules/CanvasResize/Module.js
View File

@@ -59,5 +59,5 @@ module.exports = function canvasResize(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/CanvasResize/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

10
src/modules/Channel/Module.js
View File

@@ -17,9 +17,9 @@ module.exports = function Channel(options, UI) {
var step = this;
function changePixel(r, g, b, a) {
if (options.channel === "red") return [r, 0, 0, a];
if (options.channel === "green") return [0, g, 0, a];
if (options.channel === "blue") return [0, 0, b, a];
if (options.channel === 'red') return [r, 0, 0, a];
if (options.channel === 'green') return [0, g, 0, a];
if (options.channel === 'blue') return [0, 0, b, a];
}
function output(image, datauri, mimetype) {
@@ -46,5 +46,5 @@ module.exports = function Channel(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Channel/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

30
src/modules/ColorTemperature/Module.js
View File

@@ -4,7 +4,7 @@ module.exports = function ColorTemperature(options, UI) {
function draw(input, callback, progressObj) {
options.temperature = (options.temperature > "40000") ? "40000" : options.temperature
options.temperature = (options.temperature > '40000') ? '40000' : options.temperature;
progressObj.stop(true);
progressObj.overrideFlag = true;
@@ -13,8 +13,8 @@ module.exports = function ColorTemperature(options, UI) {
function extraManipulation(pixels) {
let temp = parseInt(options.temperature)
temp /= 100
let temp = parseInt(options.temperature);
temp /= 100;
let r, g, b;
@@ -38,21 +38,21 @@ module.exports = function ColorTemperature(options, UI) {
for (let i = 0; i < pixels.shape[0]; i++) {
for (let j = 0; j < pixels.shape[1]; j++) {
r_data = pixels.get(i, j, 0)
r_new_data = (255 / r) * r_data
pixels.set(i, j, 0, r_new_data)
r_data = pixels.get(i, j, 0);
r_new_data = (255 / r) * r_data;
pixels.set(i, j, 0, r_new_data);
g_data = pixels.get(i, j, 1)
g_new_data = (255 / g) * g_data
pixels.set(i, j, 1, g_new_data)
g_data = pixels.get(i, j, 1);
g_new_data = (255 / g) * g_data;
pixels.set(i, j, 1, g_new_data);
b_data = pixels.get(i, j, 2)
b_new_data = (255 / b) * b_data
pixels.set(i, j, 2, b_new_data)
b_data = pixels.get(i, j, 2);
b_new_data = (255 / b) * b_data;
pixels.set(i, j, 2, b_new_data);
}
}
return pixels
return pixels;
}
function output(image, datauri, mimetype) {
@@ -76,6 +76,6 @@ module.exports = function ColorTemperature(options, UI) {
draw: draw,
output: output,
UI: UI
}
};
}
};

2
src/modules/ColorTemperature/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

2
src/modules/Colorbar/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

8
src/modules/Colormap/Colormap.js
View File

@@ -14,14 +14,14 @@
module.exports = function Colormap(value, options) {
options.colormap = options.colormap || colormaps.default;
// if a lookup table is provided as an array:
if(typeof(options.colormap) == "object")
if(typeof(options.colormap) == 'object')
colormapFunction = colormap(options.colormap);
// if a stored colormap is named with a string like "fastie":
else if(colormaps.hasOwnProperty(options.colormap))
colormapFunction = colormaps[options.colormap];
else colormapFunction = colormaps.default;
return colormapFunction(value / 255.00);
}
};
function colormap(segments) {
return function(x) {
@@ -49,7 +49,7 @@ function colormap(segments) {
}
return result;
};
};
}
var colormaps = {
greyscale: colormap([
@@ -194,4 +194,4 @@ var colormaps = {
[0.9, [255, 50, 50], [255, 50, 50] ]
])
}
};

4
src/modules/Colormap/Module.js
View File

@@ -38,5 +38,5 @@ module.exports = function Colormap(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Colormap/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

4
src/modules/Contrast/Contrast.js
View File

@@ -2,7 +2,7 @@ var _ = require('lodash');
module.exports = exports = function(pixels, contrast) {
let oldpix = _.cloneDeep(pixels);
contrast = Number(contrast)
contrast = Number(contrast);
if (contrast < -100) contrast = -100;
if (contrast > 100) contrast = 100;
contrast = (100.0 + contrast) / 100.0;
@@ -44,4 +44,4 @@ module.exports = exports = function(pixels, contrast) {
}
}
return pixels;
}
};

8
src/modules/Contrast/Module.js
View File

@@ -16,8 +16,8 @@ module.exports = function Contrast(options, UI) {
var step = this;
function extraManipulation(pixels) {
pixels = require('./Contrast')(pixels, options.contrast)
return pixels
pixels = require('./Contrast')(pixels, options.contrast);
return pixels;
}
function output(image, datauri, mimetype) {
@@ -41,5 +41,5 @@ module.exports = function Contrast(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Contrast/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

85
src/modules/Convolution/Convolution.js
View File

@@ -1,71 +1,50 @@
var _ = require('lodash');
module.exports = exports = function(pixels, constantFactor, kernelValues) {
let kernel = kernelGenerator(constantFactor, kernelValues), oldpix = _.cloneDeep(pixels);
kernel = flipKernel(kernel);
module.exports = exports = function(pixels, constantFactor, kernelValues, texMode) {
let kernel = kernelGenerator(constantFactor, kernelValues),
pixs = {
r: [],
g: [],
b: [],
};
for (let i = 0; i < pixels.shape[0]; i++) {
for (let j = 0; j < pixels.shape[1]; j++) {
let neighboutPos = getNeighbouringPixelPositions([i, j]);
let acc = [0.0, 0.0, 0.0, 0.0];
for (let a = 0; a < kernel.length; a++) {
for (let b = 0; b < kernel.length; b++) {
acc[0] += (oldpix.get(neighboutPos[a][b][0], neighboutPos[a][b][1], 0) * kernel[a][b]);
acc[1] += (oldpix.get(neighboutPos[a][b][0], neighboutPos[a][b][1], 1) * kernel[a][b]);
acc[2] += (oldpix.get(neighboutPos[a][b][0], neighboutPos[a][b][1], 2) * kernel[a][b]);
acc[3] += (oldpix.get(neighboutPos[a][b][0], neighboutPos[a][b][1], 3) * kernel[a][b]);
for (let y = 0; y < pixels.shape[1]; y++){
pixs.r.push([]);
pixs.g.push([]);
pixs.b.push([]);
for (let x = 0; x < pixels.shape[0]; x++){
pixs.r[y].push(pixels.get(x, y, 0));
pixs.g[y].push(pixels.get(x, y, 1));
pixs.b[y].push(pixels.get(x, y, 2));
}
}
acc[0] = Math.min(acc[0], 255);
acc[1] = Math.min(acc[1], 255);
acc[2] = Math.min(acc[2], 255);
pixels.set(i, j, 0, acc[0]);
pixels.set(i, j, 1, acc[1]);
pixels.set(i, j, 2, acc[2]);
const convolve = require('../_nomodule/gpuUtils').convolve;
const conPix = convolve([pixs.r, pixs.g, pixs.b], kernel, (pixels.shape[0] * pixels.shape[1]) < 400000 ? true : false);
for (let y = 0; y < pixels.shape[1]; y++){
for (let x = 0; x < pixels.shape[0]; x++){
pixels.set(x, y, 0, Math.max(0, Math.min(conPix[0][y][x], 255)));
pixels.set(x, y, 1, Math.max(0, Math.min(conPix[1][y][x], 255)));
pixels.set(x, y, 2, Math.max(0, Math.min(conPix[2][y][x], 255)));
}
}
return pixels;
};
function kernelGenerator(constantFactor, kernelValues) {
kernelValues = kernelValues.split(" ");
kernelValues = kernelValues.split(' ');
for (i = 0; i < 9; i++) {
kernelValues[i] = Number(kernelValues[i]) * constantFactor;
}
let k = 0;
let arr = [];
for (i = 0; i < 3; i++) {
let columns = [];
for (j = 0; j < 3; j++) {
columns.push(kernelValues[k]);
for (y = 0; y < 3; y++) {
arr.push([]);
for (x = 0; x < 3; x++) {
arr[y].push(kernelValues[k]);
k += 1;
}
arr.push(columns);
}
return arr;
}
function getNeighbouringPixelPositions(pixelPosition) {
let x = pixelPosition[0], y = pixelPosition[1], result = [];
for (let i = -1; i <= 1; i++) {
let arr = [];
for (let j = -1; j <= 1; j++)
arr.push([x + i, y + j]);
result.push(arr);
}
return result;
}
function flipKernel(kernel) {
let result = [];
for (let i = kernel.length - 1; i >= 0; i--) {
let arr = [];
for (let j = kernel[i].length - 1; j >= 0; j--) {
arr.push(kernel[i][j]);
}
result.push(arr);
}
return result;
}
}

7
src/modules/Convolution/Module.js
View File

@@ -4,6 +4,7 @@ module.exports = function Convolution(options, UI) {
options.kernelValues = options.kernelValues || defaults.kernelValues;
options.constantFactor = options.constantFactor || defaults.constantFactor;
options.texMode = options.texMode || defaults.texMode;
var output;
function draw(input, callback, progressObj) {
@@ -14,7 +15,7 @@ module.exports = function Convolution(options, UI) {
var step = this;
function extraManipulation(pixels) {
pixels = require('./Convolution')(pixels, options.constantFactor, options.kernelValues);
pixels = require('./Convolution')(pixels, options.constantFactor, options.kernelValues, options.texMode);
return pixels;
}
@@ -38,5 +39,5 @@ module.exports = function Convolution(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Convolution/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

7
src/modules/Convolution/info.json
View File

@@ -5,10 +5,11 @@
"constantFactor":{
"type": "float",
"desc": "a constant factor, multiplies all the kernel values by that factor",
"default": 0.1111,
"placeholder": 0.1111
"default": 0.111,
"min": 0.001,
"max": 2,
"step": 0.001
},
"kernelValues": {
"type": "string",
"desc": "nine space separated numbers representing the kernel values in left to right and top to bottom format.",

6
src/modules/Crop/Crop.js
View File

@@ -17,18 +17,18 @@ module.exports = function Crop(input,options,callback) {
var iw = pixels.shape[0]; //Width of Original Image
var ih = pixels.shape[1]; //Height of Original Image
var backgroundArray = [];
backgroundColor = options.backgroundColor.split(" ");
backgroundColor = options.backgroundColor.split(' ');
for(var i = 0; i < w ; i++){
backgroundArray = backgroundArray.concat([backgroundColor[0],backgroundColor[1],backgroundColor[2],backgroundColor[3]]);
}
// var newarray = new Uint8Array(4*w*h);
var array = []
var array = [];
for (var n = oy; n < oy + h; n++) {
var offsetValue = 4*w*n;
if(n<ih){
var start = n*4*iw + ox*4;
var end = n*4*iw + ox*4 + 4*w;
var pushArray = Array.from(pixels.data.slice(start, end ))
var pushArray = Array.from(pixels.data.slice(start, end ));
array.push.apply(array,pushArray);
} else {
array.push.apply(array,backgroundArray);

6
src/modules/Crop/Module.js
View File

@@ -51,7 +51,7 @@ module.exports = function CropModule(options, UI) {
step.output = {
src: out,
format: format
}
};
// This output is accessible to the UI
options.step.output = out;
@@ -81,5 +81,5 @@ module.exports = function CropModule(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

10
src/modules/Crop/Ui.js
View File

@@ -42,7 +42,7 @@ module.exports = function CropModuleUi(step, ui) {
converted[2],
converted[3]
);
$($(imgEl()).parents()[3]).find("input").trigger("change")
$($(imgEl()).parents()[3]).find('input').trigger('change');
}
});
}
@@ -56,7 +56,7 @@ module.exports = function CropModuleUi(step, ui) {
Math.floor(( _y / displayHeight ) * inputHeight),
Math.floor(( _width / displayWidth ) * inputWidth),
Math.floor(( _height / displayHeight ) * inputHeight)
]
];
}
function remove() {
@@ -78,7 +78,7 @@ module.exports = function CropModuleUi(step, ui) {
}
function setOptions(x1, y1, width, height) {
let options = $($(imgEl()).parents()[3]).find("input");
let options = $($(imgEl()).parents()[3]).find('input');
options[0].value = x1;
options[1].value = y1;
options[2].value = width;
@@ -94,5 +94,5 @@ module.exports = function CropModuleUi(step, ui) {
setup: setup,
remove: remove,
hide: hide
}
}
};
};

2
src/modules/Crop/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

6
src/modules/DecodeQr/Module.js
View File

@@ -25,7 +25,7 @@ module.exports = function DoNothing(options,UI) {
// Tell Image Sequencer that this step is complete
options.step.qrval = (decoded)?decoded.data:"undefined";
options.step.qrval = (decoded)?decoded.data:'undefined';
});
function output(image, datauri, mimetype){
@@ -49,5 +49,5 @@ module.exports = function DoNothing(options,UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/DecodeQr/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

8
src/modules/Dither/Dither.js
View File

@@ -28,11 +28,11 @@ module.exports = function Dither(pixels, type) {
for (let currentPixel = 0; currentPixel <= imageDataLength; currentPixel += 4) {
if (type === "none") {
if (type === 'none') {
// No dithering
pixels.data[currentPixel] = pixels.data[currentPixel] < threshold ? 0 : 255;
} else if (type === "bayer") {
} else if (type === 'bayer') {
// 4x4 Bayer ordered dithering algorithm
let x = currentPixel / 4 % w;
@@ -40,7 +40,7 @@ module.exports = function Dither(pixels, type) {
let map = Math.floor((pixels.data[currentPixel] + bayerThresholdMap[x % 4][y % 4]) / 2);
pixels.data[currentPixel] = (map < threshold) ? 0 : 255;
} else if (type === "floydsteinberg") {
} else if (type === 'floydsteinberg') {
// Floyd–Steinberg dithering algorithm
newPixel = pixels.data[currentPixel] < 129 ? 0 : 255;
@@ -73,4 +73,4 @@ module.exports = function Dither(pixels, type) {
}
return pixels;
}
};

8
src/modules/Dither/Module.js
View File

@@ -11,8 +11,8 @@ module.exports = function Dither(options, UI){
options.dither = options.dither || defaults.dither;
function extraManipulation(pixels) {
pixels = require('./Dither')(pixels, options.dither)
return pixels
pixels = require('./Dither')(pixels, options.dither);
return pixels;
}
function output(image, datauri, mimetype){
@@ -34,5 +34,5 @@ module.exports = function Dither(options, UI){
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Dither/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

6
src/modules/DrawRectangle/DrawRectangle.js
View File

@@ -11,7 +11,7 @@ module.exports = exports = function(pixels, options){
ex = options.endX = Number(options.endX) - thickness || iw - 1,
ey = options.endY = Number(options.endY) -thickness || ih - 1,
color = options.color || defaults.color;
color = color.split(" ");
color = color.split(' ');
var drawSide = function(startX, startY, endX, endY){
for (var n=startX; n <= endX+thickness; n++){
@@ -22,11 +22,11 @@ module.exports = exports = function(pixels, options){
pixels.set(n, k, 3, color[3]);
}
}
}
};
drawSide(ox, oy, ox, ey); // Left
drawSide(ex, oy, ex, ey); // Right
drawSide(ox, oy, ex, oy); // Top
drawSide(ox, ey, ex, ey); // Bottom
return pixels;
}
};

10
src/modules/DrawRectangle/Module.js
View File

@@ -11,12 +11,12 @@ module.exports = function DrawRectangle(options, UI) {
var step = this;
function changePixel(r, g, b, a) {
return [r, g, b, a]
return [r, g, b, a];
}
function extraManipulation(pixels) {
pixels = require('./DrawRectangle')(pixels, options)
return pixels
pixels = require('./DrawRectangle')(pixels, options);
return pixels;
}
function output(image, datauri, mimetype) {
@@ -40,5 +40,5 @@ module.exports = function DrawRectangle(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/DrawRectangle/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

16
src/modules/Dynamic/Module.js
View File

@@ -11,10 +11,10 @@ module.exports = function Dynamic(options,UI) {
var step = this;
// start with monochrome, but if options.red, options.green, and options.blue are set, accept them too
options.monochrome = options.monochrome || "(R+G+B)/3";
options.monochrome = options.monochrome || '(R+G+B)/3';
function generator(expression) {
var func = 'f = function (r, g, b, a) { var R = r, G = g, B = b, A = a;'
var func = 'f = function (r, g, b, a) { var R = r, G = g, B = b, A = a;';
func = func + 'return ';
func = func + expression + '}';
var f;
@@ -26,7 +26,7 @@ module.exports = function Dynamic(options,UI) {
channels.forEach(function(channel) {
if (options.hasOwnProperty(channel)) options[channel + '_function'] = generator(options[channel]);
else if (channel === 'alpha') options['alpha_function'] = function() { return 255; }
else if (channel === 'alpha') options['alpha_function'] = function() { return 255; };
else options[channel + '_function'] = generator(options.monochrome);
});
@@ -51,7 +51,7 @@ module.exports = function Dynamic(options,UI) {
,pixels.get(curX+distX,curY+distY,1)
,pixels.get(curX+distX,curY+distY,2)
,pixels.get(curX+distX,curY+distY,3)
]
];
}
// via P5js: https://github.com/processing/p5.js/blob/2920492842aae9a8bf1a779916893ac19d65cd38/src/math/calculation.js#L461-L472
@@ -63,13 +63,13 @@ module.exports = function Dynamic(options,UI) {
// also via P5js: https://github.com/processing/p5.js/blob/2920492842aae9a8bf1a779916893ac19d65cd38/src/math/calculation.js#L116-L119
function constrain(n, low, high) {
return Math.max(Math.min(n, high), low);
};
}
if (start2 < stop2) {
return constrain(newval, start2, stop2);
} else {
return constrain(newval, stop2, start2);
}
};
}
function output(image,datauri,mimetype){
@@ -95,5 +95,5 @@ module.exports = function Dynamic(options,UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Dynamic/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

15
src/modules/EdgeDetect/EdgeUtils.js
View File

@@ -12,8 +12,9 @@ kernely = [
let pixelsToBeSupressed = [];
module.exports = function(pixels, highThresholdRatio, lowThresholdRatio, hysteresis) {
module.exports = function(pixels, highThresholdRatio, lowThresholdRatio, useHysteresis) {
let angles = [], grads = [], strongEdgePixels = [], weakEdgePixels = [];
for (var x = 0; x < pixels.shape[0]; x++) {
grads.push([]);
angles.push([]);
@@ -31,14 +32,14 @@ module.exports = function(pixels, highThresholdRatio, lowThresholdRatio, hystere
}
nonMaxSupress(pixels, grads, angles);
doubleThreshold(pixels, highThresholdRatio, lowThresholdRatio, grads, strongEdgePixels, weakEdgePixels);
if(hysteresis.toLowerCase() == 'true') hysteresis(strongEdgePixels, weakEdgePixels);
if(useHysteresis.toLowerCase() == 'true') hysteresis(strongEdgePixels, weakEdgePixels);
strongEdgePixels.forEach(pixel => preserve(pixels, pixel));
weakEdgePixels.forEach(pixel => supress(pixels, pixel));
pixelsToBeSupressed.forEach(pixel => supress(pixels, pixel));
return pixels;
}
};
function supress(pixels, pixel) {
@@ -107,8 +108,8 @@ function isOutOfBounds(pixels, x, y){
const removeElem = (arr = [], elem) => {
return arr = arr.filter((arrelem) => {
return arrelem !== elem;
})
}
});
};
// Non Maximum Supression without interpolation
function nonMaxSupress(pixels, grads, angles) {
@@ -153,7 +154,7 @@ function nonMaxSupress(pixels, grads, angles) {
var convertToDegrees = radians => (radians * 180) / Math.PI;
// Finds the max value in a 2d array like grads
var findMaxInMatrix = arr => Math.max(...arr.map(el => el.map(val => !!val ? val : 0)).map(el => Math.max(...el)));
var findMaxInMatrix = arr => Math.max(...arr.map(el => el.map(val => val ? val : 0)).map(el => Math.max(...el)));
// Applies the double threshold to the image
function doubleThreshold(pixels, highThresholdRatio, lowThresholdRatio, grads, strongEdgePixels, weakEdgePixels) {
@@ -197,5 +198,5 @@ function hysteresis(strongEdgePixels, weakEdgePixels){
else if(weakEdgePixels.includes([x, y-1])) {
removeElem(weakEdgePixels, [x, y-1]);
}
})
});
}

22
src/modules/EdgeDetect/Module.js
View File

@@ -19,16 +19,23 @@ module.exports = function edgeDetect(options, UI) {
var step = this;
// Blur the image
const internalSequencer = ImageSequencer({ inBrowser: false, ui: false });
return internalSequencer.loadImage(input.src, function () {
internalSequencer.importJSON([{ 'name': 'blur', 'options': {blur: options.blur} }]);
return internalSequencer.run(function onCallback(internalOutput) {
require('get-pixels')(internalOutput, function(err, blurPixels){
if (err){
return;
}
// Extra Manipulation function used as an enveloper for applying gaussian blur and Convolution
function changePixel(r, g, b, a) {
return [(r + g + b) / 3, (r + g + b) / 3, (r + g + b) / 3, a];
}
function extraManipulation(pixels) {
pixels = require('ndarray-gaussian-filter')(pixels, options.blur);
pixels = require('./EdgeUtils')(pixels, options.highThresholdRatio, options.lowThresholdRatio, options.hysteresis);
return pixels;
function extraManipulation(){
return require('./EdgeUtils')(blurPixels, options.highThresholdRatio, options.lowThresholdRatio, options.hysteresis);
}
function output(image, datauri, mimetype) {
@@ -44,6 +51,9 @@ module.exports = function edgeDetect(options, UI) {
inBrowser: options.inBrowser,
callback: callback
});
});
});
});
}
return {
@@ -51,5 +61,5 @@ module.exports = function edgeDetect(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/EdgeDetect/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

8
src/modules/EdgeDetect/info.json
View File

@@ -6,9 +6,9 @@
"type": "float",
"desc": "Amount of gaussian blur(Less blur gives more detail, typically 0-5)",
"default": 2,
"min": 0,
"min": 0.05,
"max": 5,
"step": 0.25
"step": 0.05
},
"highThresholdRatio":{
"type": "float",
@@ -16,7 +16,7 @@
"default": 0.2,
"min": 0,
"max": 1,
"step": 0.25
"step": 0.01
},
"lowThresholdRatio": {
"type": "float",
@@ -24,7 +24,7 @@
"default": 0.15,
"min": 0,
"max": 1,
"step": 0.05
"step": 0.01
},
"hysteresis": {
"type": "select",

14
src/modules/Exposure/Module.js
View File

@@ -9,7 +9,7 @@ module.exports = function Exposure(options,UI){
function draw(input,callback,progressObj){
options.exposure = options.exposure || defaults.exposure
options.exposure = options.exposure || defaults.exposure;
var exposure = Math.pow(2, options.exposure);
progressObj.stop(true);
progressObj.overrideFlag = true;
@@ -18,10 +18,10 @@ module.exports = function Exposure(options,UI){
function changePixel(r, g, b, a){
r = Math.min(255, r*exposure)
g = Math.min(255, g*exposure)
b = Math.min(255, b*exposure)
return [r, g, b, a]
r = Math.min(255, r*exposure);
g = Math.min(255, g*exposure);
b = Math.min(255, b*exposure);
return [r, g, b, a];
}
function output(image,datauri,mimetype){
@@ -46,5 +46,5 @@ module.exports = function Exposure(options,UI){
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Exposure/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

8
src/modules/FisheyeGl/Module.js
View File

@@ -18,14 +18,14 @@ module.exports = function DoNothing(options, UI) {
// Create a canvas, if it doesn't already exist.
if (!document.querySelector('#image-sequencer-canvas')) {
var canvas = document.createElement('canvas');
canvas.style.display = "none";
canvas.style.display = 'none';
canvas.setAttribute('id', 'image-sequencer-canvas');
document.body.append(canvas);
}
else var canvas = document.querySelector('#image-sequencer-canvas');
distorter = FisheyeGl({
selector: "#image-sequencer-canvas"
selector: '#image-sequencer-canvas'
});
// Parse the inputs
@@ -65,5 +65,5 @@ module.exports = function DoNothing(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/FisheyeGl/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

6
src/modules/FlipImage/Module.js
View File

@@ -38,7 +38,7 @@ module.exports = function FlipImage(options, UI) {
inBrowser: options.inBrowser,
callback: callback
});
})
});
}
@@ -47,5 +47,5 @@ module.exports = function FlipImage(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

10
src/modules/FlipImage/flipImage.js
View File

@@ -3,10 +3,10 @@ module.exports = function flipImage(oldPixels, pixels, axis) {
height = oldPixels.shape[1];
function copyPixel(x1, y1, x2, y2){
pixels.set(x1, y1, 0, oldPixels.get(x2, y2, 0))
pixels.set(x1, y1, 1, oldPixels.get(x2, y2, 1))
pixels.set(x1, y1, 2, oldPixels.get(x2, y2, 2))
pixels.set(x1, y1, 3, oldPixels.get(x2, y2, 3))
pixels.set(x1, y1, 0, oldPixels.get(x2, y2, 0));
pixels.set(x1, y1, 1, oldPixels.get(x2, y2, 1));
pixels.set(x1, y1, 2, oldPixels.get(x2, y2, 2));
pixels.set(x1, y1, 3, oldPixels.get(x2, y2, 3));
}
function flip(){
@@ -28,4 +28,4 @@ module.exports = function flipImage(oldPixels, pixels, axis) {
flip();
return pixels;
}
};

2
src/modules/FlipImage/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

4
src/modules/GammaCorrection/Module.js
View File

@@ -43,5 +43,5 @@ module.exports = function Gamma(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/GammaCorrection/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

14
src/modules/Gradient/Module.js
View File

@@ -12,7 +12,7 @@ module.exports = function Invert(options, UI) {
getPixels(input.src, function(err, pixels) {
if (err) {
console.log("Bad Image path");
console.log('Bad Image path');
return;
}
@@ -31,14 +31,14 @@ module.exports = function Invert(options, UI) {
var totalLength = 0;
var r = savePixels(pixels, input.format, { quality: 100 });
r.on("data", function(chunk) {
r.on('data', function(chunk) {
totalLength += chunk.length;
chunks.push(chunk);
});
r.on("end", function() {
var data = Buffer.concat(chunks, totalLength).toString("base64");
var datauri = "data:image/" + input.format + ";base64," + data;
r.on('end', function() {
var data = Buffer.concat(chunks, totalLength).toString('base64');
var datauri = 'data:image/' + input.format + ';base64,' + data;
output(input.image, datauri, input.format);
callback();
});
@@ -57,5 +57,5 @@ module.exports = function Invert(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Gradient/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

4
src/modules/GridOverlay/GridOverlay.js
View File

@@ -4,7 +4,7 @@ module.exports = exports = function(pixels, options){
options.x = Number(options.x) || defaults.x;
options.y = Number(options.y) || defaults.y;
color = options.color || defaults.color;
color = color.split(" ");
color = color.split(' ');
for(var x = 0; x < pixels.shape[0]; x+=options.x){
for(var y = 0 ; y < pixels.shape[1]; y++){
@@ -25,4 +25,4 @@ module.exports = exports = function(pixels, options){
}
return pixels;
}
};

6
src/modules/GridOverlay/Module.js
View File

@@ -12,7 +12,7 @@ module.exports = function GridOverlay(options,UI) {
function extraManipulation(pixels) {
pixels = require('./GridOverlay')(pixels, options);
return pixels
return pixels;
}
function output(image, datauri, mimetype) {
@@ -39,5 +39,5 @@ module.exports = function GridOverlay(options,UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/GridOverlay/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module'),
require('./info.json')
]
];

4
src/modules/Histogram/Module.js
View File

@@ -90,5 +90,5 @@ module.exports = function Channel(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

2
src/modules/Histogram/index.js
View File

@@ -1,4 +1,4 @@
module.exports = [
require('./Module.js'),
require('./info.json')
]
];

6
src/modules/ImportImage/Module.js
View File

@@ -9,7 +9,7 @@
module.exports = function ImportImageModule(options, UI) {
var defaults = require('./../../util/getDefaults.js')(require('./info.json'));
options.imageUrl = options.inBrowser ? (options.url || defaults.url) : "./examples/images/monarch.png";
options.imageUrl = options.inBrowser ? (options.url || defaults.url) : './examples/images/monarch.png';
var output;
@@ -44,5 +44,5 @@ module.exports = function ImportImageModule(options, UI) {
draw: draw,
output: output,
UI: UI
}
}
};
};

Some files were not shown because too many files have changed in this diff Show More