Update PixelManipulation.js

.codecov.yml

@@ -1,5 +0,0 @@
-comment: off
-coverage:
-  status:
-    project: off
-    patch: off

.github/ISSUE_TEMPLATE.md

@@ -1,35 +0,0 @@
-### Please describe the problem (or idea)
-
-> What happened just before the problem occurred? Or what problem could this idea solve?
-
-
-
-> What did you expect to see that you didn't?
-
-
-
-### Please show us where to look
-
-https://beta.sequencer.publiclab.org
-
-
-### What's your PublicLab.org username?
-
-> This can help us diagnose the issue:
-
-
-
-### Browser, version, and operating system
-
-> Many bugs are related to these -- please help us track it down and reproduce what you're seeing!
-
-
-****
-
-## Thank you!
-
-Your help makes Public Lab better! We *deeply* appreciate your helping refine and improve this site.
-
-To learn how to write really great issues, which increases the chances they'll be resolved, see:
-
-https://publiclab.org/wiki/developers#Contributing+for+non-coders

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +0,0 @@
-Fixes #[Add issue number here.]
-
-Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!
-
-* [ ] tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with `npm test`
-* [ ] code is in uniquely-named feature branch and has no merge conflicts
-* [ ] PR is descriptively titled
-* [ ] ask `@publiclab/is-reviewers` for help, in a comment below
-
-> We're happy to help you get this ready -- don't be afraid to ask for help, and **don't be discouraged** if your tests fail at first!
-
-If tests do fail, click on the red `X` to learn why by reading the logs.
-
-Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software
-
-Thanks!

.github/config.yml

@@ -1,25 +0,0 @@
-# Configuration for welcome - https://github.com/behaviorbot/welcome
-
-# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
-
-# Comment to be posted to on first time issues
-newIssueWelcomeComment: |
-  Thanks for opening your first issue here! Please follow the issue template to help us help you 👍🎉😄
-  If you have screenshots to share demonstrating the issue, that's really helpful! 📸 You can [make a gif](https://www.cockos.com/licecap/) too!
-# Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
-
-# Comment to be posted to on PRs from first time contributors in your repository
-newPRWelcomeComment: |
- Thanks for opening this pull request!
- There may be some errors, **but don't worry!** We're here to help! 👍🎉😄
-# Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
-
-# Comment to be posted to on pull requests merged by a first time user
-firstPRMergeComment: |
- Congrats on merging your first pull request! 🙌🎉⚡️ 
- Your code will be published to https://beta.sequencer.publiclab.org in a day or two. 
- In the meantime, can you tell us your Twitter handle so we can thank you properly?
- Now that you've completed this, you can help someone else take their first step!
- See: [Public Lab's coding community!](https://code.publiclab.org)
-
-# It is recommended to include as many gifs and emojis as possible

.github/first-timers.yml

@@ -1,12 +0,0 @@
-# You can change the labels to suit your needs if "first-timers-only" is not what you are looking for.
-# These are some examples.
-labels:
-  - first-timers-only
-  - help wanted
-  
-#If you would like to add your own template for the issue, add an .md file to your .github folder
-template: .github/fto-template.md
-  
-# You can create the issue in a different repo than where the problem is. Just make sure you installed the bot on the configured repository.
-# The issue will link back to the original repository where the contribution will be made.
-#repository: repo-name 

.github/fto-template.md

@@ -1,51 +0,0 @@
-Hi, this is a [first-timers-only issue](https://code.publiclab.org/#r=all). This means we've worked to make it more legible to folks who either **haven't contributed to our codebase before, or even folks who haven't contributed to open source before**. 
-
-If that's you, we're interested in helping you take the first step and can answer questions and help you out as you do. Note that we're especially interested in contributions from people from groups underrepresented in free and open source software!
-
-We know that the process of creating a pull request is the biggest barrier for new contributors. This issue is for you 💝
-
-If you have contributed before, **consider leaving this one for someone new**, and looking through our general [help wanted](https://github.com/publiclab/image-sequencer/labels/help-wanted) issues. Thanks!
-
-### 🤔 What you will need to know.
-
-Nothing. This issue is meant to welcome you to Open Source :) We are happy to walk you through the process.
-
-### 📋 Step by Step
-
-- [ ] 🙋 **Claim this issue**: Comment below. If someone else has claimed it, ask if they've opened a pull request already and if they're stuck -- maybe you can help them solve a problem or move it along!
-
-- [ ] 📝 **Update** the file [$FILENAME]($BRANCH_URL) in the `$REPO` repository (press the little pen Icon) and edit the line as shown below. 
-
-[See this page](https://code.publiclab.org/#r=all) for some help in taking your first steps!
-
-Below is a "diff" showing in red (and a `-`) which lines to remove, and in green (and a `+`) which lines to add:
-
-```diff
-
-$DIFF
-
-```
-- [ ] 💾 **Commit** your changes
-
-- [ ] 🔀 **Start a Pull Request**. There are two ways how you can start a pull request:
-
-1. If you are familiar with the terminal or would like to learn it, [here is a great tutorial](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github) on how to send a pull request using the terminal.
-
-2. You can also [edit files directly in your browser](https://help.github.com/articles/editing-files-in-your-repository/) and open a pull request from there. 
-
-- [ ] 🏁 **Done** Ask in comments for a review :)
-
-### Please keep us updated
-
-💬⏰ - We encourage contributors to be respectful to the community and provide an update **within a week** of claiming a first-timers-only issue. We're happy to keep it assigned to you as long as you need if you update us with a request for more time or help, but if we don't see any activity a week after you claim it we may reassign it to give someone else a chance. Thank you in advance! 
-
-If this happens to you, don't sweat it! Grab another open issue.
-
-### Is someone else already working on this?
-
-🔗- We encourage contributors to link to the original issue in their pull request so all users can easily see if someone's already started on it. 
-
-👥- **If someone seems stuck, offer them some help!** Otherwise, [take a look at some other issues you can help with](https://code.publiclab.org/#r=all). Thanks!
-
-### 🤔❓ Questions?
-Leave a comment below!

.gitignore

@@ -27,10 +27,6 @@ build/Release
 node_modules
 node_modules/*
 
-# Dist Files
-dist/*
-dist
-
 # Optional npm cache directory
 .npm
 
@@ -44,9 +40,5 @@ todo.txt
 test.js
 output.txt
 output/
-test/core/modules/test_outputs
-test/core/modules/test_outputs/*
 node_modules/
 node_modules/*
-test_outputs
-/test_outputs

.npmignore

@@ -1,47 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Optional npm cache directory
-.npm
-
-# Optional REPL history
-.node_repl_history
-
-.DS_Store
-
-*.swp
-todo.txt
-test.js
-output.txt
-output/
-
-
-
-examples/
-icons/
-
-.travis.yml
-Gruntfile.js
-yarn.lock

.travis.yml

@@ -1,24 +1,16 @@
 language: node_js
 node_js:
+  - '4'
+  - '5'
   - '6'
-  - '8'
-  - '10'
+  - '7' # Node.js 7 is most stable version
 env:
   - CXX=g++-4.8
 before_script:
   - npm install grunt-cli -g # for "grunt build"
-  - npm install jasmine -g
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - ./cc-test-reporter before-build
 script:
   - npm test
-  - npm run test-ui
   - grunt build
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
 addons:
   apt:
     sources:

CODE_OF_CONDUCT.md

@@ -1,114 +0,0 @@
-This document was copied from its home at https://publiclab.org/conduct on October 12, 2017. See that page if you would like to submit your concerns in a safe, completely anonymous way, and to learn more about this document. 
-
-****
-
-# Public Lab Code of Conduct 
-
-_Public Lab, PO Box 426113, Cambridge, MA 02142_
-
-We are coming together with an intent to care for ourselves and one another. We want to nurture a compassionate democratic culture where responsibility is shared. We -- visitors, community members, community moderators, staff, organizers, sponsors, and all others -- hold ourselves accountable to the same values regardless of position or experience. For this to work for everybody, individual decisions will not be allowed to run counter to the welfare of other people. This community aspires to be a respectful place both during online and in-person interactions so that all people are able to fully participate with their dignity intact. This document is a piece of the culture we're creating.
-
-
-This code of conduct applies to all spaces managed by the Public Lab community and non-profit, both online and in person. It was written by the Conduct Committee (formed in 2015 during Public Lab’s annual conference “The Barnraising”) and facilitated by staff to provide a clear set of practical guidelines for multi-day events such as Barnraisings, events led by organizers and community members, and online venues such as the website, comment threads on software platforms, chatrooms, our mailing lists, the issue tracker, and any other forums created by Public Lab which the community uses for communication. 
-
-
-## We come from all kinds of backgrounds
-
-Our community is best when we fully invite and include participants from a wide range of backgrounds. We specifically design spaces to be welcoming and accessible to newcomers and folks from underrepresented groups. Public Lab is dedicated to providing a harassment-free, safe, and inclusive experience for everyone, regardless of personal and professional background, gender, gender identity and expression, style of clothing, sexual orientation, dis-/ability, physical appearance, body size, race, class, age, or religion. Public Lab resists and rejects: racism, sexism, ableism, ageism, homophobia, transphobia, body shaming, religion shaming, “geekier-than-thou” shaming, education bias, the shaming of people nursing children, and the dismissal or bullying of children or adults.
-
-## We do not tolerate harassment or shaming
-
-While we operate under the assumption that all people involved with Public Lab subscribe to the basic understanding laid out above, we take these issues very seriously and think they should, in general, be taken seriously. Therefore, individuals who violate this Code both in and outside of Public Lab spaces may affect their ability to participate in Public Lab ranging from temporarily being placed into online moderation to, as a last resort, expulsion from the community. If you have any questions about our commitment to this framework and/or if you are unsure about aspects of it, email conduct@publiclab.org and we will do our best to provide clarification.
-
-## How It Works
-
-Sometimes things go wrong. When a situation is uncomfortable, hurtful, exclusionary, or upsetting, there is a problem that should be addressed. This code of conduct is an effort to maintain a safe space for everyone, and to talk about what might happen if that space is compromised. Please see additional guidelines below for community behavior on how we expect people to interact with one another. 
-
-### Two helpful groups
-
-__Conduct Committee (ConductCom)__: If at any time you experience something that you are not comfortable with, you may contact the Conduct Committee. As established during the 2015 Annual Barnraising, the following individuals are on the Conduct Committee: Klie Kliebert, Carla Green, Nick Shapiro, and Shannon Dosemagen, the executive director of the Public Lab nonprofit. 
-
-
-If you would like to have a confidential conversation, connect with ConductCom in person or email via [conduct@publiclab.org](mailto:conduct@publiclab.org). A minimum of two committee members will confer and respond as swiftly as possible. If you would prefer to speak privately with a representative of the nonprofit, please contact the executive director directly either in person or by email: [shannon@publiclab.org.](mailto:conduct@publiclab.org)
-
-
-To submit a report anonymously for review by ConductCom, go online via phone or computer to our anonymous “contact” app, located at [http://bit.ly/PLReport](http://bit.ly/PLReport). This contact app will be monitored daily at 8am CST during in-person events like Barnraisings and weekly at all other times. During multi-day in-person events hosted by the Public Lab non-profit, there will also be a physical suggestion box available. This box will be monitored throughout the event and can also be used to let us know if you need us to check on an anonymous online submission sooner.
-
-
-__Moderators Group:__ The moderators group is responsible for addressing immediate moderation issues that arise during online violations of the code over email lists and Public Lab community websites, as well as approving first-time posts and generally handling spam. Instructions on how to become a moderator, and, if you’ve been placed in moderation how to begin the process of getting out of moderation can be found at: https://publiclab.org/wiki/moderation. 
-
-****
-
-## A Culture of Empathy
-
-We begin interactions by acknowledging that we are part of a community with complementary goals. Different views are allowed to respectfully coexist in the same space. When something's happened and someone is uncomfortable, our first choice is to work through it. Endeavor to listen and appropriately adjust your behavior if someone approaches you privately with a request that you apologize or publicly requests that you stop an ongoing presentation. If someone questions your words, actions or motives, or "calls you out", hear their feedback and respond respectfully. It’s okay to not understand why something is hurtful or causes discomfort, as long as you approach it respectfully, with empathy. Repeating hurtful behavior after it has been addressed is disrespectful and is not allowed. Doing so will result in removal and subsequent banning from in-person events and being placed into moderation in online spaces. 
-
-### The first rule of engaging with others is consent
-
-During in-person gatherings, consent is important to highlight because the negotiation of consent can be subtle, and it’s easy to miss each other’s non-verbal cues, resulting in miscommunication and/or offense. During online interactions, consent can be even harder to distinguish.
-
-We make guesses or assessments of consent (willingness, welcome, invitation) all the time. Then we stay open to signs that the consent isn't there. Handshakes are a clear example of consent: someone offers a hand, and you take it if you want to shake it. A friendly smile might indicate consent to start a conversation. It might not. We learn that in the interaction. Sometimes we ask directly. We are open to making mistakes, and learning from them. The more we learn to be empathetic and see other people, the more we're able to talk about consent.
-
-Before you engage with someone on any level, be sure you have their consent. If your indications aren't being heard, you can also ask for help from other folks, especially Conduct Committee members and staff of the non-profit: "They aren't taking the hint. Will you help?" Turning a blind eye to hurtful interactions can be as bad for our community as the exchange itself. If you witness something, it's your responsibility to say something.  This is how we keep each other accountable, encourage empathy, and keep our community safe.
-
-## Guidelines for in-person community behavior
-
-
-Do | Don’t
------------ | -----------
-Respectfully share what method works best for you, while giving others space to think differently and contribute other ideas | Disparage entire groups/sets of people for their beliefs or methods
-Ask permission to take pictures of and post about others on social media (see Media Consent, above)| Upload photos, tag or mention others online without their consent 
-Speak your own narrative, from your own unique culture | Caricature the cultural expressions of groups you are not a member of
-Model inclusionary expertise - if others in the group appear to be “lost”, slow down; stop and ask for input | Present information in a way / at a level that no one else in the room can understand, with no attempt to include others in the discussion
-Create events that are all-ages appropriate | Use language that excludes youth and their experiences as vital contributors
-Give everyone a chance to talk, only interrupting if absolutely necessary - for example, Code of Conduct violations | Repeatedly disrupt a discussion
-Stop, listen and ask for clarification if someone perceives your behavior or presentation as violating the Code of Conduct | Ignore others’ request to stop potentially harmful behavior, even if it was an accident
-Cultivate a sense of humor based on other subjects, such as word play (especially puns!)  | Joke using words related to actual or insulting descriptions of people
-Use words that accurately describe the situation - For example, “The wind was ridiculously strong!” instead of “The wind was crazy!” | Use disability and mental/emotional health terminology to describe a situation metaphorically, especially if the phrasing is meant as an insult
-Only discuss someone else’s lifestyle practices if they invite you to a conversation on the topic | Make unwelcomed comments regarding a person’s lifestyle practices, including those related to food, health, parenting, relationships, and employment
-Ask someone before you hug them; keep your hands/body to yourself, even when joking, unless the other person has given verbal consent | Initiate physical contact or simulate physical contact without consent 
-Disengage and find another activity if someone did not invite you and is not engaging with you | Violate personal space by continuing your physical presence into private spaces without consent
-Exercise the right to talk about your own identity if you want to, or not if you don’t want to | Deliberately “out” any aspect of a person’s identity without their consent
-Use the pronouns people have specified for themselves | Purposely misgender someone (ie, refusing to use their correct gender pronouns) after they have told you their correct pronouns 
-
-
-## Additional guidelines for online community behavior
-
-
-Online modes of interaction involve large numbers of people without the helpful presence of gestural, expression, and tonal cues regarding consent. Because of this, respectful and self-aware online conduct is both especially important and difficult. Our community has evolved specific guidelines for online interactions. 
-
-_If someone violates these guidelines, someone from the Moderators group will place them into moderation by changing that person’s posting permission on the relevant list, on the website, or both._
-
-Our triple notification standard for moderation means a point person from the Moderators group will:
-
-1. e-mail the person directly with a brief explanation of what was violated,
-2. send a summary email to the rest of the moderators group, 
-3. if it happened on a public list (vs a website), notify the list that one of our members has been placed into moderation with a brief explanation of what is not tolerated.
-
-
-If you wish to begin the process of getting out of moderation, respond to the email sent to you from [moderators@publiclab.org](mailto:moderators@publiclab.org). The Moderators group has the option to involve ConductCom.
-
-
-Do | Don’t
--------|--------
-Stay on topic to make long threads easier to follow |Send spurious one-line responses that effectively "spam" hundreds of people and lower the overall content quality of a conversation. (Exception: expressions of appreciation and encouragement!)
-Start a new thread to help others follow along. Important if your response starts to significantly diverge from the original topic | Respond with off-topic information making it hard for the large group of readers to follow along
-Write short and literal subject lines to help the readers of the list manage the volume of communication | Humor and euphemisms in subject lines are easily misunderstood, although enthusiasm is welcome! 
-Mind your tone. We are not having this conversation in person, so it is all the more important to maintain a tone of respect | Write in aggressive tone, disrespectful tone, mocking tone, off-color tone. Note: writing in all caps is regarded as shouting
-
-## Media Consent
-
-* ALWAYS check with parents about posting anything with minors.
-* Never post the names of minors in conjunction with their photo. 
-* During multi-day events like Barnraisings most people will have signed media releases. Those who haven’t will be responsible for placing stickers on their nametags, and/or raising their hands in the moment to alert photographers to move them out of frame. 
-* For events where people have not signed blanket media release forms, the photographer is responsible for letting the room know that you are taking photos that will be posted online. Pay special attention to the presence of minors and their parent's wishes.
-
-
-## Addendum for all staff 
-
-Staff are bound by their Employment Handbook, you must reference it. Additionally:  
-
-* Direct problems that come up among community members to the Conduct Committee.
-* When organizing events, circulate access information regarding wheelchair-accessible ADA bathrooms, non-gendered bathrooms, the presence of stairs or curb ramps in the parking lot, et cetera.
-* During events that you are attending in person, solve accessibility issues by making sure attendees know where bathrooms are located and can access them by wheelchair without being obstructed by things like chairs, kites, contraptions, or cords. 
-* Watch for people feeling left out and include them.  

CONTRIBUTING.md

@@ -10,14 +10,13 @@ Most contribution (we imagine) would be in the form of API-compatible modules, w
 * [README.md](https://github.com/publiclab/image-sequencer)
 * [Contributing Modules](#contributing-modules)
 * [Info File](#info-file)
-* [Ideas](#Contribution-ideas)
-* [Grunt Tasks](#grunt-tasks)
+* [Ideas](#ideas)
 
 ****
 
-## Contribution-ideas
+## Contribution ideas
 
-See [this issue](https://github.com/publiclab/image-sequencer/issues/118) for a range of ideas for new contributions and links to possibly helpful libraries, or you can solve an [existing issue](https://github.com/publiclab/image-sequencer/labels/module). Also see the [new features issues list](https://github.com/publiclab/image-sequencer/labels/new-feature).
+See [this issue](https://github.com/publiclab/image-sequencer/issues/118) for a range of ideas for new contributions, and links to possibly helpful libraries. Also see the [new features issues list](https://github.com/publiclab/image-sequencer/labels/new-feature).
 
 ### Bugs
 
@@ -27,7 +26,7 @@ If you find a bug please list it here, and help us develop Image Sequencer by [o
 
 ## Contributing modules
 
-Most contributions can happen in modules, rather than to core library code. Modules and their [corresponding info files](#info-file) are included into the library in this file: https://github.com/publiclab/image-sequencer/blob/main/src/Modules.js#L5-L7
+Most contributions can happen in modules, rather than to core library code. Modules and their [corresponding info files](#info-file) are included into the library in this file: https://github.com/publiclab/image-sequencer/blob/master/src/Modules.js#L5-L7
 
 Module names, descriptions, and parameters are set in the `info.json` file -- [see below](#info-file).
 
@@ -36,18 +35,23 @@ Any module must follow this basic format:
 ```js
 module.exports = function ModuleName(options,UI) {
 
+  options = options || {};
+  UI.onSetup(options.step);
   var output;
-  // Module requirements have been simplified in version 3, see https://github.com/publiclab/image-sequencer/blob/master/CONTRIBUTING.md#contributing-modules
 
   function draw(input,callback) {
 
+    UI.onDraw(options.step); // tell the UI to "draw"
+
     var output = function(input){
       /* do something with the input */
       return input;
     }
 
     this.output = output(input); // run the output and assign it to this.output
+    options.step.output = output.src;
     callback();
+    UI.onComplete(options.step); // tell UI we are done
   }
 
   return {
@@ -59,72 +63,6 @@ module.exports = function ModuleName(options,UI) {
 }
 ```
 
-Image Sequencer modules are designed to be run either in the browser or in a Node.js environment. For dynamically loaded modules, that means that any uses of `require()` to include an external library must be compiled using a system like `browserify` or `webpack` to ensure browser compatibility. An example of this can be found here:
-
-https://github.com/tech4gt/image-sequencer
-
-### Browser/node compatibility
-
-If you wish to offer a module without browser-compatibility, please indicate this in the returned `info` object as:
-
-module.exports = [
-  ModuleName,
-  { only: ['node'] }
-];
-
-If you believe that full cross-compatibility is possible, but need help, please open an issue on your module's issue tracker requesting assistance (and potentially link to it from an inline comment or the module description).
-
-Any Independent Module Must follow this basic format
-```js
-function ModuleName(options,UI) {
-
-  var output;
-
-  function draw(input,callback) {
-
-    var output = function(input){
-      /* do something with the input */
-      return input;
-    }
-
-    this.output = output(input); // run the output and assign it to this.output
-    callback();
-  }
-
-  return {
-    options: options,
-    draw: draw,
-    output: output,
-    UI: UI
-  };
-}
-
-  module.exports = [ModuleName,{
-      "name": "ModuleName",
-      "description": "",
-      "inputs": {
-        // inputs here
-      }
-      /* Info can be defined here or imported from a json file */
-      // require('./info.json') This only works in node
-      // In a module compiled with browserify or webpack, a require() can be used to
-      // load a standard info.json file.
-      ];
-```
-### Running a browser-only module in node
-If your module has browser specific code or you are consuming a dependency which does the `gl-context` api. We designed this api especially for webl based modules but since it runs the module in a headless browser, ti supports all browser specific APIs.
-
-The api must be used in the following format
-```js
-var step = this;
-
-    if (!options.inBrowser) {
-      require('../_nomodule/gl-context')(input, callback, step, options);
-    }
-    else {
-      /* Browser specific code */
-    }
-```
 
 ### options
 
@@ -146,18 +84,9 @@ The `draw` method should accept an `input` parameter, which will be an object of
 ```js
 input = {
   src: "datauri of an image here",
-  format: "jpeg/png/etc",
-  // utility functions
-  getPixels: "function to get Image pixels. Wrapper around https://npmjs.com/get-pixels",
-  savePixels: "function to save Image pixels. Wrapper around https://npmjs.com/save-pixels",
-  lodash: "wrapper around lodash library, https://github.com/lodash",
-  dataUriToBuffer: "wrapper around https://www.npmjs.com/package/data-uri-to-buffer",
-  pixelManipulation: "general purpose pixel manipulation API, see https://github.com/publiclab/image-sequencer/blob/master/src/modules/_nomodule/PixelManipulation.js"
+  format: "jpeg/png/etc"
 }
 ```
-For example usage of pixelManipulation see https://github.com/publiclab/image-sequencer/blob/main/src/modules/Invert/Module.js
-
-**The module is included in the browser inside a script tag and since the code runs directly in the browser if any other module is required apart from the apis available on the input object, it should be either bundled with the module code and imported in es6 format or the module code must be browserified before distribution for browser**
 
 The draw method is run every time the step is `run` using `sequencer.run()`.
 So any calculations must go **into** the `draw()` method's definition.
@@ -191,7 +120,6 @@ There are four events in all:
 * `UI.onComplete(options.step)` must be emitted whenever the output of a draw call
 is ready. An argument, that is the DataURL of the output image must be passed in.
 * `UI.onRemove(options.step)` is emitted automatically and the module should not emit it.
-* `UI.notify(msg,id)` must be emmited when a notification has to be produced.
 
 ### Name and description
 
@@ -243,25 +171,32 @@ The default "loading spinner" can be optionally overriden with a custom progress
 ```js
 module.exports = function ModuleName(options,UI) {
 
+  options = options || {};
+  UI.onSetup(options.step);
   var output;
 
   function draw(input,callback,progressObj) {
 
     /* If you wish to supply your own progress bar you need to override progressObj */
+
     progressObj.stop() // Stop the current progress spinner
 
-    progressObj.overrideFlag = true; // Tell image sequencer that you will supply your own progressBar
+    progressObj.overrideFlag = true; // Tell image sequencer that you will supply your own progressBar 
 
     /* Override the object and give your own progress Bar */
     progressObj = /* Your own progress Object */
 
+    UI.onDraw(options.step);
+
     var output = function(input){
-      /* do something with the input */
+      /* do something with the input */ 
       return input;
     };
 
     this.output = output();
+    options.step.output = output.src;
     callback();
+    UI.onComplete(options.step);
   }
 
   return {
@@ -277,101 +212,8 @@ The `progressObj` parameter of `draw()` is not consumed unless a custom progress
 
 ### Module example
 
-See existing module `channel` for an example: https://github.com/publiclab/image-sequencer/blob/main/src/modules/Channel/Module.js
+See existing module `green-channel` for an example: https://github.com/publiclab/image-sequencer/tree/master/src/modules/GreenChannel/Module.js
 
-The `channel` module is included into the core modules here: https://github.com/publiclab/image-sequencer/blob/main/src/Modules.js#L5-L7
+The `green-channel` module is included into the core modules here: https://github.com/publiclab/image-sequencer/blob/master/src/Modules.js#L5-L7
 
 For help integrating, please open an issue.
-
-## Meta Module
-
-IMAGE SEQUENCER supports "meta modules" -- modules made of other modules. The syntax and structure of these meta modules is very similar to standard modules. Sequencer can also genarate meta modules dynamically with the function `createMetaModule` which can be called in the following ways
-
-```js
-
-/* Mapping function is a function which gets the inputs of the module as argument
-*  and returns an array with steps mapped to their options
-*  See https://github.com/publiclab/image-sequencer/blob/main/src/modules/Colorbar/Module.js for example
-*/
-
-/* Module options is an object with the following keys
-*  infoJson: the info.json object for the module
-*/
-sequencer.createMetaModule(mappingFunction,moduleOptions)
-
-/* createMetaModule returns an array of module function and info just like normal
-*  modules. These can also be loaded into sequencer dynamically like other modules
-*/
-```
-
-A Meta module can also be contributed like a normal module with an info and a Module.js. A basic Meta module shall follow the following format
-
-
-```js
-// Module.js
-  module.exports = require('../../util/createMetaModule.js')(
-    function mapFunction(options) {
-
-        return [
-            { 'name': 'module-name', 'options': {} },
-            { 'name': 'module-name', 'options': {} },
-        ];
-    }, {
-        infoJson: require('./info.json')
-    }
-)[0];
-```
-
-```json
-// Info
-{
-  "name": "meta-moduleName",
-  "description": "",
-  "inputs": {
-  }
-}
-```
-
-```js
-//index.js
-module.exports = [
-  require('./Module.js'),
-  require('./info.json')
-]
-```
-
-All of the above can also be combined together to form a single file module.
-
-```js
-
-// MetaModule.js
-module.exports =
-  sequencer.createMetaModule(
-    function mapFunction(options) {
-
-        return [
-            { 'name': 'module-name', 'options': {} },
-            { 'name': 'module-name', 'options': {} },
-        ];
-    }, {
-        infoJson: {
-            "name": "meta-moduleName",
-            "description": "",
-            "inputs": {
-            }
-        }
-    });
-```
-
-## Grunt Tasks
-This repository has different grunt tasks for different uses. The source code is in the [Gruntfile](https://github.com/publiclab/image-sequencer/blob/main/Gruntfile.js).
-
-The following command is used for running the tasks: `grunt [task-name]`. Here `[task-name]` should be replaced by the name of the task to be run. To run the default task run `grunt` without any options.
-
-#### Tasks
-1. **compile**: Compiles/Browserifies the dist files in `/dist/image-sequencer.js` and `/dist/image-sequencer-ui.js`.
-2. **build**: Compiles the files as in the **compile** task and minifies/uglifies dist files in `/dist/image-sequencer.min.js` and `/dist/image-sequencer-ui.min.js`.
-3. **watch**: Checks for any changes in the source code and runs the **compile** task if any changes are found.
-4. **serve**: Compiles the dist files as in the **compile** task and starts a local server on `localhost:3000` to host the demo site in `/examples/` directory. Also runs the **watch** task.
-5. **production**: Compiles and minifies dist files in `/dist/image-sequencer.js` and `/dist/image-sequencer-ui.js` without the `.min.js` extension to include minified files in the demo site. This script should only be used in production mode while deploying.
-6. **default**: Runs the **watch** task as default.

Gruntfile.js

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

README.md

@@ -1,45 +1,34 @@
 Image Sequencer
 ====
 
-
-[![Build Status](https://travis-ci.org/publiclab/image-sequencer.svg?branch=master)](https://travis-ci.org/publiclab/image-sequencer) [![Maintainability](https://api.codeclimate.com/v1/badges/5906996dd2e90aca6398/maintainability)](https://codeclimate.com/github/publiclab/image-sequencer/maintainability) ![Codecov](https://img.shields.io/codecov/c/github/publiclab/image-sequencer.svg?logo=codecov)
-
-- **Latest Stable Demo**: https://sequencer.publiclab.org
-- **Latest Beta Demo**: https://beta.sequencer.publiclab.org
-- **Stable Branch**: https://github.com/publiclab/image-sequencer/tree/stable/
+[![Build Status](https://travis-ci.org/publiclab/image-sequencer.svg?branch=master)](https://travis-ci.org/publiclab/image-sequencer)
 
 ## Why
 
-Image Sequencer is different from other image processing systems because it's _non-destructive_: instead of modifying the original image, it **creates a new image at each step in a sequence**. This is because it:
+Image Sequencer is different from other image processing systems in that it's _non-destructive_: instead of modifying the original image, it **creates a new image at each step in a sequence**. This is because it:
 
 * produces a legible trail of operations, to "show your work" for evidential, educational, or reproducibility reasons
 * makes the creation of new tools or "modules" simpler -- each must accept an input image, and produce an output image
-* allows many images to run through the same sequence of steps
-* works identically in the browser, on Node.js, and on the command line
+* allows many images to be run through the same sequence of steps
+* works identically in the browser, on Node.js, and on the commandline
 
-The following diagrams attempt to explain how the applications various components interconnect:
+![workflow diagram](https://raw.githubusercontent.com/publiclab/image-sequencer/master/examples/images/diagram-workflows.png)
 
-![general diagram](https://publiclab.org/i/30547.png?s=o)
+It is also for prototyping some other related ideas:
 
-![workflow diagram](https://raw.githubusercontent.com/publiclab/image-sequencer/main/examples/images/diagram-workflows.png)
-
-It also for prototypes other related ideas:
-
-* filter-like image processing -- apply a transform to an image from a given source, like a proxy. I.e. [every image tile of a satellite imagery web map](https://publiclab.org/notes/warren/05-10-2018/prototype-filter-map-tiles-in-real-time-in-a-browser-with-imagesequencer-ndvi-landsat)
-* test-based image processing -- the ability to create a sequence of steps that do the same task as other image processing tools, provable with example before/after images to compare with
-* logging each step -- to produce an evidentiary record of modifications to an original image
+* filter-like image processing -- applying a transform to any image from a given source, like a proxy. I.e. every image tile of a satellite imagery web map
+* test-based image processing -- the ability to create a sequence of steps that do the same task as some other image processing tool, provable with example before/after images to compare with
+* logging of each step to produce an evidentiary record of modifications to an original image
 * cascading changes -- change an earlier step's settings, and see those changes affect later steps
-* "small modules" -- based extensibility: see [Contributing](https://github.com/publiclab/image-sequencer/blob/main/CONTRIBUTING.md)
-
+* "small modules"-based extensibility: see [Contributing](https://github.com/publiclab/image-sequencer/blob/master/CONTRIBUTING.md)
 
 ## Examples
 
-* [Simple Demo](https://sequencer.publiclab.org)
-* [Latest Beta Demo](https://beta.sequencer.publiclab.org)
+* [Simple Demo](https://publiclab.github.io/image-sequencer/)
 
 A diagram of this running 5 steps on a single sample image may help explain how it works:
 
-![example workflow](https://raw.githubusercontent.com/publiclab/image-sequencer/main/examples/images/diagram-6-steps.png)
+![example workflow](https://raw.githubusercontent.com/publiclab/image-sequencer/master/examples/images/diagram-6-steps.png)
 
 ## Jump to:
 
@@ -50,35 +39,22 @@ A diagram of this running 5 steps on a single sample image may help explain how
 * [Method Chaining](#method-chaining)
 * [Multiple Images](#multiple-images)
 * [Creating a User Interface](#creating-a-user-interface)
-* [Contributing](https://github.com/publiclab/image-sequencer/blob/main/CONTRIBUTING.md)
-* [Submit a Module](https://github.com/publiclab/image-sequencer/blob/main/CONTRIBUTING.md#contributing-modules)
+* [Contributing](https://github.com/publiclab/image-sequencer/blob/master/CONTRIBUTING.md)
+* [Submit a Module](https://github.com/publiclab/image-sequencer/blob/master/CONTRIBUTING.md#contributing-modules)
 * [Get Demo Bookmarklet](https://publiclab.org/w/imagesequencerbookmarklet)
 
 ## Installation
 
-This library conveniently works in the browser, in Node, and on the command line (CLI).
-
-### Unix based platforms
-You can set up a local environment to test the UI with `npm run setup` followed by `npm start`.
-
-### Windows
-Our npm scripts do not support windows shells, please run the following snippet in PowerShell.
-```powershell
-npm i ; npm i -g grunt grunt-cli ; grunt build; grunt serve
-```
-In case of a port conflict please run the following
-```powershell
-npm i -g http-server ; http-server -p 3000
-```
+This library works in the browser, in Node, and on the commandline (CLI), which we think is great. 
 
 ### Browser
 
-Just include [image-sequencer.min.js](https://github.com/publiclab/image-sequencer/blob/stable/dist/image-sequencer.min.js) in the Head section of your web page. See the [demo here](https://sequencer.publiclab.org)!
+Just include [image-sequencer.js](https://publiclab.github.io/image-sequencer/dist/image-sequencer.js) in the Head section of your web page. See the [demo here](https://publiclab.github.io/image-sequencer/)!
 
 ### Node (via NPM)
 
 (You must have NPM for this)
-Add `image-sequencer` to your list of dependencies and run `npm install`
+Add `image-sequencer` to your list of dependancies and run `$ npm install`
 
 ### CLI
 
@@ -95,46 +71,30 @@ $ npm install image-sequencer -g
 ```
 $ npm run debug invert
 ```
- 
+
 ## Quick Usage
 
-### Initializing the Sequencer
-
-The Image Sequencer Library exports a function ImageSequencer which initializes a sequencer.
-
-```js
-var sequencer = ImageSequencer();
-```
-
 Image Sequencer can be used to run modules on an HTML Image Element using the
-`replaceImage` method, which accepts two parameters - `selector` and `steps`.
+`replaceImage` method. The method accepts two parameters - `selector` and `steps`.
 `selector` is a CSS selector. If it matches multiple images, all images will be
 modified. `steps` may be the name of a module or array of names of modules.
 
 Note: Browser CORS Restrictions apply. Some browsers may not allow local images
-from other folders, and throw a Security Error instead.
+form other folders, and throw a Security Error instead.
 
 ```js
-sequencer.replaceImage(selector,steps,optional_options);
+  sequencer.replaceImage(selector,steps,optional_options);
 ```
 
-`optional_options` allows passing additional arguments to the module itself.
+`optional_options` allows to pass additional arguments to the module itself.
 
 For example:
 
 ```js
-sequencer.replaceImage('#photo','invert');
-sequencer.replaceImage('#photo',['invert','ndvi-red']);
+  sequencer.replaceImage('#photo','invert');
+  sequencer.replaceImage('#photo',['invert','ndvi-red']);
 ```
 
-### Data URL usage
-
-Since Image Sequencer uses data-urls, you can initiate a new sequence by providing an image in the [data URL format](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs), which will import into the demo and run:
-
-[Try this example link with a very small Data URL](http://sequencer.publiclab.org/examples/#src=data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wAARCAAQABADASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAf/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFQEBAQAAAAAAAAAAAAAAAAAABgj/xAAUEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwCdABykX//Z&steps=invert{})
-
-To produce a data URL from an HTML image, see [this nice blog post with example code](https://davidwalsh.name/convert-image-data-uri-javascript).
-
 ## CLI Usage
 
 Image Sequencer also provides a CLI for applying operations to local files. The CLI takes the following arguments:
@@ -144,13 +104,11 @@ Image Sequencer also provides a CLI for applying operations to local files. The
     -b  | --basic            | Basic mode only outputs the final image
     -o  | --output [PATH]    | Directory where output will be stored. (optional)
     -c  | --config {object} | Options for the step. (optional)
-    --save-sequence [string] | Name space separated with Stringified sequence to save
-    --install-module [string] | Module name space seaprated npm package name
 
-The basic format for using the CLI is as follows:
+The basic format for using the CLI is as follows: 
 
 ```
-$ ./index.js -i [PATH] -s step-name
+    $ ./index.js -i [PATH] -s step-name
 ```
 
 *NOTE:* On Windows you'll have to use `node index.js` instead of `./index.js`.
@@ -158,29 +116,20 @@ $ ./index.js -i [PATH] -s step-name
 The CLI also can take multiple steps at once, like so:
 
 ```
-$ ./index.js -i [PATH] -s "step-name-1 step-name-2 ..."
+    $ ./index.js -i [PATH] -s "step-name-1 step-name-2 ..."
 ```
 
 But for this, double quotes must wrap the space-separated steps.
 
-Options for the steps can be passed in one line as JSON in the details option like
+Options for the steps can be passed in one line as json in the details option like 
 ```
-$ ./index.js -i [PATH] -s "brightness" -c '{"brightness":50}'
+$ ./index.js -i [PATH] -s "brightness" -d '{"brightness":50}'
 
 ```
-Or the values can be given through the terminal prompt like
-
+Or the values can be given through terminal prompt like
+ 
 <img width="1436" alt="screen shot 2018-02-14 at 5 18 50 pm" src="https://user-images.githubusercontent.com/25617855/36202790-3c6e8204-11ab-11e8-9e17-7f3387ab0158.png">
 
-`save-sequence` option can be used to save a sequence and the associated options for later usage. You should provide a string which contains a name of the sequence space separated from the sequence of steps which constitute it.
-```shell
-sequencer --save-sequence "invert-colormap invert(),colormap()"
-```
-
-`install-module` option can be used to install new modules from npm. You can register this module in your sequencer with a custom namespace separated with the npm package name. Below is an example of the `image-sequencer-invert` module.
-```shell
-sequencer --install-module "invert image-sequencer-invert"
-```
 
 The CLI is also chainable with other commands using `&&`
 
@@ -215,7 +164,7 @@ CORS Restrictions). To sum up, these are accepted:
 * DataURLs
 
 return value: **none** (A callback should be used to ensure the image gets loaded)
-The callback is called within the scope of a sequencer. For example:
+The callback is called within the scope of a the sequencer. For example:
 (addSteps is defined later)
 
 ```js
@@ -229,7 +178,7 @@ In this case, only `'SRC'`.
 
 ### Adding steps to the image
 
-The `addSteps` method is used to add steps to the image. One or more steps can
+The `addSteps` method is used to add steps on the image. One or more steps can
 be added at a time. Each step is called a module.
 
 ```js
@@ -237,11 +186,11 @@ sequencer.addSteps(modules, optional_options);
 ```
 
 If only one module is to be added, `modules` is simply the name of the module.
-If multiple images are to be added, `modules` is an array, which holds the names of modules
-to be added, in that particular order.
+If multiple images are to be added, `modules` is an array of the names of modules
+which are to be added, in that particular order.
 
-optional_otions is just an optional parameter, in object form, which you might
-want to provide to the modules. 
+optional_otions is just additional parameters, in object form, which you might
+want to provide to the modules. It's an optional parameter.
 
 return value: **`sequencer`** (To allow method chaining)
 
@@ -255,35 +204,13 @@ modules.
 sequencer.run();
 ```
 
-Sequencer can be run with a custom config object
+Additionally, an optional callback can be passed to this method.
 
 ```js
-// The config object enables custom progress bars in a node environment and
-// ability to run the sequencer from a particular index(of the steps array)
-
-sequencer.run(config);
-
-```
-
-The config object can have the following keys
-
-```js
-config: {
-  progressObj: , //A custom object to handle progress bar
-  index: //Index to run the sequencer from (defaults to 0)
-}
-```
-
-Additionally, an optional callback function can be passed to this method.
-
-```js
-sequencer.run(function callback(out){
+sequencer.run(function(out){
   // this gets called back.
   // "out" is the DataURL of the final image.
 });
-sequencer.run(config,function callback(out){
-  // the callback is supported by all types of invocations
-});
 ```
 
 return value: **`sequencer`** (To allow method chaining)
@@ -292,7 +219,7 @@ return value: **`sequencer`** (To allow method chaining)
 ### Removing a step from the sequencer
 
 The `removeSteps` method is used to remove unwanted steps from the sequencer.
-It accepts the index of the step as an input or an array of the unwanted indices,
+It accepts the index of the step as an input, or an array of the unwanted indices
 if there are more than one.
 
 For example, if the modules ['ndvi-red','crop','invert'] were added in this order,
@@ -312,14 +239,14 @@ return value: **`sequencer`** (To allow method chaining)
 ### Inserting a step in between the sequencer
 
 The `insertSteps` method can be used to insert one or more steps at a given index
-in the sequencer. It accepts the index where the module is to be inserted, the name of
+in the sequencer. It accepts the index where the module is to be inserted, name of
 the module, and an optional options parameter. `index` is the index of the inserted
 step. Only one step can be inserted at a time. `optional_options` plays the same
 role it played in `addSteps`.
 
 Indexes can be negative. Negative sign with an index means that counting will be
 done in reverse order. If the index is out of bounds, the counting will wrap in
-the original direction of counting. So, an `index` of -1 means the module is
+the original direction of counting. So, an `index` of -1 means that the module is
 inserted at the end.
 
 ```js
@@ -328,28 +255,19 @@ sequencer.insertSteps(index,module_name,optional_options);
 
 return value: **`sequencer`** (To allow method chaining)
 
-### Importing an independent module
-
-The `loadNewModule` method can be used to import a new module inside the sequencer. Modules can be downloaded via npm, yarn or CDN and are imported with a custom name. If you wish to load a new module at runtime, it will need to avoid using `require()` -- unless it is compiled with a system like browserify or webpack.
-
-```js
-const module = require('sequencer-moduleName')
-sequencer.loadNewModule('moduleName',module);
-```
-
 
 ## Method Chaining
-
 Methods can be chained on the Image Sequencer:
 * loadImage()/loadImages() can only terminate a chain.
 * run() can not be in the middle of the chain.
 * If the chain starts with loadImage() or loadImages(), the following methods are
 applied only to the newly loaded images.
-
+* If no name is provided to the image, a name will be generated for it. The name will
+be of the form "image<number>". For ex: "image1", "image2", "image3", etc.
 
 Valid Chains:
 ```js
-sequencer.loadImage(function(){
+sequencer.loadImage('red',function(){
   this.addSteps('invert').run(function(out){
     //do something with ouptut.
   });
@@ -364,80 +282,152 @@ sequencer.addSteps('invert').run().addSteps('ndvi-red');
 ```
 
 
+## Multiple Images
+Image Sequencer is capable of handling multiple images at once.
 
-## Fetching current steps
+### Initializing a sequencer with multiple images.
+This is just like before.
+```js
+var sequencer = ImageSequencer();
+```
 
-The `getSteps` method can be used to get the array of current steps in `this` instance of sequencer.For example
+### Loading Multiple Images into the Sequencer
+
+Multiple images can be loaded by the method `loadImages`. Everything is the same,
+except that now, a unique identification called `image_name` has to be provided
+with each image. This is a string literal.
+
+* 3/2 parameters :
+    ```js
+    sequencer.loadImages(image_name,
+      image_src,optional_callback);
+    ```
+* 1/2 parameters (JSON) :
+    ```js
+    sequencer.loadImages({
+      images: {
+        image1_name: image_src,
+        image2_name: image_src,
+        ...
+      },
+      callback: optional_callback
+    });
+    ```
+
+return value: **none**
+
+
+### Adding Steps on Multiple Images
+
+The same method `addSteps` is used for this. There's just a slight obvious change
+in the syntax that the image name has to be supplied too. `image_name` as well as
+`module_name` in the following examples can be either strings or arrays of strings.
 
 ```js
-sequencer.getSteps()
+sequencer.addSteps(image_name,module_name,optional_options);
 ```
 
-returns an array of steps associated with the current sequencer.
-
-## Saving Sequences
-
-IMAGE SEQUENCER supports saving a sequence of modules and their associated settings in a simple string syntax. These sequences can be saved in the local storage of the browser and inside a JSON file in node.js. sequences can be saved in node context using the CLI option
-
-```shell
---save-sequence "name stringified-sequence"
-```
-
-In Node and the browser the following function can be used
-```js
-sequencer.saveSequence(name,sequenceString)
-```
-
-The function `sequencer.loadModules()` reloads the modules and the saved sequences into `sequencer.modules` and `sequencer.sequences`
-
-
-## String syntax
-
-Image sequencer supports stringifying a sequence which is appended to the url and hence can then be shared. An example below shows the string syntax for `channel` and `invert` module
-```
-channel{channel:green},invert{}
-```
-
-Sequencer also supports the use of `()` in place of `{}` for backward compatibility with older links. (This syntax is deprecated and should be avoided as far as possible)
-```
-channel(channel:green),invert()
-```
-
-Following are the core API functions that can be used to stringify and jsonify steps.
-```js
-sequencer.toString() //returns the stringified sequence of current steps
-sequencer.toJSON(str) // returns the JSON for the current sequence
-sequencer.stringToJSON(str) // returns the JSON for given stringified sequence
-sequencer.importString(str) //Imports the sequence of steps into sequencer
-sequencer.importJSON(obj) //Imports the given sequence of JSON steps into sequencer
-```
-
-Image Sequencer can also generate a string for usage in the CLI for the current sequence of steps:
-```js
-sequencer.toCliString()
-```
-
-
-## Importing steps using JSON array
-
-Image sequencer provides the following core API function to import the given sequence of JSON steps into sequencer.
+If no Image Name is specified, the module is added to **all** images.
 
 ```js
-sequencer.importJSON(obj)
+sequencer.addSteps(module_name,optional_options);
 ```
-It can be implemented the following way for example:
+
+All this can be passed in as JSON:
 
 ```js
-sequencer.importJSON([
-    { name: 'blur', options: {} }
-  ]);
-  ```
-  where name is the name of step to be added, options object can be the one used to provide various params to the sequencer which can customise the default ones.
+sequencer.addSteps({
+  image1_name: {name: module_name, o: optional_options},
+  image2_name: {name: module_name, o: optional_options},
+  ...
+});
+```
 
-To see this in action, please refer to line # 51 of the following:
+return value: **`sequencer`** (To allow method chaining)
 
-[test/core/modules/import-export.js](https://github.com/publiclab/image-sequencer/blob/main/test/core/modules/import-export.js)
- 
+
+### Running a Sequencer with multiple images
+
+The same `run` method can be used with a slight change in syntax.
+The `run` method accepts parameters `image` and `from`. `from` is the index from
+where the function starts generating output. By default, it will run across all
+the steps. (from = 1) If no image is specified, the sequencer will be run over **all
+the images**. `image_name` may be an array of image names.
+
+```js
+sequencer.run(); //All images from first step
+```
+
+```js
+sequencer.run(image_name,from); //Image 'image' from 'from'
+```
+
+The `run` method also accepts an optional callback just like before:
+
+```js
+  sequencer.run(image_name,from,function(out){
+    // This gets called back.
+    // "out" is the DataURL of final image.
+  });
+```
+
+JSON Input is also acceptable.
+
+```js
+sequencer.run({
+  image1_name: from,
+  image2_name: from,
+  ...
+});
+```
+
+return value: **`sequencer`** (To allow method chaining)
+
+
+### Removing Steps from an Image
+
+Similarly, `removeSteps` can also accept an `image_name` parameter. Either, both,
+or none of `image_name` and `steps` them may be an array. JSON input is also acceptable.
+
+```js
+sequencer.removeSteps("image_name",[steps]);
+```
+
+```js
+sequencer.removeSteps("image_name",step);
+```
+
+```js
+sequencer.removeSteps({
+  image1_name: [steps],
+  image2_name: [steps],
+  ...
+});
+```
+return value: **`sequencer`** (To allow method chaining)
+
+
+### Inserting steps on an image
+
+The `insertSteps` method can also accept an `image_name` parameter. `image_name`
+may be an array. Everything else remains the same. JSON Inout is acceptable too.
+
+```js
+sequencer.insertSteps("image",index,"module_name",o);
+```
+```js
+sequencer.insertSteps([image],index,"module_name",o);
+```
+```js
+sequencer.insertSteps({
+  image1: [
+    {index:index1, name: module_name1, o:optional_options1},
+    {index:index2, name: module_name2, o:optional_options2},
+    ...
+  ]
+});
+```
+return value: **`sequencer`** (To allow method chaining)
 
 
 ## Creating a User Interface
@@ -454,10 +444,6 @@ for a module. This can be used, for instance, to update the DIV with the new ima
 and remove the loading GIF generated above.
 * `onRemove` : This event is triggered when a module is removed. This can be used,
 for instance, to remove the DIV generated above.
-* `notify` : This event is triggered whenever we need to shoot a notification to the
-user-interface.For example when the step is not available, we can shoot a notification,
-by sending appropriate message.For HTML UI it adds a DOM node to the browser, for CLI
-and node , it logs the notification output to the respective console.
 
 How to define these functions:
 
@@ -466,8 +452,7 @@ sequencer.setUI({
   onSetup: function(step) {},
   onDraw: function(step) {},
   onComplete: function(step) {},
-  onRemove: function(step) {},
-  notify: function(msg,id) {}
+  onRemove: function(step) {}
 });
 ```
 
@@ -510,37 +495,10 @@ sequencer.setUI({
 });
 ```
 
-## Using multiple images on same sequencer:
+Note: `identity.imageName` is the "name" of that particular image. This name can
+be specified while loading the image via `sequencer.loadImage("name","SRC")`. If
+not specified, the name of a loaded image defaults to a name like "image1",
+"image2", et cetra.
 
-Image Sequencer object supports one imageURL at a time.
-
-Adding a seccond image to same sequencer will result to adding same set of steps added to prior image and flushing out the previous one. 
-
-```js
-s1 = new ImageSequencer(...);
-s1.loadImage(url1);
-s1.addSteps('blur');
-s1.run();
-s1.addImage(url2);
-s1.run();
-```
-However if we want to use more than one image, we can either initialize a sequencer for each image like:
-
-```js
-sequencer1 = new ImageSequencer(...);
-sequencer1.loadImage(...);
-sequencer1.addSteps(steps);
-sequencer1.run();
-
-sequencer2 = new ImageSequencer(...);
-sequencer2.loadImage(...);
-sequencer2.addSteps(steps);
-sequencer2.run();
-```
-
-
-
-**Note**: Details of all modules can be sought using `sequencer.modulesInfo()`.
+Details of all modules can be sought using `sequencer.modulesInfo()`.
 This method returns an object which defines the name and inputs of the modules. If a module name (hyphenated) is passed in the method, then only the details of that module are returned.
-
-The `notify` function takes two parameters `msg` and `id`, former being the message to be displayed on console (in case of CLI and node ) and a HTML component(in browser). The id is optional and is useful for HTML interface to give appropriate IDs.

docs/MODULES.md

@@ -1,47 +1,7 @@
 Documentation of various Modules
 ===
 
-List of Module Documentations
-
-1.  [Crop](#crop-module)
-2.  [Segmented-Colormap](#segmented-colormap-module)
-3.  [FisheyeGl](#fisheyeGl-module)
-4.  [Add QR](#Add-QR-module)
-5.  [Average](#average-module)
-6.  [Blend](#blend-module)
-7.  [Blur](#blur-module)
-8.  [Brightness](#brightness-module)
-9.  [Channel](#channel-module)
-10. [Colorbar](#colorbar-module)
-11. [Colormap](#colormap-module)
-12. [Contrast](#contrast-module)
-13. [Convolution](#convolution-module)
-14. [DecodeQr](#decodeQr-module)
-15. [Dither](#dither-module)
-16. [DrawRectangle](#draw-rectangle-module)
-17. [Dynamic](#dynamic-module)
-18. [Edge-Detect](#edge-detect-module)
-19. [FlipImage](#flipimage-module)
-20. [Gamma-Correction](#gamma-correction-module)
-21. [Gradient](#gradient-module)
-22. [Histogram](#histogram-module)
-23. [Import-image](#import-image-module)
-24. [Invert](#invert-module)
-25. [Ndvi](#ndvi-module)
-26. [Ndvi-Colormap](#ndvi-colormap-module)
-27. [Overlay](#overlay-module)
-28. [PaintBucket](#paint-bucket-module)
-29. [Resize](#resize-module)
-30. [ReplaceColor](#replacecolor-module)
-31. [Rotate](#rotate-module)
-32. [Saturation](#saturation-module)
-33. [Threshold](#threshold)
-34. [Tint](#tint)
-35. [ColorTemperature](#color-temperature)
-36. [Grid-Overlay](#grid-overlay)
-
-
-## crop-module
+## Crop Module (crop)
 
 This module is used to crop an image.
 
@@ -64,7 +24,7 @@ Where `options` is an object having the properties `x`, `y`, `w`, `h`. This diag
 * `options.h` : half of image height
 
 
-## segmented-colormap-module
+## Segmented Colormap Module (segmented-colormap)
 
 This module is used to map the pixels of the image to a segmented colormap.
 
@@ -88,7 +48,7 @@ where `options` is an object with the property `colormap`. `options.colormap` ca
 
 * A custom array.
 
-## fisheyeGl-module
+## FisheyeGl (fisheye-gl)
 
 This module is used for correcting Fisheye or Lens Distortion
 
@@ -108,496 +68,3 @@ where `options` is an object with the following properties:
 * scale : The ratio to which the original image is to be scaled (0 to 20; default 1.5)
 * x : Field of View x (0 to 2; default 1)
 * y : Field of View y (0 to 2; default 1)
-
-## add-qr-module
-
-This module Adds QR corresponding to the given string.
-
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('add-qr',options)
-           .run()
-```
-
-where `options` is an object with the following properties:
-* size : size of QR code in pixels (default 200)
-* qrCodeString : input string to generate QR code
-
-
-## average-module
-
-This module is used for averaging all the pixels of the image.
-
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('average',options)
-           .run()
-```
-
-## blend-module
-
-This module is used for blending two images .
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('blend',options)
-           .run()
-```
-
-where `options` is an object with the following properties:
-* offset: step of image with which current image is to be blended(Two steps back is -2, three                steps back is -3 etc; default -2) 
-* func: function used to blend two images (default : function(r1, g1, b1, a1, r2, g2, b2, a2) {            return [ r1, g2, b2, a2 ] })
-
-## blur-module
-
-This module is used for applying a Gaussian blur effect.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('blur',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* blur : Intensity of Gaussian blur (0 to 5; default 2)
-
-## brightness-module
-
-This module is used for changing the brightness of the image.
-
-
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('brightness',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* brightness : brightness of the image in percentage (0 to 100; default 100)
-
-## channel-module
-
-This module is used for forming a grayscale image by applying one of the three primary colors.
-
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('channel',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* channel : color of the channel (red, green, blue; default green)
-
-## colorbar-module
-
-This module is used for displaying an image with a colorbar.
-
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('colorbar',options)
-           .run()
-```
-
-where `options` is an object with the following properties:
-* colormap : Name of the Colormap(default, greyscale, stretched, fastie, brntogrn, blutoredjet,                 colors16; default: default)
-* x : X-position of the image on which the new image is overlayed (default 0)
-* y : Y-position of the image on which the new image is overlayed (default 0)
-* h : height of resulting cropped image (default : 50% of input image width )
-
-## colormap-module
-
-This module is used for mapping brightness values (average of red, green & blue) to a given color  lookup table, made up of a set of one more color gradients.
-
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('colormap',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* colormap : Name of the Colormap ( greyscale, stretched, fastie, brntogrn, blutoredjet,                        colors16)
-
-## contrast-module
-
-This module is used for changing the contrast of the image.
-
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('contrast',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* contrast : contrast for the given image (-100 to 100; default : 70)
-
-## convolution-module
-
-This module is used for performing image-convolution.
-
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('convolution',options)
-           .run()
-```
-
-where `options` is an object with the following properties:
-* constantFactor : a constant factor, multiplies all the kernel values by that factor (default :                     1/9)
-* kernelValues : nine space separated numbers representing the kernel values in left to right and                   top to bottom format(default : 1 1 1 1 1 1 1 1 1)
-
-## decodeQr-module
-
-This module is used for decoding a QR in image (if present).
-
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('decode-qr',options)
-           .run()
-```
-
-## dither-module
-
-This module approximates a color from a mixture of other colors when the required color is not available, creating illusions of the color that is not present actually.
-
-[more info on wikipedia](https://en.wikipedia.org/wiki/Dither)
-
-## Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('dither',options)
-           .run()
-```
-where `options` is an object with the following property:
-* dither : Can select the name of the Dithering Algorithm(default none)
- 
-## draw-rectangle-module
-
-This module helps to draw a rectangle on the image with a starting and ending corner with the specified thickness and color of the border.
-
-## Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('draw-rectangle',options)
-           .run()
-```
-where `options` is an object with the following properties:
-* startingX : starting x position of the rectangle (default 0)
-* startingY : starting y position of the rectangle (default 0)
-* endX      : last x position of the rectangle (default "width")
-* endY      : last y position of the rectangle (default "height")
-* thickness : thickness of the border (default 1)
-* color     : RGBA values separated by a space (default "0 0 0 255") 
-
-## dynamic-module
-
-This module is used for producing each color channel based on the original image's color.
-
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('dynamic',options)
-           .run()
-```
-
-where `options` is an object with the following properties:
-* red : expression for red channel (R, G, B and A as inputs; default r)
-* green : expression for green channel (R, G, B and A as inputs; default g)
-* blue : expression for blue channel (R, G, B and A as inputs; default b)
-* monochrome: fallback for other channels if none provided (default : r+g+b/3)
-
-## edge-detect-module
-
-This module is used for detecting images.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('edge-detect',options)
-           .run()
-```
-
-where `options` is an object with the following properties:
-* blur :  Intensity of Gaussian blur (0 to 5; default 2)
-* highThresholdRatio : Upper Threshold Ratio ( default : 0.2)
-* lowThresholdratio : Lower Threshold Ratio ( default : 0.2)
-
-## flipimage-module 
-
-This module is used for flipping the image on the selected axis.
-#### Usage
-
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('flip-image',options)
-           .run()
-```
-
-where `options` is an object with the following properties:
-* Axis : select the required axis (default : vertical)
-
-
-## gamma-correction-module
-
-This module is used for applying gamma correction.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('gamma-correction',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* adjustment : Inverse of actual gamma factor (default 0.2)
-
-## gradient-module
-
-This module is used for finding gradient of the image.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('gradient',options)
-           .run()
-```
-
-## histogram-module
-
-This module is used for calculating histogram of the image.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('histogram',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* gradient : boolean value used to toggle gradient along x-axis (true or false; default true)
-
-## import-image-module
-
-This module is used for importing a new image and replacing the original with it.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('import-image',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* url : url of the  new image (local image url or data url;default : "./images/monarch.png")
-
-## invert-module
-
-This module is used for inverting the image.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('invert',options)
-           .run()
-```
-
-## ndvi-module  
-
-This module is used for applying ndvi technique to the image.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('ndvi',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* filter : filter for NDVI (blue or red; default red)
-
-## ndvi-colormap-module
-
-This module is used for demonstrating ndvi and colormap properties consecutively.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('ndvi-colormap',options)
-           .run()
-```
-
-## overlay-module
-
-This module is used for overlaying an Image over another .
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('overlay',options)
-           .run()
-```
-
-where `options` is an object with the following properties:
-* x : X-position of the image on which the new image is overlayed (default 0)
-* y : Y-position of the image on which the new image is overlayed (default 0)
-* offset : offset to the step on which the output of the last step is overlayed (default -2)
-
-## paint-bucket-module
-
-This module fills any polygonal shape with the specified color in pixels.
-
-## Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('paint-bucket',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* startingX : it is the value of the starting x-cordinate (default 10)
-* startingY : it is the value of the starting y-cordinate (default 10)
-* fillColor : they are four spaced seperated numbers representing the RGBA values of fill-color (default "100 100 100 255")
-* tolerance : it is the % tolerance (default 10)
-
-## resize-module
-
-This module is used for resizing an image.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('resize',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* resize : Percentage value of resize (default 125%)
-
-## replacecolor-module
-
-This module is used in replacing the color with grey or any desired color.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('replace-color',options)
-           .run()
-```
-where `options` is an object with the following properties:
-* replaceMethod : replaces with the desired color (default greyscale)
-* replaceColor : three space separated numbers representing the RGB values of color to be filled (default "0 0 255")
-* color : three space separated numbers representing the RGB values of color to be replaced (default "228 86 81")
-* tolerance : it is the % tolerance (default 50)
-
-## rotate-module
-
-This module is used for rotating an image.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('rotate',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* rotate : angular value for rotation in degrees (between 0 and 360; default 0)
-
-## saturation-module
-
-This module is used for changing the saturation of the image.
-#### Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('saturation',options)
-           .run()
-```
-
-where `options` is an object with the following property:
-* saturation : saturation for the new image (between 0 and 2; default 0)
-
-## Threshold 
-
-Thresholding is used to create binary images.
-
-## Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('threshold',options)
-           .run()
-```
-where `options` is an object with the following property:
-* threshold : it allows to select the types of thresholding (default "manual thresholding")
-* input : it allows to select the range of thresholding value (default 120)
-
-
-## Tint 
-
-It adds color tint to an image
-
-## Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('tint',options)
-           .run()
-```
-where `options` is an object with the following property:
-* color : RGB values seperated by a space (default "0 0 255")
-* factor : amount of tint (default 0.5)
-
-
-## Color Temperature
-
-This changes the color temperature of the image.
-
-## Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('color-temperature',options)
-           .run()
-```
-where `options` is an object with the following property:
-* temperature : temperature between 0 - 40,000 kelvin (default 6000)
-
-## Grid Overlay
-
-This adds the grid over an image.
-
-## Usage
-
-```js
-  sequencer.loadImage('PATH')
-           .addSteps('grid-overlay',options)
-           .run()
-```
-where `options` is an object with the following property:
-* options.x : The value at which the grid line should start in x-axis.
-* options.y : The value at which the grid line should start in y-axis.
-* color : Color for the grid on the image.

examples/demo.css

@@ -1,14 +1,14 @@
 /* https://github.com/theleagueof/league-spartan */
 @font-face {
-  font-family: 'League Spartan';
-  src: url('https://raw.githubusercontent.com/theleagueof/league-spartan/master/_webfonts/leaguespartan-bold.eot');
-  src: url('https://raw.githubusercontent.com/theleagueof/league-spartan/master/_webfonts/leaguespartan-bold.eot?#iefix') format('embedded-opentype'),
-       url('https://raw.githubusercontent.com/theleagueof/league-spartan/master/_webfonts/leaguespartan-bold.woff2') format('woff2'),
-       url('https://raw.githubusercontent.com/theleagueof/league-spartan/master/_webfonts/leaguespartan-bold.woff') format('woff'),
-       url('https://raw.githubusercontent.com/theleagueof/league-spartan/master/_webfonts/leaguespartan-bold.ttf') format('truetype'),
-       url('https://raw.githubusercontent.com/theleagueof/league-spartan/master/_webfonts/leaguespartan-bold.svg#league_spartanbold') format('svg');
-  font-weight: bold;
-  font-style: normal;
+    font-family: 'League Spartan';
+    src: url('https://raw.githubusercontent.com/theleagueof/league-spartan/master/_webfonts/leaguespartan-bold.eot');
+    src: url('https://raw.githubusercontent.com/theleagueof/league-spartan/master/_webfonts/leaguespartan-bold.eot?#iefix') format('embedded-opentype'),
+         url('https://raw.githubusercontent.com/theleagueof/league-spartan/master/_webfonts/leaguespartan-bold.woff2') format('woff2'),
+         url('https://raw.githubusercontent.com/theleagueof/league-spartan/master/_webfonts/leaguespartan-bold.woff') format('woff'),
+         url('https://raw.githubusercontent.com/theleagueof/league-spartan/master/_webfonts/leaguespartan-bold.ttf') format('truetype'),
+         url('https://raw.githubusercontent.com/theleagueof/league-spartan/master/_webfonts/leaguespartan-bold.svg#league_spartanbold') format('svg');
+    font-weight: bold;
+    font-style: normal;
 }
 
 body {
@@ -18,43 +18,20 @@ body {
   background: #f8f8fa;
 }
 
-footer {
-  margin-top: 40px;
-}
-
 h1 {
   font-family: 'League Spartan';
   color: #445;
 }
 
-body > .container,
-body > .container-fluid {
-}
-
-.center-align {
-  display: flex;
-  justify-content: center;
-  text-align:center;
-}
-
 .header {
   text-align: center;
 }
 
-.panel {
-  margin-left: 20px;
-  margin-right: 20px;
-}
-
 .nomargin {
   margin: 0 !important;
 }
 
-.form-control[type="range"] {
-  padding: 0px 0px;
-}
-
-.dropzone {
+#dropzone {
   padding: 30px;
   margin: 0 20% 30px;
   border: 4px dashed #ccc;
@@ -67,7 +44,7 @@ body > .container-fluid {
   background: #eee;
 }
 
-.dropzone input {
+#dropzone input {
   max-width: 100%;
 }
 
@@ -79,6 +56,17 @@ body > .container-fluid {
   margin-bottom: 20px;
 }
 
+.details {
+  border-top: 3px solid #444;
+  padding-left: 6px;
+}
+
+.details h3 {
+  font-family: monospace;
+  margin-top: 12px;
+  font-size: 1.3em;
+}
+
 .det {
   padding: 10px 16px;
   text-decoration: italic;
@@ -102,10 +90,6 @@ body > .container-fluid {
   margin: 20px auto;
 }
 
-#add-step-btn{
-  margin-left: 10px;
-}
-
 #addStep .labels {
   text-align: right;
   padding: 6px;
@@ -123,152 +107,3 @@ body > .container-fluid {
   text-align: center;
   margin: 10px;
 }
-#save-seq {
-  display: block;
-  margin: 0px 10px 0px 0px;
-  width: 250px;
-}
-.info {
-  padding: 8px;
-  text-align: center;
-}
-#gif {
-  display: block;
-  margin: 0px 0px 0px 10px;
-  width: 250px;
-}
-#dwnld {
-  max-width: 500px;
-  margin: 20px auto;
-  margin-left: 5px;
-}
-
-#gif_element {
-  display: block;
-  margin: 0 auto;
-  width: 100%;
-  height: auto;
-}
-
-#move-up {
-  position: fixed;
-  bottom: 50px;
-  right: 40px;
-  z-index: 550;
-  display: none;
-  background:transparent;
-  border:none;
-}
-
-#move-up i {
-  font-size:60px;
-  opacity:0.7;
-  color:#BABABA;
-}
-
-.btn-circle{
-  min-width: 80px;
-  min-height: 80px;
-  text-align: center;
-  display: flex !important;
-  flex-direction: column;
-  padding: 6px 0;
-  font-size: 12px;
-  line-height: 1.42;
-  border-radius: 10px;
-  margin-left: 5px;
-  margin-right: 5px;
-}
-.radio{
-  cursor:pointer;
-  overflow: hidden;
-  height: 80px;
-  width: 80px;
-  margin-left: 5px;
-  margin-right: 5px;
-}
-
-.radio-group {
-  margin-bottom: 20px;
-  overflow: auto;
-}
-
-.no-border {
-  border: 0px;
-}
-
-.savesequencemsg{
-  display: none;
-  text-align: center;
-}
-
-.notification {
-  background-color: #808b96;
-  padding:4px;
-  color:white;
-  border-radius:3px;
-  font-size:2rem;
-  position:fixed;
-  bottom:2px;
-  left:50%;
-  min-width:14rem;
-  text-align:center;
-  display:none;
-  transform: translate(-50%, -50%);
-}
-
-#resetButton {
-  margin-top: 20px;
-}
-
-.i-over {
-  position: absolute;
-  left: 15px;
-  top: 15px;
-  z-index: 2;
-  color: white;
-}
-
-.i-small {
-  left: 25px;
-}
-
-@media all and (max-width: 767px) {
-  .center-align {
-    justify-content: space-between;
-  }
-}
-a.name-header{
-  text-decoration: none;
-  color: #445;
-}
-
-.step-column{
-  display:flex; 
-  align-content: center;
-  justify-content: center;
-}
-
-.trash-container button.btn-xs {
-  margin-top: -5px !important;
-}
-
-.toggleIcon {
-  transition: transform 0.2s;
-}
-
-.rotated {
-  transform: rotate(180deg);
-}
-
-#gif{
-  margin-left:0px;
-  margin-top:5px;
-  width:100%;
-}
-.save-button{
-  margin-top:20px; 
-  margin-bottom:0px;
-  align:center; 
-  width:100%;
-}

examples/demo.js

@@ -1,225 +1,208 @@
-var defaultHtmlSequencerUi = require('./lib/defaultHtmlSequencerUi.js'),
-    setupCache = require('./lib/cache.js'),
-    intermediateHtmlStepUi = require('./lib/intermediateHtmlStepUi.js'),
-    DefaultHtmlStepUi = require('./lib/defaultHtmlStepUi.js'),
-    urlHash = require('./lib/urlHash.js'),
-    insertPreview = require('./lib/insertPreview.js');
-
 window.onload = function() {
+
   sequencer = ImageSequencer();
 
-  function refreshOptions() {
-    // Load information of all modules (Name, Inputs, Outputs)
-    var modulesInfo = sequencer.modulesInfo();
+  // Load information of all modules (Name, Inputs, Outputs)
+  var modulesInfo = sequencer.modulesInfo();
 
-    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>"
-        );
-    }
-    // Null option
-    addStepSelect.append('<option value="" disabled selected>Select a Module</option>');
-    addStepSelect.selectize({
-      sortField: 'text'
-  });
-  }
-  refreshOptions();
-
-  $(window).on('scroll', scrollFunction);
-
-  function scrollFunction() {
-    var shouldDisplay = $('body').scrollTop() > 20 || $(':root').scrollTop() > 20;
-
-    $('#move-up').css({
-       display: shouldDisplay ? 'block' : 'none'
-    });
+  // Add modules to the addStep dropdown
+  for(var m in modulesInfo) {
+    $('#addStep select').append(
+      '<option value="'+m+'">'+modulesInfo[m].name+'</option>'
+    );
   }
 
+  // Initial definitions
+  var steps = document.querySelector('#steps');
+  var parser = new DOMParser();
+  var reader = new FileReader();
 
-  function topFunction() {
-    $('body').animate({scrollTop: 0});
-    $(':root').animate({scrollTop: 0});
-  }
+  // Set the UI in sequencer. This Will generate HTML based on
+  // Image Sequencer events :
+  // onSetup : Called every time a step is added
+  // onDraw : Called every time a step starts draw
+  // onComplete : Called every time a step finishes drawing
+  // onRemove : Called everytime a step is removed
+  // The variable 'step' stores useful data like input and
+  // output values, step information.
+  // See documetation for more details.
+  sequencer.setUI({
 
-  $('#move-up').on("click",topFunction);
+    onSetup: function(step) {
 
+      if (step.options && step.options.description) step.description = step.options.description
 
-  // UI for each step:
-  sequencer.setUI(DefaultHtmlStepUi(sequencer));
+      step.ui = '\
+      <div class="row step">\
+        <div class="col-md-4 details">\
+          <h3>'+step.name+'</h3>\
+          <p><i>'+(step.description || '')+'</i></p>\
+        </div>\
+        <div class="col-md-8">\
+          <div class="load" style="display:none;"><i class="fa fa-circle-o-notch fa-spin"></i></div>\
+          <a><img alt="" class=“img-thumbnail” /></a>\
+        </div>\
+      </div>\
+      ';
 
-  // UI for the overall demo:
-  var ui = defaultHtmlSequencerUi(sequencer);
+      var tools =
+      '<div class="tools btn-group">\
+         <button confirm="Are you sure?" class="remove btn btn btn-default">\
+           <i class="fa fa-trash"></i>\
+         </button>\
+      </div>';
 
-  // find any `src` parameters in URL hash and attempt to source image from them and run the sequencer
-  if (urlHash.getUrlHashParameter('src')) {
-    sequencer.loadImage(urlHash.getUrlHashParameter('src'), ui.onLoad);
-  } else {
-    sequencer.loadImage("images/tulips.png", ui.onLoad);
-  }
+      step.ui = parser.parseFromString(step.ui,'text/html');
+      step.ui = step.ui.querySelector('div.row');
+      step.linkElement =  step.ui.querySelector('a');
+      step.imgElement = step.ui.querySelector('a img');
 
-  var resetSequence = function(){
-    var r=confirm("Do you want to reset the sequence?");
-    if (r)
-      window.location = "/";
-  }
-
-  $("#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() {
-    $(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);
-    ui.selectNewStepUi(newStep);
-    ui.addStepUi(newStep);
-    $(this).removeClass('selected');
-  });
-
-  $('#download-btn').click(function() {
-    $('.step-thumbnail:last()').trigger("click");
-    return false;
-  });
-
-  function displayMessageOnSaveSequence(){
-      $(".savesequencemsg").fadeIn();
-      setTimeout(function() {
-          $(".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).");
-    if(result){
-      result = result + " (local)";
-      sequencer.saveSequence(result, sequencer.toString());
-      sequencer.loadModules();
-      displayMessageOnSaveSequence();
-      refreshOptions();
-    }
-  });
-
-  var isWorkingOnGifGeneration = false;
-
-  $('.js-view-as-gif').on('click', function(event) {
-    // Prevent user from triggering generation multiple times
-    if (isWorkingOnGifGeneration) return;
-
-    isWorkingOnGifGeneration = true;
-
-    var button = event.target;
-    button.disabled = true;
-    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 imgSrcs = [];
-
-      for (var i = 0; i < imgs.length; i++) {
-        imgSrcs.push(imgs[i].src);
-      }
-
-      var options = {
-        'gifWidth': imgs[0].width,
-        'gifHeight': imgs[0].height,
-        'images': imgSrcs,
-        'frameDuration': 7,
-      }
-
-      gifshot.createGIF(options, function(obj) {
-        if (!obj.error) {
-          // Final gif encoded with base64 format
-          var image = obj.image;
-          var animatedImage = document.createElement('img');
-
-          animatedImage.id = "gif_element";
-          animatedImage.src = image;
-
-
-          var modal = $('#js-download-gif-modal');
-
-          $("#js-download-as-gif-button").one("click", function() {
-            // Trigger download
-            download(image, "index.gif", "image/gif");
-
-            // Close modal
-            modal.modal('hide');
-          })
-
-          var gifContainer = document.getElementById("js-download-modal-gif-container");
-
-          // Clear previous results
-          gifContainer.innerHTML = '';
-
-          // Insert image
-          gifContainer.appendChild(animatedImage);
-
-
-          // Open modal
-          modal.modal();
-
-          button.disabled = false;
-          button.innerHTML = 'View GIF';
-          isWorkingOnGifGeneration = false;
+      if(sequencer.modulesInfo().hasOwnProperty(step.name)) {
+        var inputs = sequencer.modulesInfo(step.name).inputs;
+        var outputs = sequencer.modulesInfo(step.name).outputs;
+        var merged = Object.assign(inputs, outputs); // combine outputs w inputs
+        for (var paramName in merged) {
+          var isInput = inputs.hasOwnProperty(paramName);
+          var html = "";
+          var inputDesc = (isInput)?inputs[paramName]:{};
+          if (!isInput) {
+            html += "<span class=\"output\"></span>";
+          } else if (inputDesc.type.toLowerCase() == "select") {
+            html += "<select class=\"form-control\" name=\""+paramName+"\">";
+            for (var option in inputDesc.values) {
+              html += "<option>"+inputDesc.values[option]+"</option>";
+            }
+            html += "</select>";
+          } else {
+            html = "<input class=\"form-control\" type=\""+inputDesc.type+"\" 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'>\
+                             <label for='" + paramName + "'>" + description + "</label>\
+                             "+html+"\
+                           </div>";
+          step.ui.querySelector('div.details').appendChild(div);
         }
-      });
-    }
-    catch (e) {
-      console.error(e);
-      button.disabled = false;
-      button.innerHTML = 'View GIF';
-      isWorkingOnGifGeneration = false;
+        $(step.ui.querySelector('div.details')).append("<p><button class='btn btn-default btn-save'>Save</button></p>");
 
+	function saveOptions() {
+          $(step.ui.querySelector('div.details')).find('input,select').each(function(i, input) {
+            step.options[$(input).attr('name')] = input.value;
+          });
+          sequencer.run();
+        }
+
+        // on clicking Save in the details pane of the step
+        $(step.ui.querySelector('div.details .btn-save')).click(saveOptions);
+      }
+
+      if(step.name != "load-image")
+        step.ui.querySelector('div.details').appendChild(
+          parser.parseFromString(tools,'text/html')
+                .querySelector('div')
+        );
+
+      steps.appendChild(step.ui);
+    },
+
+    onDraw: function(step) {
+      $(step.ui.querySelector('.load')).show();
+      $(step.ui.querySelector('img')).hide();
+    },
+
+    onComplete: function(step) {
+      $(step.ui.querySelector('.load')).hide();
+      $(step.ui.querySelector('img')).show();
+
+      step.imgElement.src = step.output;
+      step.linkElement.href = step.output;
+
+      function fileExtension(output) {
+        return output.split('/')[1].split(';')[0];
+      }
+
+      step.linkElement.download = step.name + "." + fileExtension(step.output);
+      step.linkElement.target = "_blank";
+
+      if(sequencer.modulesInfo().hasOwnProperty(step.name)) {
+        var inputs = sequencer.modulesInfo(step.name).inputs;
+        var outputs = sequencer.modulesInfo(step.name).outputs;
+        for (var i in inputs) {
+          if (step.options[i] !== undefined &&
+              inputs[i].type.toLowerCase() === "input") step.ui.querySelector('div[name="' + i + '"] input')
+                                                               .value = step.options[i];
+          if (step.options[i] !== undefined &&
+              inputs[i].type.toLowerCase() === "select") step.ui.querySelector('div[name="' + i + '"] select')
+                                                                .value = step.options[i];
+        }
+        for (var i in outputs) {
+          if (step[i] !== undefined) step.ui.querySelector('div[name="'+i+'"] input')
+                                            .value = step[i];
+        }
+      }
+    },
+
+    onRemove: function(step) {
+      step.ui.remove();
     }
+
   });
 
+  sequencer.loadImage('images/tulips.png', function loadImageUI() {
+
+    // look up needed steps from Url Hash:
+    var hash = getUrlHashParameter('steps');
+
+    if (hash) {
+      var stepsFromHash = hash.split(',');
+      stepsFromHash.forEach(function eachStep(step) {
+        sequencer.addSteps(step);
+      });
+      sequencer.run();
+    }
+
+  });
+
+  $('#addStep select').on('change', selectNewStepUI);
+
+  function selectNewStepUI() {
+    var m = $('#addStep select').val();
+    $('#addStep .info').html(sequencer.modulesInfo(m).description);
+  }
+
+  function addStepUI() {
+    var options = {};
+    var inputs = $('#options input, #options select');
+    $.each(inputs, function() {
+      options[this.name] = $(this).val();
+    });
+    if($('#addStep select').val() == "none") return;
+    // add to URL hash too
+    var hash = getUrlHashParameter('steps') || '';
+    if (hash != '') hash += ',';
+    setUrlHashParameter('steps', hash + $('#addStep select').val())
+    sequencer.addSteps($('#addStep select').val(),options).run();
+  }
+
+  $('#addStep button').on('click', addStepUI);
+
+
+  function removeStepUI(){
+    var index = $('button.remove').index(this) + 1;
+    sequencer.removeSteps(index).run();
+    // remove from URL hash too
+    var urlHash = getUrlHashParameter('steps').split(',');
+    urlHash.splice(index - 1, 1);
+    setUrlHashParameter("steps", urlHash.join(','));
+  }
+
+  $('body').on('click','button.remove', removeStepUI);
+
+
   // image selection and drag/drop handling from examples/lib/imageSelection.js
-  sequencer.setInputStep({
-    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")
-        step.options.step.imgElement.src = reader.result;
-      else
-        step.imgElement.src = reader.result;
-      insertPreview.updatePreviews(reader.result,'#addStep');
-      insertPreview.updatePreviews(sequencer.steps[0].imgElement.src,'.insertDiv');
-    },
-    onTakePhoto: function (url) {
-      var step = sequencer.steps[0];
-      step.output.src = url;
-      sequencer.run({ index: 0 });
-      if(typeof step.options !=="undefined")
-        step.options.step.imgElement.src = url;
-      else
-        step.imgElement.src = url;
-      insertPreview.updatePreviews(url,'#addStep');
-      insertPreview.updatePreviews(sequencer.steps[0].imgElement.src,'.insertDiv');
-    }
-  });
+  setupFileHandling(sequencer);
 
-  setupCache();
-
-  if (urlHash.getUrlHashParameter('src')) {
-    insertPreview.updatePreviews(urlHash.getUrlHashParameter('src'),'#addStep');
-  } else {
-    insertPreview.updatePreviews("images/tulips.png",'#addStep');
-  }
-};
+}

examples/fisheye.html

@@ -29,7 +29,6 @@
       }
     </style>
 
-    <script src="../node_modules/jquery/dist/jquery.min.js"></script>
     <script src="../dist/image-sequencer.js"></script>
   </head>
 

examples/index.html

@@ -2,222 +2,77 @@
 
 <html>
 
-<head>
 
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="content-type" content="text/html; charset=UTF8">
-  <meta name="theme-color" content="#428bca">
-  <link rel="icon" sizes="192x192" href="../icons/ic_192.png">
-  <link rel="manifest" href="manifest.json">
-   <!--Adding meta Tag for search engine optimisation-->
-   <meta property="og:description" content="A pure JavaScript sequential image processing system, inspired by storyboards. Instead of modifying the original image, it creates a new image at each step in a sequence.">
-   <meta property="og:site_name" content="sequencer.publiclab.org">
-   <meta property="og:url" content="https://sequencer.publiclab.org">
-   <meta property="og:title" content="Image Sequencer">
+  <head>
 
-  <title>Image Sequencer</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="content-type" content="text/html; charset=UTF8">
+    <link rel="icon" sizes="192x192" href="../icons/ic_192.png">
 
-  <script src="../node_modules/jquery/dist/jquery.min.js"></script>
-  <script src="../node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
-  <script src="../src/ui/prepareDynamic.js"></script>
-  <script src="../dist/image-sequencer.js" charset="utf-8"></script>
-  <script src="../dist/image-sequencer-ui.js" charset="utf-8"></script>
-  <!-- for crop module: -->
-  <script src="../node_modules/imgareaselect/jquery.imgareaselect.dev.js"></script>
-  <script src="../node_modules/gifshot/dist/gifshot.min.js" type="text/javascript"></script>
 
-  <!-- Download.js for large files -->
-  <script src="../node_modules/downloadjs/download.min.js" type="text/javascript"/>
+    <title>Image Sequencer</title>
 
-  <script src="lib/scrollToTop.js"></script>
-  <script src="../node_modules/selectize/dist/js/standalone/selectize.min.js"></script>
-</head>
+    <script src="../node_modules/jquery/dist/jquery.min.js"></script>
+    <script src="../node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
+    <script src="../dist/image-sequencer.js" charset="utf-8"></script>
+    <script src="lib/urlHash.js" charset="utf-8"></script>
+    <script src="lib/imageSelection.js" charset="utf-8"></script>
+    <script src="demo.js" charset="utf-8"></script>
 
-<body>
+  </head>
 
-  <link href="../node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
-  <link rel="stylesheet" href="demo.css">
-  <link href="../node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet">
-  <link href="../node_modules/selectize/dist/css/selectize.default.css" rel="stylesheet">
-  <!-- for crop module: -->
-  <link href="./selectize.default.css" rel="stylesheet">
-  <link rel="stylesheet" href="demo.css">
 
-  <div class="container-fluid">
+  <body>
 
-    <header class="text-center">
-      <h1><a href="/" target='_blank' class="name-header">Image Sequencer</a></h1>
-      <p>
-        A pure JavaScript sequential image processing system, inspired by storyboards. Instead of modifying the original image, it
-        creates a new image at each step in a sequence.
-        <a href="https://publiclab.org/image-sequencer">Learn more</a>
-      </p>
-      <p>
-        Open Source
-        <a href="https://github.com/publiclab/image-sequencer">
-          <i class="fa fa-github"></i>
-        </a>
-       by <a href= "https://publiclab.org" title = "Publiclab Website"><i class = "fa fa-globe"></i> Publiclab</a>
-      </p>
-    </header>
+    <link href="../node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
+    <link href="../node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet">
+    <link rel="stylesheet" href="demo.css">
 
-    <div id="dropzone" class="dropzone">
-      <p>
-        <i>Select or drag in an image to start!</i>
-      </p>
-      <center>
-        <input type="file" id="fileInput" value="" accept="image/*"><br />
-        <button type="button" id="take-photo" class="btn btn-primary btn-block btn-lg ">Take a Photo</button>
-        <video  id="video" width="400" height="300" style="display:none"></video>
-        <a href="#" id="capture" style="display:none" class="btn btn-primary btn-md">Click Picture</a>
-        <a href="#" id="close" style="display:none" class="btn btn-default btn-md">Close</a>
-        <canvas id="canvas" width="400" height="300" style="display:none"></canvas>
-      </center>
-    </div>
+    <div class="container-fluid">
 
-    <section id="steps" class="row">
-      <div id="load-image"></div>
-    </section>
-
-    <hr />
-  <p class = "alert alert-success savesequencemsg">Saved Sequence Success. Sequence can be found among other modules.</p>
-  <div class="row">
-    <div class="col-sm-8">
-    <section id="addStep" class="panel panel-primary">
-      <div class="form-inline">
-        <div class="panel-body">
-          <div style="display:flex; justify-content:center;">
-          </div>
-          <p class="info">Select a new module to add to your sequence.</p>
-          <div class="row center-align radio-group">
-            <div>
-              <div class="radio" data-value="resize">
-                <i class="fa fa-arrows-alt fa-4x i-over"></i>
-              </div>
-              <p>Resize</p>
-            </div>
-            <div>
-              <div class="radio" data-value="brightness">
-                <i class="fa fa-sun-o fa-4x i-over"></i>
-              </div>
-              <p>Brightness</p>
-            </div>
-            <div>
-              <div class="radio" data-value="contrast">
-                <i class="fa fa-adjust fa-4x i-over"></i>
-              </div>
-              <p>Contrast</p>
-            </div>
-            <div>
-              <div class="radio" data-value="saturation">
-                <i class="fa fa-tint fa-4x i-over i-small"></i>
-              </div>
-              <p>Saturation</p>
-            </div>
-            <div>
-              <div class="radio" data-value="rotate">
-                <i class="fa fa-rotate-right fa-4x i-over"></i>
-              </div>
-              <p>Rotate</p>
-            </div>
-            <div>
-              <div class="radio" data-value="crop">
-                <i class="fa fa-crop fa-4x i-over"></i>
-              </div>
-              <p>Crop</p>
-            </div>
-          </div>
-          <div class="row center-align">
-            <div class="col-md-8">
-              
-            <select  id="selectStep" >
-              <!-- The default null selection has been appended manually in demo.js
-              This is because the options in select are overritten when options are appended.-->
-            </select>
-            </div>
-            <div class="col-md-4">
-            <button class="btn btn-success btn-lg" name="add" id="add-step-btn">Add Step</button></div>
-          </div>
-          <div class="row center-align">
-          <button id="resetButton" class="btn btn-default btn-lg" style=" margin: 20px 35px 0px 35px; width:100%;">Clear All Steps</button>
-        </div>
-        </div>
-      </div>
-    </section>
-
-    <div class="modal fade" id="js-download-gif-modal" tabindex="-1" role="dialog">
-      <div class="modal-dialog" role="document">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            <h4 class="modal-title">Your gif is ready</h4>
-          </div>
-          <div class="modal-body">
-            <div id="js-download-modal-gif-container">
-              <!-- Gif should appear here -->
-            </div>
-          </div>
-          <div class="modal-footer">
-            <button type="button" class="btn btn-default" data-dismiss="modal">Done</button>
-
-            <button id="js-download-as-gif-button" class="btn btn-primary">Download</button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    </div>
-    <div class="col-sm-4">
-    <section id="dwnld" class="panel panel-primary">
-      <div class="form-inline">
-        <div class="panel-body">
-          <div style="text-align:center;">
-            <h2 style="margin-top:20px">Save</h2>
-            <select class="form-control input-md" id="selectSaveOption" style="margin-top:20px">
-              <option>Save as PNG</option>
-              <option>Save as GIF (all steps)</option>
-              <option>Save sequence</option>
-              <option>Save sequence string</option>
-            </select>
-            <p><button id="saveButton" class="btn btn-primary btn-lg save-button">Save</button></p>
-            <p><button class="btn btn-default btn-lg js-view-as-gif" id="gif">Preview GIF</button></p>
-          </div>
-        </div>
-      </div>
-    </section>
-    </div>
-  </div>
-
-  <footer>
-    <hr style="margin:20px;"><center><button class="btn btn-default btn-sm" id="clear-cache">Clear offline cache</button></center>
-    <div class="row">
-      <div class="col-md-6">
-        <h2>Need Help?</h2>
+      <header class="text-center">
+        <h1>Image Sequencer</h1>
         <p>
-          <a class="btn btn-default" href="https://github.com/publiclab/image-sequencer/issues">Ask a question</a>
-          <a class="btn btn-default" href="https://publiclab.org/chat">Ask in our chatroom</a>
-        </p>
-      </div>
-      <div class="col-md-6">
-        <h2>Improve this tool</h2>
-        <p>
-          This is an open source toolkit which you can help improve on Github
+          A pure JavaScript sequential image processing system, inspired by storyboards. Instead of modifying the original image, it creates a new image at each step in a sequence. 
+          <a href="https://publiclab.org/image-sequencer">Learn more</a>
         </p>
         <p>
-          <a class="btn btn-default" href="https://github.com/publiclab/image-sequencer">View the code &raquo;</a>
+          Open Source <a href="https://github.com/publiclab/image-sequencer"><i class="fa fa-github"></i></a> by <a href="https://publiclab.org">Public Lab</a>
         </p>
+      </header>
+
+      <div id="dropzone">
+        <p><i>Select or drag in an image to start!</i></p>
+        <center><input type="file" id="fileInput" value=""></center>
       </div>
+
+      <section id="steps" class="row"></section>
+
+      <hr />
+
+      <section id="addStep" class="panel panel-primary">
+        <div class="form-inline">
+          <div class="panel-body">
+            <div style="text-align:center;">
+              <select class="form-control input-lg">
+                <option value="none" disabled selected>Select a new step...</option>
+              </select>
+              <button class="btn btn-success btn-lg" name="add">Add Step</button>
+            </div>
+            <br />
+	    <p class="info" style="padding:8px;">Select a new module to add to your sequence.</p>
+	  </div>
+        </div>
+      </section>
+
     </div>
-  </footer>
 
-  <button id="move-up"><i class="fa fa-arrow-circle-o-up"></i></button>
+    <script type="text/javascript">
 
-  <script type="text/javascript">
-    $(function() {
       var sequencer;
-    })
-  </script>
 
-</body>
+    </script>
+
+  </body>
 
 </html>

examples/lib/cache.js

@@ -1,39 +0,0 @@
-var setupCache = function() {
-  if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.register('sw.js', { scope: '/examples/' })
-      .then(function(registration) {
-        const installingWorker = registration.installing;
-        installingWorker.onstatechange = () => {
-          console.log(installingWorker)
-          if (installingWorker.state === 'installed') {
-            location.reload();
-          }
-        }
-        console.log('Registration successful, scope is:', registration.scope);
-      })
-      .catch(function(error) {
-        console.log('Service worker registration failed, error:', error);
-      });
-  }
-
-  if ('serviceWorker' in navigator) {
-    caches.keys().then(function(cacheNames) {
-      cacheNames.forEach(function(cacheName) {
-        $("#clear-cache").append(" " + cacheName);
-      });
-    });
-  }
-
-  $("#clear-cache").click(function() {
-    if ('serviceWorker' in navigator) {
-      caches.keys().then(function(cacheNames) {
-        cacheNames.forEach(function(cacheName) {
-          caches.delete(cacheName);
-        });
-      });
-    }
-    location.reload();
-  });
-}
-
-module.exports = setupCache;

examples/lib/defaultHtmlSequencerUi.js

@@ -1,92 +0,0 @@
-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";
-
-  function onLoad() {
-    importStepsFromUrlHash();
-    if ($('#selectStep').val()==='none')
-        $(addStepSel + " #add-step-btn").prop("disabled", true);
-      handleSaveSequence();
-  }
-
-  // look up needed steps from Url Hash:
-  function importStepsFromUrlHash() {
-    var hash = urlHash.getUrlHashParameter("steps");
-
-    if (hash) {
-      _sequencer.importString(hash);
-      _sequencer.run({ index: 0 });
-    }
-    urlHash.setUrlHashParameter("steps", sequencer.toString());
-  }
-
-  function selectNewStepUi() {
-    var m = $(addStepSel + " select").val();
-    if(!m) m = arguments[0];
-    $(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());
-    //disable save-sequence button if all steps are removed
-    handleSaveSequence();
-  }
-
-  function addStepUi() {
-    if ($(addStepSel + " select").val() == "none") return;
-
-    var newStepName = $(addStepSel + " select").val();
-  
-    if(!newStepName) newStepName = arguments[0]
-
-    /*
-    * after adding the step we run the sequencer from defined step
-    * and since loadImage is not a part of the drawarray the step lies at current
-    * length - 2 of the drawarray
-    */
-    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"];
-    }
-    _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");
-
-    //enable save-sequence button if disabled initially
-    handleSaveSequence();
-
-    // add to URL hash too
-    urlHash.setUrlHashParameter("steps", _sequencer.toString())
-  }
-
-  function handleSaveSequence(){
-    var stepCount=sequencer.steps.length;
-    if(stepCount<2)
-    $(" #save-seq").prop("disabled", true);
-    else
-    $(" #save-seq").prop("disabled", false);
-  }
-
-  return {
-    onLoad: onLoad,
-    importStepsFromUrlHash: importStepsFromUrlHash,
-    selectNewStepUi: selectNewStepUi,
-    removeStepUi: removeStepUi,
-    addStepUi: addStepUi
-  }
-}
-
-module.exports = DefaultHtmlSequencerUi;
-

examples/lib/defaultHtmlStepUi.js

@@ -1,344 +0,0 @@
-// Set the UI in sequencer. This Will generate HTML based on
-// Image Sequencer events :
-// onSetup : Called every time a step is added
-// onDraw : Called every time a step starts draw
-// onComplete : Called every time a step finishes drawing
-// onRemove : Called everytime a step is removed
-// The variable 'step' stores useful data like input and
-// output values, step information.
-// See documetation for more details.
-
-var intermediateHtmlStepUi = require('./intermediateHtmlStepUi.js');
-var urlHash = require('./urlHash.js');
-var _ = require('lodash');
-var mapHtmlTypes = require('./mapHtmltypes');
-
-function DefaultHtmlStepUi(_sequencer, options) {
-  
-  options = options || {};
-  var stepsEl = options.stepsEl || document.querySelector("#steps");
-  var selectStepSel = options.selectStepSel = options.selectStepSel || "#selectStep";
-
-  function onSetup(step, stepOptions) {
-    if (step.options && step.options.description)
-      step.description = step.options.description;
-
-    step.ui =
-      '\
-      <div class="container-fluid step-container">\
-          <div class="panel panel-default">\
-            <div class="panel-heading">\
-              <div class="trash-container pull-right"></div>\
-              <h3 class="panel-title">' +  
-                '<span class="toggle">' +step.name + ' <span class="caret toggleIcon rotated"></span>\
-                 <span class="load-spin pull-right" style="display:none;padding:1px 8px;"><i class="fa fa-circle-o-notch fa-spin"></i></span>\
-              </h3>\
-            </div>\
-            <form class="input-form">\
-            <div class="panel-body cal collapse in">\
-              <div class="row step">\
-                <div class="col-md-4 details container-fluid">\
-                  <div class="cal collapse in"><p>' +
-                    '<i>' + (step.description || "") + '</i>' +
-                 '</p></div>\
-                </div>\
-                <div class="col-md-8 cal collapse in step-column">\
-                  <div class="load load-spin" style="display:none;"><i class="fa fa-circle-o-notch fa-spin"></i></div>\
-                  <div class="step-image">\
-                    <a class="cal collapse in"><img class="img-thumbnail step-thumbnail"/></a>\
-                  </div>\
-                </div>\
-              </div>\
-            </div>\
-            <div class="panel-footer cal collapse in"></div>\
-            </form>\
-          </div>\
-      </div>';
-
-    var tools =
-    '<div class="trash">\
-      <button confirm="Are you sure?" class="remove btn btn-default btn-xs">\
-        <i class="fa fa-trash"></i>\
-      </button>\
-    </div>';
-
-    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");
-
-    if (_sequencer.modulesInfo().hasOwnProperty(step.name)) {
-      var inputs = _sequencer.modulesInfo(step.name).inputs;
-      var outputs = _sequencer.modulesInfo(step.name).outputs;
-      var merged = Object.assign(inputs, outputs); // combine outputs w inputs
-
-      for (var paramName in merged) {
-        var isInput = inputs.hasOwnProperty(paramName);
-        var html = "";
-        var inputDesc = isInput ? mapHtmlTypes(inputs[paramName]) : {};
-        if (!isInput) {
-          html += '<span class="output"></span>';
-        } 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 += "</select>";
-        } else {
-          let paramVal = step.options[paramName] || inputDesc.default;
-          html =
-            '<input class="form-control target" type="' +
-            inputDesc.type +
-            '" name="' +
-            paramName +
-            '" value="' +
-            paramVal +
-            '" placeholder ="' +
-            (inputDesc.placeholder || "");
-
-          if (inputDesc.type.toLowerCase() == "range") {
-            html +=
-              '"min="' +
-              inputDesc.min +
-              '"max="' +
-              inputDesc.max +
-              '"step="' +
-              (inputDesc.step ? inputDesc.step : 1)+ '">' + '<span>' + paramVal + '</span>';
-
-          }
-          else html += '">';
-        }
-
-        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='" +
-          paramName +
-          "'>" +
-          description +
-          "</label>\
-                           " +
-          html +
-          "\
-                         </div>";
-        step.ui.querySelector("div.details").appendChild(div);
-      }
-      $(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(
-        '<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") {
-      step.ui
-        .querySelector("div.trash-container")
-        .prepend(
-          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) });    
-      // 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);
-      } else {
-        stepsEl.insertBefore(step.ui, $(stepsEl).children()[stepOptions.index]);
-      }
-    }
-    else {
-      $("#load-image").append(step.ui);
-    }
-    $(step.ui.querySelector(".toggle")).on("click", () => {
-      $(step.ui.querySelector('.toggleIcon')).toggleClass('rotated');
-       $(step.ui.querySelectorAll(".cal")).collapse('toggle');
-    });
-    
-    $(step.imgElement).on("mousemove", _.debounce(() => imageHover(step), 150));
-
-    function saveOptions(e) {
-      e.preventDefault();
-      if (optionsChanged){
-        $(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();
-          });
-        _sequencer.run({ index: step.index - 1 });
-
-        // modify the url hash
-        urlHash.setUrlHashParameter("steps", _sequencer.toString())
-        // disable the save button
-        $(step.ui.querySelector('.btn-save')).prop('disabled', true);
-        optionsChanged = false;
-        changedInputs = 0;
-      }
-    }
-
-    function handleInputValueChange(currentValue, initValue, hasChangedBefore) {
-      var inputChanged = !(isNaN(initValue) || isNaN(currentValue) ? currentValue === initValue : currentValue - initValue === 0);
-      changedInputs += hasChangedBefore ? inputChanged ? 0 : -1 : inputChanged ? 1 : 0;
-      optionsChanged = changedInputs > 0;
-
-      $(step.ui.querySelector('.btn-save')).prop('disabled', !optionsChanged);
-      return inputChanged;
-    }
-
-    var 
-      changedInputs = 0,
-      optionsChanged = false;
-    $(step.ui.querySelector('.input-form')).on('submit', saveOptions);
-    $(step.ui.querySelectorAll('.target')).each(function(i, input) {
-      $(input)
-        .data('initValue', $(input).val())
-        .data('hasChangedBefore', false)
-        .on('input', function() {
-          $(this)
-            .focus()
-            .data('hasChangedBefore',
-              handleInputValueChange(
-                $(this).val(),
-                $(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();
-  }
-
-  function onComplete(step) {
-    $(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");
-    for (let index = 0; index < step.linkElements.length; index++) {
-      if (step.linkElements[index].contains(imgthumbnail))
-        step.linkElements[index].href = step.imgElement.src;
-    }
-
-    // TODO: use a generalized version of this
-    function fileExtension(output) {
-      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";
-    }
-
-    // fill inputs with stored step options
-    if (_sequencer.modulesInfo().hasOwnProperty(step.name)) {
-      var inputs = _sequencer.modulesInfo(step.name).inputs;
-      var outputs = _sequencer.modulesInfo(step.name).outputs;
-      for (var i in inputs) {
-        if (step.options[i] !== undefined) {
-          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")
-            $(step.ui.querySelector('div[name="' + i + '"] select'))
-              .val(step.options[i])
-              .data('initValue', step.options[i]);
-        }
-      }
-      for (var i in outputs) {
-        if (step[i] !== undefined)
-          $(step.ui.querySelector('div[name="' + i + '"] input'))
-            .val(step[i]);
-      }
-    }
-  }
-
-  function imageHover(step){
-
-    var img = $(step.imgElement);
-
-    img.mousemove(function(e) { 
-      var canvas = document.createElement('canvas');
-      canvas.width = img.width();
-      canvas.height = img.height();
-      var context = canvas.getContext('2d');
-      context.drawImage(this,0,0);
-
-      var offset = $(this).offset();
-      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;
-    }); 
-  }
-
-  function onRemove(step) {
-    step.ui.remove();
-    $("#steps .step-container:nth-last-child(1) .insert-step").prop('disabled',true);
-    $('div[class*=imgareaselect-]').remove();
-  }
-
-  function getPreview() {
-    return step.imgElement;
-  }
-
-  function notify(msg,id){
-    if ($('#'+id).length == 0) {
-      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");
-  
-      $('body').append(notification);
-    }
-  
-    $('#'+id).fadeIn(500).delay(200).fadeOut(500);
-  }
-    
-  
-  return {
-    getPreview: getPreview,
-    onSetup: onSetup,
-    onComplete: onComplete,
-    onRemove: onRemove,
-    onDraw: onDraw, 
-    notify: notify,
-    imageHover: imageHover
-  }
-}
-
-if(typeof window === "undefined"){
-  module.exports={
-    DefaultHtmlStepUi: DefaultHtmlStepUi
-  }
-}
-
-module.exports = DefaultHtmlStepUi;
-

examples/lib/imageSelection.js

@@ -0,0 +1,50 @@
+function setupFileHandling(_sequencer, dropzoneId, fileInputId) {
+
+  dropzoneId = dropzoneId || "dropzone";
+  var dropzone = $('#' + dropzoneId);
+
+  fileInputId = fileInputId || "fileInput";
+  var fileInput = $('#' + fileInputId);
+
+  var reader = new FileReader();
+
+  function handleFile(e) {
+
+    e.preventDefault();
+    e.stopPropagation(); // stops the browser from redirecting.
+
+    if (e.target && e.target.files) var file = e.target.files[0];
+    else var file = e.dataTransfer.files[0];
+    if(!file) return;
+
+    var reader = new FileReader();
+    
+    reader.onload = function onFileReaderLoad() {
+      var loadStep = _sequencer.images.image1.steps[0];
+      loadStep.output.src = reader.result;
+      _sequencer.run(0);
+      loadStep.options.step.imgElement.src = reader.result;
+    }
+
+    reader.readAsDataURL(file);
+  }
+
+  fileInput.on('change', handleFile);
+
+  dropzone[0].addEventListener('drop', handleFile, false);
+
+  dropzone.on('dragover', function onDragover(e) {
+    e.stopPropagation();
+    e.preventDefault();
+    e.dataTransfer.dropEffect = 'copy'; // Explicitly show this is a copy.
+  }, false);
+
+  dropzone.on('dragenter', function onDragEnter(e) {
+    dropzone.addClass('hover');
+  });
+
+  dropzone.on('dragleave', function onDragLeave(e) {
+    dropzone.removeClass('hover');
+  });
+
+}

examples/lib/insertPreview.js

@@ -1,55 +0,0 @@
-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('no-border');
-      img.src = src;
-      $(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);
-        }
-      });
-    }
-
-    function loadPreview() {
-      if (previewStepName === "crop") {
-        previewSequencer.addSteps(previewStepName, customValues).run(insertPreview);
-      }
-      else {
-        previewSequencer.addSteps(previewStepName, { [previewStepName]: customValues }).run(insertPreview);
-      }
-    }
-    previewSequencer.loadImage(path, loadPreview);
-  }
-
-  function updatePreviews(src, 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
-      }
-    }
-
-    Object.keys(previewSequencerSteps).forEach(function (step, index) {
-      generatePreview(step, Object.values(previewSequencerSteps)[index], src, selector);
-    });
-  }
-
-module.exports = {
-  generatePreview : generatePreview,
-  updatePreviews : updatePreviews
-}

examples/lib/intermediateHtmlStepUi.js

@@ -1,163 +0,0 @@
-var urlHash = require('./urlHash.js'),
-    insertPreview = require('./insertPreview.js');
-
-function IntermediateHtmlStepUi(_sequencer, step, options) {
-  function stepUI() {
-    return '<div class="row insertDiv collapse">\
-          <section class="panel panel-primary .insert-step">\
-            <button class="btn btn-default close-insert-box"><i class="fa fa-times" aria-hidden="true"></i> Close</button>\
-            <div class="form-inline">\
-              <div class="panel-body">\
-                <p class="info">Select a new module to add to your sequence.</p>\
-                <div class="row center-align radio-group">\
-                  <div>\
-                    <div class="radio" data-value="resize">\
-                      <i class="fa fa-arrows-alt fa-4x i-over"></i>\
-                    </div>\
-                    <p>Resize</p>\
-                  </div>\
-                  <div>\
-                    <div class="radio" data-value="brightness">\
-                      <i class="fa fa-sun-o fa-4x i-over"></i>\
-                    </div>\
-                    <p>Brightness</p>\
-                  </div>\
-                  <div>\
-                    <div class="radio" data-value="contrast">\
-                      <i class="fa fa-adjust fa-4x i-over"></i>\
-                    </div>\
-                    <p>Contrast</p>\
-                  </div>\
-                  <div>\
-                    <div class="radio" data-value="saturation">\
-                      <i class="fa fa-tint fa-4x i-over i-small"></i>\
-                    </div>\
-                    <p>Saturation</p>\
-                  </div>\
-                  <div>\
-                    <div class="radio" data-value="rotate">\
-                      <i class="fa fa-rotate-right fa-4x i-over"></i>\
-                    </div>\
-                    <p>Rotate</p>\
-                  </div>\
-                  <div>\
-                    <div class="radio" data-value="crop">\
-                      <i class="fa fa-crop fa-4x i-over"></i>\
-                    </div>\
-                    <p>Crop</p>\
-                  </div>\
-                </div>\
-                <div class="row center-align">\
-                  <div class="col-md-8">\
-                    <select class="insert-step-select">\
-                      <!-- The default null selection has been appended manually in demo.js\
-                      This is because the options in select are overritten when options are appended.-->\
-                    </select>\
-                  <div>\
-                  <div class="col-md-4">\
-                    <button class="btn btn-success btn-lg insert-save-btn add-step-btn" name="add">Add Step</button>\
-                  <div>\
-                </div>\
-              </div>\
-            </div>\
-          </section>\
-        </div>';
-  }
-
-
-  function selectNewStepUi() {
-    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);
-  }
-    
-    
-  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)})
-    }
-    else {
-      $(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")
-
-    if ($(step.ui.querySelector('.insertDiv')).length > 0){
-      toggleDiv();
-    }
-    else {
-      step.ui
-      .querySelector("div.step")
-      .insertAdjacentElement('afterend',
-        addStepUI
-      );
-      toggleDiv(function(){
-        insertPreview.updatePreviews(step.output, '.insertDiv');
-      });
-    }
-
-    $(step.ui.querySelector('.insertDiv .close-insert-box')).off('click').on('click', function(){toggleDiv(function(){})});
-    
-    var insertStepSelect = $(step.ui.querySelector('.insert-step-select'));
-    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>"
-        );
-    }
-    insertStepSelect.selectize({
-      sortField: 'text'
-    });
-    $(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 () {
-      $(this).parent().find('.radio').removeClass('selected');
-      $(this).addClass('selected');
-      newStep = $(this).attr('data-value');
-      $(step.ui.querySelector('.insert-step-select')).val(newStep);
-      selectNewStepUi();
-      insert(id);
-      $(this).removeClass('selected');
-    });
-    insertStepSelect.on('change', selectNewStepUi);
-    $(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;
-
-    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"];
-    }
-    _sequencer
-      .insertSteps(id + 1, newStepName).run({ index: id });
-
-    // add to URL hash too
-    urlHash.setUrlHashParameter("steps", _sequencer.toString());
-
-  }
-
-  return {
-    insertStep
-  }
-}
-module.exports = IntermediateHtmlStepUi;
-

examples/lib/mapHtmltypes.js

@@ -1,28 +0,0 @@
-function mapHtmlTypes(inputInfo){
-  var htmlType;
-  switch(inputInfo.type.toLowerCase()){
-    case 'integer':
-      htmlType = inputInfo.min != undefined ? 'range' : 'number';
-      break;
-    case 'string':
-      htmlType = 'text';
-      break;
-    case 'select':
-      htmlType = 'select';
-      break;
-    case 'percentage':
-      htmlType = 'number';
-      break;
-    case 'float':
-      htmlType = inputInfo.min != undefined ? 'range' : 'text';
-      break;
-    default:
-      htmlType = 'text';
-      break;
-  }
-  var response = inputInfo;
-  response.type = htmlType;
-  return response;
-}
-
-module.exports = mapHtmlTypes;

examples/lib/urlHash.js

@@ -40,10 +40,3 @@ function setUrlHashParameter(param, value) {
   setUrlHashParameters(params);
 
 }
-
-module.exports =  {
-                    getUrlHashParameter: getUrlHashParameter,
-                    setUrlHashParameter: setUrlHashParameter,
-                    getUrlHashParameters: getUrlHashParameters,
-                    setUrlHashParameters: setUrlHashParameters
-                  }

examples/manifest.json

@@ -1,21 +0,0 @@
-{
-  "short_name": "IS",
-  "name": "Image Sequencer",
-  "icons": [
-    {
-      "src": "../icons/ic_192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "../icons/ic_512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": "/examples/#steps=",
-  "background_color": "#428bca",
-  "display": "standalone",
-  "scope": "/examples/",
-  "theme_color": "#428bca"
-}

examples/selectize.default.css

@@ -1,403 +0,0 @@
-/**
- * selectize.default.css (v0.12.6) - Default Theme
- * Copyright (c) 2013–2015 Brian Reavis & contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
- * file except in compliance with the License. You may obtain a copy of the License at:
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under
- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
- * ANY KIND, either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- *
- * @author Brian Reavis <brian@thirdroute.com>
- */
-.selectize-control.plugin-drag_drop.multi > .selectize-input > div.ui-sortable-placeholder {
-  visibility: visible !important;
-  background: #f2f2f2 !important;
-  background: rgba(0, 0, 0, 0.06) !important;
-  border: 0 none !important;
-  -webkit-box-shadow: inset 0 0 12px 4px #fff;
-  box-shadow: inset 0 0 12px 4px #fff;
-}
-.selectize-control.plugin-drag_drop .ui-sortable-placeholder::after {
-  content: '!';
-  visibility: hidden;
-}
-.selectize-control.plugin-drag_drop .ui-sortable-helper {
-  -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
-}
-.selectize-dropdown-header {
-  position: relative;
-  padding: 5px 8px;
-  border-bottom: 1px solid #d0d0d0;
-  background: #f8f8f8;
-  -webkit-border-radius: 3px 3px 0 0;
-  -moz-border-radius: 3px 3px 0 0;
-  border-radius: 3px 3px 0 0;
-}
-.selectize-dropdown-header-close {
-  position: absolute;
-  right: 8px;
-  top: 50%;
-  color: #303030;
-  opacity: 0.4;
-  margin-top: -12px;
-  line-height: 20px;
-  font-size: 20px !important;
-}
-.selectize-dropdown-header-close:hover {
-  color: #000000;
-}
-.selectize-dropdown.plugin-optgroup_columns .optgroup {
-  border-right: 1px solid #f2f2f2;
-  border-top: 0 none;
-  float: left;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.selectize-dropdown.plugin-optgroup_columns .optgroup:last-child {
-  border-right: 0 none;
-}
-.selectize-dropdown.plugin-optgroup_columns .optgroup:before {
-  display: none;
-}
-.selectize-dropdown.plugin-optgroup_columns .optgroup-header {
-  border-top: 0 none;
-}
-.selectize-control.plugin-remove_button [data-value] {
-  position: relative;
-  padding-right: 24px !important;
-}
-.selectize-control.plugin-remove_button [data-value] .remove {
-  z-index: 1;
-  /* fixes ie bug (see #392) */
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  width: 17px;
-  text-align: center;
-  font-weight: bold;
-  font-size: 12px;
-  color: inherit;
-  text-decoration: none;
-  vertical-align: middle;
-  display: inline-block;
-  padding: 2px 0 0 0;
-  border-left: 1px solid #0073bb;
-  -webkit-border-radius: 0 2px 2px 0;
-  -moz-border-radius: 0 2px 2px 0;
-  border-radius: 0 2px 2px 0;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.selectize-control.plugin-remove_button [data-value] .remove:hover {
-  background: rgba(0, 0, 0, 0.05);
-}
-.selectize-control.plugin-remove_button [data-value].active .remove {
-  border-left-color: #00578d;
-}
-.selectize-control.plugin-remove_button .disabled [data-value] .remove:hover {
-  background: none;
-}
-.selectize-control.plugin-remove_button .disabled [data-value] .remove {
-  border-left-color: #aaaaaa;
-}
-.selectize-control.plugin-remove_button .remove-single {
-  position: absolute;
-  right: 0;
-  top: 0;
-  font-size: 23px;
-}
-.selectize-control {
-  position: relative;
-}
-.selectize-dropdown,
-.selectize-input,
-.selectize-input input {
-  color: #303030;
-  font-family: inherit;
-  font-size: 18px;
-  line-height: 18px;
-  -webkit-font-smoothing: inherit;
-}
-.selectize-input,
-.selectize-control.single .selectize-input.input-active {
-  background: #fff;
-  cursor: text;
-  display: inline-block;
-}
-.selectize-input {
-  border: 1px solid #d0d0d0;
-  padding: 10px 0px;
-  display: inline-block;
-  width: 24vw;
-  overflow: hidden;
-  position: relative;
-  z-index: 1;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1);
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-.selectize-control.multi .selectize-input.has-items {
-  padding: 5px 8px 2px;
-}
-.selectize-input.full {
-  background-color: #fff;
-}
-.selectize-input.disabled,
-.selectize-input.disabled * {
-  cursor: default !important;
-}
-.selectize-input.focus {
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.15);
-}
-.selectize-input.dropdown-active {
-  -webkit-border-radius: 3px 3px 0 0;
-  -moz-border-radius: 3px 3px 0 0;
-  border-radius: 3px 3px 0 0;
-}
-.selectize-input > * {
-  vertical-align: baseline;
-  display: -moz-inline-stack;
-  display: inline-block;
-  zoom: 1;
-  *display: inline;
-}
-.selectize-control.multi .selectize-input > div {
-  cursor: pointer;
-  margin: 0 3px 3px 0;
-  padding: 2px 6px;
-  background: #1da7ee;
-  color: #fff;
-  border: 1px solid #0073bb;
-}
-.selectize-control.multi .selectize-input > div.active {
-  background: #92c836;
-  color: #fff;
-  border: 1px solid #00578d;
-}
-.selectize-control.multi .selectize-input.disabled > div,
-.selectize-control.multi .selectize-input.disabled > div.active {
-  color: #ffffff;
-  background: #d2d2d2;
-  border: 1px solid #aaaaaa;
-}
-.selectize-input > input {
-  display: inline-block !important;
-  padding: 0 !important;
-  min-height: 0 !important;
-  max-height: none !important;
-  max-width: 100% !important;
-  margin: 0 1px !important;
-  text-indent: 0 !important;
-  border: 0 none !important;
-  background: none !important;
-  line-height: inherit !important;
-  -webkit-user-select: auto !important;
-  -webkit-box-shadow: none !important;
-  box-shadow: none !important;
-}
-.selectize-input > input::-ms-clear {
-  display: none;
-}
-.selectize-input > input:focus {
-  outline: none !important;
-}
-.selectize-input::after {
-  content: ' ';
-  display: block;
-  clear: left;
-}
-.selectize-input.dropdown-active::before {
-  content: ' ';
-  display: block;
-  position: absolute;
-  background: #f0f0f0;
-  height: 1px;
-  bottom: 0;
-  left: 0;
-  right: 0;
-}
-.selectize-dropdown {
-  position: absolute;
-  z-index: 10;
-  border: 1px solid #d0d0d0;
-  background: #fff;
-  margin: -1px 0 0 0;
-  border-top: 0 none;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  box-sizing: border-box;
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-  -webkit-border-radius: 0 0 3px 3px;
-  -moz-border-radius: 0 0 3px 3px;
-  border-radius: 0 0 3px 3px;
-}
-.selectize-dropdown [data-selectable] {
-  cursor: pointer;
-  overflow: hidden;
-}
-.selectize-dropdown [data-selectable] .highlight {
-  background: rgba(125, 168, 208, 0.2);
-  -webkit-border-radius: 1px;
-  -moz-border-radius: 1px;
-  border-radius: 1px;
-}
-.selectize-dropdown .option,
-.selectize-dropdown .optgroup-header {
-  padding: 5px 8px;
-}
-.selectize-dropdown .option,
-.selectize-dropdown [data-disabled],
-.selectize-dropdown [data-disabled] [data-selectable].option {
-  cursor: inherit;
-  opacity: 0.5;
-}
-.selectize-dropdown [data-selectable].option {
-  opacity: 1;
-}
-.selectize-dropdown .optgroup:first-child .optgroup-header {
-  border-top: 0 none;
-}
-.selectize-dropdown .optgroup-header {
-  color: #303030;
-  background: #fff;
-  cursor: default;
-}
-.selectize-dropdown .active {
-  background-color: #f5fafd;
-  color: #495c68;
-}
-.selectize-dropdown .active.create {
-  color: #495c68;
-}
-.selectize-dropdown .create {
-  color: rgba(48, 48, 48, 0.5);
-}
-.selectize-dropdown-content {
-  overflow-y: auto;
-  overflow-x: hidden;
-  max-height: 200px;
-  -webkit-overflow-scrolling: touch;
-}
-.selectize-control.single .selectize-input,
-.selectize-control.single .selectize-input input {
-  cursor: pointer;
-}
-.selectize-control.single .selectize-input.input-active,
-.selectize-control.single .selectize-input.input-active input {
-  cursor: text;
-}
-.selectize-control.single .selectize-input:after {
-  content: ' ';
-  display: block;
-  position: absolute;
-  top: 50%;
-  right: 15px;
-  margin-top: -3px;
-  width: 0;
-  height: 0;
-  border-style: solid;
-  border-width: 5px 5px 0 5px;
-  border-color: #808080 transparent transparent transparent;
-}
-.selectize-control.single .selectize-input.dropdown-active:after {
-  margin-top: -4px;
-  border-width: 0 5px 5px 5px;
-  border-color: transparent transparent #808080 transparent;
-}
-.selectize-control.rtl.single .selectize-input:after {
-  left: 15px;
-  right: auto;
-}
-.selectize-control.rtl .selectize-input > input {
-  margin: 0 4px 0 -2px !important;
-}
-.selectize-control .selectize-input.disabled {
-  opacity: 0.5;
-  background-color: #fafafa;
-}
-.selectize-control.multi .selectize-input.has-items {
-  padding-left: 5px;
-  padding-right: 5px;
-}
-.selectize-control.multi .selectize-input.disabled [data-value] {
-  color: #999;
-  text-shadow: none;
-  background: none;
-  -webkit-box-shadow: none;
-  box-shadow: none;
-}
-.selectize-control.multi .selectize-input.disabled [data-value],
-.selectize-control.multi .selectize-input.disabled [data-value] .remove {
-  border-color: #e6e6e6;
-}
-.selectize-control.multi .selectize-input.disabled [data-value] .remove {
-  background: none;
-}
-.selectize-control.multi .selectize-input [data-value] {
-  text-shadow: 0 1px 0 rgba(0, 51, 83, 0.3);
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  background-color: #1b9dec;
-  background-image: -moz-linear-gradient(top, #1da7ee, #178ee9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#1da7ee), to(#178ee9));
-  background-image: -webkit-linear-gradient(top, #1da7ee, #178ee9);
-  background-image: -o-linear-gradient(top, #1da7ee, #178ee9);
-  background-image: linear-gradient(to bottom, #1da7ee, #178ee9);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff1da7ee', endColorstr='#ff178ee9', GradientType=0);
-  -webkit-box-shadow: 0 1px 0 rgba(0,0,0,0.2),inset 0 1px rgba(255,255,255,0.03);
-  box-shadow: 0 1px 0 rgba(0,0,0,0.2),inset 0 1px rgba(255,255,255,0.03);
-}
-.selectize-control.multi .selectize-input [data-value].active {
-  background-color: #0085d4;
-  background-image: -moz-linear-gradient(top, #008fd8, #0075cf);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#008fd8), to(#0075cf));
-  background-image: -webkit-linear-gradient(top, #008fd8, #0075cf);
-  background-image: -o-linear-gradient(top, #008fd8, #0075cf);
-  background-image: linear-gradient(to bottom, #008fd8, #0075cf);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff008fd8', endColorstr='#ff0075cf', GradientType=0);
-}
-.selectize-control.single .selectize-input {
-  -webkit-box-shadow: 0 1px 0 rgba(0,0,0,0.05), inset 0 1px 0 rgba(255,255,255,0.8);
-  box-shadow: 0 1px 0 rgba(0,0,0,0.05), inset 0 1px 0 rgba(255,255,255,0.8);
-  background-color: #f9f9f9;
-  background-image: -moz-linear-gradient(top, #fefefe, #f2f2f2);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fefefe), to(#f2f2f2));
-  background-image: -webkit-linear-gradient(top, #fefefe, #f2f2f2);
-  background-image: -o-linear-gradient(top, #fefefe, #f2f2f2);
-  background-image: linear-gradient(to bottom, #fefefe, #f2f2f2);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffefefe', endColorstr='#fff2f2f2', GradientType=0);
-}
-/* .selectize-control.single .selectize-input,
-.selectize-dropdown.single {
-  border-color: #b8b8b8;
-} */
-.selectize-dropdown .optgroup-header {
-  padding-top: 7px;
-  font-weight: bold;
-  font-size: 0.85em;
-}
-.selectize-dropdown .optgroup {
-  border-top: 1px solid #f0f0f0;
-}
-.selectize-dropdown .optgroup:first-child {
-  border-top: 0 none;
-}

examples/sw.js

@@ -1,35 +0,0 @@
-const staticCacheName = 'image-sequencer-static-v3';
-
-self.addEventListener('install', event => {
-  console.log('Attempting to install service worker');
-});
-
-self.addEventListener('activate', function(e) {
-  console.log('[ServiceWorker] Activate');
-  e.waitUntil(
-    caches.keys().then(function(cacheNames) {
-      return Promise.all(
-        cacheNames.filter(function(cacheName){
-          return cacheName.startsWith('image-sequencer-') &&
-                 cacheName != staticCacheName;
-        }).map(function(cacheName){
-          return caches.delete(cacheName);
-        })
-      );
-    })
-  );      
-});
-
-self.addEventListener('fetch', function(event) {
-  event.respondWith(
-    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")
-            cache.put(event.request, response.clone());
-          return response;
-        });
-      });
-    })
-  );
-});

index.js

@@ -1,14 +1,11 @@
 #!/usr/bin/env node
 
 require('./src/ImageSequencer');
-sequencer = ImageSequencer({ ui: false });
-var fs = require('fs')
-var program = require('commander');
-var utils = require('./src/CliUtils')
+sequencer = ImageSequencer({ui: false});
+var Spinner = require('ora')
 
-var saveSequence = require('./src/cli/saveSequence.js')
-var installModule = require('./src/cli/installModule.js')
-var sequencerSteps = require('./src/cli/sequencerSteps.js')
+var program = require('commander');
+var readlineSync = require('readline-sync');
 
 function exit(message) {
   console.error(message);
@@ -16,74 +13,153 @@ 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")
-  .parse(process.argv);
+.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')
+.parse(process.argv);
 
-if (program.saveSequence) saveSequence(program, sequencer)
+// Parse step into an array to allow for multiple steps.
+if(!program.step) exit("No steps passed")
+program.step = program.step.split(" ");
 
-else if (program.installModule) installModule(program, sequencer)
+// User must input an image.
+if(!program.image) exit("Can't read file.")
 
-else {
-  // Parse step into an array to allow for multiple steps.
-  if (!program.step) exit("No steps passed");
-  program.step = program.step.split(" ");
+// User must input an image.
+require('fs').access(program.image, function(err){
+  if(err) exit("Can't read file.")
+});
 
-  // User must input an image.
-  if (!program.image) exit("Can't read file.");
+// User must input a step. If steps exist, check that every step is a valid step.
+if(!program.step || !validateSteps(program.step))
+exit("Please ensure all steps are valid.");
 
-  // User must input an image.
-  fs.access(program.image, function(err) {
-    if (err) exit("Can't read file.");
-  });
+// If there's no user defined output directory, select a default directory.
+program.output = program.output || "./output/";
 
-  // 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.");
+// Set sequencer to log module outputs, if any.
+sequencer.setUI({
+  
+  onComplete: function(step) {
+    
+    // Get information of outputs.
+    step.info = sequencer.modulesInfo(step.name);
+    
+    for (var output in step.info.outputs) {
+      console.log("["+program.step+"]: "+output+" = "+step[output]);
+    }
+    
+  }
+  
+});
 
-  // If there's no user defined output directory, select a default directory.
-  program.output = program.output || "./output/";
-
-  // Set sequencer to log module outputs, if any.
-  sequencer.setUI({
-    onComplete: function(step) {
-      // Get information of outputs.
-      step.info = sequencer.modulesInfo(step.name);
-
-      for (var output in step.info.outputs) {
-        console.log("[" + program.step + "]: " + output + " = " + step[output]);
+// 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")
+  
+  //Generate the Output Directory
+  require('./src/CliUtils').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")
+    
+    // Iterate through the steps and retrieve their inputs.
+    program.step.forEach(function(step){
+      var options = Object.assign({}, sequencer.modulesInfo(step).inputs);
+      
+      // If inputs exists, print to console.
+      if (Object.keys(options).length) {
+        console.log("[" + step + "]: Inputs");
       }
-    },
-    notify: function(msg) {
-      console.log('\x1b[36m%s\x1b[0m','🌟  '+msg);
+      
+      // If inputs exists, print them out with descriptions.
+      Object.keys(options).forEach(function(input) {
+        // 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(' ') + input + ": " + options[input].desc);
+      });
+      
+      if(program.config){
+        try{
+          program.config = JSON.parse(program.config);
+          console.log(`The parsed options object: `, program.config);
+        }
+        catch(e){
+          console.error('\x1b[31m%s\x1b[0m',`Options(Config) is not a not valid JSON Fallback activate`);
+          program.config = false;
+          console.log(e);
+        }
+      }
+      if(program.config && validateConfig(program.config,options)){
+        console.log("Now using Options object");
+        Object.keys(options).forEach(function (input) {
+          options[input] = program.config[input];
+        })
+      }
+      else{
+        // 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 " + input + " (" + options[input].type + ", default: " + options[input].default + "): ");
+          options[input] = value;
+        });
+      }
+      // Add the step and its inputs to the sequencer.
+      sequencer.addSteps(step, options);
+    });
+    
+    var spinnerObj = Spinner('Your Image is being processed..').start();
+    
+    // Run the sequencer.
+    sequencer.run(spinnerObj,function(){
+
+      // Export all images or final image as binary files.
+      sequencer.exportBin(program.output,program.basic);
+
+      //check if spinner was not overriden stop it
+      if(!spinnerObj.overrideFlag) {
+        spinnerObj.succeed()
+        console.log(`\nDone!!`)
+      }
+      
+    });
+    
+  });
+  
+});
+
+// Takes an array of steps and checks if they are valid steps for the sequencer.
+function validateSteps(steps) {
+  
+  // Assume all are valid in the beginning. 
+  var valid = true;
+  steps.forEach(function(step) {
+    // If any step in the array is not valid (not a property of modulesInfo), set valid to false.
+    if (!sequencer.modulesInfo().hasOwnProperty(step)) {
+      valid = false;
     }
   });
-
-  // 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"
-    );
-
-    //Generate the Output Directory
-    var outputFilename = program.output.split('/').slice(-1)[0];
-    if (outputFilename.includes('.')) {
-      // user did give an output filename we have to remove it from dir
-      program.output = program.output.split('/').slice(0, -1).join('/');
-    }
-    else {
-      outputFilename = null;
-    }
-
-    sequencerSteps(program, sequencer, outputFilename)
-
-  });
-
+  
+  // Return valid. (If all of the steps are valid properties, valid will have remained true).
+  return valid;
 }
+
+//Takes config and options object and checks if all the keys exist in config 
+function validateConfig(config_,options_){
+  options_ = Object.keys(options_);
+  if (
+    (function(){
+      for(var input in options_){
+        if(!config_[options_[input]]){
+          console.error('\x1b[31m%s\x1b[0m',`Options Object does not have the required details "${options_[input]}" not specified. Fallback case activated`);
+          return false;
+        } 
+      }
+    })()
+    == false)
+    return false;
+    else
+    return true;
+  }

package.json

@@ -1,14 +1,11 @@
 {
   "name": "image-sequencer",
-  "version": "3.0.1",
+  "version": "1.3.0",
   "description": "A modular JavaScript image manipulation library modeled on a storyboard.",
   "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 | 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-ui": "jasmine test/spec/*.js",
-    "setup": "npm i && npm i -g grunt grunt-cli && grunt build",
-    "start": "grunt serve"
+    "debug": "node ./index.js -i ./examples/images/monarch.png -s",
+    "test": "tape test/**/*.js test/*.js | tap-spec; browserify test/modules/image-sequencer.js test/modules/chain.js test/modules/replace.js | tape-run --render=\"tap-spec\""
   },
   "repository": {
     "type": "git",
@@ -24,57 +21,41 @@
     "url": "https://github.com/publiclab/image-sequencer/issues"
   },
   "dependencies": {
-    "bootstrap": "~3.4.0",
-    "buffer": "~5.2.1",
+    "bootstrap": "~3.2.0",
+    "buffer": "~5.0.2",
     "commander": "^2.11.0",
     "data-uri-to-buffer": "^2.0.0",
-    "downloadjs": "^1.4.7",
     "fisheyegl": "^0.1.2",
-    "font-awesome": "~4.7.0",
-    "geotiff": "^1.0.0-beta.6",
+    "font-awesome": "~4.5.0",
     "get-pixels": "~3.3.0",
-    "gifshot": "^0.4.5",
-    "image-sequencer-invert": "^1.0.0",
-    "imagejs": "0.0.9",
-    "imgareaselect": "git://github.com/jywarren/imgareaselect.git#v1.0.0-rc.2",
-    "istanbul": "^0.4.5",
-    "jquery": "^3.3.1",
-    "jsdom": "^14.0.0",
-    "jsqr": "^1.1.1",
-    "lodash": "^4.17.11",
-    "ndarray": "^1.0.18",
+    "jquery": "~2",
+    "jsqr": "^0.2.2",
+    "lodash": "^4.17.5",
     "ndarray-gaussian-filter": "^1.0.0",
-    "ora": "^3.0.0",
+    "ora": "^2.0.0",
     "pace": "0.0.4",
-    "puppeteer": "^1.14.0",
-    "qrcode": "^1.3.3",
     "readline-sync": "^1.4.7",
     "save-pixels": "~2.3.4",
-    "selectize": "^0.12.6",
-    "urify": "^2.1.1"
+    "urify": "^2.1.0"
   },
   "devDependencies": {
-    "base64-img": "^1.0.4",
-    "browserify": "16.2.3",
-    "grunt": "^1.0.3",
-    "grunt-browser-sync": "^2.2.0",
+    "browserify": "13.0.0",
+    "data-uri-to-buffer": "^2.0.0",
+    "grunt": "^0.4.5",
     "grunt-browserify": "^5.0.0",
-    "grunt-contrib-concat": "^1.0.1",
-    "grunt-contrib-uglify-es": "^3.3.0",
-    "grunt-contrib-watch": "^1.1.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",
-    "looks-same": "^7.0.0",
-    "matchdep": "^2.0.0",
-    "tap-spec": "^5.0.0",
-    "tape": "^4.9.2",
-    "tape-run": "^5.0.0",
+    "grunt-contrib-concat": "^0.5.0",
+    "grunt-contrib-uglify-es": "git://github.com/gruntjs/grunt-contrib-uglify.git#harmony",
+    "grunt-contrib-watch": "^0.6.1",
+    "image-filter-core": "~1.0.0",
+    "image-filter-threshold": "~1.0.0",
+    "looks-same": "^3.2.1",
+    "matchdep": "^0.3.0",
+    "tap-spec": "^4.1.1",
+    "tape": ">=4.7.0",
+    "tape-run": "^3.0.0",
     "uglify-es": "^3.3.7"
   },
-  "homepage": "https://sequencer.publiclab.org",
+  "homepage": "https://github.com/publiclab/image-sequencer",
   "bin": {
     "sequencer": "./index.js"
   }

spec/defaultHtmlSequencerUi.spec.js

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

spec/defaultHtmlStepUi.spec.js

@@ -1,61 +0,0 @@
-var { JSDOM } = require('jsdom');
-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;
-  var step = 'brightness'
-  var options = {
-    name: "Brightness",
-    description: "Change the brightness of the image by given percent value"
-  }
-  // options = JSON.parse(options)
-
-  beforeEach(()=>{
-    defaultHtmlStepUi = new DefaultHtmlStepUi(sequencer)
-
-    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')
-  })
-
-
-  it('result preview ui', function() {
-    expect(defaultHtmlStepUi.getPreview).toHaveBeenCalled()
-  })
-
-  it('load initial setup ui', function() {
-    expect(defaultHtmlStepUi.onSetup).toHaveBeenCalledWith(step,options)
-  })
-
-  it('load completion ui', function() {
-    expect(defaultHtmlStepUi.onComplete).toHaveBeenCalledWith(step)
-  })
-
-  it('draw step ui', function() {
-    expect(defaultHtmlStepUi.onDraw).toHaveBeenCalledWith(step)
-  })
-
-  it('remove step ui', function() {
-    expect(defaultHtmlStepUi.onRemove).toHaveBeenCalledWith(step)
-  })
-
-  it('notification ui', function() {
-    expect(defaultHtmlStepUi.notify).toHaveBeenCalledWith('Step removed','remove-notification')
-  })
-
-})

spec/helpers/reporter.js

@@ -1,8 +0,0 @@
-var SpecReporter = require('jasmine-spec-reporter').SpecReporter;
-
-jasmine.getEnv().clearReporters();               // remove default reporter logs
-jasmine.getEnv().addReporter(new SpecReporter({  // add jasmine-spec-reporter
-  spec: {
-    displayPending: true
-  }
-}));

spec/insertPreview.spec.js

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

spec/intermediateHtmlStepUi.spec.js

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

spec/support/jasmine.json

@@ -1,11 +0,0 @@
-{
-  "spec_dir": "spec",
-  "spec_files": [
-    "**/*[sS]pec.js"
-  ],
-  "helpers": [
-    "helpers/**/*.js"
-  ],
-  "stopSpecOnExpectationFailure": false,
-  "random": true
-}

spec/urlHash.spec.js

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

src/AddStep.js

@@ -1,5 +1,34 @@
-// add steps to the sequencer
-function AddStep(_sequencer, name, o) {
-  return require('./InsertStep')(_sequencer,-1,name,o);
+// add steps to the sequencer 
+function AddStep(ref, image, name, o) {
+
+  function addStep(image, name, o_) {
+    var moduleInfo = ref.modules[name][1];
+
+    var o = ref.copy(o_);
+    o.number = ref.options.sequencerCounter++; // gives a unique ID to each step
+    o.name = o_.name || name || moduleInfo.name;
+    o.description = o_.description || moduleInfo.description;
+    o.selector = o_.selector || 'ismod-' + name;
+    o.container = o_.container || ref.options.selector;
+    o.image = image;
+    o.inBrowser = ref.options.inBrowser;
+
+    o.step = {
+      name: o.name,
+      description: o.description,
+      ID: o.number,
+      imageName: o.image,
+      inBrowser: ref.options.inBrowser,
+      ui: ref.options.ui,
+      options: o
+    };
+    var UI = ref.events;
+    var module = ref.modules[name][0](o,UI);
+    ref.images[image].steps.push(module);
+
+    return true;
+  }
+
+  addStep(image, name, o);
 }
 module.exports = AddStep;

src/CliUtils.js

@@ -1,6 +1,8 @@
-var fs = require('fs')
+const fs = require('fs')
 
-/*
+
+
+/* 
 * This function checks if the directory exists, if not it creates one on the given path
 * Callback is called with argument error if an error is encountered
 */
@@ -14,45 +16,6 @@ function makedir(path,callback){
     });
 };
 
-// Takes an array of steps and checks if they are valid steps for the sequencer.
-function validateSteps(steps, sequencer) {
-  // Assume all are valid in the beginning.
-  var valid = true;
-  steps.forEach(function(step) {
-    // If any step in the array is not valid (not a property of modulesInfo), set valid to false.
-    if (!sequencer.modulesInfo().hasOwnProperty(step)) {
-      valid = false;
-    }
-  });
-
-  // Return valid. (If all of the steps are valid properties, valid will have remained true).
-  return valid;
-}
-
-//Takes config and options object and checks if all the keys exist in config
-function validateConfig(config_, options_) {
-  options_ = Object.keys(options_);
-  if (
-    (function() {
-      for (var input in options_) {
-        if (!config_[options_[input]]) {
-          console.error(
-            "\x1b[31m%s\x1b[0m",
-            `Options Object does not have the required details "${
-            options_[input]
-            }" not specified. Fallback case activated`
-          );
-          return false;
-        }
-      }
-    })() == false
-  )
-    return false;
-  else return true;
-}
-
 module.exports = exports = {
-    makedir: makedir,
-    validateSteps: validateSteps,
-    validateConfig: validateConfig
+    makedir: makedir
 }

src/ExportBin.js

@@ -1,69 +1,60 @@
 var fs = require('fs');
 var getDirectories = function(rootDir, cb) {
   fs.readdir(rootDir, function(err, files) {
-    var dirs = [];
-    if (typeof (files) == "undefined" || files.length == 0) {
-      cb(dirs);
-      return [];
-    }
-    for (var index = 0; index < files.length; ++index) {
-      var file = files[index];
-      if (file[0] !== '.') {
-        var filePath = rootDir + '/' + file;
-        fs.stat(filePath, function(err, stat) {
-          if (stat.isDirectory()) {
-            dirs.push(this.file);
-          }
-          if (files.length === (this.index + 1)) {
-            return cb(dirs);
-          }
-        }.bind({ index: index, file: file }));
+      var dirs = [];
+      if(typeof(files)=="undefined" || files.length == 0) {
+        cb(dirs);
+        return [];
+      }
+      for (var index = 0; index < files.length; ++index) {
+          var file = files[index];
+          if (file[0] !== '.') {
+              var filePath = rootDir + '/' + file;
+              fs.stat(filePath, function(err, stat) {
+                  if (stat.isDirectory()) {
+                      dirs.push(this.file);
+                  }
+                  if (files.length === (this.index + 1)) {
+                      return cb(dirs);
+                  }
+              }.bind({index: index, file: file}));
+          }
       }
-    }
   });
 }
 
-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 + "/";
-  if (ref.options.inBrowser) return false;
-  fs.access(dir, function(err) {
-    if (err) console.error(err)
+module.exports = function ExportBin(dir = "./output/",ref,basic) {
+  dir = (dir[dir.length-1]=="/") ? dir : dir + "/";
+  if(ref.options.inBrowser) return false;
+  fs.access(dir, function(err){
+    if(err) console.error(err)
   });
-  if (filename && basic) {
-    var steps = ref.steps;
-    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(dir + filename, buffer, function() { });
-  }
-  else {
-    getDirectories(dir, function(dirs) {
-      var num = 1;
-      for (var d in dirs) {
-        if (dirs[d].match(/^sequencer(.*)$/) == null) continue;
-        var n = parseInt(dirs[d].match(/^sequencer(.*)$/)[1]);
-        num = (n >= num) ? (n + 1) : num;
-      }
-      fs.mkdir(dir + 'sequencer' + num, function() {
-        var root = dir + 'sequencer' + num + '/';
-        var steps = ref.steps;
-        if (basic) {
+  getDirectories(dir,function(dirs){
+    var num = 1;
+    for(var d in dirs){
+      if(dirs[d].match(/^sequencer(.*)$/)==null) continue;
+      var n = parseInt(dirs[d].match(/^sequencer(.*)$/)[1]);
+      num = (n>=num)?(n+1):num;
+    }
+    fs.mkdir(dir+'sequencer'+num,function(){
+      var root = dir+'sequencer'+num+'/';
+      for(var image in ref.images) {
+        var steps = ref.images[image].steps;
+        if(basic){
           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() { });
+            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(){});
         }
-        else {
-          for (var i in steps) {
+        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(){});
           }
         }
-      });
-    });
-  }
+      }
+    })
+  });
 }

src/FormatInput.js

@@ -24,19 +24,42 @@ function copy(a) {
 }
 
 function formatInput(args,format,images) {
+  images = [];
+  for (var image in this.images) {
+    images.push(image);
+  }
   var json_q = {};
   var format_i = format;
   if (format == "+")
-    format = ['string_a', 'o_object'];
+    format = ['o_string_a', 'string_a', 'o_object'];
   else if (format == "-")
-    format = ['number_a'];
+    format = ['o_string_a', 'number_a'];
   else if (format == "^")
-    format = ['number', 'string', 'o_object'];
+    format = ['o_string_a', 'number', 'string', 'o_object'];
   else if (format == "r")
-    format = ['o_number'];
+    format = ['o_string_a', 'o_number'];
   else if (format == "l")
-    format = ['string','o_function'];
-    
+    format = ['o_string','string','o_function'];
+
+  /*
+    formats:
+      addSteps :: o_image_a, name_a, o_o
+        o_string_a, string_a, o_object => { image: [{name,o}] }
+      removeSteps :: o_image_a, index_a
+        o_string_a, number_a => { image: [index] }
+      insertSteps :: o_image_a, index, name, o_o
+        o_string_a, number, string, o_object => { image: [{index,name,o}] }
+      run :: o_image_a, o_from
+        o_string_a, o_number => { image: index }
+      loadImages :: image, src, o_function
+        string, string, o_function => { images: [{image:src}], callback }
+
+    optionals:
+      image: o_string_a
+      options: o_object
+      from: o_number
+      callback: o_function
+  */
 
   if(format[format.length-1] == "o_object") {
     if(objTypeOf(args[args.length-1]) != "Object")
@@ -51,56 +74,90 @@ function formatInput(args,format,images) {
       args.push(function(){});
   }
 
+  if(format[0] == "o_string_a") {
+    if(args.length == format.length - 1) {
+      var insert = false;
+      for (var i in args) {
+        if (format[parseInt(i)+1].includes( typeof(getPrimitive(args[i])) )){
+          insert = true;
+        }
+        else {insert = false; break;}
+      }
+      if(insert)
+        args.splice(0,0,copy(images));
+    }
+  }
+  else if (format[0] == "o_string" && format_i == "l" && args.length == 2) {
+    if (typeof(args[0]) == "string") {
+      var identifier = "image";
+      var number = 1;
+      while (this.images.hasOwnProperty(identifier+number)) number++;
+      args.splice(0,0,identifier+number);
+    }
+  }
 
-  if(args.length == format.length) {//making of arrays
+  if(args.length == format.length) {
     for (var i in format) {
       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 == "-") {
-      json_q=[];
-      json_q= copy(args[0]);
+  if (args.length == 1) {
+    json_q = copy(args[0]);
+    if(!(format_i == "r" || format_i == "l")) {
+      for (var img in json_q)
+        json_q[img] = makeArray(json_q[img]);
     }
   }
-  else if (format_i == "r" ) {
-    for (var img in args[0]) json_q = {0:args[0]};
+  else if (format_i == "r") {
+    for (var img in args[0]) json_q[args[0][img]] = args[1];
   }
   else if (format_i == "l") {
     json_q = {
-      image: args[0],
-      callback: args[1]
+      images: {},
+      callback: args[2]
     }
+    json_q.images[args[0]] = args[1];
   }
   else {
-      json_q = [];
+    for (var img in args[0]) {
+      var image = args[0][img];
+      json_q[image] = [];
+
       if(format_i == "+") {
-        for(var s in args[0]) {
-          json_q.push({
-            name: args[0][s],
-            o: args[1]
+        for(var s in args[1]) {
+          json_q[image].push({
+            name: args[1][s],
+            o: args[2]
           });
         }
       }
 
+      if(format_i == "-") {
+        json_q[image] = args[1];
+      }
 
       if(format_i == "^") {
-        var size = this.steps.length;
-        var index = args[0];
+        var size = this.images[image].steps.length;
+        var index = args[1];
         index = (index==size)?index:index%size;
         if (index<0) index += size+1;
-        json_q.push({
+        json_q[image].push({
           index: index,
-          name: args[1],
-          o: args[2]
+          name: args[2],
+          o: args[3]
         });
+      }
 
     }
   }
 
+  if(format_i == "l") {
+    json_q.loadedimages = [];
+    for (var i in json_q.images) json_q.loadedimages.push(i);
+  }
+
   return json_q;
 
 }

src/ImageSequencer.js

@@ -1,30 +1,28 @@
-if (typeof window !== 'undefined') { isBrowser = true }
-else { var isBrowser = false }
-require('./util/getStep.js');
+if (typeof window !== 'undefined') {window.$ = window.jQuery = require('jquery'); isBrowser = true}
+else {var isBrowser = false}
 
 ImageSequencer = function ImageSequencer(options) {
-
-  var sequencer = (this.name == "ImageSequencer") ? this : this.sequencer;
+  
   options = options || {};
-  options.inBrowser = options.inBrowser === undefined ? isBrowser : options.inBrowser;
+  options.inBrowser = options.inBrowser || isBrowser;
   options.sequencerCounter = 0;
-
-  function objTypeOf(object) {
-    return Object.prototype.toString.call(object).split(" ")[1].slice(0, -1)
+  
+  function objTypeOf(object){
+    return Object.prototype.toString.call(object).split(" ")[1].slice(0,-1)
   }
-
-  function log(color, msg) {
-    if (options.ui != "none") {
-      if (arguments.length == 1) console.log(arguments[0]);
-      else if (arguments.length == 2) console.log(color, msg);
+  
+  function log(color,msg) {
+    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 (!typeof(a) == "object") return a;
     if (objTypeOf(a) == "Array") return a.slice();
     if (objTypeOf(a) == "Object") {
-      var b = {}; 
+      var b = {};
       for (var v in a) {
         b[v] = copy(a[v]);
       }
@@ -32,132 +30,121 @@ ImageSequencer = function ImageSequencer(options) {
     }
     return a;
   }
-
+  
   function makeArray(input) {
-    return (objTypeOf(input) == "Array") ? input : [input];
+    return (objTypeOf(input)=="Array")?input:[input];
   }
-
+  
   var image,
-    steps = [],
-    modules = require('./Modules'),
-    sequences = require('./SavedSequences.json'),
-    formatInput = require('./FormatInput'),
-    inputlog = [],
-    events = require('./ui/UserInterface')(),
-    fs = require('fs');
-
-
-
-  if (options.inBrowser) {
-    for (o in sequencer) {
-      modules[o] = sequencer[o];
-    }
-    sequences = JSON.parse(window.localStorage.getItem('sequences'));
-    if (!sequences) {
-      sequences = {};
-      window.localStorage.setItem('sequences', JSON.stringify(sequences));
-    }
-  }
-
+  steps = [],
+  modules = require('./Modules'),
+  formatInput = require('./FormatInput'),
+  images = {},
+  inputlog = [],
+  events = require('./ui/UserInterface')(),
+  fs = require('fs');
+  
   // if in browser, prompt for an image
   // if (options.imageSelect || options.inBrowser) addStep('image-select');
   // else if (options.imageUrl) loadImage(imageUrl);
-
-  function addSteps() {
-    var this_ = (this.name == "ImageSequencer") ? this : this.sequencer;
-    var args = [];
+  
+  function addSteps(){
+    var this_ = (this.name == "ImageSequencer")?this:this.sequencer;
+    var args = (this.name == "ImageSequencer")?[]:[this.images];
     var json_q = {};
-    for (var arg in arguments) { args.push(copy(arguments[arg])); }
-    json_q = formatInput.call(this_, args, "+");
-
-    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);
+    for(var arg in arguments){args.push(copy(arguments[arg]));}
+    json_q = formatInput.call(this_,args,"+");
+    
+    inputlog.push({method:"addSteps", json_q:copy(json_q)});
+    
+    for (var i in json_q)
+    for (var j in json_q[i])
+    require("./AddStep")(this_,i,json_q[i][j].name,json_q[i][j].o);
+    
     return this;
   }
-
-  function removeStep(ref, index) {
+  
+  function removeStep(image,index) {
     //remove the step from images[image].steps and redraw remaining images
-    if (index > 0) {
-      //var this_ = (this.name == "ImageSequencer") ? this : this.sequencer;
-      thisStep = ref.steps[index];
+    if(index>0) {
+      thisStep = images[image].steps[index];
       thisStep.UI.onRemove(thisStep.options.step);
-      ref.steps.splice(index, 1);
+      images[image].steps.splice(index,1);
     }
     //tell the UI a step has been removed
   }
-
-  function removeSteps() {
-    var   indices;
-    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) });
-
-      indices = json_q.sort(function(a, b) { return b - a });
+  
+  function removeSteps(image,index) {
+    var run = {}, indices;
+    var this_ = (this.name == "ImageSequencer")?this:this.sequencer;
+    var args = (this.name == "ImageSequencer")?[]:[this.images];
+    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)});
+    
+    for (var img in json_q) {
+      indices = json_q[img].sort(function(a,b){return b-a});
+      run[img] = indices[indices.length-1];
       for (var i in indices)
-        removeStep(this_, indices[i]);
+      removeStep(img,indices[i]);
+    }
+    // this.run(run); // This is creating problems
     return this;
   }
-
-  function insertSteps() {
-    var this_ = (this.name == "ImageSequencer") ? this : this.sequencer;
-    var args = []
+  
+  function insertSteps(image, index, name, o) {
+    var run = {};
+    var this_ = (this.name == "ImageSequencer")?this:this.sequencer;
+    var args = (this.name == "ImageSequencer")?[]:[this.images];
     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 details = json_q;
-      details = details.sort(function(a, b) { return b.index - a.index });
+    
+    var json_q = formatInput.call(this_,args,"^");
+    inputlog.push({method:"insertSteps", json_q:copy(json_q)});
+    
+    for (var img in json_q) {
+      var details = json_q[img];
+      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_,img,details[i].index,details[i].name,details[i].o);
+      run[img] = details[details.length-1].index;
+    }
+    // this.run(run); // This is Creating issues
     return this;
   }
+  
+  function run(spinnerObj,t_image,t_from) {
+    let progressObj;
+    if(arguments[0] != 'test'){
+      progressObj = spinnerObj
+      delete arguments['0']    
+    }
 
-  // Config is an object which contains the runtime configuration like progress bar
-  // information and index from which the sequencer should run
-  function run(config) {
-    var progressObj, index = 0;
-    config = config || { mode: 'no-arg' };
-    if (config.index) index = config.index;
-
-      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 args = [];
+    var this_ = (this.name == "ImageSequencer")?this:this.sequencer;
+    var args = (this.name == "ImageSequencer")?[]:[this.images];
     for (var arg in arguments) args.push(copy(arguments[arg]));
-
-    var callback = function() { };
+    
+    var callback = function() {};
     for (var arg in args)
-      if (objTypeOf(args[arg]) == "Function")
-        callback = args.splice(arg, 1)[0]; //callback is formed
-
-    var json_q = formatInput.call(this_, args, "r");
-
-    require('./Run')(this_, json_q, callback, index, progressObj);
-
+    if(objTypeOf(args[arg]) == "Function")
+    callback = args.splice(arg,1)[0];
+    
+    var json_q = formatInput.call(this_,args,"r");
+    
+    require('./Run')(this_, json_q, callback,progressObj);
+    
     return true;
   }
-
+  
   function loadImages() {
     var args = [];
-    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");
-    if(this.getSteps().length!=0){
-      this.options.sequencerCounter = 0;
-      inputlog = [];
-      this.steps = [];
-    }
-    inputlog.push({ method: "loadImages", json_q: copy(json_q) });
+    var json_q = formatInput.call(this,args,"l");
+    
+    inputlog.push({method:"loadImages", json_q:copy(json_q)});
+    var loadedimages = this.copy(json_q.loadedimages);
+    
     var ret = {
       name: "ImageSequencer Wrapper",
       sequencer: this,
@@ -166,252 +153,58 @@ ImageSequencer = function ImageSequencer(options) {
       insertSteps: this.insertSteps,
       run: this.run,
       UI: this.UI,
-      setUI: this.setUI
+      setUI: this.setUI,
+      images: loadedimages
     };
-    function loadPrevSteps(ref){
-      if(prevSteps.length!=0){
-        ref.addSteps(prevSteps)
-        prevSteps=[];
-      }
-    }
-    require('./ui/LoadImage')(sequencer, "image", json_q.image, function() {
-      loadPrevSteps(sequencer);
-      json_q.callback.call(ret);
-    });
     
+    function load(i) {
+      if(i==loadedimages.length) {
+        json_q.callback.call(ret);
+        return;
+      }
+      var img = loadedimages[i];
+      require('./ui/LoadImage')(sequencer,img,json_q.images[img],function(){
+        load(++i);
+      });
+    }
+    
+    load(0);
   }
-
-  function replaceImage(selector, steps, options) {
+  
+  function replaceImage(selector,steps,options) {
     options = options || {};
-    options.callback = options.callback || function() { };
-    return require('./ReplaceImage')(this, selector, steps, options);
+    options.callback = options.callback || function() {};
+    return require('./ReplaceImage')(this,selector,steps,options);
   }
-
-  //returns the steps added
-  function getSteps(){
-    return this.steps;
-  }
-
+  
   function setUI(UI) {
     this.events = require('./ui/UserInterface')(UI);
   }
-
-  var exportBin = function(dir, basic, filename) {
-    return require('./ExportBin')(dir, this, basic, filename);
-  }
-
-  function modulesInfo(name) {
-    var modulesdata = {}
-    if (name == "load-image") return {};
-    if (arguments.length == 0) {
-      for (var modulename in this.modules) {
-        modulesdata[modulename] = modules[modulename][1];
-      }
-      for (var sequencename in this.sequences) {
-        modulesdata[sequencename] = { name: sequencename, steps: this.sequences[sequencename] };
-      }
-    }
-    else {
-      if (modules[name]){ 
-         modulesdata = modules[name][1];
-        }
-      else
-        modulesdata = { 'inputs': sequences[name]['options'] };
-    }
-    return modulesdata;
-  }
-
-  // Genates a CLI string for the current sequence
-  function toCliString() {
-    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"){
-        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)}'`
-  }
-
-  // Strigifies the current sequence
-  function toString(step) {
-    if (step) {
-      return stepToString(step);
-    } else {
-      return copy(this.steps.map(stepToString).slice(1).join(','));
-    }
+  
+  var exportBin = function(dir,basic) {
+    return require('./ExportBin')(dir,this,basic);
   }
   
-  // Stringifies one step of the sequence
-  function stepToString(step) {
-    var arg = (step.name)?step.name:step.options.name;
-    let inputs = modulesInfo(arg).inputs || {}, op = {};
-
-    for (let input in inputs) {
-
-      if (!!step.options[input] && step.options[input] != inputs[input].default) {
-        op[input] = step.options[input];
-        op[input] = encodeURIComponent(op[input]);
-      }
-
+  function modulesInfo(name) {
+    var modulesdata = {}
+    if(name == "load-image") return {};
+    if(arguments.length==0)
+    for (var modulename in modules) {
+      modulesdata[modulename] = modules[modulename][1];
     }
-
-    var configurations = Object.keys(op).map(key => key + ':' + op[key]).join('|');
-    return `${arg}{${configurations}}`;
+    else modulesdata = modules[name][1];
+    return modulesdata;
   }
-
-  // exports the current sequence as an array of JSON steps
-  function toJSON() {
-    return this.stringToJSON(this.toString());
-  }
-
-  // Coverts stringified sequence into an array of JSON steps
-  function stringToJSON(str) {
-    let steps;
-    if (str.includes(','))
-      steps = str.split(',');
-    else
-      steps = [str];
-    return steps.map(stringToJSONstep);
-  }
-
-  // Converts one stringified step into JSON
-  function stringToJSONstep(str) {
-    var bracesStrings;
-    if (str.includes('{'))
-      if (str.includes('(') && str.indexOf('(') < str.indexOf('{'))
-        bracesStrings = ['(', ')'];
-      else
-        bracesStrings = ['{', '}'];
-    else
-      bracesStrings = ['(', ')'];
-
-    if (str.indexOf(bracesStrings[0]) === -1) { // if there are no settings specified
-      var moduleName = str.substr(0);
-      stepSettings = "";
-    } else {
-      var moduleName = str.substr(0, str.indexOf(bracesStrings[0]));
-      stepSettings = str.slice(str.indexOf(bracesStrings[0]) + 1, -1);
-    }
-
-    stepSettings = stepSettings.split('|').reduce(function formatSettings(accumulator, current, i) {
-      var settingName = current.substr(0, current.indexOf(':')),
-        settingValue = current.substr(current.indexOf(':') + 1);
-      settingValue = settingValue.replace(/^\(/, '').replace(/\)$/, ''); // strip () at start/end
-      settingValue = settingValue.replace(/^\{/, '').replace(/\}$/, ''); // strip {} at start/end
-      settingValue = decodeURIComponent(settingValue);
-      current = [
-        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")
-      sequencer = this.sequencer;
-    var stepsFromString = stringToJSON(str);
-    stepsFromString.forEach(function eachStep(stepObj) {
-      sequencer.addSteps(stepObj.name, stepObj.options);
-    });
-  }
-
-  // imports a array of JSON steps into the sequencer steps
-  function importJSON(obj) {
-    let sequencer = this;
-    if (this.name != "ImageSequencer")
-      sequencer = this.sequencer;
-    obj.forEach(function eachStep(stepObj) {
-      sequencer.addSteps(stepObj.name, stepObj.options);
-    });
-  }
-
-  function loadNewModule(name, options) {
-
-    if (!options) {
-      return this;
-
-    } else if (Array.isArray(options)) {
-      // contains the array of module and info
-      this.modules[name] = options;
-
-    } else if (options.func && options.info) {
-      // passed in options object
-      this.modules[name] = [
-        options.func, options.info
-      ];
-
-    } else if (options.path && !this.inBrowser) {
-      // load from path(only in node)
-      const module = [
-        require(`${options.path}/Module.js`),
-        require(`${options.path}/info.json`)
-      ];
-      this.modules[name] = module;
-    }
-    return this;
-  }
-
-  function saveNewModule(name, path) {
-    if (options.inBrowser) {
-      // Not for browser context
-      return;
-    }
-    var mods = fs.readFileSync('./src/Modules.js').toString();
-    mods = mods.substr(0, mods.length - 1) + "  '" + name + "': require('" + path + "'),\n}";
-    fs.writeFileSync('./src/Modules.js', mods);
-  }
-
-  function saveSequence(name, sequenceString) {
-    const sequence = stringToJSON(sequenceString);
-    // Save the given sequence string as a module
-    if (options.inBrowser) {
-      // Inside the browser we save the meta-modules using the Web Storage API
-      var sequences = JSON.parse(window.localStorage.getItem('sequences'));
-      sequences[name] = sequence;
-      window.localStorage.setItem('sequences', JSON.stringify(sequences));
-    }
-    else {
-      // In node we save the sequences in the json file SavedSequences.json
-      var sequences = require('./SavedSequences.json');
-      sequences[name] = sequence;
-      fs.writeFileSync('./src/SavedSequences.json', JSON.stringify(sequences));
-    }
-  }
-
-  function loadModules() {
-    // This function loads the modules and saved sequences
-    this.modules = require('./Modules');
-    if (options.inBrowser)
-      this.sequences = JSON.parse(window.localStorage.getItem('sequences'));
-    else
-      this.sequences = require('./SavedSequences.json');
-  }
-
+  
   return {
     //literals and objects
     name: "ImageSequencer",
     options: options,
     inputlog: inputlog,
     modules: modules,
-    sequences: sequences,
+    images: images,
     events: events,
-    steps: steps,
-    image: image,
-
+    
     //user functions
     loadImages: loadImages,
     loadImage: loadImages,
@@ -423,28 +216,12 @@ ImageSequencer = function ImageSequencer(options) {
     setUI: setUI,
     exportBin: exportBin,
     modulesInfo: modulesInfo,
-    toCliString: toCliString,
-    toString: toString,
-    stepToString: stepToString,
-    toJSON: toJSON,
-    stringToJSON: stringToJSON,
-    stringToJSONstep: stringToJSONstep,
-    importString: importString,
-    importJSON: importJSON,
-    loadNewModule: loadNewModule,
-    saveNewModule: saveNewModule,
-    createMetaModule: require('./util/createMetaModule'),
-    saveSequence: saveSequence,
-    loadModules: loadModules,
-    getSteps:getSteps,
-
+    
     //other functions
     log: log,
     objTypeOf: objTypeOf,
-    copy: copy,
-
-    setInputStep: require('./ui/SetInputStep')(sequencer)
+    copy: copy
   }
-
+  
 }
 module.exports = ImageSequencer;

src/InsertStep.js

@@ -1,62 +1,33 @@
-const getStepUtils = require('./util/getStep.js');
-
 // insert one or more steps at a given index in the sequencer
-function InsertStep(ref, index, name, o) {
-  if (ref.sequences[name]) {
-    return ref.importJSON(ref.sequences[name]);
-  }
-
-
-  function insertStep(index, name, o_) {
-    if (ref.modules[name]) var moduleInfo = ref.modules[name][1];
-    else {
-      console.log('Module ' + name + ' not found.');
-    }
+function InsertStep(ref, image, index, name, o) {
 
+  function insertStep(image, index, name, o_) {
     var o = ref.copy(o_);
-
     o.number = ref.options.sequencerCounter++; //Gives a Unique ID to each step
-    o.name = o_.name || name || moduleInfo.name;
-    o.description = o_.description || moduleInfo.description;
+    o.name = o_.name || name;
     o.selector = o_.selector || 'ismod-' + name;
     o.container = o_.container || ref.options.selector;
-    o.inBrowser = ref.options.inBrowser;
+    o.image = image;
 
-    if (index == -1) index = ref.steps.length;
+    if(index==-1) index = ref.images[image].steps.length;
 
     o.step = {
       name: o.name,
       description: o.description,
+      url: o.url,
       ID: o.number,
+      imageName: o.image,
       inBrowser: ref.options.inBrowser,
       ui: ref.options.ui,
       options: o
     };
     var UI = ref.events;
-
-    // define the expandSteps function for sequencer
-    ref.modules[name].expandSteps = function expandSteps(stepsArray) {
-      for (var i in stepsArray) {
-        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 || {};
-
-    if (!ref.modules[name][1].length) {
-      UI.onSetup(o.step, { index: index });
-      ref.steps.splice(index, 0, ref.modules[name][0](o, UI));
-    } else {
-      ref.modules[name][0](o, UI);
-    }
+    var module = ref.modules[name][0](o,UI);
+    ref.images[image].steps.splice(index,0,module);
 
     return true;
   }
 
-  insertStep(index, name, o);
-  ref.steps = ref.steps;
-
+  insertStep(image, index, name, o);
 }
 module.exports = InsertStep;

src/Modules.js

@@ -2,43 +2,40 @@
 * Core modules and their info files
 */
 module.exports = {
-  'add-qr': require('./modules/AddQR'),
-  'average': require('./modules/Average'),
-  'blend': require('./modules/Blend'),
-  'blur': require('./modules/Blur'),
-  'brightness': require('./modules/Brightness'),
-  'canvas-resize': require('./modules/CanvasResize'),
-  'channel': require('./modules/Channel'),
-  'colorbar': require('./modules/Colorbar'),
-  'color-temperature': require('./modules/ColorTemperature'),
-  'colormap': require('./modules/Colormap'),
-  'contrast': require('./modules/Contrast'),
-  'convolution': require('./modules/Convolution'),
-  'crop': require('./modules/Crop'),
-  'decode-qr': require('./modules/DecodeQr'),
-  'dither': require('./modules/Dither'),
-  'draw-rectangle': require('./modules/DrawRectangle'),
-  'dynamic': require('./modules/Dynamic'),
-  'edge-detect': require('./modules/EdgeDetect'),
-  'exposure': require('./modules/Exposure'),
-  'flip-image': require('./modules/FlipImage'),
-  'fisheye-gl': require('./modules/FisheyeGl'),
-  'histogram': require('./modules/Histogram'),
-  'gamma-correction': require('./modules/GammaCorrection'),
-  'gradient': require('./modules/Gradient'),
-  'grid-overlay': require('./modules/GridOverlay'),
-  'import-image': require('./modules/ImportImage'),
-  'invert': require('image-sequencer-invert'),
-  'ndvi': require('./modules/Ndvi'),
-  'ndvi-colormap': require('./modules/NdviColormap'),
-  'paint-bucket': require('./modules/PaintBucket'),
-  'overlay': require('./modules/Overlay'),
-  'replace-color': require('./modules/ReplaceColor'),
-  'resize': require('./modules/Resize'),
-  'rotate': require('./modules/Rotate'),
-  'saturation': require('./modules/Saturation'),
-  'text-overlay': require('./modules/TextOverlay'),
-  'threshold': require('./modules/Threshold'),
-  'tint': require('./modules/Tint'),
-  'white-balance': require('./modules/WhiteBalance')
+  'channel': [
+    require('./modules/Channel/Module'),require('./modules/Channel/info')
+  ],
+  'brightness': [
+    require('./modules/Brightness/Module'),require('./modules/Brightness/info')
+  ],
+  'edge-detect':[
+    require('./modules/EdgeDetect/Module'),require('./modules/EdgeDetect/info')
+  ],
+  'ndvi': [
+    require('./modules/Ndvi/Module'),require('./modules/Ndvi/info')
+  ],
+  'invert': [
+    require('./modules/Invert/Module'),require('./modules/Invert/info')
+  ],
+  'crop': [
+    require('./modules/Crop/Module'),require('./modules/Crop/info')
+  ],
+  'colormap': [
+    require('./modules/Colormap/Module'),require('./modules/Colormap/info')
+  ],
+  'decode-qr': [
+    require('./modules/DecodeQr/Module'),require('./modules/DecodeQr/info')
+  ],
+  'fisheye-gl': [
+    require('./modules/FisheyeGl/Module'),require('./modules/FisheyeGl/info')
+  ],
+  'dynamic': [
+    require('./modules/Dynamic/Module'),require('./modules/Dynamic/info')
+  ],
+  'blur': [
+    require('./modules/Blur/Module'),require('./modules/Blur/info')
+  ],
+  'saturation': [
+    require('./modules/Saturation/Module'),require('./modules/Saturation/info')
+  ]
 }

src/ReplaceImage.js

@@ -1,11 +1,10 @@
 // Uses a given image as input and replaces it with the output.
-// Works only in the browser.
+// Works only in the browser. 
 function ReplaceImage(ref,selector,steps,options) {
   if(!ref.options.inBrowser) return false; // This isn't for Node.js
   var tempSequencer = ImageSequencer({ui: false});
   var this_ = ref;
-  if (window.hasOwnProperty('$')) var input = $(selector);
-  else var input = document.querySelectorAll(selector);
+  var input = document.querySelectorAll(selector);
   var images = [];
   for (var i = 0; i < input.length; i++) {
     if (input[i] instanceof HTMLImageElement) images.push(input[i]);
@@ -13,25 +12,14 @@ function ReplaceImage(ref,selector,steps,options) {
 
   function replaceImage (img, steps) {
     var url = img.src;
-    // refactor to filetypeFromUrl()
-    var ext = url.split('?')[0].split('.').pop();
+    var ext = url.split('.').pop();
 
     var xmlHTTP = new XMLHttpRequest();
     xmlHTTP.open('GET', url, true);
     xmlHTTP.responseType = 'arraybuffer';
     xmlHTTP.onload = function(e) {
       var arr = new Uint8Array(this.response);
-
-      // in chunks to avoid "RangeError: Maximum call stack exceeded"
-      // https://github.com/publiclab/image-sequencer/issues/241
-      // https://stackoverflow.com/a/20048852/1116657
-      var raw = '';
-      var i,j,subArray,chunk = 5000;
-      for (i=0,j=arr.length; i<j; i+=chunk) {
-        subArray = arr.subarray(i,i+chunk);
-        raw += String.fromCharCode.apply(null, subArray);
-      }
-
+      var raw = String.fromCharCode.apply(null,arr);
       var base64 = btoa(raw);
       var dataURL="data:image/"+ext+";base64," + base64;
       make(dataURL);

src/Run.js

@@ -1,89 +1,56 @@
-const getStepUtils = require('./util/getStep.js');
-
-function Run(ref, json_q, callback, ind, progressObj) {
-  if (!progressObj) progressObj = { stop: function() { } };
+function Run(ref, json_q, callback,progressObj) {
+  if(!progressObj) progressObj = {stop: function(){}}
 
   function drawStep(drawarray, pos) {
     if (pos == drawarray.length && drawarray[pos - 1] !== undefined) {
-      if (ref.objTypeOf(callback) == "Function" && ref.steps.slice(-1)[0].output) {
-        var steps = ref.steps;
-        var out = steps[steps.length - 1].output.src;
+      var image = drawarray[pos-1].image;
+      if(ref.objTypeOf(callback) == 'Function') {
+        var steps = ref.images[image].steps;
+        var out = steps[steps.length-1].output.src;
         callback(out);
         return true;
       }
     }
-
     // so we don't run on the loadImage module:
     if (drawarray[pos] !== undefined) {
+      var image = drawarray[pos].image;
       var i = drawarray[pos].i;
-      var input = ref.steps[i - 1].output;
-      var step = ref.steps[i];
-
-      step.getStep = function getStep(offset) {
-        if (i + offset >= ref.steps.length) return { options: { name: undefined } };
-        else return ref.steps.slice(i + offset)[0];
-      };
-      step.getIndex = function getIndex() {
-        return i;
-      }
-
-      for (var util in getStepUtils) {
-        if (getStepUtils.hasOwnProperty(util)) {
-          step[util] = getStepUtils[util];
-        }
-      }
-
-      // Tell UI that a step is being drawn.
-      step.UI.onDraw(step.options.step);
-
-      // provides a set of standard tools for each step
-      var inputForNextStep = require('./RunToolkit')(ref.copy(input));
-
-      step.draw(
-        inputForNextStep,
-        function onEachStep() {
-
-          // This output is accessible by UI        
-          ref.steps[i].options.step.output = ref.steps[i].output.src;
-
-          // Tell UI that step has been drawn.
-          ref.steps[i].UI.onComplete(ref.steps[i].options.step);
-
-          drawStep(drawarray, ++pos);
-        },
-        progressObj
-      );
+      var input = ref.images[image].steps[i - 1].output;
+      ref.images[image].steps[i].draw(ref.copy(input), function onEachStep() {
+        drawStep(drawarray, ++pos);
+      },progressObj);
     }
   }
 
   function drawSteps(json_q) {
-    var drawarray = [],
-    no_steps = ref.steps.length,
-    init = json_q[0];
-      for (var i = 0; i < no_steps - init; i++) {
-        drawarray.push({i: init + i });
+    var drawarray = [];
+    for (var image in json_q) {
+      var no_steps = ref.images[image].steps.length;
+      var init = json_q[image];
+      for(var i = 0; i < no_steps - init; i++) {
+        drawarray.push({ image: image, i: init + i });
       }
-    drawStep(drawarray, ind);
+    }
+    drawStep(drawarray,0);
   }
 
-  function filter(json_q) {
- 
-      if (json_q[0] == 0 && ref.steps.length == 1)
-        delete json_q[0];
-      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"
-      ) {        
-        prevstep = ref.steps[--json_q[0] - 1];
+  function filter(json_q){
+    for (var image in json_q) {
+      if (json_q[image] == 0 && ref.images[image].steps.length == 1)
+        delete json_q[image];
+      else if (json_q[image] == 0) json_q[image]++;
+    }
+    for (var image in json_q) {
+      var prevstep = ref.images[image].steps[json_q[image] - 1];
+      while (typeof(prevstep) == "undefined" || typeof(prevstep.output) == "undefined") {
+        prevstep = ref.images[image].steps[(--json_q[image]) - 1];
       }
-    
+    }
     return json_q;
   }
-  
+
   var json_q = filter(json_q);
-  
   return drawSteps(json_q);
+
 }
 module.exports = Run;

src/RunToolkit.js

@@ -1,14 +0,0 @@
-const getPixels = require('get-pixels');
-const pixelManipulation = require('./modules/_nomodule/PixelManipulation');
-const lodash = require('lodash');
-const dataUriToBuffer = require('data-uri-to-buffer');
-const savePixels = require('save-pixels');
-
-module.exports = function(input) {
-    input.getPixels = getPixels;
-    input.pixelManipulation = pixelManipulation;
-    input.lodash = lodash;
-    input.dataUriToBuffer = dataUriToBuffer;
-    input.savePixels = savePixels;
-    return input;
-}

src/SavedSequences.json

@@ -1 +0,0 @@
-{"sample":[{"name":"invert","options":{}},{"name":"channel","options":{"channel":"red"}},{"name":"blur","options":{"blur":"5"}}]}

src/cli/installModule.js

@@ -1,17 +0,0 @@
-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!"
-    );
-
-    var params = program.installModule.split(' ');
-    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!!");
-}

src/cli/saveSequence.js

@@ -1,7 +0,0 @@
-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!!");
-
-}

src/cli/sequencerSteps.js

@@ -1,88 +0,0 @@
-var Spinner = require('ora');
-var readlineSync = require('readline-sync');
-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");
-
-    // Iterate through the steps and retrieve their inputs.
-    program.step.forEach(function(step) {
-      var options = Object.assign({}, sequencer.modulesInfo(step).inputs);
-
-      // If inputs exists, print to console.
-      if (Object.keys(options).length) {
-        console.log("[" + step + "]: Inputs");
-      }
-
-      // If inputs exists, print them out with descriptions.
-      Object.keys(options).forEach(function(input) {
-        // 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(" ") +
-          input +
-          ": " +
-          options[input].desc
-        );
-      });
-
-      if (program.config) {
-        try {
-          var config = JSON.parse(program.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`
-          );
-          program.config = false;
-          console.log(e);
-        }
-      }
-      if (program.config && utils.validateConfig(config, options)) {
-        console.log("Now using Options object");
-        Object.keys(options).forEach(function(input) {
-          options[input] = config[input];
-        });
-      } else {
-        // 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 " +
-            input +
-            " (" +
-            options[input].type +
-            ", default: " +
-            options[input].default +
-            "): "
-          );
-          options[input] = value;
-        });
-      }
-      // Add the step and its inputs to the sequencer.
-      sequencer.addSteps(step, options);
-    });
-
-    var spinnerObj = { succeed: () => { }, stop: () => { } };
-    if (!process.env.TEST)
-      spinnerObj = Spinner("Your Image is being processed..").start();
-
-    // Run the sequencer.
-    sequencer.run({ progressObj: spinnerObj }, function() {
-      // Export all images or final image as binary files.
-      sequencer.exportBin(program.output, program.basic, outputFilename);
-
-      //check if spinner was not overriden stop it
-      if (!spinnerObj.overrideFlag) {
-        spinnerObj.succeed();
-        console.log(`\nDone!!`);
-      }
-    });
-  });
-}

src/modules/AddQR/Module.js

@@ -1,51 +0,0 @@
-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";
-    var output;
-    getPixels = require('get-pixels');
-
-    function draw(input, callback, progressObj) {
-
-        progressObj.stop(true);
-        progressObj.overrideFlag = true;
-
-        var step = this;
-
-        return getPixels(input.src, function (err, oldPixels) {
-            function changePixel(r, g, b, a) {
-                return [r, g, b, a];
-            }
-           
-            function extraManipulation(pixels,generateOutput) {
-                if (err) {
-                    console.log(err);
-                    return;
-                }
-                 require('./QR')(options, pixels, oldPixels, generateOutput);
-            }
-            function output(image, datauri, mimetype) {
-                step.output = { src: datauri, format: mimetype };
-            }
-
-            return require('../_nomodule/PixelManipulation.js')(input, {
-                output: output,
-                changePixel: changePixel,
-                extraManipulation: extraManipulation,
-                format: input.format,
-                image: options.image,
-                inBrowser: options.inBrowser,
-                callback: callback
-            });
-        })
-
-    }
-
-    return {
-        options: options,
-        draw: draw,
-        output: output,
-        UI: UI
-    }
-}

src/modules/AddQR/QR.js

@@ -1,48 +0,0 @@
-module.exports = exports = function (options, pixels, oldPixels, callback) {
-    var QRCode = require('qrcode')
-    QRCode.toDataURL(options.qrCodeString, function (err, url) {
-        var getPixels = require("get-pixels");
-        getPixels(url, function (err, qrPixels) {
-            if (err) {
-                console.log("Bad image path", image);
-            }
-
-            var imagejs = require('imagejs');
-            var bitmap = new imagejs.Bitmap({ width: qrPixels.shape[0], height: qrPixels.shape[1] });
-            bitmap._data.data = qrPixels.data;
-            var resized = bitmap.resize({
-                width: options.size, height: options.size,
-                algorithm: "bicubicInterpolation"
-            });
-
-            qrPixels.data = resized._data.data;
-            qrPixels.shape = [options.size, options.size, 4];
-            qrPixels.stride[1] = 4 * options.size;
-
-            var width = oldPixels.shape[0],
-                height = oldPixels.shape[1];
-            var xe = width - options.size,
-                ye = height - options.size;
-            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))
-                    }
-
-                    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))
-                    }
-
-                }
-            }
-            callback();
-
-        })
-    })
-}

src/modules/AddQR/index.js

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

src/modules/AddQR/info.json

@@ -1,19 +0,0 @@
-{
-    "name": "Add QR",
-    "description": "Adds QR corresponding to the given string",
-    "url": "https://github.com/publiclab/image-sequencer/tree/master/MODULES.md",
-    "inputs": {
-      "size": {
-        "type": "integer",
-        "desc": "size of QR code in pixels",
-        "default": 200
-      },
-      "qrCodeString":{
-        "type": "string",
-        "desc": "input string to generate QR code",
-        "default": "https://github.com/publiclab/image-sequencer"
-      }
-    },
-    "docs-link":"https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#add-qr-module"
-  }
-  

src/modules/Average/Module.js

@@ -1,74 +0,0 @@
-/*
-* Average all pixel colors
-*/
-module.exports = function Average(options, UI) {
-
-    var output;
-
-    options.step.metadata = options.step.metadata || {};
-
-    function draw(input, callback, progressObj) {
-
-        progressObj.stop(true);
-        progressObj.overrideFlag = true;
-
-        var step = this;
-
-        // do the averaging
-        function extraManipulation(pixels) {
-            var i = 0, sum = [0, 0, 0, 0];
-            while (i < pixels.data.length) {
-                sum[0] += pixels.data[i++];
-                sum[1] += pixels.data[i++];
-                sum[2] += pixels.data[i++];
-                sum[3] += pixels.data[i++];
-            }
-
-            let divisor = pixels.data.length / 4;
-
-            sum[0] = Math.floor(sum[0] / divisor);
-            sum[1] = Math.floor(sum[1] / divisor);
-            sum[2] = Math.floor(sum[2] / divisor);
-            sum[3] = Math.floor(sum[3] / divisor);
-
-            i = 0
-            while (i < pixels.data.length) {
-                pixels.data[i++] = sum[0];
-                pixels.data[i++] = sum[1];
-                pixels.data[i++] = sum[2];
-                pixels.data[i++] = sum[3];
-            }
-
-            // report back and store average in metadata:
-            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>");
-            return pixels;
-        }
-
-        function output(image, datauri, mimetype) {
-
-            // This output is accessible 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,
-            callback: callback
-        });
-
-    }
-    return {
-        options: options,
-        draw: draw,
-        output: output,
-        UI: UI
-    }
-}

src/modules/Average/index.js

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

src/modules/Average/info.json

@@ -1,7 +0,0 @@
-{
-    "name": "Average",
-    "description": "Average all pixel color",
-    "inputs": {
-    },
-    "docs-link":"https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#average-module"
-}

src/modules/Blend/Module.js

@@ -1,75 +0,0 @@
-module.exports = function Dynamic(options, UI, util) {
-
-    var defaults = require('./../../util/getDefaults.js')(require('./info.json'));
-
-    options.func = options.func || defaults.blend;
-    options.offset = options.offset || defaults.offset;
-
-    var output;
-
-    // This function is called on every draw.
-    function draw(input, callback, progressObj) {
-
-        progressObj.stop(true);
-        progressObj.overrideFlag = true;
-
-        var step = this;
-
-        // convert to runnable code:
-        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);
-
-        // save first image's pixels
-        var priorStep = this.getStep(options.offset);
-
-        if (priorStep.output === undefined) {
-            this.output = input;
-            UI.notify('Offset Unavailable', 'offset-notification');
-            callback();
-        } 
-
-        getPixels(priorStep.output.src, function(err, pixels) {
-            options.firstImagePixels = pixels;
-
-            function changePixel(r2, g2, b2, a2, x, y) {
-                // blend!
-                let p = options.firstImagePixels;
-                return options.func(
-                    r2, g2, b2, a2,
-                    p.get(x, y, 0),
-                    p.get(x, y, 1),
-                    p.get(x, y, 2),
-                    p.get(x, y, 3)
-                )
-            }
-
-            function output(image, datauri, mimetype) {
-
-                // This output is accessible by Image Sequencer
-                step.output = { src: datauri, format: mimetype };
-
-            }
-
-            // run PixelManipulatin on second image's pixels
-            return require('../_nomodule/PixelManipulation.js')(input, {
-                output: output,
-                changePixel: changePixel,
-                format: input.format,
-                image: options.image,
-                inBrowser: options.inBrowser,
-                callback: callback
-            });
-        });
-    }
-
-    return {
-        options: options,
-        draw: draw,
-        output: output,
-        UI: UI
-    }
-}

src/modules/Blend/index.js

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

src/modules/Blend/info.json

@@ -1,17 +0,0 @@
-{
-  "name": "Blend",
-  "description": "Blend two chosen image steps with the given function. Defaults to using the red channel from image 1 and the green and blue and alpha channels of image 2. Easier to use interfaces coming soon!",
-  "inputs": {
-    "offset": {
-      "type": "integer",
-      "desc": "Choose which image to blend the current image with. Two steps back is -2, three steps back is -3 etc.",
-      "default": -2
-    },
-    "blend": {
-      "type": "string",
-      "desc": "Function to use to blend the two images.",
-      "default": "function(r1, g1, b1, a1, r2, g2, b2, a2) { return [ r1, g2, b2, a2 ] }"
-    }
-  },
-  "docs-link":"https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#blend-module"
-}

src/modules/Blur/Blur.js

@@ -1,32 +1,33 @@
-module.exports = exports = function(pixels, blur) {
-    let kernel = kernelGenerator(blur, 1), oldpix = require('lodash').cloneDeep(pixels);
-    kernel = flipKernel(kernel);
-
-    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]);
+module.exports = exports = function(pixels,blur){
+    let kernel = kernelGenerator(blur,1)
+    kernel = flipKernel(kernel)
+    var oldpix = pixels
+    
+    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]);
                 }
             }
-            pixels.set(i, j, 0, acc[0]);
-            pixels.set(i, j, 1, acc[1]);
-            pixels.set(i, j, 2, acc[2]);
+            pixels.set(i,j,0,acc[0])
+            pixels.set(i,j,1,acc[1])
+            pixels.set(i,j,2,acc[2])
         }
     }
-    return pixels;
-
-
-
+    return pixels
+    
+    
+    
     //Generates a 3x3 Gaussian kernel
-    function kernelGenerator(sigma, size) {
+    function kernelGenerator(sigma,size){
 
-        /*
+        /* 
         Trying out a variable radius kernel not working as of now
         */
         // const coeff = (1.0/(2.0*Math.PI*sigma*sigma))
@@ -46,39 +47,39 @@ module.exports = exports = function(pixels, blur) {
         //     })
         // })
         // result = result.map(arr=>arr.map(val=>(val + 0.0)/(sum + 0.0)))
-
+        
         // 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]
-        ];
+            [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]);
+    function getNeighbouringPixelPositions(pixelPosition){
+        let x = pixelPosition[0],y=pixelPosition[1]
+        let 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);
+            result.push(arr)
         }
-        return result;
+    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
+}
 }

src/modules/Blur/Module.js

@@ -1,43 +1,58 @@
 /*
 * Blur an Image
 */
-module.exports = function Blur(options, UI) {
-
-    var defaults = require('./../../util/getDefaults.js')(require('./info.json'));
-    options.blur = options.blur || defaults.blur;
+module.exports = function Blur(options,UI){
+    options = options || {};
+    options.blur = options.blur || 2
+    
+    //Tell the UI that a step has been set up
+    UI.onSetup(options.step);
     var output;
-
-    function draw(input, callback, progressObj) {
+    
+    function draw(input,callback,progressObj){
 
         progressObj.stop(true);
         progressObj.overrideFlag = true;
-
+        
+        // Tell the UI that a step is being drawn
+        UI.onDraw(options.step);
+        
         var step = this;
-
-        function extraManipulation(pixels) {
-            pixels = require('./Blur')(pixels, options.blur);
-            return pixels;
+        
+        function changePixel(r, g, b, a){
+            return [r,g,b,a]
+        }
+        
+        function extraManipulation(pixels){
+            pixels =  require('./Blur')(pixels,options.blur)
+            return pixels
         }
 
-        function output(image, datauri, mimetype) {
-
+        function output(image,datauri,mimetype){
+            
             // This output is accessible by Image Sequencer
-            step.output = { src: datauri, format: mimetype };
-
+            step.output = {src:datauri,format:mimetype};
+            
+            // This output is accessible by UI
+            options.step.output = datauri;
+            
+            // Tell UI that step has been drawn.
+            UI.onComplete(options.step);
         }
-
+        
         return require('../_nomodule/PixelManipulation.js')(input, {
             output: output,
+            changePixel: changePixel,
             extraManipulation: extraManipulation,
             format: input.format,
             image: options.image,
             callback: callback
         });
-
+        
     }
     return {
         options: options,
-        draw: draw,
+        draw:  draw,
         output: output,
         UI: UI
     }

src/modules/Blur/index.js

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

src/modules/Blur/info.json

@@ -1,15 +1,11 @@
 {
     "name": "Blur",
-    "description": "Applies a Gaussian blur given by the intensity value",
+    "description": "Gaussian blur an image by a given value, typically 0-5",
     "inputs": {
         "blur": {
-            "type": "float",
-            "desc": "Amount of gaussian blur(Less blur gives more detail, typically 0-5)",
-            "default": 2,
-            "min": 0,
-            "max": 5,
-            "step": 0.25
+            "type": "integer",
+            "desc": "amount of gaussian blur(Less blur gives more detail, typically 0-5)",
+            "default": 2
         }
-    },
-    "docs-link":"https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#blur-module"
+    }
 }

src/modules/Brightness/Module.js

@@ -1,43 +1,51 @@
-/*
+/* 
 * Changes the Image Brightness
 */
-module.exports = function Brightness(options, UI) {
 
-    var defaults = require('./../../util/getDefaults.js')(require('./info.json'));
+module.exports = function Brightness(options,UI){
+    options = options || {};
+
+    //Tell the UI that a step has been set up
+    UI.onSetup(options.step);
     var output;
 
-
-
-    function draw(input, callback, progressObj) {
-
-        options.brightness = options.brightness || defaults.brightness;
-
+    function draw(input,callback,progressObj){
+        
         progressObj.stop(true);
         progressObj.overrideFlag = true;
 
         /*
         In this case progress is handled by changepixel internally otherwise progressObj
-        needs to be overriden and used
+        needs to be overriden and used 
         For eg. progressObj = new SomeProgressModule()
         */
 
-        var step = this, val = (options.brightness) / 100.0;;
+        // Tell the UI that a step is being drawn
+        UI.onDraw(options.step);
+        
+        var step = this;
+        
+        function changePixel(r, g, b, a){
+            var val = (options.brightness)/100.0
 
-        function changePixel(r, g, b, a) {
-
-            r = Math.min(val * r, 255);
-            g = Math.min(val * g, 255);
-            b = Math.min(val * b, 255);
-            return [r, g, b, a];
+            r = val*r<255?val*r:255
+            g = val*g<255?val*g:255
+            b = val*b<255?val*b:255
+            return [r , g, b, a]
         }
-
-        function output(image, datauri, mimetype) {
-
+        
+        function output(image,datauri,mimetype){
+            
             // This output is accessible by Image Sequencer
-            step.output = { src: datauri, format: mimetype };
-
+            step.output = {src:datauri,format:mimetype};
+            
+            // This output is accessible by UI
+            options.step.output = datauri;
+            
+            // Tell UI that step has been drawn.
+            UI.onComplete(options.step);
         }
-
+        
         return require('../_nomodule/PixelManipulation.js')(input, {
             output: output,
             changePixel: changePixel,
@@ -46,11 +54,11 @@ module.exports = function Brightness(options, UI) {
             inBrowser: options.inBrowser,
             callback: callback
         });
-
+        
     }
     return {
         options: options,
-        draw: draw,
+        draw:  draw,
         output: output,
         UI: UI
     }

src/modules/Brightness/index.js

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

src/modules/Brightness/info.json

@@ -1,14 +1,11 @@
 {
-  "name": "Brightness",
-  "description": "Change the brightness of the image by given percent value",
-  "inputs": {
-      "brightness": {
-          "type": "integer",
-          "desc": "% brightness for the new image",
-          "default": "175",
-          "min": "0",
-          "max": "200"
-      }
-  },
-  "docs-link":"https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#brightness-module"
+    "name": "Brightness",
+    "description": "Change the brightness of the image by given percent value",
+    "inputs": {
+        "brightness": {
+            "type": "integer",
+            "desc": "% brightness for the new image",
+            "default": 0 
+        }
+    } 
 }

src/modules/CanvasResize/Module.js

@@ -1,63 +0,0 @@
-/*
-* Changes the Canvas Size
-*/
-module.exports = function canvasResize(options, UI) {
-
-    var defaults = require('./../../util/getDefaults.js')(require('./info.json'));
-    var output;
-
-
-
-    function draw(input, callback, progressObj) {
-
-        options.width = options.width || defaults.width;
-        options.height = options.height || defaults.height;
-        options.x = options.x || defaults.x;
-        options.y = options.y || defaults.y;
-
-        progressObj.stop(true);
-        progressObj.overrideFlag = true;
-
-        var step = this;
-
-        function extraManipulation(pixels) {
-
-            let newPixels = require('ndarray')(new Uint8Array(4 * options.width * options.height).fill(255), [options.width, options.height, 4]);
-            let iMax = options.width - options.x,
-                jMax = options.height - options.y;
-            for (let i = 0; i < iMax && i < pixels.shape[0]; i++) {
-                for (let j = 0; j < jMax && j < pixels.shape[1]; j++) {
-                    let x = i + options.x, y = j + options.y;
-                    newPixels.set(x, y, 0, pixels.get(i, j, 0));
-                    newPixels.set(x, y, 1, pixels.get(i, j, 1));
-                    newPixels.set(x, y, 2, pixels.get(i, j, 2));
-                    newPixels.set(x, y, 3, pixels.get(i, j, 3));
-                }
-            }
-            return newPixels;
-        }
-
-        function output(image, datauri, mimetype) {
-
-            // This output is accessible 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
-    }
-}

src/modules/CanvasResize/index.js

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

src/modules/CanvasResize/info.json

@@ -1,26 +0,0 @@
-{
-    "name": "Resize Canvas",
-    "description": "This module resizes the canvas and overlays the ouput of the previous step at given location",
-    "inputs": {
-        "width": {
-            "type": "integer",
-            "desc": "Final width of the canvas",
-            "default": 1000
-        },
-        "height": {
-            "type": "integer",
-            "desc": "Final height of the canvas",
-            "default": 1000
-        },
-        "x": {
-            "type": "integer",
-            "desc": "X-cord of the top left corner of the image on the canvas",
-            "default": 500
-        },
-        "y": {
-            "type": "float",
-            "desc": "Y-cord of the top left corner of the image on the canvas",
-            "default": 500
-        }
-    }
-}

src/modules/Channel/Module.js

@@ -1,32 +1,40 @@
 /*
  * Display only one color channel
  */
-module.exports = function Channel(options, UI) {
+module.exports = function Channel(options,UI) {
 
-  var defaults = require('./../../util/getDefaults.js')(require('./info.json'));
-
-  options.channel = options.channel || defaults.channel;
+  options = options || {};
+  options.channel = options.channel || "green";
 
+  // Tell UI that a step has been set up
+  UI.onSetup(options.step);
   var output;
 
-  function draw(input, callback, progressObj) {
+  function draw(input,callback,progressObj) {
 
     progressObj.stop(true);
     progressObj.overrideFlag = true;
 
+    // Tell UI that a step is being drawn
+    UI.onDraw(options.step);
     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) {
+    function output(image,datauri,mimetype){
 
       // This output is accesible by Image Sequencer
-      step.output = { src: datauri, format: mimetype };
+      step.output = {src:datauri,format:mimetype};
 
+      // This output is accessible by UI
+      options.step.output = datauri;
+
+      // Tell UI that step ahs been drawn
+      UI.onComplete(options.step);
     }
 
     return require('../_nomodule/PixelManipulation.js')(input, {
@@ -43,7 +51,7 @@ module.exports = function Channel(options, UI) {
   return {
     options: options,
     //setup: setup, // optional
-    draw: draw,
+    draw:  draw,
     output: output,
     UI: UI
   }

src/modules/Channel/index.js

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

src/modules/Channel/info.json

@@ -8,6 +8,5 @@
       "default": "green",
       "values": ["red", "green", "blue"]
     }
-  },
-  "docs-link":"https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#channel-module"
+  }
 }

src/modules/ColorTemperature/Module.js

@@ -1,81 +0,0 @@
-module.exports = function ColorTemperature(options, UI) {
-
-    var output;
-
-    function draw(input, callback, progressObj) {
-
-        options.temperature = (options.temperature > "40000") ? "40000" : options.temperature
-
-        progressObj.stop(true);
-        progressObj.overrideFlag = true;
-
-        var step = this;
-
-        function extraManipulation(pixels) {
-
-            let temp = parseInt(options.temperature)
-            temp /= 100
-
-            let r, g, b;
-
-            if (temp <= 66) {
-                r = 255;
-                g = Math.min(Math.max(99.4708025861 * Math.log(temp) - 161.1195681661, 0), 255);
-            } else {
-                r = Math.min(Math.max(329.698727446 * Math.pow(temp - 60, -0.1332047592), 0), 255);
-                g = Math.min(Math.max(288.1221695283 * Math.pow(temp - 60, -0.0755148492), 0), 255);
-            }
-
-            if (temp >= 66) {
-                b = 255;
-            } else if (temp <= 19) {
-                b = 0;
-            } else {
-                b = temp - 10;
-                b = Math.min(Math.max(138.5177312231 * Math.log(b) - 305.0447927307, 0), 255);
-            }
-
-            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)
-
-                    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)
-                }
-            }
-
-            return pixels
-        }
-
-        function output(image, datauri, mimetype) {
-
-            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
-    }
-
-}

src/modules/ColorTemperature/index.js

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

src/modules/ColorTemperature/info.json

@@ -1,12 +0,0 @@
-{
-    "name": "Color Temperature",
-    "description": "Changes the color temperature of the image.",
-    "inputs": {
-      "temperature": {
-        "type": "integer",
-        "desc": "Temperature between 0 - 40,000 Kelvin",
-        "default": 6000
-      }
-    },
-    "docs-link":"https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#color-temperature"
-}

src/modules/Colorbar/Module.js

@@ -1,14 +0,0 @@
-module.exports = require('../../util/createMetaModule.js')(
-  function mapFunction(options) {
-
-    // return steps with options:
-    return [
-      { 'name': 'gradient', 'options': {} },
-      { 'name': 'colormap', 'options': { colormap: options.colormap } },
-      { 'name': 'crop', 'options': { 'y': 0, 'h': options.h } },
-      { 'name': 'overlay', 'options': { 'x': options.x, 'y': options.y, 'offset': -4 } }
-    ];
-  }, {
-    infoJson: require('./info.json')
-  }
-)[0];

src/modules/Colorbar/index.js

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

src/modules/Colorbar/info.json

@@ -1,33 +0,0 @@
-{
-    "name": "Colorbar",
-    "description": "Generates a colorbar to lay over the image",
-    "inputs": {
-        "colormap": {
-            "type": "select",
-            "desc": "Name of the Colormap",
-            "default": "default",
-            "values": [
-                "default",
-                "greyscale",
-                "stretched",
-                "fastie"
-            ]
-        },
-        "x": {
-            "type": "integer",
-            "desc": "X-position of the image on which the new image is overlayed",
-            "default": 0
-        },
-        "y": {
-            "type": "integer",
-            "desc": "Y-position of the image on which the new image is overlayed",
-            "default": 0
-        },
-        "h": {
-            "type": "integer",
-            "desc": "height of the colorbar",
-            "default": 10
-        }
-    },
-    "docs-link": "https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#colorbar-module"
-}

src/modules/Colormap/Colormap.js

@@ -56,142 +56,32 @@ var colormaps = {
                [0,     [0,   0,   0],   [255, 255, 255] ],
                [1,     [255, 255, 255], [255, 255, 255] ]
              ]),
-
- bluwhtgrngis:   colormap([
-               [0,     	[6,23,86],    [6,25, 84]    ],
-               [0.0625, [6,25,84],    [6,25, 84]    ],//1
-               [0.125,  [6,25,84],    [6,25, 84]    ],//2
-               [0.1875, [6,25,84],    [6,25, 84]    ],
-               [0.25,   [6,25,84],    [6,25,84]     ],
-               [0.3125, [6,25,84],    [9,24, 84]    ],//5
-               [0.3438, [9,24, 84],   [119,120,162] ],//5
-               [0.375,  [119,129,162],[249,250,251] ], //6
-               [0.406,  [249,250,251],[255,255,255] ], //6.5
-               [0.4375, [255,255,255],[255,255,255] ], //7 white
-               [0.50,   [255,255,255],[214,205,191] ],//8
-               [0.52,   [214,205,191],[178,175,96]  ],//8.2
-               [0.5625, [178,175,96], [151,176,53]  ],//9
-               [0.593,  [151,176,53], [146,188,12]  ],//9.5
-               [0.625,  [146,188,12], [96,161,1]    ], //10
-               [0.6875, [96,161,1],   [30,127,3]    ],//11
-               [0.75,   [30,127,3],   [0,99,1]      ],//12
-               [0.8125, [0,99,1],     [0,74,1]      ],//13
-               [0.875,  [0,74,1],     [0,52, 0]     ],//14
-               [0.9375, [0,52, 0],    [0,34,0]      ], //15
-               [0.968,  [0,34,0],     [68,70,67]    ] //16
-              ]),
-
-
-  brntogrn:   colormap([
-               [0,      [110,12,3],   [118,6,1]      ],
-               [0.0625, [118,6,1],    [141,19,6]     ],
-               [0.125,  [141,19,6],   [165,35,13]    ],
-               [0.1875, [165,35,13],  [177,59,25]    ],
-               [0.2188, [177,59,25],  [192,91,36]    ],
-               [0.25,   [192,91,36],  [214, 145, 76] ],
-               [0.3125, [214,145,76], [230,183,134]  ],
-               [0.375,  [230,183,134],[243, 224, 194]],   
-               [0.4375, [243,224,194],[250,252,229]  ],
-               [0.50,   [250,252,229],[217,235,185]  ],
-               [0.5625, [217,235,185],[184,218,143]  ],
-               [0.625,  [184,218,143],[141,202,89]   ],
-               [0.6875, [141,202,89], [80,176,61]    ],
-               [0.75,   [80,176,61],  [0, 147, 32]   ],
-               [0.8125, [0,147,32],   [1, 122, 22]   ],
-               [0.875,  [1,122,22],   [0, 114, 19]   ],
-               [0.90,   [0,114,19],   [0,105,18]     ],
-               [0.9375, [0,105,18],   [7,70,14]      ] 
-
+  default:   colormap([
+               [0,     [0,   0,   255], [0,   255, 0]   ],
+               [0.25,  [0,   255, 0],   [255, 255, 0]   ],
+               [0.50,  [0,   255, 255], [255, 255, 0]   ],
+               [0.75,  [255, 255, 0],   [255, 0,   0]   ]
              ]),
-
-
-  blutoredjet:     colormap([
-               [0,       [0,0,140],    [1,1,186]    ],
-               [0.0625,  [1,1,186],    [0,1,248]    ],
-               [0.125,   [0,1,248],    [0,70,254]   ],
-               [0.1875,  [0,70,254],   [0,130,255]  ],
-               [0.25,    [0,130,255],  [2,160,255]  ],
-	       [0.2813,  [2,160,255],  [0,187,255]  ],	//inset
-               [0.3125,  [0,187,255],  [6,250,255]  ],
- //            [0.348,   [0,218,255],  [8,252,251]  ],//inset
-               [0.375,   [8,252,251],  [27,254,228] ], 
-               [0.406,   [27,254,228], [70,255,187] ], //insert
-               [0.4375,  [70,255,187], [104,254,151]],
-               [0.47, 	 [104,254,151],[132,255,19] ],//insert
-               [0.50,    [132,255,19], [195,255,60] ],
-               [0.5625,  [195,255,60], [231,254,25] ],
-               [0.5976,  [231,254,25], [253,246,1]  ],//insert
-               [0.625,   [253,246,1],  [252,210,1]  ], //yellow
-               [0.657,   [252,210,1],  [255,183,0]  ],//insert
-               [0.6875,  [255,183,0],  [255,125,2]  ],
-               [0.75,    [255,125,2],  [255,65, 1]  ],
-               [0.8125,  [255,65, 1],  [247, 1, 1]  ],
-               [0.875,   [247,1,1],    [200, 1,  3] ],
-               [0.9375,  [200,1,3],    [122, 3,  2] ] 
-
+  ndvi:      colormap([
+               [0,     [0,   0,   255], [38,  195, 195] ],
+               [0.5,   [0,   150, 0],   [255, 255, 0]   ],
+               [0.75,  [255, 255, 0],   [255, 50,  50]  ]
              ]),
-
-
-  colors16:   colormap([
-               [0,      [0,0,0],       [0,0,0]       ],
-               [0.0625, [3,1,172],     [3,1,172]     ],
-               [0.125,  [3,1,222],     [3,1, 222]    ],
-               [0.1875, [0,111,255],   [0,111,255]   ],
-               [0.25,   [3,172,255],   [3,172,255]   ],
-               [0.3125, [1,226,255],   [1,226,255]   ],
-               [0.375,  [2,255,0],     [2,255,0]     ],   
-               [0.4375, [198,254,0],   [190,254,0]   ],
-               [0.50,   [252,255,0],   [252,255,0]   ],
-               [0.5625, [255,223,3],   [255,223,3]   ],
-               [0.625,  [255,143,3],   [255,143,3]   ],
-               [0.6875, [255,95,3],    [255,95,3]    ],
-               [0.75,   [242,0,1],     [242,0,1]     ],
-               [0.8125, [245,0,170],   [245,0,170]   ],
-               [0.875,  [223,180,225], [223,180,225] ],
-               [0.9375, [255,255,255], [255,255, 255]] 
-
-             ]),
-
-   default:      colormap([
-               [0,       [45,1,121],     [25,1,137]    ],
-               [0.125,   [25,1,137],     [0,6,156]     ],
-               [0.1875,  [0,6,156],      [7,41,172]    ],
-               [0.25,    [7,41,172],     [22,84,187]   ],
-               [0.3125,  [22,84,187],    [25,125,194]  ],
-               [0.375,   [25,125,194],   [26,177,197]  ],   
-               [0.4375,  [26,177,197],   [23,199,193]  ],
-               [0.47,    [23,199,193],   [25, 200,170] ],
-               [0.50,    [25, 200,170],  [21,209,27]   ],
-               [0.5625,  [21,209,27],    [108,215,18]  ],
-               [0.625,   [108,215,18],   [166,218,19]  ],
-               [0.6875,  [166,218,19],   [206,221,20]  ],
-               [0.75,    [206,221,20],   [222,213,19 ] ],
-               [0.7813,  [222,213,19],   [222, 191, 19]],
-               [0.8125,  [222, 191, 19], [227,133,17]  ],
-               [0.875,   [227,133,17],   [231,83,16]   ],
-               [0.9375,  [231,83,16],    [220,61,48]   ] 
-
-             ]),
-
-
-  fastie:    colormap([
-               [0,     [255, 255, 255], [0,   0,   0]   ],
-               [0.167, [0,   0,   0],   [255, 255, 255] ],
-               [0.33,  [255, 255, 255],   [0,   0,   0] ],
-               [0.5,   [0,   0,   0],   [140, 140, 255] ],
-               [0.55,  [140, 140, 255], [0,   255, 0]   ],
-               [0.63,  [0,   255, 0],   [255, 255, 0]   ],
-               [0.75,  [255, 255, 0],   [255, 0,   0]   ],
-               [0.95,  [255, 0,   0],   [255, 0,   255] ]
-             ]),
-
-
   stretched: colormap([
                [0,     [0,   0,   255], [0,   0,   255] ],
                [0.1,   [0,   0,   255], [38,  195, 195] ],
                [0.5,   [0,   150, 0],   [255, 255, 0]   ],
                [0.7,   [255, 255, 0],   [255, 50,  50]  ],
                [0.9,   [255, 50,  50],  [255, 50,  50]  ]
+             ]),
+  fastie:    colormap([
+               [0,     [255, 255, 255], [0,   0,   0]   ],
+               [0.167, [0,   0,   0],   [255, 255, 255] ],
+               [0.33,  [255, 255, 255], [0,   0,   0]   ],
+               [0.5,   [0,   0,   0],   [140, 140, 255] ],
+               [0.55,  [140, 140, 255], [0,   255, 0]   ],
+               [0.63,  [0,   255, 0],   [255, 255, 0]   ],
+               [0.75,  [255, 255, 0],   [255, 0,   0]   ],
+               [0.95,  [255, 0,   0],   [255, 0,   255] ]
              ])
- 
-}
+}

src/modules/Colormap/Module.js

@@ -1,13 +1,19 @@
-module.exports = function Colormap(options, UI) {
+module.exports = function Colormap(options,UI) {
 
+  options = options || {};
+
+  // Tell the UI that a step has been set up.
+  UI.onSetup(options.step);
   var output;
 
   // This function is called on every draw.
-  function draw(input, callback, progressObj) {
+  function draw(input,callback,progressObj) {
 
     progressObj.stop(true);
     progressObj.overrideFlag = true;
 
+    // Tell the UI that the step is being drawn
+    UI.onDraw(options.step);
     var step = this;
 
     function changePixel(r, g, b, a) {
@@ -16,11 +22,17 @@ module.exports = function Colormap(options, UI) {
       return [res[0], res[1], res[2], 255];
     }
 
-    function output(image, datauri, mimetype) {
+    function output(image,datauri,mimetype){
 
       // This output is accessible by Image Sequencer
       step.output = { src: datauri, format: mimetype };
 
+      // This output is accessible by the UI
+      options.step.output = datauri;
+
+      // Tell the UI that the draw is complete
+      UI.onComplete(options.step);
+
     }
     return require('../_nomodule/PixelManipulation.js')(input, {
       output: output,

src/modules/Colormap/index.js

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

src/modules/Colormap/info.json

@@ -6,8 +6,7 @@
       "type": "select",
       "desc": "Name of the Colormap",
       "default": "default",
-      "values": ["default","greyscale","bluwhtgrngis","stretched","fastie","brntogrn","blutoredjet","colors16"]
+      "values": ["default","greyscale","stretched","fastie"]
     }
-  },
-  "docs-link":"https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#colormap-module"
+  }
 }

src/modules/Contrast/Contrast.js

@@ -1,47 +0,0 @@
-var _ = require('lodash');
-
-module.exports = exports = function(pixels, contrast) {
-    let oldpix = _.cloneDeep(pixels);
-    contrast = Number(contrast)
-    if (contrast < -100) contrast = -100;
-    if (contrast > 100) contrast = 100;
-    contrast = (100.0 + contrast) / 100.0;
-    contrast *= contrast;
-
-    for (let i = 0; i < pixels.shape[0]; i++) {
-        for (let j = 0; j < pixels.shape[1]; j++) {
-            var r = oldpix.get(i, j, 0) / 255.0;
-            r -= 0.5;
-            r *= contrast;
-            r += 0.5;
-            r *= 255;
-            if (r < 0) r = 0;
-            if (r > 255) r = 255;
-
-
-            var g = oldpix.get(i, j, 1) / 255.0;
-            g -= 0.5;
-            g *= contrast;
-            g += 0.5;
-            g *= 255;
-            if (g < 0) g = 0;
-            if (g > 255) g = 255;
-
-
-            var b = oldpix.get(i, j, 2) / 255.0;
-            b -= 0.5;
-            b *= contrast;
-            b += 0.5;
-            b *= 255;
-            if (b < 0) b = 0;
-            if (b > 255) b = 255;
-
-
-            pixels.set(i, j, 0, r);
-            pixels.set(i, j, 1, g);
-            pixels.set(i, j, 2, b);
-
-        }
-    }
-    return pixels;
-}

src/modules/Contrast/Module.js

@@ -1,45 +0,0 @@
-// /*
-// * Changes the Image Contrast
-// */
-
-module.exports = function Contrast(options, UI) {
-
-    var defaults = require('./../../util/getDefaults.js')(require('./info.json'));
-    options.contrast = options.contrast || defaults.contrast;
-    var output;
-
-    function draw(input, callback, progressObj) {
-
-        progressObj.stop(true);
-        progressObj.overrideFlag = true;
-
-        var step = this;
-
-        function extraManipulation(pixels) {
-            pixels = require('./Contrast')(pixels, options.contrast)
-            return pixels
-        }
-
-        function output(image, datauri, mimetype) {
-
-            // This output is accessible 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,
-            callback: callback
-        });
-
-    }
-    return {
-        options: options,
-        draw: draw,
-        output: output,
-        UI: UI
-    }
-}

src/modules/Contrast/index.js

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

src/modules/Contrast/info.json

@@ -1,14 +0,0 @@
-{
-    "name": "Contrast",
-    "description": "Change the contrast of the image by given value",
-    "inputs": {
-        "contrast": {
-            "type": "integer",
-            "desc": "contrast for the new image, typically -100 to 100",
-            "default": 70,
-            "min": -100,
-            "max": 100
-        }
-    },
-    "docs-link":"https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#contrast-module"
-}

src/modules/Convolution/Convolution.js

@@ -1,71 +0,0 @@
-var _ = require('lodash');
-module.exports = exports = function(pixels, constantFactor, kernelValues) {
-    let kernel = kernelGenerator(constantFactor, kernelValues), oldpix = _.cloneDeep(pixels);
-    kernel = flipKernel(kernel);
-
-    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]);
-                }
-            }
-            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]);
-        }
-    }
-    return pixels;
-
-
-    function kernelGenerator(constantFactor, kernelValues) {
-        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]);
-                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;
-    }
-}

src/modules/Convolution/Module.js

@@ -1,42 +0,0 @@
-module.exports = function Convolution(options, UI) {
-
-    var defaults = require('./../../util/getDefaults.js')(require('./info.json'));
-
-    options.kernelValues = options.kernelValues || defaults.kernelValues;
-    options.constantFactor = options.constantFactor || defaults.constantFactor;
-    var output;
-
-    function draw(input, callback, progressObj) {
-
-        progressObj.stop(true);
-        progressObj.overrideFlag = true;
-
-        var step = this;
-
-        function extraManipulation(pixels) {
-            pixels = require('./Convolution')(pixels, options.constantFactor, options.kernelValues);
-            return pixels;
-        }
-
-        function output(image, datauri, mimetype) {
-
-            step.output = { src: datauri, format: mimetype };
-
-        }
-
-        return require('../_nomodule/PixelManipulation.js')(input, {
-            output: output,
-            extraManipulation: extraManipulation,
-            format: input.format,
-            image: options.image,
-            callback: callback
-        });
-
-    }
-    return {
-        options: options,
-        draw: draw,
-        output: output,
-        UI: UI
-    }
-}

src/modules/Convolution/index.js

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

src/modules/Convolution/info.json

@@ -1,20 +0,0 @@
-{
-    "name": "Convolution",
-    "description": "Image Convolution using a given 3x3 kernel matrix <a href='https://en.wikipedia.org/wiki/Kernel_(image_processing)'>Read more</a>",
-    "inputs": {
-  		"constantFactor":{
-  			"type": "float",
-  			"desc": "a constant factor, multiplies all the kernel values by that factor",
-  			"default": 0.1111,
-        "placeholder": 0.1111
-  		},
-        
-      "kernelValues": {
-        "type": "string",
-        "desc": "nine space separated numbers representing the kernel values in left to right and top to bottom format.",
-        "default": "1 1 1 1 1 1 1 1 1",
-        "placeholder": "1 1 1 1 1 1 1 1 1"
-      }
-    },
-    "docs-link":"https://github.com/publiclab/image-sequencer/blob/main/docs/MODULES.md#convolution-module"
-}

src/modules/Crop/Crop.js

@@ -1,33 +1,22 @@
 module.exports = function Crop(input,options,callback) {
-  var defaults = require('./../../util/getDefaults.js')(require('./info.json'));
+
   var getPixels = require('get-pixels'),
       savePixels = require('save-pixels');
 
-  options.x = parseInt(options.x) || defaults.x;
-  options.y = parseInt(options.y) || defaults.y;
+  options.x = parseInt(options.x) || 0;
+  options.y = parseInt(options.y) || 0;
 
   getPixels(input.src,function(err,pixels){
-    options.w = parseInt(options.w) || Math.floor(pixels.shape[0]);
-    options.h = parseInt(options.h) || Math.floor(pixels.shape[1]);
-    options.backgroundColor = options.backgroundColor || defaults.backgroundColor;
+    options.w = parseInt(options.w) || Math.floor(0.5*pixels.shape[0]);
+    options.h = parseInt(options.h) || Math.floor(0.5*pixels.shape[1]);
     var ox = options.x;
     var oy = options.y;
     var w = options.w;
     var h = options.h;
     var iw = pixels.shape[0]; //Width of Original Image
-    var ih = pixels.shape[1]; //Height of Original Image
-    var backgroundArray = [];
-    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);
     for (var n = oy; n < oy + h; n++) {
-      if(n<ih){
       newarray.set(pixels.data.slice(n*4*iw + ox, n*4*iw + ox + 4*w),4*w*(n-oy));
-      } else {
-        newarray.set(backgroundArray,4*w*(n-oy));
-      }
     }
     pixels.data = newarray;
     pixels.shape = [w,h,4];

src/modules/Crop/Module.js

@@ -13,73 +13,47 @@
  *          y = options.y
  *          y = options.y + options.h
  */
-module.exports = function CropModule(options, UI) {
+ module.exports = function CropModule(options,UI) {
 
-  // we should get UI to return the image thumbnail so we can attach our own UI extensions
-  // add our custom in-module html ui:
-  if (options.step.inBrowser && !options.noUI) var ui = require('./Ui.js')(options.step, UI);
-  var output,
-    setupComplete = false;
+   // TODO: we could also set this to {} if nil in AddModule.js to avoid this line:
+   options = options || {};
 
-  // This function is caled everytime the step has to be redrawn
-  function draw(input,callback) {
+   // Tell the UI that a step has been added
+   UI.onSetup(options.step);
+   var output;
 
-    var step = this;
+   // This function is caled everytime the step has to be redrawn
+   function draw(input,callback) {
 
-    // save the input image;
-    // TODO: this should be moved to module API to persist the input image
-    options.step.input = input.src;
-    var parseCornerCoordinateInputs = require('../../util/ParseInputCoordinates');
+     // Tell the UI that the step has been triggered
+     UI.onDraw(options.step);
+     var step = this;
 
-    //parse the inputs
-    parseCornerCoordinateInputs(options,{
-      src: input.src,
-      x: { valInp: options.x, type: 'horizontal' },
-      y: { valInp: options.y, type: 'vertical' },
-      w: { valInp: options.w, type: 'horizontal' },
-      h: { valInp: options.h, type: 'vertical' },
-    }, function (options, coord) {
-      options.x = parseInt(coord.x.valInp);
-      options.y = parseInt(coord.y.valInp);
-      options.w = coord.w.valInp;
-      options.h = coord.h.valInp;
-    });
+     require('./Crop')(input,options,function(out,format){
 
-    require('./Crop')(input, options, function (out, format) {
+       // This output is accessible to Image Sequencer
+       step.output = {
+         src: out,
+         format: format
+       }
 
-      // This output is accessible to Image Sequencer
-      step.output = {
-        src: out,
-        format: format
-      }
+       // This output is accessible to the UI
+       options.step.output = out;
 
-      // This output is accessible to the UI
-      options.step.output = out;
+       // Tell the UI that the step has been drawn
+       UI.onComplete(options.step);
 
-      // Tell the UI that the step has been drawn
-      UI.onComplete(options.step);
+       // Tell Image Sequencer that step has been drawn
+       callback();
 
-      // we should do this via event/listener:
-      if (ui && ui.hide) ui.hide();
+     });
 
-      // start custom UI setup (draggable UI)
-      // only once we have an input image
-      if (setupComplete === false && options.step.inBrowser && !options.noUI) {
-        setupComplete = true;
-        ui.setup();
-      }
+   }
 
-      // Tell Image Sequencer that step has been drawn
-      callback();
-
-    });
-
-  }
-
-  return {
-    options: options,
-    draw: draw,
-    output: output,
-    UI: UI
-  }
-}
+   return {
+     options: options,
+     draw: draw,
+     output: output,
+     UI: UI
+   }
+ }

src/modules/Crop/Ui.js

@@ -1,97 +0,0 @@
-// hide on save
-module.exports = function CropModuleUi(step, ui) {
-
-  let inputWidth = 0,
-      inputHeight = 0;
-
-  // We don't have input image dimensions at the
-  // time of setting up the UI; that comes when draw() is triggered.
-  // So we trigger setup only on first run of draw()
-  // TODO: link this to an event rather than an explicit call in Module.js
-  function setup() {
-    let x = 0,
-        y = 0;
-
-    // display original uncropped input image on initial setup
-    showOriginal();
-
-    inputWidth = Math.floor(imgEl().naturalWidth);
-    inputHeight = Math.floor(imgEl().naturalHeight);
-
-    // display with 50%/50% default crop:
-    setOptions(x, y, inputWidth, inputHeight);
-
-    $(imgEl()).imgAreaSelect({
-      handles: true,
-      x1: x,
-      y1: y,
-      x2: x + inputWidth / 2,
-      y2: y + inputHeight / 2,
-      // when selection is complete
-      onSelectEnd: function onSelectEnd(img, selection) {
-        // assign crop values to module UI form inputs:
-        let converted = convertToNatural(
-          selection.x1,
-          selection.y1,
-          selection.width,
-          selection.height
-        );
-        setOptions(
-          converted[0],
-          converted[1],
-          converted[2],
-          converted[3]
-        );
-      }
-    });
-  }
-
-  function convertToNatural(_x, _y, _width, _height) {
-    let displayWidth = $(imgEl()).width(),
-        displayHeight = $(imgEl()).height();
-    // return in same order [ x, y, width, height ]:
-    return [
-      Math.floor(( _x / displayWidth ) * inputWidth),
-      Math.floor(( _y / displayHeight ) * inputHeight),
-      Math.floor(( _width / displayWidth ) * inputWidth),
-      Math.floor(( _height / displayHeight ) * inputHeight)
-    ]
-  }
-
-  function remove() {
-    $(imgEl()).imgAreaSelect({
-      remove: true
-    });
-  }
-
-  function hide() {
-    // then hide the draggable UI
-    $(imgEl()).imgAreaSelect({
-      hide: true
-    });
-  }
-
-  // step.imgSelector is not defined, imgElement is:
-  function imgEl() {
-    return step.imgElement;
-  }
-
-  function setOptions(x1, y1, width, height) {
-    let options = $($(imgEl()).parents()[2]).find("input");
-    options[0].value = x1;
-    options[1].value = y1;
-    options[2].value = width;
-    options[3].value = height;
-  }
-
-  // replaces currently displayed output thumbnail with the input image, for ui dragging purposes
-  function showOriginal() {
-    step.imgElement.src = step.input;
-  }
-
-  return {
-    setup: setup,
-    remove: remove,
-    hide: hide
-  }
-}