summaryrefslogtreecommitdiff
path: root/app/client
diff options
context:
space:
mode:
Diffstat (limited to 'app/client')
-rw-r--r--app/client/live/player.js11
-rw-r--r--app/client/modules/pix2pix/views/pix2pix.live.js5
-rw-r--r--app/client/socket/socket.live.js1
3 files changed, 9 insertions, 8 deletions
diff --git a/app/client/live/player.js b/app/client/live/player.js
index 3fd33e8..2fafb5c 100644
--- a/app/client/live/player.js
+++ b/app/client/live/player.js
@@ -79,10 +79,8 @@ export function onFrame (data) {
}
let previousValue, currentValue
-function handleChange() {
- let previousValue = currentValue
- currentValue = store.getState().live.playing
-
+export function toggleFPS(state) {
+ currentValue = typeof state !== 'undefined' ? state : store.getState().live.playing
if (previousValue !== currentValue) {
if (currentValue) {
startWatchingFPS()
@@ -90,11 +88,12 @@ function handleChange() {
stopWatchingFPS()
}
}
+ previousValue = currentValue
}
let fpsInterval;
-function startWatchingFPS(){
+export function startWatchingFPS(){
clearInterval(fpsInterval)
fpsInterval = setInterval(() => {
store.dispatch({
@@ -108,6 +107,6 @@ function startWatchingFPS(){
fps = 0
}, 1000)
}
-function stopWatchingFPS(){
+export function stopWatchingFPS(){
clearInterval(fpsInterval)
} \ No newline at end of file
diff --git a/app/client/modules/pix2pix/views/pix2pix.live.js b/app/client/modules/pix2pix/views/pix2pix.live.js
index 26ad3ce..be19d15 100644
--- a/app/client/modules/pix2pix/views/pix2pix.live.js
+++ b/app/client/modules/pix2pix/views/pix2pix.live.js
@@ -7,7 +7,7 @@ import {
Slider, Select, Button, Loading
} from '../../../common/'
-import { startRecording, stopRecording, saveFrame } from '../../../live/player'
+import { startRecording, stopRecording, saveFrame, toggleFPS } from '../../../live/player'
import * as liveActions from '../../../live/live.actions'
import * as queueActions from '../../../queue/queue.actions'
@@ -47,6 +47,7 @@ class Pix2PixLive extends Component {
}
seek(percentage){
const frame = Math.floor(percentage * (parseInt(this.props.frame.sequence_len) || 1) + 1)
+ console.log("seek to frame", percentage, frame)
this.props.actions.live.seek(frame)
}
start(){
@@ -112,7 +113,7 @@ class Pix2PixLive extends Component {
options={this.props.epochs}
onChange={this.changeEpoch}
/>
- <Slider live
+ <Slider
name='position'
min={0.0} max={1.0} type='float'
value={(this.props.frame.sequence_i || 0) / (this.props.frame.sequence_len || 1)}
diff --git a/app/client/socket/socket.live.js b/app/client/socket/socket.live.js
index ab5878e..3780ba6 100644
--- a/app/client/socket/socket.live.js
+++ b/app/client/socket/socket.live.js
@@ -19,6 +19,7 @@ socket.on('res', (data) => {
type: types.socket.load_params,
opt: data.res,
})
+ player.toggleFPS(data.res.processing)
break
case 'list_checkpoints':
dispatch({