diff options
Diffstat (limited to 'public/bundle.js')
| -rw-r--r-- | public/bundle.js | 349 |
1 files changed, 215 insertions, 134 deletions
diff --git a/public/bundle.js b/public/bundle.js index 662bc72..337c8fa 100644 --- a/public/bundle.js +++ b/public/bundle.js @@ -261,12 +261,12 @@ var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-r var _reactRouterDom = __webpack_require__(/*! react-router-dom */ "./node_modules/react-router-dom/es/index.js"); +var _store = __webpack_require__(/*! ./store */ "./app/client/store.js"); + var _socket = __webpack_require__(/*! ./socket */ "./app/client/socket.js"); var _socket2 = _interopRequireDefault(_socket); -var _store = __webpack_require__(/*! ./store */ "./app/client/store.js"); - var _header = __webpack_require__(/*! ./common/header.component */ "./app/client/common/header.component.js"); var _header2 = _interopRequireDefault(_header); @@ -278,6 +278,7 @@ var _live2 = _interopRequireDefault(_live); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } // import client from './client' + var app = (0, _preact.h)( _reactRedux.Provider, { store: _store.store }, @@ -300,6 +301,43 @@ var app = (0, _preact.h)( /***/ }), +/***/ "./app/client/live/actions.js": +/*!************************************!*\ + !*** ./app/client/live/actions.js ***! + \************************************/ +/*! no static exports found */ +/***/ (function(module, exports, __webpack_require__) { + +"use strict"; + + +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.get_checkpoints = exports.set_param = exports.get_params = undefined; + +var _socket = __webpack_require__(/*! ../socket */ "./app/client/socket.js"); + +var socket = _interopRequireWildcard(_socket); + +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + +var get_params = exports.get_params = function get_params() { + socket.get_params(); + return { type: 'GET_PARAMS' }; +}; + +var set_param = exports.set_param = function set_param(key, value) { + socket.set_param(key, value); + return { type: 'SET_PARAM', key: key, value: value }; +}; + +var get_checkpoints = exports.get_checkpoints = function get_checkpoints() { + return { type: 'GET_CHECKPOINTS' }; +}; + +/***/ }), + /***/ "./app/client/live/components/player.component.js": /*!********************************************************!*\ !*** ./app/client/live/components/player.component.js ***! @@ -348,8 +386,12 @@ Object.defineProperty(exports, "__esModule", { value: true }); +var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); + var _preact = __webpack_require__(/*! preact */ "./node_modules/preact/dist/preact.esm.js"); +var _redux = __webpack_require__(/*! redux */ "./node_modules/redux/es/redux.js"); + var _reactRedux = __webpack_require__(/*! react-redux */ "./node_modules/react-redux/es/index.js"); var _player = __webpack_require__(/*! ./components/player.component */ "./app/client/live/components/player.component.js"); @@ -364,134 +406,167 @@ var _slider = __webpack_require__(/*! ../common/slider.component */ "./app/clien var _slider2 = _interopRequireDefault(_slider); +var _actions = __webpack_require__(/*! ./actions */ "./app/client/live/actions.js"); + +var liveActions = _interopRequireWildcard(_actions); + +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -function App(props) { - return (0, _preact.h)( - 'div', - { className: 'app' }, - (0, _preact.h)(_player2.default, null), - (0, _preact.h)( - 'div', - { className: 'params' }, - (0, _preact.h)( - _paramGroup2.default, - { - title: 'Transition' - }, - (0, _preact.h)(_slider2.default, { - name: 'transition_period', - min: 10, max: 5000, type: 'int' - }), - (0, _preact.h)(_slider2.default, { - name: 'transition_min', - min: 0.001, max: 0.2, type: 'float' - }), - (0, _preact.h)(_slider2.default, { - name: 'transition_max', - min: 0.1, max: 1.0, type: 'float' - }) - ), - (0, _preact.h)( - _paramGroup2.default, - { - title: 'Recursion', - toggle: 'recursive' - }, - (0, _preact.h)(_slider2.default, { - name: 'recursive_frac', - min: 0.01, max: 0.3, type: 'float' - }), - (0, _preact.h)(_slider2.default, { - name: 'recurse_roll', - min: -5, max: 5, type: 'int' - }), - (0, _preact.h)(_slider2.default, { - name: 'recurse_roll_axis', - min: 0, max: 1, type: 'int' - }) - ), - (0, _preact.h)( - _paramGroup2.default, - { - title: 'Sequence', - toggle: 'sequence' - }, - (0, _preact.h)(_slider2.default, { - name: 'sequence_frac', - min: 0.01, max: 0.3, type: 'float' - }), - (0, _preact.h)(_slider2.default, { - name: 'process_frac', - min: 0, max: 1, type: 'float' - }) - ), - (0, _preact.h)( - _paramGroup2.default, - { - title: 'Clahe', - toggle: 'clahe' - }, - (0, _preact.h)(_slider2.default, { - name: 'clip_limit', - min: 1.0, max: 4.0, type: 'float' - }) - ), - (0, _preact.h)( - _paramGroup2.default, - { - title: 'Posterize', - toggle: 'posterize' - }, - (0, _preact.h)(_slider2.default, { - name: 'spatial_window', - min: 2, max: 128, type: 'int' - }), - (0, _preact.h)(_slider2.default, { - name: 'color_window', - min: 2, max: 128, type: 'int' - }) - ), - (0, _preact.h)( - _paramGroup2.default, - { - title: 'Blur', - toggle: 'blur' - }, - (0, _preact.h)(_slider2.default, { - name: 'blur_radius', - min: 3, max: 7, type: 'int' - }), - (0, _preact.h)(_slider2.default, { - name: 'blur_sigma', - min: 0, max: 2, type: 'float' - }) - ), - (0, _preact.h)( - _paramGroup2.default, - { - title: 'Canny Edge Detection', - toggle: 'canny' - }, - (0, _preact.h)(_slider2.default, { - name: 'canny_lo', - min: 10, max: 200, type: 'int' - }), - (0, _preact.h)(_slider2.default, { - name: 'canny_hi', - min: 10, max: 200, type: 'int' - }) - ) - ) - ); -} +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } + +var App = function (_Component) { + _inherits(App, _Component); + + function App(props) { + _classCallCheck(this, App); + + var _this = _possibleConstructorReturn(this, (App.__proto__ || Object.getPrototypeOf(App)).call(this)); + + props.actions.get_params(); + return _this; + } + + _createClass(App, [{ + key: 'render', + value: function render() { + var props = this.props; + return (0, _preact.h)( + 'div', + { className: 'app' }, + (0, _preact.h)(_player2.default, null), + (0, _preact.h)( + 'div', + { className: 'params' }, + (0, _preact.h)( + _paramGroup2.default, + { + title: 'Transition' + }, + (0, _preact.h)(_slider2.default, { + name: 'transition_period', + min: 10, max: 5000, type: 'int' + }), + (0, _preact.h)(_slider2.default, { + name: 'transition_min', + min: 0.001, max: 0.2, type: 'float' + }), + (0, _preact.h)(_slider2.default, { + name: 'transition_max', + min: 0.1, max: 1.0, type: 'float' + }) + ), + (0, _preact.h)( + _paramGroup2.default, + { + title: 'Recursion', + toggle: 'recursive' + }, + (0, _preact.h)(_slider2.default, { + name: 'recursive_frac', + min: 0.01, max: 0.3, type: 'float' + }), + (0, _preact.h)(_slider2.default, { + name: 'recurse_roll', + min: -5, max: 5, type: 'int' + }), + (0, _preact.h)(_slider2.default, { + name: 'recurse_roll_axis', + min: 0, max: 1, type: 'int' + }) + ), + (0, _preact.h)( + _paramGroup2.default, + { + title: 'Sequence', + toggle: 'sequence' + }, + (0, _preact.h)(_slider2.default, { + name: 'sequence_frac', + min: 0.01, max: 0.3, type: 'float' + }), + (0, _preact.h)(_slider2.default, { + name: 'process_frac', + min: 0, max: 1, type: 'float' + }) + ), + (0, _preact.h)( + _paramGroup2.default, + { + title: 'Clahe', + toggle: 'clahe' + }, + (0, _preact.h)(_slider2.default, { + name: 'clip_limit', + min: 1.0, max: 4.0, type: 'float' + }) + ), + (0, _preact.h)( + _paramGroup2.default, + { + title: 'Posterize', + toggle: 'posterize' + }, + (0, _preact.h)(_slider2.default, { + name: 'spatial_window', + min: 2, max: 128, type: 'int' + }), + (0, _preact.h)(_slider2.default, { + name: 'color_window', + min: 2, max: 128, type: 'int' + }) + ), + (0, _preact.h)( + _paramGroup2.default, + { + title: 'Blur', + toggle: 'blur' + }, + (0, _preact.h)(_slider2.default, { + name: 'blur_radius', + min: 3, max: 7, type: 'int' + }), + (0, _preact.h)(_slider2.default, { + name: 'blur_sigma', + min: 0, max: 2, type: 'float' + }) + ), + (0, _preact.h)( + _paramGroup2.default, + { + title: 'Canny Edge Detection', + toggle: 'canny' + }, + (0, _preact.h)(_slider2.default, { + name: 'canny_lo', + min: 10, max: 200, type: 'int' + }), + (0, _preact.h)(_slider2.default, { + name: 'canny_hi', + min: 10, max: 200, type: 'int' + }) + ) + ) + ); + } + }]); + + return App; +}(_preact.Component); var mapStateToProps = function mapStateToProps(state) { return {}; }; var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) { - return {}; + return { + actions: (0, _redux.bindActionCreators)(liveActions, dispatch) + }; }; exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(App); @@ -529,16 +604,16 @@ var liveReducer = function liveReducer() { var action = arguments[1]; var results = void 0; - + console.log(action.type); switch (action.type) { - case 'LIVE_LOAD_OPT_FROM_SERVER': + case 'LOAD_PARAMS': return _extends({}, state, { loading: false, error: null, opt: action.opt }); - case 'LIVE_SET_OPT': + case 'SET_PARAM': return _extends({}, state, { opt: _extends({}, state.opt, _defineProperty({}, action.key, action.value)) }); @@ -565,21 +640,31 @@ exports.default = liveReducer; Object.defineProperty(exports, "__esModule", { value: true }); +exports.socket = undefined; exports.get_params = get_params; -exports.send_param = send_param; +exports.set_param = set_param; + +var _store = __webpack_require__(/*! ./store */ "./app/client/store.js"); + var socket = io.connect('/client'); var got_frame = false; socket.on('res', function (data) { + console.log(data.cmd); switch (data.cmd) { case 'get_last_frame': - console.log('get last frame!'); if (data.res !== 'working') { socket.emit('cmd', { cmd: 'get_last_frame' }); } break; + case 'get_params': + _store.store.dispatch({ + type: 'LOAD_PARAMS', + opt: data.payload + }); + break; default: break; } @@ -600,10 +685,6 @@ socket.on('frame', function (data) { img.src = url; }); -socket.emit('cmd', { - cmd: 'get_params' -}); - setTimeout(function () { if (!got_frame) { // socket.emit('cmd', { @@ -612,14 +693,14 @@ setTimeout(function () { } }, 500); -function get_params(key, value) { +function get_params() { socket.emit('cmd', { cmd: 'get_params' }); } -function send_param(key, value) { +function set_param(key, value) { socket.emit('cmd', { - cmd: 'send_param', + cmd: 'set_param', payload: { 'key': key, 'value': value |