From 28eda92b20df45e5bcc0ce9d5cac7656ddc55dd9 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Sat, 11 Jan 2020 14:37:02 +0100
Subject: ui updates

---
 app/client/modules/biggan/views/biggan.live.js | 31 +++++++++++++++-----------
 1 file changed, 18 insertions(+), 13 deletions(-)

(limited to 'app/client/modules/biggan/views/biggan.live.js')

diff --git a/app/client/modules/biggan/views/biggan.live.js b/app/client/modules/biggan/views/biggan.live.js
index 8d4a234..4410968 100644
--- a/app/client/modules/biggan/views/biggan.live.js
+++ b/app/client/modules/biggan/views/biggan.live.js
@@ -15,6 +15,7 @@ import * as bigganTasks from '../biggan.tasks'
 import * as bigganActions from '../biggan.actions'
 import BigGANCategoryList from './biggan.categoryList.js'
 import BigGANEncodingList from './biggan.encodingList.js'
+import { frameTimestamp } from '../../../util'
 
 class BigGANLive extends Component {
   constructor(props) {
@@ -32,7 +33,7 @@ class BigGANLive extends Component {
     this.props.actions.queue.stop_task('gpu')
   }
   render() {
-    const { biggan, actions } = this.props
+    const { biggan, actions, frame } = this.props
     // console.log(actions)
     // if (biggan.loading) {
     //   return <Loading progress={biggan.progress} />
@@ -44,9 +45,18 @@ class BigGANLive extends Component {
             <Player width={512} height={512} square fullscreen={this.props.fullscreen} />
           </div>
           <div className='params column audioParams'>
-            <Group>
+            <div className='spacer'>
+              {frame.i ?
+                <div className='param'>
+                  <span>Frame #{frame.i}</span>
+                  {frameTimestamp(frame.i)}
+                </div>
+                : <div className='param'><span>Not playing</span></div>
+              }
+            </div>
+
+            <Group title="Player">
               {this.renderRestartButton()}
-              <p class='last_message'>{this.props.last_message}</p>
             </Group>
 
             <Group title={"Latent"}>
@@ -57,7 +67,7 @@ class BigGANLive extends Component {
               <Slider live
                 name='latent_speed'
                 title={"Update Speed"}
-                min={0.0001} max={10} type='float'
+                min={1} max={250} type='int'
               />
               <Slider live
                 name='truncation'
@@ -79,7 +89,7 @@ class BigGANLive extends Component {
               <Slider live
                 name='label_speed'
                 title={"Mix Speed"}
-                min={0.0001} max={10} type='float'
+                min={1} max={250} type='int'
               />
             </Group>
 
@@ -87,7 +97,7 @@ class BigGANLive extends Component {
               <Slider live
                 name='orbit_speed'
                 title={"Orbit speed"}
-                min={-4} max={4} type='float'
+                min={-250} max={250} type='int'
               />
               <Slider live
                 name='orbit_radius'
@@ -101,7 +111,7 @@ class BigGANLive extends Component {
               <Slider live
                 name='orbit_noise_speed'
                 title={"Shuffle Speed"}
-                min={0} max={4} type='float'
+                min={1} max={250} type='int'
               />
             </Group>
 
@@ -163,14 +173,10 @@ class BigGANLive extends Component {
     // }
     return (
       <div>
-        <Button
-          title={i18n.gpu.processing}
-          onClick={this.togglePlaying}
-        >{i18n.gpu.stop}</Button>
         <Button
           title={i18n.gpu.busy}
           onClick={() => this.interrupt()}
-        >{i18n.gpu.interrupt}</Button>
+        >{i18n.gpu.stop}</Button>
       </div>
     )
   }
@@ -178,7 +184,6 @@ class BigGANLive extends Component {
 
 
 const mapStateToProps = state => ({
-  last_message: state.live.last_message,
   fullscreen: state.live.fullscreen,
   opt: state.live.opt,
   frame: state.live.frame,
-- 
cgit v1.2.3-70-g09d2