From adb8c6623adfbcb5e1a0e02f26612631217f357f Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 8 Mar 2014 16:18:06 +0200 Subject: [PATCH] fixed floating framerate config bug --- src/config.py | 2 +- static/js/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config.py b/src/config.py index 99b4233..b4ea82e 100644 --- a/src/config.py +++ b/src/config.py @@ -462,7 +462,7 @@ def camera_ui_to_dict(ui): width = int(ui['resolution'].split('x')[0]) height = int(ui['resolution'].split('x')[1]) - threshold = int(ui['frame_change_threshold']) * width * height / 100 + threshold = int(float(ui['frame_change_threshold']) * width * height / 100) data = { # device diff --git a/static/js/main.js b/static/js/main.js index 8ce14e9..fc033db 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -165,7 +165,7 @@ function initUI() { makeSlider($('#contrastSlider'), 0, 100, 2, null, 5, 0, '%'); makeSlider($('#saturationSlider'), 0, 100, 2, null, 5, 0, '%'); makeSlider($('#hueSlider'), 0, 100, 2, null, 5, 0, '%'); - makeSlider($('#framerateSlider'), 1, 30, 0, [ + makeSlider($('#framerateSlider'), 2, 30, 0, [ {value: 1, label: '1'}, {value: 5, label: '5'}, {value: 10, label: '10'}, -- 2.39.5