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 +6 -1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7ca9ade4ea - Show all commits

7
app/www/index.html
View File

@ -474,6 +474,7 @@ null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"
'use strict'; 'use strict';
var exposure; var exposure;
var scale; var scale;
var scaledExposure;
if (res.frame.dir !== true) { if (res.frame.dir !== true) {
$('#dir').prop('checked', true); $('#dir').prop('checked', true);
STATE.dir = res.frame.dir; STATE.dir = res.frame.dir;
@ -481,15 +482,19 @@ null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"
} }
$('#counter').val(res.counter); $('#counter').val(res.counter);
STATE.count = res.counter; STATE.count = res.counter;
if (res.frame.exposure === 0) { if (res.frame.exposure === 0) {
res.frame.exposure = BOLEX.expected; res.frame.exposure = BOLEX.expected;
} }
$('#exposure').val(res.frame.exposure);
STATE.exposure = res.frame.exposure; STATE.exposure = res.frame.exposure;
exposure = shutter(STATE.exposure); exposure = shutter(STATE.exposure);
$('#str').text(exposure.str); $('#str').text(exposure.str);
scale = scaleAuto(STATE.exposure); scale = scaleAuto(STATE.exposure);
$('#scale').val(scale); $('#scale').val(scale);
STATE.scale = scale;
scaledExposure = scaleTime(STATE.exposure, STATE.scale);
$('#exposure').val(scaledExposure);
$('#delay').val(res.frame.delay); $('#delay').val(res.frame.delay);
STATE.delay = res.frame.delay; STATE.delay = res.frame.delay;
}; };