16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Merge all work on server with filmout features #77

Merged
mattmcw merged 12 commits from server into main 2023-02-26 02:16:29 +00:00
Conversation 0 Commits 12 Files Changed 33 +45 -30
18 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f296488bc2 - Show all commits

2
app/data/cfg.json
View File

@ -1,5 +1,5 @@
{
"version": "1.7.12",
"version": "1.7.13",
"ext_port": 1111,
"profiles": {
"mcopy": {

8
app/lib/client/index.js
View File

@ -50,9 +50,7 @@ function setImage(src) {
imgTmp = new Image();
let img = document.getElementById('img');
let body = document.querySelector('body');
if (body.classList.contains('meter')) {
body.classList.remove('meter');
}
body.className = '';
imgTmp.onload = function () {
img.style.backgroundImage = `url('${src}')`;
return resolve(src);
@ -88,6 +86,8 @@ function onFocus(arg) {
const can = document.getElementById('can');
const dpr = window.devicePixelRatio || 1;
let ctx;
const body = document.querySelector('body');
body.className = '';
if (!can.classList.contains('show')) {
can.classList.add('show');
}
@ -132,6 +132,8 @@ function onField(arg) {
const can = document.getElementById('can');
const dpr = window.devicePixelRatio || 1;
const screen = window.outerWidth / window.outerHeight;
const body = document.querySelector('body');
body.className = '';
let ctx;
if (!can.classList.contains('show')) {
can.classList.add('show');

2
app/lib/client/index.js.map
View File

File diff suppressed because one or more lines are too long

11
app/lib/filmout/index.js
View File

@ -23,7 +23,7 @@ class FilmOut {
* @param {object} ui Electron ui object
* @param {object} light Light device object
**/
constructor(display, ffmpeg, ffprobe, ui, light) {
constructor(display, server, ffmpeg, ffprobe, ui, light) {
this.id = 'filmout';
this.videoExtensions = ['.mpg', '.mpeg', '.mov', '.mkv', '.avi', '.mp4'];
this.stillExtensions = ['.tif', '.tiff', '.png', '.jpg', '.jpeg', '.bmp'];
@ -42,6 +42,7 @@ class FilmOut {
files: []
};
this.display = display;
this.server = server;
this.ffmpeg = ffmpeg;
this.ffprobe = ffprobe;
this.ui = ui;
@ -426,6 +427,7 @@ class FilmOut {
try {
await this.display.open();
await this.display.focus();
await this.server.cmdAll('focus');
}
catch (err) {
this.log.error(err, 'FILMOUT', true, true);
@ -440,6 +442,7 @@ class FilmOut {
try {
await this.display.open();
await this.display.field(ratio);
await this.server.cmdAll('field', { ratio });
}
catch (err) {
this.log.error(err, 'FILMOUT', true, true);
@ -453,6 +456,7 @@ class FilmOut {
try {
await this.display.open();
await this.display.meter();
await this.server.cmdAll('meter');
}
catch (err) {
this.log.error(err, 'FILMOUT', true, true);
@ -465,6 +469,7 @@ class FilmOut {
try {
await this.display.hide();
await this.display.close();
await this.server.cmdAll('blank');
}
catch (err) {
this.log.error(err, 'FILMOUT', true, true);
@ -478,7 +483,7 @@ class FilmOut {
this.log.info(`Changing the display to ${arg.display}`);
}
}
module.exports = (display, ffmpeg, ffprobe, ui, light) => {
return new FilmOut(display, ffmpeg, ffprobe, ui, light);
module.exports = (display, server, ffmpeg, ffprobe, ui, light) => {
return new FilmOut(display, server, ffmpeg, ffprobe, ui, light);
};
//# sourceMappingURL=index.js.map

2
app/lib/filmout/index.js.map
View File

File diff suppressed because one or more lines are too long

3
app/lib/server/index.js
View File

@ -63,10 +63,11 @@ class Server {
this.wss.on('connection', async function (ws) {
ws.on("message", function (data) {
let obj = JSON.parse(data);
this.log.info(data);
//this.log.info(data)
if (obj.id && this.queue[obj.id]) {
this.queue[obj.id](obj);
delete this.queue[obj.id];
this.log.info(`${obj.action} complete`);
}
}.bind(this));
ws.on('close', function () {

2
app/lib/server/index.js.map
View File

File diff suppressed because one or more lines are too long

5
app/main.js
View File

@ -117,8 +117,9 @@ var init = async function () {
log.error('Error enumerating connected devices', err)
}
server = require('server')()
light = require('light')(arduino, cfg, mainWindow.webContents)
filmout = require('filmout')(display, ffmpeg, ffprobe, mainWindow.webContents, light)
filmout = require('filmout')(display, server, ffmpeg, ffprobe, mainWindow.webContents, light)
cam = require('cam')(arduino, cfg, mainWindow.webContents, filmout)
proj = require('proj')(arduino, cfg, mainWindow.webContents, filmout)
alert = require('alert')(mainWindow.webContents)
@ -136,8 +137,6 @@ var init = async function () {
cmd = require('cmd')(cfg, proj, cam, light, alert, cam2, proj2, capper)
seq = require('sequencer')(cfg, cmd, mainWindow.webContents)
server = require('server')()
}
app.on('ready', init)

2
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "mcopy-app",
"version": "1.7.12",
"version": "1.7.13",
"lockfileVersion": 2,
"requires": true,
"packages": {

2
app/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mcopy-app",
"version": "1.7.12",
"version": "1.7.13",
"description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js",
"scripts": {

3
app/server.html
View File

@ -4,8 +4,7 @@
html, body{ background: #000; padding: 0; margin: 0; width: 100vw; height: 100vh; overflow: hidden; }
body.meter { background: rgb(117, 117, 117); }
body.blank { background: #000; }
body.blank #img { display: none; }
body.blank #can { display: none; }
body.blank #img, body.blank #can, body.meter #img, body.meter #can { display: none; }
#nosleep { color: #fff; margin: 50px auto }
#img {
position: absolute;

8
app/src/lib/client/index.ts
View File

@ -32,9 +32,7 @@ async function setImage (src : string) {
imgTmp = new Image()
let img = document.getElementById('img')
let body = document.querySelector('body')
if (body.classList.contains('meter')) {
body.classList.remove('meter')
}
body.className = ''
imgTmp.onload = function () {
img.style.backgroundImage = `url('${src}')`;
return resolve(src)
@ -66,6 +64,8 @@ async function onFocus (arg : McopyRequest ) {
const can : HTMLCanvasElement = document.getElementById('can') as HTMLCanvasElement
const dpr = window.devicePixelRatio || 1
let ctx;
const body = document.querySelector('body')
body.className = ''
if (!can.classList.contains('show')) {
can.classList.add('show')
@ -113,6 +113,8 @@ async function onField (arg : McopyRequest) {
const can : HTMLCanvasElement = document.getElementById('can') as HTMLCanvasElement
const dpr : number = window.devicePixelRatio || 1
const screen : number = window.outerWidth / window.outerHeight
const body = document.querySelector('body')
body.className = ''
let ctx : CanvasRenderingContext2D;
if (!can.classList.contains('show')) {
can.classList.add('show')

2
data/cfg.json
View File

@ -1,5 +1,5 @@
{
"version": "1.7.12",
"version": "1.7.13",
"ext_port": 1111,
"profiles": {
"mcopy": {

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "mcopy",
"version": "1.7.12",
"version": "1.7.13",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "mcopy",
"version": "1.7.12",
"version": "1.7.13",
"license": "MIT",
"dependencies": {
"arduino": "file:app/lib/arduino",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "mcopy",
"version": "1.7.12",
"version": "1.7.13",
"description": "Small gauge film optical printer platform",
"main": "build.js",
"directories": {

2
processing/mcopy/cfg.json
View File

@ -1,5 +1,5 @@
{
"version": "1.7.12",
"version": "1.7.13",
"ext_port": 1111,
"profiles": {
"mcopy": {

12
src/filmout/index.ts
View File

@ -37,6 +37,7 @@ class FilmOut {
private ipc : any;
private ui : any;
private log : any;
private server : any;
/**
* @constructor
* Builds FilmOut class with display, ffmpeg, ffprobe, ui and light as internal properties.
@ -47,8 +48,9 @@ class FilmOut {
* @param {object} ui Electron ui object
* @param {object} light Light device object
**/
constructor (display : any, ffmpeg : any, ffprobe : any, ui : any, light : any) {
constructor (display : any, server : any, ffmpeg : any, ffprobe : any, ui : any, light : any) {
this.display = display;
this.server = server;
this.ffmpeg = ffmpeg;
this.ffprobe = ffprobe;
this.ui = ui;
@ -444,6 +446,7 @@ class FilmOut {
try {
await this.display.open();
await this.display.focus();
await this.server.cmdAll('focus')
} catch (err) {
this.log.error(err, 'FILMOUT', true, true);
}
@ -457,6 +460,7 @@ class FilmOut {
try {
await this.display.open();
await this.display.field(ratio);
await this.server.cmdAll('field', { ratio });
} catch (err) {
this.log.error(err, 'FILMOUT', true, true);
}
@ -469,6 +473,7 @@ class FilmOut {
try {
await this.display.open();
await this.display.meter();
await this.server.cmdAll('meter');
} catch (err) {
this.log.error(err, 'FILMOUT', true, true);
}
@ -480,6 +485,7 @@ class FilmOut {
try {
await this.display.hide();
await this.display.close();
await this.server.cmdAll('blank');
} catch (err) {
this.log.error(err, 'FILMOUT', true, true);
}
@ -493,6 +499,6 @@ class FilmOut {
}
}
module.exports = (display : any, ffmpeg : any, ffprobe : any, ui : any, light : any) => {
return new FilmOut(display, ffmpeg, ffprobe, ui, light);
module.exports = (display : any, server : any, ffmpeg : any, ffprobe : any, ui : any, light : any) => {
return new FilmOut(display, server, ffmpeg, ffprobe, ui, light);
}

3
src/server/index.ts
View File

@ -95,10 +95,11 @@ class Server {
this.wss.on('connection', async function (ws : WebSocket) {
ws.on("message", function (data : string ) {
let obj : any = JSON.parse(data)
this.log.info(data)
//this.log.info(data)
if (obj.id && this.queue[obj.id]) {
this.queue[obj.id](obj)
delete this.queue[obj.id]
this.log.info(`${obj.action} complete`)
}
}.bind(this))