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

2
app/www/index.html
View File

@ -52,7 +52,7 @@
<button id="seq" onclick="sequence();">START SEQUENCE</button> <button id="seq" onclick="sequence();">START SEQUENCE</button>
</div> </div>
<div> <div>
<button id="frame" onclick="frame();">1 FRAME</button> <button id="frame" onclick="frame();">+1 FRAME</button>
</div> </div>
</div> </div>
<div id="settings" class="page"> <div id="settings" class="page">

13
app/www/static/js/intval.core.js
View File

@ -113,12 +113,15 @@ var setDelayScale = function () {
var setDirLabel = function (dir) { var setDirLabel = function (dir) {
const bwdLabel = document.getElementById('bwdLabel'); const bwdLabel = document.getElementById('bwdLabel');
const fwdLabel = document.getElementById('fwdLabel'); const fwdLabel = document.getElementById('fwdLabel');
const but = document.getElementById('frame');
if (dir) { if (dir) {
bwdLabel.classList.remove('selected') bwdLabel.classList.remove('selected');
fwdLabel.classList.add('selected') fwdLabel.classList.add('selected');
frame.innerHTML = '+1 FRAME';
} else { } else {
fwdLabel.classList.remove('selected') fwdLabel.classList.remove('selected');
bwdLabel.classList.add('selected') bwdLabel.classList.add('selected');
frame.innerHTML = '-1 FRAME';
} }
}; };
var incCounter = function (val) { var incCounter = function (val) {
@ -162,7 +165,7 @@ var setState = function (res) {
exposure = shutter(STATE.exposure); exposure = shutter(STATE.exposure);
exposureScale = scaleAuto(STATE.exposure); exposureScale = scaleAuto(STATE.exposure);
document.getElementById('str').value = exposure.str; document.getElementById('str').innerHTML = exposure.str;
document.getElementById('scale').value = exposureScale; document.getElementById('scale').value = exposureScale;
setExposureScale(); setExposureScale();

2
app/www/static/js/intval.web.js
View File

@ -89,7 +89,7 @@ web.setExposureSuccess = function (res) {
} }
STATE.exposure = res.exposure; STATE.exposure = res.exposure;
exposure = shutter(STATE.exposure); exposure = shutter(STATE.exposure);
document.getElementById('str').value = exposure.str; document.getElementById('str').innerHTML = exposure.str;
console.log(`setExposure to ${res.exposure}`); console.log(`setExposure to ${res.exposure}`);
}; };
web.setDelay = function () { web.setDelay = function () {