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

implemented modulesInfo in Demo

Browse Source
This commit is contained in:
Chinmay Pandhare
2017-08-15 08:02:54 +05:30
parent a9e0068628
commit d207c147fe
5 changed files with 59 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dist/image-sequencer.js vendored
View File

@@ -28654,10 +28654,10 @@ module.exports = function Crop(input,options,callback) {
savePixels = require('save-pixels'); savePixels = require('save-pixels');
getPixels(input.src,function(err,pixels){ getPixels(input.src,function(err,pixels){
var ox = options.x || 0; var ox = parseInt(options.x) || 0;
var oy = options.y || 0; var oy = parseInt(options.y) || 0;
var w = options.w || Math.floor(0.5*pixels.shape[0]); var w = parseInt(options.w) || Math.floor(0.5*pixels.shape[0]);
var h = options.h || Math.floor(0.5*pixels.shape[1]); var h = parseInt(options.h) || Math.floor(0.5*pixels.shape[1]);
var iw = pixels.shape[0]; //Width of Original Image var iw = pixels.shape[0]; //Width of Original Image
var newarray = new Uint8Array(4*w*h); var newarray = new Uint8Array(4*w*h);
for (var n = oy; n < oy + h; n++) { for (var n = oy; n < oy + h; n++) {
@@ -28749,12 +28749,12 @@ module.exports={
"desc": "Y-position (measured from top) from where cropping starts", "desc": "Y-position (measured from top) from where cropping starts",
"default": 0 "default": 0
}, },
"width": { "w": {
"type": "integer", "type": "integer",
"desc": "Width of crop", "desc": "Width of crop",
"default": "(50%)" "default": "(50%)"
}, },
"height": { "h": {
"type": "integer", "type": "integer",
"desc": "Height of crop", "desc": "Height of crop",
"default": "(50%)" "default": "(50%)"
@@ -28922,13 +28922,13 @@ module.exports = function DoNothing(options,UI) {
selector: "#image-sequencer-canvas" selector: "#image-sequencer-canvas"
}); });
distorter.lens.a = options.a || distorter.lens.a; distorter.lens.a = parseFloat(options.a) || distorter.lens.a;
distorter.lens.b = options.b || distorter.lens.b; distorter.lens.b = parseFloat(options.b) || distorter.lens.b;
distorter.lens.Fx = options.Fx || distorter.lens.Fx; distorter.lens.Fx = parseFloat(options.Fx) || distorter.lens.Fx;
distorter.lens.Fy = options.Fy || distorter.lens.Fy; distorter.lens.Fy = parseFloat(options.Fy) || distorter.lens.Fy;
distorter.lens.scale = options.scale || distorter.lens.scale; distorter.lens.scale = parseFloat(options.scale) || distorter.lens.scale;
distorter.fov.x = options.x || distorter.fov.x; distorter.fov.x = parseFloat(options.x) || distorter.fov.x;
distorter.fov.y = options.y || distorter.fov.y; distorter.fov.y = parseFloat(options.y) || distorter.fov.y;
distorter.setImage(input.src,function(){ distorter.setImage(input.src,function(){
step.output = {src: canvas.toDataURL(), format: input.format}; step.output = {src: canvas.toDataURL(), format: input.format};

58
examples/index.html
View File

@@ -51,13 +51,6 @@
Add Step : Add Step :
<select style="font-family: sans-serif; height: 30px"> <select style="font-family: sans-serif; height: 30px">
<option value="none" disabled selected>Please Select</option> <option value="none" disabled selected>Please Select</option>
<option value="crop">Crop</option>
<option value="decode-qr">Decode Qr</option>
<option value="fisheye-gl">Fisheye GL</option>
<option value="green-channel">Green Channel</option>
<option value="invert">Invert</option>
<option value="ndvi-red">NDVI Red</option>
<option value="segmented-colormap">Segmented Colormap</option>
</select> </select>
<button type="button" name="add">Add Step</button> <button type="button" name="add">Add Step</button>
</div> </div>
@@ -65,23 +58,7 @@
<div class="c"> <div class="c">
Options: Options:
</div> </div>
<div class="c rh"> <div id="options" class="c rh">
<div class="r">
<div class="c">
key:
</div>
<div class="c">
<input type="text" name="" value="" placeholder="default"/>
</div>
</div>
<div class="r">
<div class="c">
key:
</div>
<div class="c">
<input type="text" name="" value="" placeholder="default"/>
</div>
</div>
</div> </div>
</div> </div>
</section> </section>
@@ -94,6 +71,14 @@
window.onload = function() { window.onload = function() {
var modulesInfo = sequencer.modulesInfo();
for(var m in modulesInfo) {
if(m!="do-nothing" && m!="do-nothing-pix")
$('#addStep select').append(
'<option value="'+m+'">'+modulesInfo[m].name+'</option>'
);
}
var steps = document.querySelector('#steps'); var steps = document.querySelector('#steps');
var parser = new DOMParser(); var parser = new DOMParser();
@@ -147,9 +132,32 @@
this.addSteps('crop').run(); this.addSteps('crop').run();
}); });
$('#addStep select').on('change', function(){
$('#options').html('');
var m = $('#addStep select').val();
for(var input in modulesInfo[m].inputs) {
$('#options').append(
'<div class="r">\
<div class="c">\
'+input+':\
</div>\
<div class="c">\
<input type="text" name="'+input+'" value="" placeholder="'+
modulesInfo[m].inputs[input].default+'"/>\
</div>\
</div>'
);
}
});
$('#addStep button').on('click',function(){ $('#addStep button').on('click',function(){
var options = {};
var inputs = $('#options input');
$.each(inputs, function() {
options[this.name] = $(this).val();
});
if($('#addStep select').val()=="none") return; if($('#addStep select').val()=="none") return;
sequencer.addSteps($('#addStep select').val()).run(); sequencer.addSteps($('#addStep select').val(),options).run();
}); });
$('body').on('click','button.remove',function(){ $('body').on('click','button.remove',function(){

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

@@ -4,10 +4,10 @@ module.exports = function Crop(input,options,callback) {
savePixels = require('save-pixels'); savePixels = require('save-pixels');
getPixels(input.src,function(err,pixels){ getPixels(input.src,function(err,pixels){
var ox = options.x || 0; var ox = parseInt(options.x) || 0;
var oy = options.y || 0; var oy = parseInt(options.y) || 0;
var w = options.w || Math.floor(0.5*pixels.shape[0]); var w = parseInt(options.w) || Math.floor(0.5*pixels.shape[0]);
var h = options.h || Math.floor(0.5*pixels.shape[1]); var h = parseInt(options.h) || Math.floor(0.5*pixels.shape[1]);
var iw = pixels.shape[0]; //Width of Original Image var iw = pixels.shape[0]; //Width of Original Image
var newarray = new Uint8Array(4*w*h); var newarray = new Uint8Array(4*w*h);
for (var n = oy; n < oy + h; n++) { for (var n = oy; n < oy + h; n++) {

4
src/modules/Crop/info.json
View File

@@ -11,12 +11,12 @@
"desc": "Y-position (measured from top) from where cropping starts", "desc": "Y-position (measured from top) from where cropping starts",
"default": 0 "default": 0
}, },
"width": { "w": {
"type": "integer", "type": "integer",
"desc": "Width of crop", "desc": "Width of crop",
"default": "(50%)" "default": "(50%)"
}, },
"height": { "h": {
"type": "integer", "type": "integer",
"desc": "Height of crop", "desc": "Height of crop",
"default": "(50%)" "default": "(50%)"

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

@@ -28,13 +28,13 @@ module.exports = function DoNothing(options,UI) {
selector: "#image-sequencer-canvas" selector: "#image-sequencer-canvas"
}); });
distorter.lens.a = options.a || distorter.lens.a; distorter.lens.a = parseFloat(options.a) || distorter.lens.a;
distorter.lens.b = options.b || distorter.lens.b; distorter.lens.b = parseFloat(options.b) || distorter.lens.b;
distorter.lens.Fx = options.Fx || distorter.lens.Fx; distorter.lens.Fx = parseFloat(options.Fx) || distorter.lens.Fx;
distorter.lens.Fy = options.Fy || distorter.lens.Fy; distorter.lens.Fy = parseFloat(options.Fy) || distorter.lens.Fy;
distorter.lens.scale = options.scale || distorter.lens.scale; distorter.lens.scale = parseFloat(options.scale) || distorter.lens.scale;
distorter.fov.x = options.x || distorter.fov.x; distorter.fov.x = parseFloat(options.x) || distorter.fov.x;
distorter.fov.y = options.y || distorter.fov.y; distorter.fov.y = parseFloat(options.y) || distorter.fov.y;
distorter.setImage(input.src,function(){ distorter.setImage(input.src,function(){
step.output = {src: canvas.toDataURL(), format: input.format}; step.output = {src: canvas.toDataURL(), format: input.format};