diff --git a/web-service/server/src/index.js b/web-service/server/src/index.js
index 2ece593bda338e45e0829e3a0633b86f216660ff..ca6d16eb95a8505d9d009fc2cc47963c33ca4623 100644
--- a/web-service/server/src/index.js
+++ b/web-service/server/src/index.js
@@ -2,9 +2,9 @@ const express = require('express');
const app = express();
const expressWs = require('express-ws')(app);
const Peer = require('./peer.js');
+const jwt = require('jsonwebtoken');
const passport = require('passport');
const passportSetup = require('./passport/passport'); //Without this, the app doesn't know passports google strategy
-const jwt = require('jsonwebtoken');
const keys = require('./passport/keys')
const mongoose = require('mongoose')
const config = require('./utils/config')
@@ -207,13 +207,17 @@ app.get('/stream/depth', (req, res) => {
});
app.post('/stream/config', async (req, res) => {
- const {board_size, square_size, frame_delay, num_frames, name} = req.body
- const savedConfigs = new Config({
+ const {board_size, square_size, frame_delay, num_frames, URI} = req.body;
+ console.log(req.body)
+ const data = {
board_size,
square_size,
frame_delay,
- num_frames,
- name
+ num_frames
+ }
+ const savedConfigs = new Configs({
+ URI,
+ data
});
try{
diff --git a/web-service/server/src/models/configs.js b/web-service/server/src/models/configs.js
deleted file mode 100644
index ff617d61f6e543a453a0b8072067b6ce13e2801e..0000000000000000000000000000000000000000
--- a/web-service/server/src/models/configs.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const mongoose = require('mongoose')
-
-const cameraConfigSchema = mongoose.Schema({
- board_size: Array,
- square_size: Number,
- frame_delay: Number,
- num_frames: Number,
- assume_zero_tangential_distortion: {type: Boolean, default: false},
- fix_aspect_ratio: {type: Boolean, default: false},
- fix_principal_point_at_center: {type: Boolean, default: false},
- use_fisheye_model: {type: Boolean, default: false},
- fix_k1: {type: Boolean, default: false},
- fix_k2: {type: Boolean, default: false},
- fix_k3: {type: Boolean, default: false},
- fix_k4: {type: Boolean, default: true},
- fix_k5: {type: Boolean, default: true},
- //Mongoose doesn't let you use the word 'save' as an attribute
- //save: {type: Boolean, default: true},
- use_intrinsics: {type: Boolean, default: true},
- use_extrinsics: {type: Boolean, default: true},
- flip_vertical: {type: Boolean, default: true},
- //For Mongo
- name: {type: String, default: null}
- })
-
- cameraConfigSchema.set('toJSON', {
- transform: (document, returnedObject) => {
- delete returnedObject._id
- delete returnedObject.__v
- }
- })
-
-module.exports = mongoose.model('cameraConfig', cameraConfigSchema)
\ No newline at end of file
diff --git a/web-service/server/src/models/disparity.js b/web-service/server/src/models/disparity.js
deleted file mode 100644
index 03795f815cead0e1663a8595b0656df6071b63ef..0000000000000000000000000000000000000000
--- a/web-service/server/src/models/disparity.js
+++ /dev/null
@@ -1,23 +0,0 @@
-const mongoose = require('mongoose')
-
-const disparitySchema = mongoose.Schema({
- name: {type: String, default: null},
- algorithm: {type: String, default: 'libsgm'},
- use_cuda: {type: Boolean, default: true},
- minimum: {type: Number, default: 0},
- maximum: {type: Number, default: 256},
- tau: {type: Number, default: 0.0},
- gamma: {type: Number, default: 0.0},
- window_size: {type: Number, default: 5},
- sigma: {type: Number, default: 1.5},
- lambda: {type: Number, default: 8000.0}
-})
-
-disparitySchema.set('toJSON', {
- transform: (document, returnedObject) => {
- delete returnedObject._id
- delete returnedObject.__v
- }
- })
-
-module.exports = mongoose.model('disparityConfig', disparitySchema)
\ No newline at end of file
diff --git a/web-service/server/src/public/js/bundle.js b/web-service/server/src/public/js/bundle.js
index 6871d2abf83bd845c00163d5f7a25fdaca96a775..d59fd118b23415f6c09ff8d01cd93dda0423e99e 100644
--- a/web-service/server/src/public/js/bundle.js
+++ b/web-service/server/src/public/js/bundle.js
@@ -383,7 +383,7 @@ BufferList.prototype._match = function(offset, search) {
module.exports = BufferList
-},{"readable-stream":18,"safe-buffer":19,"util":39}],2:[function(require,module,exports){
+},{"readable-stream":19,"safe-buffer":20,"util":39}],2:[function(require,module,exports){
(function (Buffer){
// Copyright Joyent, Inc. and other Node contributors.
//
@@ -493,8 +493,8 @@ function objectToString(o) {
return Object.prototype.toString.call(o);
}
-}).call(this,{"isBuffer":require("../../../../../../../../../../../usr/lib/node_modules/watchify/node_modules/is-buffer/index.js")})
-},{"../../../../../../../../../../../usr/lib/node_modules/watchify/node_modules/is-buffer/index.js":33}],3:[function(require,module,exports){
+}).call(this,{"isBuffer":require("../../../../../../../../../usr/local/lib/node_modules/browserify/node_modules/is-buffer/index.js")})
+},{"../../../../../../../../../usr/local/lib/node_modules/browserify/node_modules/is-buffer/index.js":33}],3:[function(require,module,exports){
if (typeof Object.create === 'function') {
// implementation from standard node.js 'util' module
module.exports = function inherits(ctor, superCtor) {
@@ -613,7 +613,7 @@ function msgpack (options) {
module.exports = msgpack
-},{"./lib/decoder":6,"./lib/encoder":7,"./lib/streams":8,"assert":24,"bl":1,"safe-buffer":19}],6:[function(require,module,exports){
+},{"./lib/decoder":6,"./lib/encoder":7,"./lib/streams":8,"assert":24,"bl":1,"safe-buffer":20}],6:[function(require,module,exports){
'use strict'
var bl = require('bl')
@@ -1396,7 +1396,7 @@ function encodeFloat (obj, forceFloat64) {
return buf
}
-},{"bl":1,"safe-buffer":19}],8:[function(require,module,exports){
+},{"bl":1,"safe-buffer":20}],8:[function(require,module,exports){
'use strict'
var Transform = require('readable-stream').Transform
@@ -1488,7 +1488,7 @@ Decoder.prototype._transform = function (buf, enc, done) {
module.exports.decoder = Decoder
module.exports.encoder = Encoder
-},{"bl":1,"inherits":3,"readable-stream":18}],9:[function(require,module,exports){
+},{"bl":1,"inherits":3,"readable-stream":19}],9:[function(require,module,exports){
(function (process){
'use strict';
@@ -2739,7 +2739,7 @@ function indexOf(xs, x) {
return -1;
}
}).call(this,require('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"./_stream_duplex":10,"./internal/streams/BufferList":15,"./internal/streams/destroy":16,"./internal/streams/stream":17,"_process":35,"core-util-is":2,"events":31,"inherits":3,"isarray":4,"process-nextick-args":9,"safe-buffer":19,"string_decoder/":20,"util":29}],13:[function(require,module,exports){
+},{"./_stream_duplex":10,"./internal/streams/BufferList":15,"./internal/streams/destroy":16,"./internal/streams/stream":17,"_process":35,"core-util-is":2,"events":31,"inherits":3,"isarray":4,"process-nextick-args":9,"safe-buffer":20,"string_decoder/":18,"util":29}],13:[function(require,module,exports){
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
@@ -3644,7 +3644,7 @@ Writable.prototype._destroy = function (err, cb) {
cb(err);
};
}).call(this,require('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {},require("timers").setImmediate)
-},{"./_stream_duplex":10,"./internal/streams/destroy":16,"./internal/streams/stream":17,"_process":35,"core-util-is":2,"inherits":3,"process-nextick-args":9,"safe-buffer":19,"timers":36,"util-deprecate":21}],15:[function(require,module,exports){
+},{"./_stream_duplex":10,"./internal/streams/destroy":16,"./internal/streams/stream":17,"_process":35,"core-util-is":2,"inherits":3,"process-nextick-args":9,"safe-buffer":20,"timers":36,"util-deprecate":21}],15:[function(require,module,exports){
'use strict';
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -3724,7 +3724,7 @@ if (util && util.inspect && util.inspect.custom) {
return this.constructor.name + ' ' + obj;
};
}
-},{"safe-buffer":19,"util":29}],16:[function(require,module,exports){
+},{"safe-buffer":20,"util":29}],16:[function(require,module,exports){
'use strict';
/*<replacement>*/
@@ -3803,79 +3803,6 @@ module.exports = {
module.exports = require('events').EventEmitter;
},{"events":31}],18:[function(require,module,exports){
-exports = module.exports = require('./lib/_stream_readable.js');
-exports.Stream = exports;
-exports.Readable = exports;
-exports.Writable = require('./lib/_stream_writable.js');
-exports.Duplex = require('./lib/_stream_duplex.js');
-exports.Transform = require('./lib/_stream_transform.js');
-exports.PassThrough = require('./lib/_stream_passthrough.js');
-
-},{"./lib/_stream_duplex.js":10,"./lib/_stream_passthrough.js":11,"./lib/_stream_readable.js":12,"./lib/_stream_transform.js":13,"./lib/_stream_writable.js":14}],19:[function(require,module,exports){
-/* eslint-disable node/no-deprecated-api */
-var buffer = require('buffer')
-var Buffer = buffer.Buffer
-
-// alternative to using Object.keys for old browsers
-function copyProps (src, dst) {
- for (var key in src) {
- dst[key] = src[key]
- }
-}
-if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
- module.exports = buffer
-} else {
- // Copy properties from require('buffer')
- copyProps(buffer, exports)
- exports.Buffer = SafeBuffer
-}
-
-function SafeBuffer (arg, encodingOrOffset, length) {
- return Buffer(arg, encodingOrOffset, length)
-}
-
-// Copy static methods from Buffer
-copyProps(Buffer, SafeBuffer)
-
-SafeBuffer.from = function (arg, encodingOrOffset, length) {
- if (typeof arg === 'number') {
- throw new TypeError('Argument must not be a number')
- }
- return Buffer(arg, encodingOrOffset, length)
-}
-
-SafeBuffer.alloc = function (size, fill, encoding) {
- if (typeof size !== 'number') {
- throw new TypeError('Argument must be a number')
- }
- var buf = Buffer(size)
- if (fill !== undefined) {
- if (typeof encoding === 'string') {
- buf.fill(fill, encoding)
- } else {
- buf.fill(fill)
- }
- } else {
- buf.fill(0)
- }
- return buf
-}
-
-SafeBuffer.allocUnsafe = function (size) {
- if (typeof size !== 'number') {
- throw new TypeError('Argument must be a number')
- }
- return Buffer(size)
-}
-
-SafeBuffer.allocUnsafeSlow = function (size) {
- if (typeof size !== 'number') {
- throw new TypeError('Argument must be a number')
- }
- return buffer.SlowBuffer(size)
-}
-
-},{"buffer":30}],20:[function(require,module,exports){
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
@@ -4172,7 +4099,80 @@ function simpleWrite(buf) {
function simpleEnd(buf) {
return buf && buf.length ? this.write(buf) : '';
}
-},{"safe-buffer":19}],21:[function(require,module,exports){
+},{"safe-buffer":20}],19:[function(require,module,exports){
+exports = module.exports = require('./lib/_stream_readable.js');
+exports.Stream = exports;
+exports.Readable = exports;
+exports.Writable = require('./lib/_stream_writable.js');
+exports.Duplex = require('./lib/_stream_duplex.js');
+exports.Transform = require('./lib/_stream_transform.js');
+exports.PassThrough = require('./lib/_stream_passthrough.js');
+
+},{"./lib/_stream_duplex.js":10,"./lib/_stream_passthrough.js":11,"./lib/_stream_readable.js":12,"./lib/_stream_transform.js":13,"./lib/_stream_writable.js":14}],20:[function(require,module,exports){
+/* eslint-disable node/no-deprecated-api */
+var buffer = require('buffer')
+var Buffer = buffer.Buffer
+
+// alternative to using Object.keys for old browsers
+function copyProps (src, dst) {
+ for (var key in src) {
+ dst[key] = src[key]
+ }
+}
+if (Buffer.from && Buffer.alloc && Buffer.allocUnsafe && Buffer.allocUnsafeSlow) {
+ module.exports = buffer
+} else {
+ // Copy properties from require('buffer')
+ copyProps(buffer, exports)
+ exports.Buffer = SafeBuffer
+}
+
+function SafeBuffer (arg, encodingOrOffset, length) {
+ return Buffer(arg, encodingOrOffset, length)
+}
+
+// Copy static methods from Buffer
+copyProps(Buffer, SafeBuffer)
+
+SafeBuffer.from = function (arg, encodingOrOffset, length) {
+ if (typeof arg === 'number') {
+ throw new TypeError('Argument must not be a number')
+ }
+ return Buffer(arg, encodingOrOffset, length)
+}
+
+SafeBuffer.alloc = function (size, fill, encoding) {
+ if (typeof size !== 'number') {
+ throw new TypeError('Argument must be a number')
+ }
+ var buf = Buffer(size)
+ if (fill !== undefined) {
+ if (typeof encoding === 'string') {
+ buf.fill(fill, encoding)
+ } else {
+ buf.fill(fill)
+ }
+ } else {
+ buf.fill(0)
+ }
+ return buf
+}
+
+SafeBuffer.allocUnsafe = function (size) {
+ if (typeof size !== 'number') {
+ throw new TypeError('Argument must be a number')
+ }
+ return Buffer(size)
+}
+
+SafeBuffer.allocUnsafeSlow = function (size) {
+ if (typeof size !== 'number') {
+ throw new TypeError('Argument must be a number')
+ }
+ return buffer.SlowBuffer(size)
+}
+
+},{"buffer":30}],21:[function(require,module,exports){
(function (global){
/**
@@ -4586,7 +4586,7 @@ renderThumbnails = async () => {
// console.log('THUMBNAILS', thumbnails)
const containerDiv = document.getElementById('container')
containerDiv.innerHTML = '';
- containerDiv.innerHTML = renderConfigsButton()
+ containerDiv.innerHTML = `<button onClick="configs()">change configs</button>`
containerDiv.innerHTML += `<div class="ftlab-stream-thumbnails"></div>`
// console.log(containerDiv)
for(var i=0; i<thumbnails.length; i++){
@@ -4708,10 +4708,6 @@ const cardLogic = () => {
const cards = document.getElementsByClassName('ftlab-card-component');
}
-const renderConfigsButton = () => {
- return `<button onClick="configs()">change configs</button>`
-}
-
configs = () => {
const container = document.getElementById("container");
container.innerHTML = `<div class="ftlab-configurations"></div>`;
@@ -4719,9 +4715,22 @@ configs = () => {
}
renderConfigOptions = () => {
- const input = `<input type="text">`
+ const input = `<p>input1</p><br><input type="text">`
const doc = document.getElementsByClassName('ftlab-configurations')[0];
doc.innerHTML = input
+}
+
+changeConfigs = async () => {
+ const rawResp = await fetch('http://localhost:8080/stream/config', {
+ method: 'POST',
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({board_size: [0, 5], square_size: 1, frame_delay: 5, num_frames: 10, URI: current_data.uri})
+ });
+ const content = await rawResp.json();
+ console.log(content)
}
},{"../../peer":22}],24:[function(require,module,exports){
(function (global){
diff --git a/web-service/server/src/public/js/index.js b/web-service/server/src/public/js/index.js
index c9724e9676351aff700150d402c2493f54015f48..2f304dc023a2596ca9603a84b5807b3e0cea5593 100644
--- a/web-service/server/src/public/js/index.js
+++ b/web-service/server/src/public/js/index.js
@@ -66,7 +66,7 @@ renderThumbnails = async () => {
// console.log('THUMBNAILS', thumbnails)
const containerDiv = document.getElementById('container')
containerDiv.innerHTML = '';
- containerDiv.innerHTML = renderConfigsButton()
+ containerDiv.innerHTML = `<button onClick="configs()">change configs</button>`
containerDiv.innerHTML += `<div class="ftlab-stream-thumbnails"></div>`
// console.log(containerDiv)
for(var i=0; i<thumbnails.length; i++){
@@ -188,10 +188,6 @@ const cardLogic = () => {
const cards = document.getElementsByClassName('ftlab-card-component');
}
-const renderConfigsButton = () => {
- return `<button onClick="configs()">change configs</button>`
-}
-
configs = () => {
const container = document.getElementById("container");
container.innerHTML = `<div class="ftlab-configurations"></div>`;
@@ -199,7 +195,20 @@ configs = () => {
}
renderConfigOptions = () => {
- const input = `<input type="text">`
+ const input = `<p>input1</p><br><input type="text">`
const doc = document.getElementsByClassName('ftlab-configurations')[0];
doc.innerHTML = input
+}
+
+changeConfigs = async () => {
+ const rawResp = await fetch('http://localhost:8080/stream/config', {
+ method: 'POST',
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({board_size: [0, 5], square_size: 1, frame_delay: 5, num_frames: 10, URI: "current_data.uri"})
+ });
+ const content = await rawResp.json();
+ console.log(content)
}
\ No newline at end of file