From f11cd4a04d7a6f85226383c82a8804d25715c5fd Mon Sep 17 00:00:00 2001
From: Chinmay Pandhare <pandharechinmay882@gmail.com>
Date: Mon, 3 Apr 2017 11:46:01 +0530
Subject: [PATCH] Finishing demo

---
 index.js                          |  9 +++-
 package.json                      |  2 +-
 src/ImageSequencerNode.js         | 71 ++++++++++++++-----------------
 src/ModulesNode.js                |  2 +-
 src/modules/DoNothingNode.js      | 23 ++++++++++
 src/modules/ImageThresholdNode.js | 54 -----------------------
 6 files changed, 63 insertions(+), 98 deletions(-)
 create mode 100644 src/modules/DoNothingNode.js
 delete mode 100644 src/modules/ImageThresholdNode.js

diff --git a/index.js b/index.js
index 59c27624..3c132f75 100644
--- a/index.js
+++ b/index.js
@@ -1,4 +1,9 @@
-require('./dist/image-sequencer-node');
+sharp = require('sharp');
+function log2(i){
+console.log('\x1b[31m%s\x1b[0m:',"This is the output of the module");
+console.log(sequencer.steps[i].get());
+}
+require('./src/ImageSequencerNode');
 sequencer = ImageSequencer();
 sequencer.loadImage('examples/grid.png');
-sequencer.addStep('ndvi-red');
+sequencer.addStep('do-nothing');
diff --git a/package.json b/package.json
index 5928e2c0..93480fae 100644
--- a/package.json
+++ b/package.json
@@ -20,8 +20,8 @@
     "url": "https://github.com/publiclab/image-sequencer/issues"
   },
   "dependencies": {
-    "font-awesome": "~4.5.0",
     "bootstrap": "~3.2.0",
+    "font-awesome": "~4.5.0",
     "jquery": "~2",
     "sharp": "~0.17.2"
   },
diff --git a/src/ImageSequencerNode.js b/src/ImageSequencerNode.js
index bea17540..3af1204e 100644
--- a/src/ImageSequencerNode.js
+++ b/src/ImageSequencerNode.js
@@ -1,10 +1,8 @@
-var sharp = require('sharp');
-
 ImageSequencer = function ImageSequencer(options) {
 
   options = options || {};
   options.inBrowser = options.inBrowser || typeof window !== 'undefined';
-  if (options.inBrowser) options.ui = options.ui || require('./UserInterface');
+  // if (options.inBrowser) options.ui = options.ui || require('./UserInterface');
   options.sequencerCounter = 0;
 
   var image,
@@ -17,8 +15,7 @@ ImageSequencer = function ImageSequencer(options) {
 
   // soon, detect local or URL?
   function addStep(name, o) {
-    console.log('adding step "' + name + '"');
-
+    console.log('\x1b[36m%s\x1b[0m','adding step "' + name + '"');
     if (typeof(global) != "undefined")
       for(var variable in global)
         if(global[variable] == this)
@@ -34,14 +31,14 @@ ImageSequencer = function ImageSequencer(options) {
 
     steps.push(module);
 
-    // function defaultSetupModule() {
-    //   if (options.ui) module.options.ui = options.ui({
-    //     selector: o.selector,
-    //     title: module.options.title,
-    //     id: o.id,
-    //     instanceName: options.instanceName
-    //   });
-    // }
+    function defaultSetupModule() {
+      if (options.ui) module.options.ui = options.ui({
+        selector: o.selector,
+        title: module.options.title,
+        id: o.id,
+        instanceName: options.instanceName
+      });
+    }
 
     if (name === "image-select") {
 
@@ -55,20 +52,20 @@ ImageSequencer = function ImageSequencer(options) {
         defaultSetupModule.apply(module); // run default setup() in scope of module (is this right?)
       }
 
-      var previousStep = steps[steps.length - 2];
-
-      if (previousStep) {
-        // connect output of last step to input of this step
-        previousStep.options.output = function output(image) {
-          if (sequencer.steps[0].options.initialImage) {
-            options.initialImage = sequencer.steps[0].options.initialImage;
-          }
-          log('running module "' + name + '"');
-          // display the image in any available ui
-          if (previousStep.options.ui && previousStep.options.ui.display) previousStep.options.ui.display(image);
-          module.draw(image);
-        }
-      }
+      // var previousStep = steps[steps.length - 2];
+      //
+      // if (previousStep) {
+      //   // connect output of last step to input of this step
+      //   previousStep.options.output = function output(image) {
+      //     if (sequencer.steps[0].options.initialImage) {
+      //       options.initialImage = sequencer.steps[0].options.initialImage;
+      //     }
+      //     log('running module "' + name + '"');
+      //     // display the image in any available ui
+      //     if (previousStep.options.ui && previousStep.options.ui.display) previousStep.options.ui.display(image);
+      //     module.draw(image);
+      //   }
+      // }
 
     }
 
@@ -78,28 +75,29 @@ ImageSequencer = function ImageSequencer(options) {
       // if (module.options.ui && module.options.ui.display) module.options.ui.display(image);
     }
 
+    return 'Addded.';
   }
 
   function removeStep (id) {
     for (i=0;i<steps.length;i++) {
       if (steps[i].options.id == id && steps[i].options.name != 'image-select'){
-        console.log('removing step "'+steps[i].options.name+'"');
+        console.log('\x1b[36m%s\x1b[0m','removing step "'+steps[i].options.name+'"');
         // if (options.inBrowser) steps[i].options.ui.remove();
         steps.splice(i,1);
-        run(options.initialImage);
+        if (steps.length != 0)
+          run(options.initialImage);
       }
     }
+    return "Removed.";
   }
 
   // passed image is optional but you can pass a
   // non-stored image through the whole steps chain
   function run(image) {
-    if (image) steps[1].draw(image);
-    else steps[0].draw();
+    steps[0].draw(image);
   }
 
   function log(msg) {
-    $('.log').append(msg + ' at ' + new Date());
     console.log(msg);
   }
 
@@ -111,13 +109,6 @@ ImageSequencer = function ImageSequencer(options) {
       for(var variable in global)
         if(global[variable] == this)
           options.instanceName = variable;
-    // image = new Image();
-    // image.onload = function() {
-    //   run(image);
-    //   if (callback) callback(image);
-    //   options.initialImage = image;
-    // }
-    // image.src = src;
     image = {};
     image.src = src;
     image.width = 0;
@@ -128,9 +119,9 @@ ImageSequencer = function ImageSequencer(options) {
       image.height = metadata.height;
       image.naturalWidth = metadata.width;
       image.naturalHeight = metadata.height;
+      options.initialImage = image;
       run(image);
       if(callback) callback(image);
-      options.initialImage = image;
     });
 
   }
diff --git a/src/ModulesNode.js b/src/ModulesNode.js
index 96c555e9..94ece1e7 100644
--- a/src/ModulesNode.js
+++ b/src/ModulesNode.js
@@ -2,5 +2,5 @@
  * Core modules
  */
 module.exports = {
-  'image-threshold': require('./modules/ImageThresholdNode')
+  'do-nothing': require('./modules/DoNothingNode')
 }
diff --git a/src/modules/DoNothingNode.js b/src/modules/DoNothingNode.js
new file mode 100644
index 00000000..3edd813c
--- /dev/null
+++ b/src/modules/DoNothingNode.js
@@ -0,0 +1,23 @@
+/*
+ * Demo Module. Does nothing.
+ */
+module.exports = function DoNothing(options) {
+  options = options || {};
+  options.title = "Do Nothing";
+
+  var image;
+
+  function draw(inputImage) {
+       image = inputImage;
+  }
+
+  function get() {
+    return image;
+  }
+
+  return {
+    options: options,
+    draw: draw,
+    get: get
+  }
+}
diff --git a/src/modules/ImageThresholdNode.js b/src/modules/ImageThresholdNode.js
deleted file mode 100644
index 67b62c78..00000000
--- a/src/modules/ImageThresholdNode.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Image thresholding with 'image-filter-threshold'
- */
-module.exports = function ImageThreshold(options) {
-  options = options || {};
-  options.title = "Threshold image";
-  options.threshold = options.threshold || 30;
-
-  var image;
-
-  function draw(inputImage) {
-    $(inputImage).load(function(){
-      var canvas = document.createElement('canvas');
-      canvas.width = inputImage.naturalWidth;
-      canvas.height = inputImage.naturalHeight;
-      var context = canvas.getContext('2d');
-      context.drawImage(inputImage, 0, 0);
-
-      var imageData = context.getImageData(0, 0, canvas.width, canvas.height);
-
-      var imageThreshold = require('image-filter-threshold');
-      var imageFilterCore = require('image-filter-core');
-
-      var result = imageThreshold({
-        data: imageData,
-        threshold: options.threshold
-      }).then(function (imageData) {
-       image = {};
-       image.src = src;
-       image.width = 0;
-       image.height = 0;
-       img = sharp(image.src);
-       img.metadata().then(function(metadata){
-         image.width = metadata.width;
-         image.height = metadata.height;
-         image.naturalWidth = metadata.width;
-         image.naturalHeight = metadata.height;
-         if (options.output) options.output(image);
-       });
-
-      });
-    });
-  }
-
-  function get() {
-    return image;
-  }
-
-  return {
-    options: options,
-    draw: draw,
-    get: get
-  }
-}