From 4ea390897a33975e76bb69d410d19569360339ba Mon Sep 17 00:00:00 2001 From: mmcwilliams Date: Tue, 28 May 2019 13:33:16 -0400 Subject: [PATCH] Refactored seq.js to Typescript and fixed stats for 1 cam 1 proj. Will need further work to add in multiple devices. Resolves #6. --- app/lib/ui/seq.js | 481 +++++++++++++++++++---------------------- app/package.json | 2 +- app/scripts/compile.sh | 1 + app/src/lib/ui/seq.ts | 271 +++++++++++++++++++++++ cli/package.json | 2 +- data/cfg.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 8 files changed, 505 insertions(+), 258 deletions(-) create mode 100644 app/src/lib/ui/seq.ts diff --git a/app/lib/ui/seq.js b/app/lib/ui/seq.js index 1e6ed12..138b0f6 100644 --- a/app/lib/ui/seq.js +++ b/app/lib/ui/seq.js @@ -1,254 +1,229 @@ -const seq = {}; -seq.id = 'sequence'; -seq.grid = []; -seq.gridLoops = 1; -seq.arr = []; -seq.loops = 1; -seq.size = 24; -seq.time = 0; -seq.running = false; - -/****** - Sequence Object -*******/ - -seq.init = function () { - seq.listen(); +'use strict'; +let seq = {}; +class Sequence { + constructor() { + this.id = 'sequence'; + this.grid = []; + this.gridLoops = 1; + this.arr = []; + this.loops = 1; + this.size = 24; + this.time = 0; + this.running = false; + } + init() { + this.listen(); + } + listen() { + ipcRenderer.on(this.id, this.listener.bind(this)); + } + listener(event, arg) { + //console.log(JSON.stringify(arg)) + if (arg.start) { + if (typeof arg.loop !== 'undefined' && typeof arg.step !== 'undefined') { + this.activeStep(arg.step); + log.info(`Step ${arg.step + 1}/${this.arr.length}, Loop ${arg.loop + 1}/${this.loops}`, 'SERIAL', true); + } + else if (typeof arg.loop !== 'undefined') { + $('#loop_current').text(gui.fmtZero(arg.loop + 1, 6)); + } + else { + this.progress(0, 0); + } + } + else if (arg.stop) { + if (typeof arg.loop !== 'undefined' && typeof arg.step !== 'undefined') { + //console.log(JSON.stringify(arg)) + this.progress(arg.step + 1, arg.loop); + this.inactiveAll(); + } + else if (typeof arg.loop !== 'undefined') { + $('#loop_current').text(''); + } + else { + gui.overlay(false); + gui.spinner(false); + log.info('Sequence stopped', 'SERIAL', true); + } + } + return event.returnValue = true; + } + progress(step, loop) { + const elem = $('.progress-bar'); + const len = this.arr.length; + const total = len * this.loops; + let pos = (loop * len) + step; + let progress = 0; + if (pos > 0 && total > 0) { + progress = (pos / total) * 100; + } + elem.attr('aria-valuenow', progress); + elem.css('width', `${progress}%`); + } + activeStep(x) { + const step = String(x); + this.inactiveAll(); + $(`.row input[x=${step}]`).addClass('h'); + $(`#numbers div[x=${step}]`).addClass('h'); + } + inactiveAll() { + $('.row input').removeClass('h'); + $('#numbers div').removeClass('h'); + } + stop() { + ipcRenderer.send(this.id, { stop: true }); + $('#loop_current').text(''); + } + //start the sequencer from the grid + start() { + this.time = +new Date(); + this.arr = JSON.parse(JSON.stringify(this.grid)); + this.loops = this.gridLoops + 0; + ipcRenderer.send(this.id, { start: true }); + } + //start a pre-set sequence, not using the gui + exec(arr, loops) { + this.time = +new Date(); + this.arr = arr; + this.loops = loops; + ipcRenderer.send(this.id, { start: true, arr, loops }); + } + set(x, cmd) { + let increase = 0; + if (x >= this.grid.length + 1) { + increase = x - this.grid.length; + for (let i = 0; i < increase; i++) { + this.grid.push({}); + } + } + if (!this.grid[x]) + this.grid[x] = {}; + this.grid[x].x = x; + this.grid[x].cmd = cmd; + if (cmd.indexOf('C') !== -1) { + this.grid[x].light = light.color; + } + else { + if (this.grid[x].light) { + delete this.grid[x].light; + } + } + //set + ipcRenderer.send(this.id, { set: [this.grid[x]] }); + //update grid? + } + unsetAll() { + const len = this.grid.length; + const steps = []; + for (let i = 0; i < len; i++) { + if (typeof this.grid[i] !== 'undefined') { + steps.push(i); + } + } + ipcRenderer.send(this.id, { unset: steps }); + this.grid = []; + } + unset(x) { + this.grid[x] = undefined; //revist this + ipcRenderer.send(this.id, { unset: [x] }); + } + /** + * Set the light value at a specific step and then update + * GUI grid via .state() + * + * @param {integer} x Step in sequence + * @param {array} rgb Light value in RGB + **/ + setLight(x, rgb) { + let color = rgb.join(','); + this.grid[x].light = color; + ipcRenderer.send(this.id, { x, cmd: this.grid[x].cmd, light: color }); + } + /** + * Function bound to the change event on the loop counter + * input element + * + * @param {integer} count Integer to set loops to + */ + setLoops(count) { + this.gridLoops = count; + this.stats(); + ipcRenderer.send(this.id, { loops: this.gridLoops }); + } + stats() { + let ms = 0; + let c = ''; + let cam_total = 0; + let proj_total = 0; + let real_total = this.grid.filter((elem) => { + if (elem == undefined) { + return false; + } + return true; + }); + //timing + for (let step of this.grid) { + if (!step) + continue; + c = step.cmd; + if (c === cfg.cmd.camera_forward || c === cfg.cmd.camera_backward) { + ms += cfg.arduino.cam.time; + ms += cfg.arduino.cam.delay; + ms += cfg.arduino.serialDelay; + } + if (c === cfg.cmd.projector_forward || c === cfg.cmd.projector_backward) { + ms += cfg.arduino.proj.time; + ms += cfg.arduino.proj.delay; + ms += cfg.arduino.serialDelay; + } + if (c === cfg.cmd.black_forward || c === cfg.cmd.black_backward) { + ms += cfg.arduino.black.before; + ms += cfg.arduino.black.after; + ms += cfg.arduino.cam.time; + ms += cfg.arduino.cam.delay; + ms += cfg.arduino.serialDelay; + } + ms += cfg.arduino.sequenceDelay; + if (c === cfg.cmd.camera_forward || c === cfg.cmd.black_forward) { + cam_total++; + } + if (c === cfg.cmd.camera_backward || c === cfg.cmd.black_backward) { + cam_total--; + } + if (c === cfg.cmd.projector_forward) { + proj_total++; + } + if (c === cfg.cmd.projector_backward) { + proj_total--; + } + } + //timing + ms = ms * this.gridLoops; + if (ms < 2000) { + $('#seq_stats .timing span').text(ms + 'ms'); + } + else { + $('#seq_stats .timing span').text(humanizeDuration(ms)); + } + //ending frames + cam_total = cam_total * this.gridLoops; + proj_total = proj_total * this.gridLoops; + $('#seq_stats .cam_end span').text(gui.fmtZero(cam.pos + cam_total, 6)); + $('#seq_stats .proj_end span').text(gui.fmtZero(proj.pos + proj_total, 6)); + //count + $('#seq_stats .seq_count span').text(real_total.length * this.gridLoops); + return ms; + } + clear() { + this.size = 24; + this.unsetAll(); + this.progress(0, 0); + } + cancel() { + gui.spinner(true, `Cancelling sequence...`); + this.running = false; + this.stop(); + } } - -seq.listen = function () { - ipcRenderer.on(seq.id, seq.listener); -} - -seq.listener = function (event, arg) { - //console.log(JSON.stringify(arg)) - if (arg.start) { - if (typeof arg.loop !== 'undefined' && typeof arg.step !== 'undefined') { - seq.activeStep(arg.step); - log.info(`Step ${arg.step + 1}/${seq.arr.length}, Loop ${arg.loop + 1}/${seq.loops}`, 'SERIAL', true); - } else if (typeof arg.loop !== 'undefined') { - $('#loop_current').text(gui.fmtZero(arg.loop + 1, 6)); - } else { - seq.progress(0, 0); - } - } else if (arg.stop) { - if (typeof arg.loop !== 'undefined' && typeof arg.step !== 'undefined') { - //console.log(JSON.stringify(arg)) - seq.progress(arg.step + 1, arg.loop); - seq.inactiveAll(); - } else if (typeof arg.loop !== 'undefined') { - $('#loop_current').text(''); - } else { - gui.overlay(false); - gui.spinner(false); - log.info('Sequence stopped', 'SERIAL', true); - } - } - return event.returnValue = true; -} - -seq.progress = function (step, loop) { - const elem = $('.progress-bar'); - const len = seq.arr.length; - const total = len * seq.loops; - let pos = (loop * len) + step; - let progress = 0; - - if (pos > 0 && total > 0) { - progress = (pos / total) * 100; - } - - //console.log(`${progress}%`) - - elem.attr('aria-valuenow', progress); - elem.css('width', `${progress}%`); -} - -seq.activeStep = function (x) { - seq.inactiveAll(); - //console.log(`.row input[x=${x + ''}]`) - $(`.row input[x=${x + ''}]`).addClass('h'); - $(`#numbers div[x=${x + ''}]`).addClass('h'); -} - -seq.inactiveAll = function () { - $('.row input').removeClass('h'); - $('#numbers div').removeClass('h'); -} - -seq.stop = function (s) { - 'use strict'; - ipcRenderer.send(seq.id, { stop : true }); - $('#loop_current').text(''); -}; -//start the sequencer from the grid -seq.start = function () { - 'use strict'; - seq.time = +new Date(); - seq.arr = seq.grid; - seq.loops = seq.gridLoops; - ipcRenderer.send(seq.id, { start : true }); -}; - -//start a pre-set sequence, not using the gui -seq.exec = function (arr, loops) { - 'use strict'; - seq.time = +new Date(); - seq.arr = arr; - seq.loops = loops; - ipcRenderer.send(seq.id, { start : true, arr, loops }); -}; - -seq.set = function (x, cmd) { - 'use strict'; - let increase = 0; - if (x >= seq.grid.length + 1) { - increase = x - seq.grid.length; - for (let i = 0; i < increase; i++) { - seq.grid.push({}); - } - } - if (!seq.grid[x]) seq.grid[x] = {}; - seq.grid[x].x = x; - seq.grid[x].cmd = cmd; - if (cmd.indexOf('C') !== -1) { - seq.grid[x].light = light.color; - } else { - if (seq.grid[x].light) { - delete seq.grid[x].light; - } - } - //set - ipcRenderer.send(seq.id, { set : [ seq.grid[x] ] }); - //update grid? -} - -seq.unsetAll = function () { - const len = seq.grid.length; - const steps = []; - for (let i = 0; i < len; i++) { - if (typeof seq.grid[i] !== 'undefined') { - steps.push(i); - } - } - ipcRenderer.send(seq.id, { unset : steps }); - seq.grid = []; -} - -seq.unset = function (x) { - 'use strict'; - seq.grid[x] = undefined - ipcRenderer.send(seq.id, { unset : [ x ]}); -} - -/** - * Set the light value at a specific step and then update - * GUI grid via .state() - * - * @param {integer} x Step in sequence - * @param {array} rgb Light value in RGB - **/ -seq.setLight = function (x, rgb) { - 'use strict'; - let color = rgb.join(','); - seq.grid[x].light = color; - ipcRenderer.send(seq.id, { x, cmd : seq.grid[x].cmd, light : color }); -}; - -/** - * Function bound to the change event on the loop counter - * input element - * - * @param {integer} count Integer to set loops to - */ -seq.setLoops = function (count) { - 'use strict'; - seq.gridLoops = count; - seq.stats(); - ipcRenderer.send(seq.id, { loops : seq.gridLoops }) -}; - -seq.stats = function () { - 'use strict'; - let ms = 0; - let c = ''; - let cam_total = 0; - let proj_total = 0; - let real_total = seq.grid.filter(function (elem) { - if (elem === undefined) { - return false; - } - return true; - }); - - //timing - for (let step of seq.grid) { - c = seq.cmd; - if (c === cfg.cmd.camera_forward || c === cfg.cmd.camera_backward){ - ms += cfg.arduino.cam.time; - ms += cfg.arduino.cam.delay; - ms += cfg.arduino.serialDelay; - } - if (c === cfg.cmd.projector_forward || c === cfg.cmd.projector_backward){ - ms += cfg.arduino.proj.time; - ms += cfg.arduino.proj.delay; - ms += cfg.arduino.serialDelay; - } - if (c === cfg.cmd.black_forward || c === cfg.cmd.black_backward){ - ms += cfg.arduino.black.before; - ms += cfg.arduino.black.after; - ms += cfg.arduino.cam.time; - ms += cfg.arduino.cam.delay; - ms += cfg.arduino.serialDelay; - } - ms += cfg.arduino.sequenceDelay; - - if (c === cfg.cmd.camera_forward || c === cfg.cmd.black_forward) { - cam_total++; - } - if (c === cfg.cmd.camera_backward || c === cfg.cmd.black_backward) { - cam_total--; - } - if (c === cfg.cmd.projector_forward) { - proj_total++; - } - if (c === cfg.cmd.projector_backward) { - proj_total--; - } - } - - //timing - ms = ms * seq.gridLoops; - if (ms < 2000) { - $('#seq_stats .timing span').text(ms + 'ms'); - } else { - $('#seq_stats .timing span').text(humanizeDuration(ms)); - } - - //ending frames - cam_total = cam_total * seq.gridLoops; - proj_total = proj_total * seq.gridLoops; - - $('#seq_stats .cam_end span').text(gui.fmtZero(cam.pos + cam_total, 6)); - $('#seq_stats .proj_end span').text(gui.fmtZero(proj.pos + proj_total, 6)); - - //count - $('#seq_stats .seq_count span').text(real_total.length * seq.gridLoops); - return ms; -}; - -seq.clear = function () { - 'use strict'; - seq.size = 24; - seq.unsetAll(); - seq.progress(0, 0); -}; - -seq.cancel = function () { - gui.spinner(true, `Cancelling sequence...`); - seq.running = false; - seq.stop(); -} - - -module.exports = seq; \ No newline at end of file +seq = new Sequence(); +module.exports = seq; diff --git a/app/package.json b/app/package.json index 22b8e50..fe9789c 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.4.8", + "version": "1.4.9", "description": "GUI for the mcopy small gauge film optical printer platform", "main": "main.js", "scripts": { diff --git a/app/scripts/compile.sh b/app/scripts/compile.sh index af659a6..3ab0abe 100644 --- a/app/scripts/compile.sh +++ b/app/scripts/compile.sh @@ -1,3 +1,4 @@ #!/bin/sh ./node_modules/.bin/tsc ./src/lib/ui/grid.ts --outFile ./lib/ui/grid.js --noImplicitAny --lib ES2017 --lib ES2016 --lib dom -t ES2016 +./node_modules/.bin/tsc ./src/lib/ui/seq.ts --outFile ./lib/ui/seq.js --noImplicitAny --lib ES2017 --lib ES2016 --lib dom -t ES2016 diff --git a/app/src/lib/ui/seq.ts b/app/src/lib/ui/seq.ts new file mode 100644 index 0000000..20a11cb --- /dev/null +++ b/app/src/lib/ui/seq.ts @@ -0,0 +1,271 @@ +'use strict' + +/// + +declare var gui : any; +declare var grid : any; +declare var light : any; +declare var cfg : any; +declare var log : any; +declare var w2popup : any; +declare var cam : any; +declare var proj : any; +declare var ipcRenderer : any; +declare var humanizeDuration : Function; + +interface Arg { + loop : number; + step : number; + stop : boolean; + start : boolean; +} + +interface Step { + cmd : string; + light: string; + x : number; +} + +let seq : any = {}; + + +class Sequence { + private id : string = 'sequence'; + public grid : any[] = []; + public gridLoops : number = 1; + public arr : any[] = []; + public loops : number = 1; + public size : number = 24; + private time : number = 0; + private running : boolean = false; + constructor () { + + } + public init () { + this.listen(); + } + private listen () { + ipcRenderer.on(this.id, this.listener.bind(this)) + } + private listener (event : Event, arg : Arg) { + //console.log(JSON.stringify(arg)) + if (arg.start) { + if (typeof arg.loop !== 'undefined' && typeof arg.step !== 'undefined') { + this.activeStep(arg.step); + log.info(`Step ${arg.step + 1}/${this.arr.length}, Loop ${arg.loop + 1}/${this.loops}`, 'SERIAL', true); + } else if (typeof arg.loop !== 'undefined') { + $('#loop_current').text(gui.fmtZero(arg.loop + 1, 6)); + } else { + this.progress(0, 0); + } + } else if (arg.stop) { + if (typeof arg.loop !== 'undefined' && typeof arg.step !== 'undefined') { + //console.log(JSON.stringify(arg)) + this.progress(arg.step + 1, arg.loop); + this.inactiveAll(); + } else if (typeof arg.loop !== 'undefined') { + $('#loop_current').text(''); + } else { + gui.overlay(false); + gui.spinner(false); + log.info('Sequence stopped', 'SERIAL', true); + } + } + return event.returnValue = true; + } + + private progress (step : number, loop : number) { + const elem : any = $('.progress-bar'); + const len : number = this.arr.length; + const total : number = len * this.loops; + let pos : number = (loop * len) + step; + let progress : number = 0; + + if (pos > 0 && total > 0) { + progress = (pos / total) * 100; + } + + elem.attr('aria-valuenow', progress); + elem.css('width', `${progress}%`); + } + + private activeStep (x : number) { + const step : string = String(x); + this.inactiveAll(); + $(`.row input[x=${step}]`).addClass('h'); + $(`#numbers div[x=${step}]`).addClass('h'); + } + + private inactiveAll () { + $('.row input').removeClass('h'); + $('#numbers div').removeClass('h'); + } + + public stop () { + ipcRenderer.send(this.id, { stop : true }); + $('#loop_current').text(''); + } + //start the sequencer from the grid + public start () { + this.time = +new Date(); + this.arr = JSON.parse(JSON.stringify(this.grid)); + this.loops = this.gridLoops + 0; + ipcRenderer.send(this.id, { start : true }); + } + //start a pre-set sequence, not using the gui + public exec (arr : any[], loops : number) { + this.time = +new Date(); + this.arr = arr; + this.loops = loops; + ipcRenderer.send(this.id, { start : true, arr, loops }); + } + + public set (x : number, cmd : string) { + let increase : number = 0; + if (x >= this.grid.length + 1) { + increase = x - this.grid.length; + for (let i : number = 0; i < increase; i++) { + this.grid.push({}); + } + } + if (!this.grid[x]) this.grid[x] = {}; + this.grid[x].x = x; + this.grid[x].cmd = cmd; + if (cmd.indexOf('C') !== -1) { + this.grid[x].light = light.color; + } else { + if (this.grid[x].light) { + delete this.grid[x].light; + } + } + //set + ipcRenderer.send(this.id, { set : [ this.grid[x] ] }); + //update grid? + } + public unsetAll () { + const len : number = this.grid.length; + const steps : number[] = []; + for (let i : number = 0; i < len; i++) { + if (typeof this.grid[i] !== 'undefined') { + steps.push(i); + } + } + ipcRenderer.send(this.id, { unset : steps }); + this.grid = []; + } + + public unset (x : number) { + this.grid[x] = undefined; //revist this + ipcRenderer.send(this.id, { unset : [ x ]}); + } + + /** + * Set the light value at a specific step and then update + * GUI grid via .state() + * + * @param {integer} x Step in sequence + * @param {array} rgb Light value in RGB + **/ + public setLight (x : number, rgb : number[]) { + let color : string = rgb.join(','); + this.grid[x].light = color; + ipcRenderer.send(this.id, { x, cmd : this.grid[x].cmd, light : color }); + } + + /** + * Function bound to the change event on the loop counter + * input element + * + * @param {integer} count Integer to set loops to + */ + public setLoops (count : number) { + this.gridLoops = count; + this.stats(); + ipcRenderer.send(this.id, { loops : this.gridLoops }) + } + + public stats () { + let ms : number = 0; + let c : string = ''; + let cam_total : number = 0; + let proj_total : number = 0; + let real_total : Step[] = this.grid.filter((elem : any) => { + if (elem == undefined) { + return false; + } + return true; + }); + + //timing + for (let step of this.grid) { + if (!step) continue + c = step.cmd; + if (c === cfg.cmd.camera_forward || c === cfg.cmd.camera_backward){ + ms += cfg.arduino.cam.time; + ms += cfg.arduino.cam.delay; + ms += cfg.arduino.serialDelay; + } + if (c === cfg.cmd.projector_forward || c === cfg.cmd.projector_backward){ + ms += cfg.arduino.proj.time; + ms += cfg.arduino.proj.delay; + ms += cfg.arduino.serialDelay; + } + if (c === cfg.cmd.black_forward || c === cfg.cmd.black_backward){ + ms += cfg.arduino.black.before; + ms += cfg.arduino.black.after; + ms += cfg.arduino.cam.time; + ms += cfg.arduino.cam.delay; + ms += cfg.arduino.serialDelay; + } + ms += cfg.arduino.sequenceDelay; + + if (c === cfg.cmd.camera_forward || c === cfg.cmd.black_forward) { + cam_total++; + } + if (c === cfg.cmd.camera_backward || c === cfg.cmd.black_backward) { + cam_total--; + } + if (c === cfg.cmd.projector_forward) { + proj_total++; + } + if (c === cfg.cmd.projector_backward) { + proj_total--; + } + } + + //timing + ms = ms * this.gridLoops; + if (ms < 2000) { + $('#seq_stats .timing span').text(ms + 'ms'); + } else { + $('#seq_stats .timing span').text(humanizeDuration(ms)); + } + + //ending frames + cam_total = cam_total * this.gridLoops; + proj_total = proj_total * this.gridLoops; + + $('#seq_stats .cam_end span').text(gui.fmtZero(cam.pos + cam_total, 6)); + $('#seq_stats .proj_end span').text(gui.fmtZero(proj.pos + proj_total, 6)); + + //count + $('#seq_stats .seq_count span').text(real_total.length * this.gridLoops); + return ms; + } + + public clear () { + this.size = 24; + this.unsetAll(); + this.progress(0, 0); + } + + public cancel () { + gui.spinner(true, `Cancelling sequence...`); + this.running = false; + this.stop(); + } +} + +seq = new Sequence(); + +module.exports = seq; \ No newline at end of file diff --git a/cli/package.json b/cli/package.json index 44d56d7..a875f93 100644 --- a/cli/package.json +++ b/cli/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-cli", - "version": "1.4.8", + "version": "1.4.9", "description": "CLI for controlling the mcopy optical printer platform", "main": "index.js", "scripts": { diff --git a/data/cfg.json b/data/cfg.json index f07a098..0dbb2d5 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.4.8", + "version": "1.4.9", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/package-lock.json b/package-lock.json index 96a59f7..f0bb0e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.4.8", + "version": "1.4.9", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e101b60..9201f42 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.4.8", + "version": "1.4.9", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": {