summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-06-28 00:16:26 +0200
committerJules Laplace <julescarbon@gmail.com>2018-06-28 00:16:26 +0200
commit591375ede4be0560ffe16bc949f00ebbe3aad414 (patch)
tree5326f0f7c8be3bf812aebf1ff8cdeb7273b71b5a /app
parenta47e2a8b38b39f90215f998206640dd369fd21d2 (diff)
lowercase datasets
Diffstat (limited to 'app')
-rw-r--r--app/client/dataset/dataset.loader.js1
-rw-r--r--app/client/modules/morph/views/morph.app.js8
-rw-r--r--app/relay/modules/morph.js1
3 files changed, 10 insertions, 0 deletions
diff --git a/app/client/dataset/dataset.loader.js b/app/client/dataset/dataset.loader.js
index 058cc07..76d8b16 100644
--- a/app/client/dataset/dataset.loader.js
+++ b/app/client/dataset/dataset.loader.js
@@ -31,6 +31,7 @@ export const emptyDataset = (module, datasetLookup, name, folder) => {
}
export const getDataset = (module, datasetLookup, name, folder, date) => {
+ name = name.toLowerCase()
let dataset = datasetLookup[name] || emptyDataset(module, datasetLookup, name, folder)
// folder = folder || unsortedFolder(module)
if (date) {
diff --git a/app/client/modules/morph/views/morph.app.js b/app/client/modules/morph/views/morph.app.js
index fe28659..b5c401f 100644
--- a/app/client/modules/morph/views/morph.app.js
+++ b/app/client/modules/morph/views/morph.app.js
@@ -34,6 +34,7 @@ class MorphResults extends Component {
steps: 16,
dilate: 2,
frames: 32,
+ padding: 0,
smooth: true,
mode: 'mix',
}
@@ -125,6 +126,13 @@ class MorphResults extends Component {
value={this.state.smooth}
onToggle={key => this.setState({ smooth: key })}
/>
+ <Slider
+ type="list"
+ title="Padding (in seconds)"
+ value={this.state.padding}
+ min={0} max={30} step={1}
+ onChange={key => this.setState({ padding: key })}
+ />
<Button
title="Run task"
value="Morph!"
diff --git a/app/relay/modules/morph.js b/app/relay/modules/morph.js
index 04583a6..1e7328d 100644
--- a/app/relay/modules/morph.js
+++ b/app/relay/modules/morph.js
@@ -13,6 +13,7 @@ const morph = {
'--dataset', task.opt.a,
'--steps', task.opt.steps,
'--dilate', task.opt.dilate,
+ '--padding', task.opt.padding,
'--video-out', ['morph', task.opt.mode, task.dataset, moment().format('YYYYMMDD_hhmm')].join('_') + '.mp4',
'--endpoint', process.env.API_REMOTE + '/api/folder/' + task.folder_id + '/upload/',
]