From 16c743b6b322961bdee1596492704229e1959356 Mon Sep 17 00:00:00 2001 From: Harshithpabbati Date: Tue, 26 Mar 2019 21:05:28 +0530 Subject: [PATCH 01/11] previewgif overflow --- examples/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/index.html b/examples/index.html index 025b8556d1..2097c2081a 100644 --- a/examples/index.html +++ b/examples/index.html @@ -186,7 +186,7 @@

Save

- + From 02c3f66460939cadd84017da50ef4349acc73e76 Mon Sep 17 00:00:00 2001 From: Harshithpabbati Date: Tue, 26 Mar 2019 22:11:40 +0530 Subject: [PATCH 02/11] made the changes in css --- examples/demo.css | 11 +++++++++++ examples/index.html | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/examples/demo.css b/examples/demo.css index 2798012f6b..9677dc7822 100644 --- a/examples/demo.css +++ b/examples/demo.css @@ -256,3 +256,14 @@ a.name-header{ align-content: center; justify-content: center; } +#gif{ + margin-left:0px; + margin-top:5px; + width:100%; +} +.save-button{ + margin-top:20px; + margin-bottom:0px; + align:center; + width:100%; +} diff --git a/examples/index.html b/examples/index.html index 2097c2081a..3ec503eeed 100644 --- a/examples/index.html +++ b/examples/index.html @@ -185,8 +185,8 @@

Save

- - + + From f9992d5e1acf0bf295ca8116aa58d3597a003291 Mon Sep 17 00:00:00 2001 From: Harshithpabbati Date: Wed, 27 Mar 2019 00:00:45 +0530 Subject: [PATCH 03/11] removed the panel old one --- examples/index.html | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/examples/index.html b/examples/index.html index 3ec503eeed..d76e2e5f6e 100644 --- a/examples/index.html +++ b/examples/index.html @@ -145,32 +145,26 @@

Image Sequencer

-
-
- -
+ +
From 49802a03fb51caf955fd512239d10656b4fc3440 Mon Sep 17 00:00:00 2001 From: Harshith pabbati Date: Sat, 30 Mar 2019 14:06:47 +0530 Subject: [PATCH 04/11] Update demo.css --- examples/demo.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/examples/demo.css b/examples/demo.css index 61baf9a673..ef1554cca8 100644 --- a/examples/demo.css +++ b/examples/demo.css @@ -259,8 +259,6 @@ a.name-header{ .trash-container button.btn-xs { margin-top: -5px !important; } - -/* .panel-footer .insert-step{ margin-left:10px; border-radius:6px; @@ -276,7 +274,6 @@ a.name-header{ .panel-footer{ height: 45px; } -<<<<<<< HEAD #gif{ margin-left:0px; margin-top:5px; @@ -288,6 +285,3 @@ a.name-header{ align:center; width:100%; } -======= -*/ ->>>>>>> main From 191cc6c828cc9f29ff63a5bece5c5d9514bbf920 Mon Sep 17 00:00:00 2001 From: Harshith pabbati Date: Sat, 30 Mar 2019 14:07:45 +0530 Subject: [PATCH 05/11] Update index.html --- examples/index.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/examples/index.html b/examples/index.html index d1a0195fd6..7bedc81787 100644 --- a/examples/index.html +++ b/examples/index.html @@ -182,7 +182,6 @@

Save

-=======

->>>>>>> main
From 9906376c0db0ae9ed4382ba96def1f6ebf9039c9 Mon Sep 17 00:00:00 2001 From: Harshithpabbati Date: Sat, 30 Mar 2019 14:13:26 +0530 Subject: [PATCH 06/11] changes --- examples/demo.css | 6 ------ examples/index.html | 11 ----------- 2 files changed, 17 deletions(-) diff --git a/examples/demo.css b/examples/demo.css index 61baf9a673..ef1554cca8 100644 --- a/examples/demo.css +++ b/examples/demo.css @@ -259,8 +259,6 @@ a.name-header{ .trash-container button.btn-xs { margin-top: -5px !important; } - -/* .panel-footer .insert-step{ margin-left:10px; border-radius:6px; @@ -276,7 +274,6 @@ a.name-header{ .panel-footer{ height: 45px; } -<<<<<<< HEAD #gif{ margin-left:0px; margin-top:5px; @@ -288,6 +285,3 @@ a.name-header{ align:center; width:100%; } -======= -*/ ->>>>>>> main diff --git a/examples/index.html b/examples/index.html index d1a0195fd6..89c3d5482b 100644 --- a/examples/index.html +++ b/examples/index.html @@ -173,7 +173,6 @@

Your gif is ready

Save

-<<<<<<< HEAD -======= - -

-

->>>>>>> main
From a76b1d378aff0fd6a68c8cfab92e5f6183ad06d2 Mon Sep 17 00:00:00 2001 From: Harshithpabbati Date: Sat, 30 Mar 2019 15:36:20 +0530 Subject: [PATCH 07/11] changes --- examples/demo.css | 2 ++ src/modules/Grid/GridOverlay.js | 22 ++++++++++++++ src/modules/Grid/Module.js | 51 +++++++++++++++++++++++++++++++++ src/modules/Grid/index.js | 4 +++ src/modules/Grid/info.json | 5 ++++ 5 files changed, 84 insertions(+) create mode 100644 src/modules/Grid/GridOverlay.js create mode 100644 src/modules/Grid/Module.js create mode 100644 src/modules/Grid/index.js create mode 100644 src/modules/Grid/info.json diff --git a/examples/demo.css b/examples/demo.css index ef1554cca8..6489e9fa1b 100644 --- a/examples/demo.css +++ b/examples/demo.css @@ -268,6 +268,7 @@ a.name-header{ .col-md-4{ padding-left: 30px; } +/* .panel-heading{ height:45px; } @@ -285,3 +286,4 @@ a.name-header{ align:center; width:100%; } +*/ \ No newline at end of file diff --git a/src/modules/Grid/GridOverlay.js b/src/modules/Grid/GridOverlay.js new file mode 100644 index 0000000000..f283479a4b --- /dev/null +++ b/src/modules/Grid/GridOverlay.js @@ -0,0 +1,22 @@ +module.exports = exports = function(pixels, options,priorstep){ + var defaults = require('../../util/getDefaults.js')(require('./info.json')); + + var canvas = document.createElement("canvas"); + var context = canvas.getContext("2d"); + canvas.width = pixels.shape[0]; //img.width(); + canvas.height = pixels.shape[1]; //img.height(); + for (var x = 0.5; x < canvas.width; x += 10) { + context.moveTo(x, 0); + context.lineTo(x, 381); + } + + for (var y = 0.5; y < canvas.height; y += 10) { + context.moveTo(0, y); + context.lineTo(canvas.height, y); + } + + context.strokeStyle = "#ddd"; + context.stroke(); + + return pixels; +} \ No newline at end of file diff --git a/src/modules/Grid/Module.js b/src/modules/Grid/Module.js new file mode 100644 index 0000000000..be039ad09d --- /dev/null +++ b/src/modules/Grid/Module.js @@ -0,0 +1,51 @@ + +module.exports = function TextOverlay(options,UI) { + + var output; + + function draw(input, callback, progressObj) { + + progressObj.stop(true); + progressObj.overrideFlag = true; + + var step = this; + if (!options.step.inBrowser) { // This module is only for browser + this.output = input; + callback(); + } + else{ + var priorStep = this.getStep(-1); // get the previous step to add text onto it. + + function extraManipulation(pixels) { + //if (options.step.inBrowser) + pixels = require('./GridOverlay')(pixels, options,priorStep); + return pixels + } + + function output(image, datauri, mimetype) { + + // This output is accesible by Image Sequencer + step.output = { src: datauri, format: mimetype }; + + } + + return require('../_nomodule/PixelManipulation.js')(input, { + output: output, + extraManipulation: extraManipulation, + format: input.format, + image: options.image, + inBrowser: options.inBrowser, + callback: callback + }); + + } + } + + return { + options: options, + draw: draw, + output: output, + UI: UI + } + } + \ No newline at end of file diff --git a/src/modules/Grid/index.js b/src/modules/Grid/index.js new file mode 100644 index 0000000000..11ef888ffe --- /dev/null +++ b/src/modules/Grid/index.js @@ -0,0 +1,4 @@ +module.exports = [ + require('./Module'), + require('./info.json') +] \ No newline at end of file diff --git a/src/modules/Grid/info.json b/src/modules/Grid/info.json new file mode 100644 index 0000000000..26a4af8843 --- /dev/null +++ b/src/modules/Grid/info.json @@ -0,0 +1,5 @@ +{ + "name": "Grid Overlay", + "description": "Overlays Grid on an image", + "inputs": {} +} From 0a3f7a5cbe9c13a09eb302a79b214e31021226fd Mon Sep 17 00:00:00 2001 From: Harshith pabbati Date: Sun, 31 Mar 2019 00:44:43 +0530 Subject: [PATCH 08/11] Delete GridOverlay.js --- src/modules/Grid/GridOverlay.js | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 src/modules/Grid/GridOverlay.js diff --git a/src/modules/Grid/GridOverlay.js b/src/modules/Grid/GridOverlay.js deleted file mode 100644 index f283479a4b..0000000000 --- a/src/modules/Grid/GridOverlay.js +++ /dev/null @@ -1,22 +0,0 @@ -module.exports = exports = function(pixels, options,priorstep){ - var defaults = require('../../util/getDefaults.js')(require('./info.json')); - - var canvas = document.createElement("canvas"); - var context = canvas.getContext("2d"); - canvas.width = pixels.shape[0]; //img.width(); - canvas.height = pixels.shape[1]; //img.height(); - for (var x = 0.5; x < canvas.width; x += 10) { - context.moveTo(x, 0); - context.lineTo(x, 381); - } - - for (var y = 0.5; y < canvas.height; y += 10) { - context.moveTo(0, y); - context.lineTo(canvas.height, y); - } - - context.strokeStyle = "#ddd"; - context.stroke(); - - return pixels; -} \ No newline at end of file From 37e25fb5d4efda3e60253d20b39db468c956533c Mon Sep 17 00:00:00 2001 From: Harshith pabbati Date: Sun, 31 Mar 2019 00:45:00 +0530 Subject: [PATCH 09/11] Delete Module.js --- src/modules/Grid/Module.js | 51 -------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 src/modules/Grid/Module.js diff --git a/src/modules/Grid/Module.js b/src/modules/Grid/Module.js deleted file mode 100644 index be039ad09d..0000000000 --- a/src/modules/Grid/Module.js +++ /dev/null @@ -1,51 +0,0 @@ - -module.exports = function TextOverlay(options,UI) { - - var output; - - function draw(input, callback, progressObj) { - - progressObj.stop(true); - progressObj.overrideFlag = true; - - var step = this; - if (!options.step.inBrowser) { // This module is only for browser - this.output = input; - callback(); - } - else{ - var priorStep = this.getStep(-1); // get the previous step to add text onto it. - - function extraManipulation(pixels) { - //if (options.step.inBrowser) - pixels = require('./GridOverlay')(pixels, options,priorStep); - return pixels - } - - function output(image, datauri, mimetype) { - - // This output is accesible by Image Sequencer - step.output = { src: datauri, format: mimetype }; - - } - - return require('../_nomodule/PixelManipulation.js')(input, { - output: output, - extraManipulation: extraManipulation, - format: input.format, - image: options.image, - inBrowser: options.inBrowser, - callback: callback - }); - - } - } - - return { - options: options, - draw: draw, - output: output, - UI: UI - } - } - \ No newline at end of file From 64a4bd9b206aee8e617b889d34580dc371518df3 Mon Sep 17 00:00:00 2001 From: Harshith pabbati Date: Sun, 31 Mar 2019 00:45:15 +0530 Subject: [PATCH 10/11] Delete index.js --- src/modules/Grid/index.js | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 src/modules/Grid/index.js diff --git a/src/modules/Grid/index.js b/src/modules/Grid/index.js deleted file mode 100644 index 11ef888ffe..0000000000 --- a/src/modules/Grid/index.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = [ - require('./Module'), - require('./info.json') -] \ No newline at end of file From 8afa528f8dd79b505af2636a8db0543c2f344e8d Mon Sep 17 00:00:00 2001 From: Harshith pabbati Date: Sun, 31 Mar 2019 00:45:29 +0530 Subject: [PATCH 11/11] Delete info.json --- src/modules/Grid/info.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 src/modules/Grid/info.json diff --git a/src/modules/Grid/info.json b/src/modules/Grid/info.json deleted file mode 100644 index 26a4af8843..0000000000 --- a/src/modules/Grid/info.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "Grid Overlay", - "description": "Overlays Grid on an image", - "inputs": {} -}