16mm
/
intval3
1
0
Fork 0
Code Issues 1 Pull Requests 9 Projects Releases Wiki Activity

Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
Conversation 0 Commits 416 Files Changed 85 +17 -8
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 11bf8b95f8 - Show all commits

12
index.js
View File

@ -287,13 +287,15 @@ function rSequence (req, res, next) {
exposure = req.body.exposure exposure = req.body.exposure
} }
} }
if (sequence._state.active) { if (intval._state.sequence && sequence._state.active) {
return sequence.stop(() => { return sequence.setStop(() => {
intval._state.sequence = false
res.send({ stopped : true }) res.send({ stopped : true })
return next() return next()
}) })
} else { } else {
console.time('sequence time') console.time('sequence time')
intval._state.sequence = true
sequence.start({ sequence.start({
loop : [ (next) => { loop : [ (next) => {
intval.frame(dir, exposure, (len) => { intval.frame(dir, exposure, (len) => {
@ -433,12 +435,14 @@ function bSequence (obj, cb) {
exposure = obj.exposure exposure = obj.exposure
} }
} }
if (sequence._state.active) { if (intval._state.sequence && sequence._state.active) {
return sequence.stop(() => { return sequence.setStop(() => {
intval._state.sequence = false
return cb() return cb()
}) })
} else { } else {
console.time('sequence time') console.time('sequence time')
intval._state.sequence = true
sequence.start({ sequence.start({
loop : [ (next) => { loop : [ (next) => {
intval.frame(dir, exposure, (len) => { intval.frame(dir, exposure, (len) => {

13
lib/sequence/index.js
View File

@ -43,8 +43,9 @@ sequence.start = function (options, cb) {
sequence.step() sequence.step()
} }
sequence.setStop = function () { sequence.setStop = function (cb) {
sequence._state.active = false sequence._state.active = false
sequence._state.input = cb
} }
sequence.stop = function () { sequence.stop = function () {
@ -57,7 +58,9 @@ sequence.stop = function () {
sequence._loop.arr = [] sequence._loop.arr = []
if (sequence._state.stop) sequence._state.stop() if (sequence._state.stop) sequence._state.stop()
if (sequence._state.input) sequence._state.input()
sequence._state.stop = null sequence._state.stop = null
sequence._state.input = null
} }
sequence.pause = function () { sequence.pause = function () {
@ -75,6 +78,7 @@ sequence.step = function () {
if (sequence._state.count > sequence._state.arr.length) { if (sequence._state.count > sequence._state.arr.length) {
return sequence.stop() return sequence.stop()
} }
log.info('step')
return sequence._state.arr[sequence._state.count](() => { return sequence._state.arr[sequence._state.count](() => {
sequence._state.count++ sequence._state.count++
sequence.step() sequence.step()
@ -84,9 +88,10 @@ sequence.step = function () {
sequence._state.count = 0 sequence._state.count = 0
sequence._loop.count++ sequence._loop.count++
} }
if (sequence._loop.max > 0 &&sequence._loop.count > sequence._loop.max) { if (sequence._loop.max > 0 && sequence._loop.count > sequence._loop.max) {
return sequence.stop() return sequence.stop()
} }
log.info()
return sequence._loop.arr[sequence._state.count](() => { return sequence._loop.arr[sequence._state.count](() => {
sequence._state.count++ sequence._state.count++
sequence.step() sequence.step()
@ -95,9 +100,9 @@ sequence.step = function () {
return sequence.stop() return sequence.stop()
} }
} else if (sequence._state.paused) { } else if (sequence._state.paused) {
log.info('Sequence paused', { loop : sequence._loop.count, count : sequence._state.count }) log.info('step', 'Sequence paused', { loop : sequence._loop.count, count : sequence._state.count })
} else if (!sequence._state.active) { } else if (!sequence._state.active) {
log.info('Sequence stopped', { loop : sequence._loop.count, count : sequence._state.count }) log.info('step', 'Sequence stopped', { loop : sequence._loop.count, count : sequence._state.count })
} }
} }