Merge branch 'master' of asdf.us:live-cortex

1 files changed, 46 insertions, 6 deletions

diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.live.js b/app/client/modules/pix2pixhd/views/pix2pixhd.live.js
index b127e23..52b4b61 100644
--- a/app/client/modules/pix2pixhd/views/pix2pixhd.live.js
+++ b/app/client/modules/pix2pixhd/views/pix2pixhd.live.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
 
 import {
   ParamGroup, Param, Player, Group,
-  Slider, Select, TextInput, Button, Loading
+  Slider, SelectGroup, Select, TextInput, Button, Loading
 } from '../../../common/'
 
 import { startRecording, stopRecording, saveFrame, toggleFPS } from '../../../live/player'
@@ -39,6 +39,7 @@ class Pix2PixHDLive extends Component {
   }
   componentWillUpdate(nextProps) {
     if (nextProps.opt.checkpoint_name && nextProps.opt.checkpoint_name !== this.props.opt.checkpoint_name) {
+      console.log('listing epochs')
       this.props.actions.live.list_epochs('pix2pixhd', nextProps.opt.checkpoint_name)
     }
   }
@@ -99,8 +100,47 @@ class Pix2PixHDLive extends Component {
   render(){
     // console.log(this.props)
     if (this.props.pix2pixhd.loading) {
-      return <Loading />
+      return <Loading progress={this.props.pix2pixhd.progress} />
     }
+    const { folderLookup, datasetLookup, sequences } = this.props.pix2pixhd.data
+
+    const sequenceLookup = sequences.reduce((a,b) => {
+      a[b.name] = true
+      return a
+    }, {})
+
+    const sequenceGroups = Object.keys(folderLookup).map(id => {
+      const folder = this.props.pix2pixhd.data.folderLookup[id]
+      if (folder.name === 'results') return
+      const datasets = folder.datasets.map(name => {
+        const sequence = sequenceLookup[name]
+        if (sequence) {
+          return name
+        }
+        return null
+      }).filter(n => !!n)
+      return {
+        name: folder.name,
+        options: datasets.sort(),
+      }
+    }).filter(n => !!n && !!n.options.length).sort((a,b) => a.name.localeCompare(b.name))
+
+    const checkpointGroups = Object.keys(folderLookup).map(id => {
+      const folder = this.props.pix2pixhd.data.folderLookup[id]
+      if (folder.name === 'results') return
+      const datasets = folder.datasets.map(name => {
+        const dataset = datasetLookup[name]
+        if (dataset.checkpoints.length) {
+          return name
+        }
+        return null
+      }).filter(n => !!n)
+      return {
+        name: folder.name,
+        options: datasets.sort(),
+      }
+    }).filter(n => !!n && !!n.options.length).sort((a,b) => a.name.localeCompare(b.name))
+
     return (
       <div className='app live centered'>
         <Player width={424} height={256} fullscreen={this.props.fullscreen} />
@@ -116,16 +156,16 @@ class Pix2PixHDLive extends Component {
                 options={['a','b','sequence','recursive']}
                 onChange={this.props.actions.live.set_param}
               />
-              <Select live
+              <SelectGroup live
                 name='sequence_name'
                 title='sequence'
-                options={this.props.pix2pixhd.data.sequences.map(file => file.name)}
+                options={sequenceGroups}
                 onChange={this.changeSequence}
               />
-              <Select live
+              <SelectGroup live
                 name='checkpoint_name'
                 title='checkpoint'
-                options={this.props.pix2pixhd.data.checkpoints.map(file => file.name)}
+                options={checkpointGroups}
                 onChange={this.changeCheckpoint}
               />
               <Select live