diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2018-06-20 17:09:33 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2018-06-20 17:09:33 +0200 |
| commit | 034fac1f6b6e4bd41de671b297bf9a5bc4abeed1 (patch) | |
| tree | 1431c1c778fe3640362abd529f2c35e054c2a5d8 /app/client/modules/pix2pixhd | |
| parent | 09b4d1541e6e06563a40f8829048e4225ed8fcf9 (diff) | |
fetching
Diffstat (limited to 'app/client/modules/pix2pixhd')
| -rw-r--r-- | app/client/modules/pix2pixhd/pix2pixhd.actions.js | 2 | ||||
| -rw-r--r-- | app/client/modules/pix2pixhd/views/pix2pixhd.live.js | 10 | ||||
| -rw-r--r-- | app/client/modules/pix2pixhd/views/pix2pixhd.results.js | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app/client/modules/pix2pixhd/pix2pixhd.actions.js b/app/client/modules/pix2pixhd/pix2pixhd.actions.js index 917b375..370597b 100644 --- a/app/client/modules/pix2pixhd/pix2pixhd.actions.js +++ b/app/client/modules/pix2pixhd/pix2pixhd.actions.js @@ -154,7 +154,7 @@ export const load_results = (id) => (dispatch) => { dispatch({ type: types.pix2pixhd.load_results, results: { - folder: folders[0], + resultsFolder: folders[0], files, results, renders, diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.live.js b/app/client/modules/pix2pixhd/views/pix2pixhd.live.js index 5dd4153..0bdcefe 100644 --- a/app/client/modules/pix2pixhd/views/pix2pixhd.live.js +++ b/app/client/modules/pix2pixhd/views/pix2pixhd.live.js @@ -51,12 +51,12 @@ class Pix2PixHDLive extends Component { this.props.actions.live.seek(frame) } start(){ - // console.log(this.props) - const sequence = this.props.live.opt.sequence_name - const checkpoint = this.props.live.opt.checkpoint_name + console.log(this.props.opt) + const sequence = this.props.opt.sequence_name || this.props.pix2pixhd.data.sequences[0].name + const checkpoint = this.props.opt.checkpoint_name || this.props.pix2pixhd.data.checkpoints[0].name console.log('starting up!', sequence, checkpoint) this.props.actions.tasks.live_task(sequence, checkpoint, { - folder_id: resultsFolder.id, + folder_id: this.props.pix2pixhd.data.resultsFolder.id, }) } interrupt(){ @@ -196,7 +196,7 @@ class Pix2PixHDLive extends Component { > <Slider live name='sequence_frac' - min={0.0} max={0.5} type='float' + min={0.0} max={1.0} type='float' /> <Slider live name='process_frac' diff --git a/app/client/modules/pix2pixhd/views/pix2pixhd.results.js b/app/client/modules/pix2pixhd/views/pix2pixhd.results.js index af8d90a..18c956f 100644 --- a/app/client/modules/pix2pixhd/views/pix2pixhd.results.js +++ b/app/client/modules/pix2pixhd/views/pix2pixhd.results.js @@ -19,7 +19,7 @@ class Pix2pixHDResults extends Component { if (! this.props.pix2pixhd.results) return <Loading progress={this.props.pix2pixhd.progress} /> const { resultsFolder, results, renders, files } = this.props.pix2pixhd.results - console.log(results) + console.log(resultsFolder, results) return ( <div className='app pix2pixhd'> |
