diff --git a/public/img/footer/m-cloclo.jpg b/public/img/footer/m-cloclo.jpg index 0d77ec4..47b0d5f 100644 Binary files a/public/img/footer/m-cloclo.jpg and b/public/img/footer/m-cloclo.jpg differ diff --git a/public/img/footer/m-cloclo.xcf b/public/img/footer/m-cloclo.xcf new file mode 100644 index 0000000..e1d3af8 Binary files /dev/null and b/public/img/footer/m-cloclo.xcf differ diff --git a/routes/index.js b/routes/index.js index 1da36bd..947c342 100644 --- a/routes/index.js +++ b/routes/index.js @@ -27,7 +27,7 @@ BOB_mod_router.get('/booth/build/:boothId', function(req, res, next) { BOB_tol_booth.buildBooth(req.params.boothId, function(pErr) { BOB_cfg_config.io.emit('boothState'); BOB_var_boothInProgress -= 1; - res.send(pErr); + res.json({ error: pErr, data : null, boothId: req.params.boothId}); }); }) @@ -47,7 +47,7 @@ BOB_mod_router.get('/dslr/takepicture/:boothId/:pictId', function(req, res, next /* GET view page. */ BOB_mod_router.get('/download/final/hd/:pictId', function(req, res, next) { - res.download('public/img/final/'+req.params.pictId); + res.download('/home/cocoon/workspace/bobinoscope/public/img/final/'+req.params.pictId); }); @@ -55,7 +55,7 @@ BOB_mod_router.get('/download/final/hd/:pictId', function(req, res, next) { BOB_var_gamepad.init() // List the state of all currently attached devices for (var i = 0, l = BOB_var_gamepad.numDevices(); i < l; i++) { - console.log(i, BOB_var_gamepad.deviceAtIndex()); + console.log(i, BOB_var_gamepad.deviceAtIndex(i)); } // Create a game loop and poll for events setInterval(BOB_var_gamepad.processEvents, 16); diff --git a/tools/tools-gphoto2.js b/tools/tools-gphoto2.js index a99bd4a..02ab49b 100644 --- a/tools/tools-gphoto2.js +++ b/tools/tools-gphoto2.js @@ -20,6 +20,7 @@ function BOB_upCameraReference(pCallback) { if (list.length === 0) { return pCallback(); } else { + console.log(list) BOB_var_camera = list[0]; console.log(BOB_var_camera.model); return pCallback(); diff --git a/tools/tools-photobooth.js b/tools/tools-photobooth.js index ef6911a..287fb1b 100644 --- a/tools/tools-photobooth.js +++ b/tools/tools-photobooth.js @@ -34,8 +34,6 @@ BOB_module.buildBooth = function(pBoothId, pCallback) { .gravity('Center') .resize(BOB_cfg_config.cropSize.width, BOB_cfg_config.cropSize.height, "^") .crop(BOB_cfg_config.cropSize.width, BOB_cfg_config.cropSize.height) - // .modulate(100, 0) - // .contrast(+2) .write(dstPict, function(pErr) { if(pErr) console.log("Failed to resize picture", pErr) pCb() @@ -60,8 +58,8 @@ function BOB_generateBooth(pBoothId, pType, pCallback) { outPict.fill(BOB_cfg_config.background); outPict.drawRectangle(0, 0, BOB_cfg_config.booths[pType].resolution.width, BOB_cfg_config.booths[pType].resolution.height); - - outPict.draw('image Over 0,2080 1600,300 \''+BOB_cfg_config.footer+'\''); + // Draw footer + outPict.draw('image Over 0,2070 1600,280 \''+BOB_cfg_config.footer+'\''); BOB_cfg_config.pictNames.forEach(function(pPictName, pIndex) { var cmdDraw = 'image Over'; @@ -71,7 +69,7 @@ function BOB_generateBooth(pBoothId, pType, pCallback) { cmdDraw += ','+BOB_cfg_config.booths[pType].layout[pIndex].height; cmdDraw += ' \''+BOB_mod_path.join(prebuiltPath, pPictName)+'\''; - console.log(cmdDraw); + // console.log(cmdDraw); outPict.draw(cmdDraw); }) diff --git a/views/index.ejs b/views/index.ejs index a76ccd5..08866ab 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -16,11 +16,20 @@