Merge branch 'master' of https://github.com/scimusmn/Vieworks-Node-Module

Author: heidgera

app/style.css

@@ -2,6 +2,7 @@ body {
 	background-color: #000000;
 	width: 100%;
 	height: 100%;
+	cursor: none;
 }
 
 .mainTable {
@@ -34,6 +35,10 @@ table {
 
 }
 
+#sbs {
+	visibility: hidden;
+}
+
 #visitor-caps{
 	width:600px;
 	text-align: center;

app/thumbSelect_revise.js

@@ -16,7 +16,7 @@ var thumbnail = inheritFrom(HTMLElement, function() {
 
     _this.reset = () => {
       _this.className = '';
-      _this.thumb.src = _this.setName.replace('-', '/') + '/thumb.jpg';
+      _this.thumb.src = _this.setName.replace('-', '/') + '/thumb.jpg?'+Math.random();
     };
 
     _this.onmousedown = () => {
@@ -34,8 +34,15 @@ var thumbnail = inheritFrom(HTMLElement, function() {
         thumbClick();
 				_this.className = 'thumbSelect';
         _this.player.loadSet(_this.setName.replace('-', '/') + '/');
+        setTimeout(()=>{
+          _this.player.play();
+        },2000)
       }
     };
+
+    _this.refreshSet = function() {
+      _this.thumb.src = _this.setName.replace('-', '/') + '/thumb.jpg?'+Math.random();
+    }
   };
 
   this.attributeChangedCallback = function(attr, oldVal, newVal) {
@@ -97,6 +104,7 @@ window.setGroup = function(flp, parent, rws, clm, asTable) {
     if (µ('[setName=' + setName + ']') && µ('[setName=' + setName + ']').length) {
       var set = µ('[setName=' + setName + ']')[0];
       set.setAttribute('setName', setName);
+      set.refreshSet();
       if (parent.childNodes.length > 1) {
         var temp = parent.removeChild(set);
         parent.insertBefore(temp, parent.firstChild);
@@ -107,7 +115,7 @@ window.setGroup = function(flp, parent, rws, clm, asTable) {
       var newSet = document.createElement('thumb-nail');//new setPointer(setName,flipPlr);
       newSet.setAttribute('setName', setName);
       newSet.setPlayer(flipPlr);
-
+      //newSet.refreshSet();
       //if(!visitorMode) newSet.setCelebMode(this);
       var curNum = sets.length;
       sets.push(newSet);

assets/audio/click.mp3

@@ -12,10 +12,11 @@ <h1>Hello World!</h1>
     and Electron <script>document.write(process.versions.electron)</script>.
     <audio id='beep' src='assets/audio/beep.mp3'></audio>
     <audio id='longBeep' src='assets/audio/long_beep.mp3'></audio>
-    <!-- <audio id='audio_1' src='assets/audio/beep.mp3'></audio>
-    <audio id='audio_2' src='assets/audio/beep.mp3'></audio>
-    <audio id='audio_3' src='assets/audio/beep.mp3'></audio>
-    <audio id='audio_4' src='assets/audio/long_beep.mp3'></audio> -->
+    <audio id='click' src='assets/audio/click.mp3'></audio>
+    <audio id='audio_3' src='assets/audio/three.mp3'></audio>
+    <audio id='audio_2' src='assets/audio/two.mp3'></audio>
+    <audio id='audio_1' src='assets/audio/one.mp3'></audio>
+    <audio id='audio_0' src='assets/audio/go.mp3'></audio>
   </body>
 
   <script>

assets/audio/go.mp3

@@ -30,10 +30,21 @@ beep.load();
 let longBeep = document.querySelector('#longBeep');
 longBeep.load();
 
+let clickTrack = document.querySelector('#click');
+clickTrack.load();
+
+let audio = [];
+
+for (var i = 0; i < 4; i++) {
+  audio.push(document.querySelector('#audio_' + (i)));
+  audio[i].load();
+}
+
 
 let idleTO = null;
 
 let resetIdleTimeout = () => {
+  console.log()
   if (idleTO) clearTimeout(idleTO);
   idleTO = setTimeout(()=> {
     alternateVideo();
@@ -63,6 +74,7 @@ var showGo = () => {
 
 var alternateVideo = () => {
   arduino.digitalWrite(6, 0);
+  console.log("alternate");
   setTimeout(() => {
     arduino.digitalWrite(6, 1);
   }, 100);
@@ -141,34 +153,46 @@ var pollLight = new function(){
 var countdown = (count) => {
   pollLight.setStage(count);
   if (count > 0) {
-    if(!beep.paused){
+    /*if(audio[i+1]&&!audio[i+1].paused){
       beep.pause();
       beep.currentTime = 0;
-    }
-    if(count<4) beep.play();
+    }*/
+    if(count<4) audio[count].play();
     setTimeout(() => { countdown(count - 1); }, 1000);
+    if(count == 1 ) cam.capture();
   } else {
-    longBeep.play();
+    //longBeep.play();
+    audio[count].play();
+    clickTrack.play();
+    //audio[count].onended = function () {
+      //longBeep.play();
+    //}
     pollLight.blink();
-    cam.capture();
+    //longBeep.play();
+    //cam.capture();
     console.log('start capture');
 
     setTimeout(function() {
+      //beep.play();
       pollLight.stopBlink();
       pollLight.setRed();
       cam.stopCapture();
       console.log('done capturing');
       var dir = './app/sequences/temp' + dirNum++;
+      if(dirNum>=21) dirNum = 0;
       greenExitLight(1);
       redExitLight(0);
       if (!fs.existsSync(dir)) {
         fs.mkdirSync(dir);
         save(dir);
+        fs.utimesSync(dir,NaN,NaN);
       } else {
+
         var exec = require('child_process').exec;
         exec('rm -r'+dir, ()=>{
           //fs.mkdirSync(dir);
           save(dir);
+          fs.utimesSync(dir,NaN, NaN);
         });
       }
 
@@ -191,7 +215,7 @@ arduino.connect(cfg.portName, function() {
       cam.ready = false;
       countdown(5);
       greenExitLight(0);
-      redExitLight(1);
+      redExitLight(0);
       greenEntranceLight( 0);
       redEntranceLight( 1);
     }
@@ -245,7 +269,7 @@ arduino.connect(cfg.portName, function() {
 cam.setFrameRate(200);
 cam.setImageGain(6);
 
-cam.allocateBuffer(600);
+cam.allocateBuffer(800);
 
 cam.start();
 cam.ready = true;
@@ -257,8 +281,11 @@ var dirNum = 0;
 function readDir(path) {
   var files = fs.readdirSync(path);
 
-  files.sort(function(b, a) {
-    return fs.statSync('./' + path + a).mtime.getTime() - fs.statSync('./' + path + b).mtime.getTime();
+  files.sort(function(a, b) {
+    //console.log("Create time for " + a+" is " + fs.statSync('./' + path + a).atime.getTime());
+    //console.log("Create time for " + b +" is " + fs.statSync('./' + path + b).atime.getTime());
+
+    return fs.statSync('./' + path + a).atime.getTime() - fs.statSync('./' + path + b).atime.getTime();
   });
 
   for (var i = 0; i < files.length; i++) {
@@ -297,7 +324,7 @@ function onOpen() {
   var celFiles = readDir('app/celeb_seq/');
   if (webSock) {
     for (var i = 0; i < files.length; i++) {
-      console.log(files[i]);
+      //console.log(files[i]);
       webSock.send('seq=' + files[i].substring(4));
     }
 
@@ -306,3 +333,10 @@ function onOpen() {
     }
   }
 }
+
+document.onkeypress = (e) => {
+  var press = String.fromCharCode(e.keyCode);
+  if(press = 'g') {
+    showGo();
+  }
+}