protonphoton/snap2laz
7
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

[wip] Batch of enhancements

Browse Source
This commit is contained in:
Alban 2020-11-05 08:49:18 +00:00
parent 9aa91985c9
commit 13888ccf38
7 changed files with 5804 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
index.html
View File

@ -3,22 +3,33 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=Edge" /> <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta name="mobile-web-app-capable" content="yes">
<title>Camera to laser roxxx!! </title> <title>Camera to laser roxxx!! </title>
<meta name="description" content="The" /> <meta name="description" content="The" />
<style> <style>
video { border: 1px solid #ccc; display: block; margin: 0 0 20px 0; } video,canvas { border: 1px solid #ccc; display: block; margin: auto; }
#canvas { margin-top: 20px; border: 1px solid #ccc; display: block; } #canvas { display: block; }
span.ui-slider-handle.ui-corner-all.ui-state-default { background: dodgerblue;} span.ui-slider-handle.ui-corner-all.ui-state-default { background: dodgerblue;}
canvas#simuCanvas {background: #333;} canvas#simuCanvas {background: #333;}
div.select {
display: inline-block;
margin: 0 0 1em 0;
}
p.small {
font-size: 0.7em;
}
label {
width: 12em;
display: inline-block;
}
</style> </style>
<link rel="stylesheet" type="text/css" href="css/bootstrap/css/bootstrap.min.css" /> <link rel="stylesheet" type="text/css" href="css/bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" type="text/css" href="js/jquery-ui/jquery-ui.css" /> <link rel="stylesheet" type="text/css" href="js/jquery-ui/jquery-ui.css" />
<link rel="stylesheet" type="text/css" href="js/cropper/cropper.min.css" /> <link rel="stylesheet" type="text/css" href="js/cropper/cropper.min.css" />
<script src="js/jquery-3.5.1.min.js"></script>
<script src="js/cropper/cropper.min.js"></script>
<script src="js/jquery-ui/jquery-ui.js"></script>
<script src="js/canvas.js"></script>
</head> </head>
<body> <body>
@ -26,42 +37,47 @@
<div class="container-fluid container-md"> <div class="container-fluid container-md">
<div class="row"> <div class="row">
<div class="col-sm col-6">
<video id="video" class="video_sized" autoplay></video>
</div>
<div class="col-sm"> <div class="col-sm">
<h1 class="text-primary">Convert your photos to laser images!</h1>
<p class="lead">Once you allow the browser to use your camera, you can start creating something new by taking a snapshot. </p>
<p class="lead">If you're happy with the result, send it to see it converted to a laser-ready image! </p>
<div class="select"> <div class="select">
<label for="videoSource">Video source: </label> <label for="videoSource">Change camera </label><select id="videoSource" class="custom-select"></select>
<select id="videoSource">
</select>
</div> </div>
<h1 class="text-primary">Send shots to the laser!</h1> <button class="snap btn btn-lg btn-primary">Take a snap</button>
</div>
</div>
<div class="row">
<div class="col-sm">
<video id="video" autoplay></video>
</div>
<div class="col-sm">
<button class="snap btn btn-lg btn-primary">Take a picture!</button>
<p class="lead">By allowing the use of your camera, you will be able to take snapshots, convert them to black and white images before sending them to the laser server. How cool is that?!</p>
</div> </div>
</div> </div>
<div class="row" id="result"> <div class="row" id="result">
<div class="col-sm"> <div class="col-sm col-6">
<canvas id="canvas" width="640" height="480"></canvas> <div class="video_sized">
<canvas id="canvas" class="video_sized"></canvas>
</div>
</div> </div>
<div class="col-sm"> <div class="col-sm">
<h3 class="snap btn btn-lg btn-primary">Not satisfied of the contrast? </h3> <h1 class="text-primary">Are you satisfied with the contrast? </h3>
<br/> <p>Before sending your snap, change the contrast using the slider to reach the effect you desire.</p><br/>
<div id="slider"></div> <div id="slider"></div>
<br/> <br/>
<div class="float-left">white ++</div> <div class="float-left">
<div class="float-right">++ dark</div><br> <button type="button" class="btn btn-secondary contrast" rel="-5">
<span class="badge badge-light">+</span> white
</button>
</div>
<div class="float-right">
<button type="button" class="btn btn-secondary contrast" rel="5">
<span class="badge badge-light">+</span> black
</button>
</div><br>
<br/> <br/>
<h3>Satisfied? </h3> <h3>Ready to send? </h3>
<p class="lead">Type the text visible on your image (if any) and push Send.</p> <p >If some text is visible on the image, type it before pushing the Send button.</p>
<div class="form-group"> <div class="form-group">
<input id="text" type="text" class="form-control form-control-lg" placeholder="Type text here"/> <input id="text" type="text" class="form-control form-control-lg" placeholder="Type text here"/>
<button id="send" class="form-control form-control-lg btn btn-lg btn-warning btn-block">Send</button> <button id="send" class="form-control form-control-lg btn btn-lg btn-success btn-block">Send</button>
</div> </div>
<div id="messages"> <div id="messages">
@ -69,11 +85,13 @@
</div> </div>
</div> </div>
<div class="row" id="preview"> <div class="row" id="preview">
<div class="col-sm"> <div class="col-sm col-6">
<canvas id="simuCanvas" width="640" height="480"></canvas> <canvas id="simuCanvas" class="video_sized"></canvas>
</div> </div>
<div class="col-sm" > <div class="col-sm" >
<h3>Your images</h3> <h1 class="text-primary">Preview your creation</h1>
<p>Now that your creation have been sent, you can check what they will look like on lasers using these links, sorted by oldest snaps last.</p>
<div id="imageList"></div> <div id="imageList"></div>
</div> </div>
</div> </div>
@ -83,5 +101,11 @@
</main> </main>
<script src="js/jquery-3.5.1.min.js"></script>
<script src="js/cropper/cropper.min.js"></script>
<script src="js/jquery-ui/jquery-ui.js"></script>
<script src="js/canvas.js"></script>
<script src="js/adapter-latest.js"></script>
<script src="js/camera.js" async></script>
</body> </body>
</html> </html>

5623
js/adapter-latest.js Normal file
View File

File diff suppressed because it is too large Load Diff

74
js/camera.js Normal file
View File

@ -0,0 +1,74 @@
/*
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree.
*/
'use strict';
const videoElement = document.querySelector('video');
const videoSelect = document.querySelector('select#videoSource');
const resizableElements = document.querySelectorAll(".video_sized")
const selectors = [ videoSelect];
function gotDevices(deviceInfos) {
// Handles being called several times to update labels. Preserve values.
const values = selectors.map(select => select.value);
selectors.forEach(select => {
while (select.firstChild) {
select.removeChild(select.firstChild);
}
});
for (let i = 0; i !== deviceInfos.length; ++i) {
const deviceInfo = deviceInfos[i];
const option = document.createElement('option');
option.value = deviceInfo.deviceId;
if (deviceInfo.kind === 'videoinput') {
option.text = deviceInfo.label || `camera ${videoSelect.length + 1}`;
videoSelect.appendChild(option);
}
}
selectors.forEach((select, selectorIndex) => {
if (Array.prototype.slice.call(select.childNodes).some(n => n.value === values[selectorIndex])) {
select.value = values[selectorIndex];
}
});
}
navigator.mediaDevices.enumerateDevices().then(gotDevices).catch(handleError);
function gotStream(stream) {
window.stream = stream; // make stream available to console
videoElement.srcObject = stream;
let track = stream.getTracks()[0]
let settings = track.getSettings()
resizableElements.forEach( el => { el.width = settings.width; el.height = settings.height; } )
// Refresh button list in case labels have become available
return navigator.mediaDevices.enumerateDevices();
}
function handleError(error) {
console.log('navigator.MediaDevices.getUserMedia error: ', error.message, error.name);
}
function start() {
if (window.stream) {
window.stream.getTracks().forEach(track => {
track.stop();
});
}
const videoSource = videoSelect.value;
const constraints = {
video: {deviceId: videoSource ? {exact: videoSource} : undefined}
};
navigator.mediaDevices.getUserMedia(constraints).then(gotStream).then(gotDevices).catch(handleError);
}
videoSelect.onchange = start;
start();

158
js/canvas.js
View File

@ -5,8 +5,11 @@ $(document).ready(function(){
var url = document.location.origin var url = document.location.origin
var cropper = null var cropper = null
var snap = null var snap = null
var width;
var height; Cropper.setDefaults({
viewMode: 1,
autoCropArea: 0.9
})
// Grab elements, create settings, etc. // Grab elements, create settings, etc.
var canvas = document.getElementById('canvas'); var canvas = document.getElementById('canvas');
@ -22,114 +25,28 @@ $(document).ready(function(){
**/ **/
function doSnap(){ function doSnap(){
cropper && cropper.destroy() cropper && cropper.destroy()
let width = video.width
let height = video.height
context.drawImage(video, 0, 0, width, height); context.drawImage(video, 0, 0, width, height);
snap = context.createImageData(width, height); snap = context.createImageData(width, height);
snap.data.set( context.getImageData(0, 0, width, height).data ) snap.data.set( context.getImageData(0, 0, width, height).data )
binary(context) binary(context)
$("#result").show() $("#result").show()
// Animation removed: it was causing problems with the send button. Fix.
//$('html, body').animate({scrollTop: $("#result").offset().top}, 2000); //$('html, body').animate({scrollTop: $("#result").offset().top}, 2000);
cropper = new Cropper(canvas);
cropper = new Cropper(canvas,{
viewMode: 3,
autoCropArea: 1
});
} }
function doContrast(){ function doContrast(){
cropper && cropper.destroy() let cropperData = {}
if( cropper ){
cropperData = cropper.getData()
cropper.destroy()
}
context.putImageData(snap,0,0) context.putImageData(snap,0,0)
binary(context) binary(context)
cropper = new Cropper(canvas,{ cropper = new Cropper(canvas);
viewMode: 3, setTimeout( () => { cropper.setData(cropperData) ; },30)
autoCropArea: 1
});
}
// https://raw.githubusercontent.com/samdutton/simpl/gh-pages/getusermedia/sources/js/main.js
var videoElement = document.querySelector('video');
var videoSelect = document.querySelector('select#videoSource');
videoSelect.onchange = getStream;
getStream().then(getDevices).then(gotDevices);
function getDevices() {
// AFAICT in Safari this only gets default devices until gUM is called :/
return navigator.mediaDevices.enumerateDevices();
}
function gotDevices(deviceInfos) {
window.deviceInfos = deviceInfos; // make available to console
for (const deviceInfo of deviceInfos) {
const option = document.createElement('option');
option.value = deviceInfo.deviceId;
option.text = deviceInfo.label || `Camera ${videoSelect.length + 1}`;
videoSelect.appendChild(option);
}
}
function getStream() {
if (window.stream) {
window.stream.getTracks().forEach(track => {
track.stop();
});
}
const videoSource = videoSelect.value;
const constraints = {
video: {deviceId: videoSource ? {exact: videoSource} : undefined}
};
return navigator.mediaDevices.getUserMedia(constraints).
then(gotStream).catch(handleError);
}
function gotStream(stream) {
window.stream = stream; // make stream available to console
videoSelect.selectedIndex = [...videoSelect.options].
findIndex(option => option.text === stream.getVideoTracks()[0].label);
videoElement.srcObject = stream;
}
function handleError(error) {
console.error('Error: ', error);
}
// https://raw.githubusercontent.com/samdutton/simpl/gh-pages/getusermedia/sources/js/main.js
function setCameraResolution( track ){
width = track.getSettings().width
height = track.getSettings().height
$("#video").attr("width",width)
$("#video").attr("height",height)
$("#canvas").attr("width",width)
$("#canvas").attr("height",height)
}
// Put video listeners into place
if(navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
navigator.mediaDevices.getUserMedia(mediaConfig).then(function(stream) {
//video.src = window.URL.createObjectURL(stream);
video.srcObject = stream;
setCameraResolution(stream.getVideoTracks()[0])
video.play();
});
}
/* Legacy code below! */
else if(navigator.getUserMedia) { // Standard
navigator.getUserMedia(mediaConfig, function(stream) {
setCameraResolution(stream.getVideoTracks()[0])
video.src = stream;
video.play();
}, errBack);
} else if(navigator.webkitGetUserMedia) { // WebKit-prefixed
navigator.webkitGetUserMedia(mediaConfig, function(stream){
setCameraResolution(stream.getVideoTracks()[0])
video.src = window.webkitURL.createObjectURL(stream);
video.play();
}, errBack);
} else if(navigator.mozGetUserMedia) { // Mozilla-prefixed
navigator.mozGetUserMedia(mediaConfig, function(stream){
setCameraResolution(stream.getVideoTracks()[0])
video.src = window.URL.createObjectURL(stream);
video.play();
}, errBack);
} }
// Trigger photo take // Trigger photo take
@ -169,13 +86,15 @@ $(document).ready(function(){
} }
$("#result").hide() $("#result").hide()
$( "#slider" ).slider({ var slider = $( "#slider" ).slider({
range: false, range: false,
values: [ binary_level ], value: 100,
animate: 300,
min : 0, min : 0,
max : 255, max : 255,
change: function(event,ui){ change: function(event,ui){
binary_level = ui.value binary_level = ui.value
console.log(`binary_level:${binary_level}`)
doContrast() doContrast()
} }
}); });
@ -185,6 +104,7 @@ $(document).ready(function(){
$("#messages").html('<div class="alert alert-primary" role="alert">Sending...</div>') $("#messages").html('<div class="alert alert-primary" role="alert">Sending...</div>')
$.ajax({ $.ajax({
timeout: 3000,
url: url + "/image", url: url + "/image",
method:"POST", method:"POST",
dataType: "json", dataType: "json",
@ -199,7 +119,7 @@ $(document).ready(function(){
$("#messages").html(`<div class="alert alert-danger" role="alert">Something went wrong: ${msg}</div>`) $("#messages").html(`<div class="alert alert-danger" role="alert">Something went wrong: ${msg}</div>`)
return return
} }
$("#messages").html(`<div class="alert alert-success" role="alert">OK, your image will be on ${d.hash_name}</div>`) $("#messages").html(`<div class="alert alert-success" role="alert">OK, your image will be available in a few seconds as <a href="#${d.hash_name}" class="hash_name btn btn-sm btn-secondary">${d.hash_name}</a></div>`)
imageList = localStorage.getItem("imageList") ? JSON.parse(localStorage.getItem("imageList")) : [] imageList = localStorage.getItem("imageList") ? JSON.parse(localStorage.getItem("imageList")) : []
imageList.push(d.hash_name) imageList.push(d.hash_name)
localStorage.setItem("imageList",JSON.stringify(imageList)) localStorage.setItem("imageList",JSON.stringify(imageList))
@ -215,8 +135,7 @@ $(document).ready(function(){
var simuCanvas = document.getElementById("simuCanvas"); var simuCanvas = document.getElementById("simuCanvas");
var ctx = simuCanvas.getContext("2d"); var ctx = simuCanvas.getContext("2d");
var lastpoint = { x: 0, y: 0, color: 0}; var lastpoint = { x: 0, y: 0, color: 0};
ctx.clearRect(0,0,400,400); var zoom = 1;
var zoom = 0.5;
//ctx.save //ctx.save
Point = function( l ){ Point = function( l ){
@ -232,7 +151,7 @@ $(document).ready(function(){
pointsList = document.pointsList pointsList = document.pointsList
if (pointsList.length > 0) if (pointsList.length > 0)
{ {
ctx.clearRect(0,0,400,400); ctx.clearRect(0,0,simuCanvas.width,simuCanvas.height);
lastpoint = new Point(pointsList[0]) lastpoint = new Point(pointsList[0])
for (var i = 0; i < pointsList.length; i+=1) for (var i = 0; i < pointsList.length; i+=1)
{ {
@ -263,20 +182,22 @@ $(document).ready(function(){
$("#preview").show() $("#preview").show()
html = '' html = ''
for( id in imageList){ for( id in imageList.reverse()){
hash_name = imageList[id] hash_name = imageList[id]
html += `<li><a href="#${hash_name}" class="hash_name" rel="${hash_name}">${hash_name}</a></li>` html += `<li class="list-group-item"><a href="#${hash_name}" class="hash_name btn-sm btn btn-secondary" rel="${hash_name}">${hash_name}</a></li>`
} }
$("#imageList").html(`<ul>${html}</ul>`) $("#imageList").html(`<ul class="list-group">${html}</ul>`)
} }
refreshImageList() refreshImageList()
$("#imageList").on("click",function(e){ var showImage = function(e){
var el = e.target var el = $(e.target)
var hash_name = $(el).attr("rel") if( ! el.hasClass("hash_name") ) { return; }
var hash_name = el.attr("rel")
var u = `${url}/hash_name/${hash_name}` var u = `${url}/hash_name/${hash_name}`
$.ajax({ $.ajax({
timeout: 3000,
url: `${url}/hash_name/${hash_name}`, url: `${url}/hash_name/${hash_name}`,
dataType: "json", dataType: "json",
@ -293,8 +214,21 @@ $(document).ready(function(){
.fail(function(d,m,jq){ .fail(function(d,m,jq){
$("#messages").html(`<div class="alert alert-danger" role="alert">Ooops... Something went wrong: ${jq}</div>`) $("#messages").html(`<div class="alert alert-danger" role="alert">Ooops... Something went wrong: ${jq}</div>`)
}) })
}) }
$("#imageList").on("click", showImage)
$("#messages").on("click", showImage)
$(".contrast").on("click",function(el){
let btn = el.target
let val = Number($(btn).attr("rel"))
let new_binary_level = binary_level + val;
console.log(`new_binary_level:${new_binary_level}`)
if( new_binary_level >= 0 && new_binary_level <= 255){
binary_level = new_binary_level
$("#slider").slider("option","value",binary_level)
}
})
}) })

4
server.py
View File

@ -6,6 +6,7 @@ import hashlib
import json import json
import os import os
import time import time
import sys
# Redis init # Redis init
environ = os.environ environ = os.environ
@ -14,7 +15,7 @@ port = environ['DB_PORT'] if 'DB_PORT' in os.environ else 6379
debug = environ['DEBUG'] if 'DEBUG' in os.environ else False debug = environ['DEBUG'] if 'DEBUG' in os.environ else False
sep='**************************************' sep='**************************************'
print("\n{}\nConnecting to Redis server on {}:{}\n{}\n".format(sep,host,port,sep)) print("\n{}\nConnecting to Redis server on {}:{}\n{}\n".format(sep,host,port,sep))
r = Redis(host="db", port=port) r = Redis(host=host, port=port)
# hashlib init # hashlib init
m = hashlib.sha256() m = hashlib.sha256()
@ -35,6 +36,7 @@ def image():
try: try:
data = dict() data = dict()
res =r.keys("*")
# Clean the request # Clean the request
if "text" in request.form: if "text" in request.form:
data["text"] = request.form["text"][:256] data["text"] = request.form["text"][:256]

2
server/install.sh
View File

@ -11,7 +11,7 @@ rm -f /etc/nginx/sites-enabled/*
pip3 install flask numpy pillow redis pip3 install flask numpy pillow redis
pip3 install pypotrace pip3 install pypotrace
cd /opt cd /opt
git clone https://git.interhacker.space/teamlaser/laser-app #git clone https://git.interhacker.space/teamlaser/laser-app
cp /opt/teamlaser/laser-app/files/nginx/sites-enabled/site.conf /etc/nginx/sites-enabled cp /opt/teamlaser/laser-app/files/nginx/sites-enabled/site.conf /etc/nginx/sites-enabled

2
worker.py
View File

@ -14,7 +14,7 @@ color = 65280
environ = os.environ environ = os.environ
host = environ['DB_HOST'] if 'DB_HOST' in os.environ else "localhost" host = environ['DB_HOST'] if 'DB_HOST' in os.environ else "localhost"
port = environ['DB_PORT'] if 'DB_PORT' in os.environ else 6379 port = environ['DB_PORT'] if 'DB_PORT' in os.environ else 6379
r = Redis(host="db", port=port) r = Redis(host=host, port=port)
def convertImg(src, image_path="/tmp/"): def convertImg(src, image_path="/tmp/"):