merge

1 files changed, 21 insertions, 3 deletions

diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
index 957b068..6aade36 100644
--- a/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
+++ b/app/client/modules/pix2pixhd/views/pix2pixhd.train.js
@@ -19,6 +19,7 @@ import NewDatasetForm from '../../../dataset/dataset.new'
 import UploadStatus from '../../../dataset/upload.status'
 
 import DatasetComponent from '../../../dataset/dataset.component'
+import SequenceEditor from './sequence.editor'
 
 import pix2pixhdModule from '../pix2pixhd.module'
 
@@ -34,9 +35,10 @@ class Pix2PixHDTrain extends Component {
       augment_make: 20,
     }
   }
-  componentWillMount(){
+  componentDidMount(){
     const id = this.props.match.params.id || localStorage.getItem('pix2pixhd.last_id')
-    console.log('load dataset:', id)
+    const dataset = localStorage.getItem('pix2pixhd.last_dataset')
+    console.log('load dataset:', id, dataset)
     const { match, pix2pixhd, actions } = this.props
     if (id === 'new') return
     if (id) {
@@ -47,9 +49,13 @@ class Pix2PixHDTrain extends Component {
     } else {
       this.props.history.push('/pix2pixhd/new/')
     }
+    if (dataset) {
+      this.setState({ checkpoint_name: dataset })
+    }
   }
   componentDidUpdate(prevProps, prevState){
     if (prevState.checkpoint_name !== this.state.checkpoint_name) {
+      localStorage.setItem('pix2pixhd.last_dataset', this.state.checkpoint_name)
       this.setState({ epoch: 'latest' })
       this.props.actions.list_epochs(this.state.checkpoint_name)
       this.props.actions.count_dataset(this.state.checkpoint_name)
@@ -114,6 +120,18 @@ class Pix2PixHDTrain extends Component {
                 value={this.state.epoch}
               />
             </Group>
+          </div>
+        </div>
+        <div>
+          <Group title='Sequence Editor'>
+            <SequenceEditor
+              module={pix2pixhdModule}
+              checkpoint={this.props.pix2pixhd.checkpoint}
+            />
+          </Group>
+        </div>
+        <div className='columns'>
+          <div className='column'>
             <Group title='Augmentation Grid'>
               <AugmentationGrid
                 checkpoint={this.props.pix2pixhd.checkpoint}
@@ -132,7 +150,7 @@ class Pix2PixHDTrain extends Component {
                     this.props.remote.augment_task(this.state.checkpoint_name, {
                       ...this.state,
                       augment_take: 10,
-                      augment_make: 150,
+                      augment_make: 149,
                       no_symlinks: true,
                       mov: true,
                       folder_id: this.props.pix2pixhd.data.resultsFolder.id