From b9e1806c97dba043af5b20c78ba2be9bbf47b4d8 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Tue, 26 Jun 2018 14:53:38 +0200
Subject: list morphs

---
 app/client/modules/morph/views/morph.app.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/client/modules/morph/views')

diff --git a/app/client/modules/morph/views/morph.app.js b/app/client/modules/morph/views/morph.app.js
index 5b43978..4a5b51b 100644
--- a/app/client/modules/morph/views/morph.app.js
+++ b/app/client/modules/morph/views/morph.app.js
@@ -53,7 +53,7 @@ class MorphResults extends Component {
 
     const totalLength = this.state.frames / 25
     let lengthWarning
-    if (this.state.steps > 64) {
+    if ((this.state.steps / this.state.dilate) > 64) {
       lengthWarning = (
         <span><br/>warning, this will take a while</span>
       )
@@ -69,6 +69,7 @@ class MorphResults extends Component {
             <Group title="From">
               <Select
                 title="Starting sequence"
+                placeholder="Please choose a sequence"
                 value={this.state.a}
                 options={sequence_options}
                 onChange={(name, key) => this.setState({ a: key, a_duration: sequenceLookup[key].count, a_pos: 0, a_offset: 0 })}
@@ -84,6 +85,7 @@ class MorphResults extends Component {
             <Group title="To">
               <Select
                 title="Ending sequence"
+                placeholder="Please choose a sequence"
                 value={this.state.b}
                 options={sequence_options}
                 onChange={(name, key) => this.setState({ b: key, b_duration: sequenceLookup[key].count, b_pos: 0, b_offset: 0 })}
@@ -107,7 +109,7 @@ class MorphResults extends Component {
                 type="list"
                 title="Steps"
                 value={this.state.steps}
-                options={[2,4,8,16,32,64,128,256]}
+                options={[2,4,8,16,32,64,128,256,512,1024,2048,4096]}
                 onChange={key => this.setState({ steps: key, frames: (key * this.state.dilate) })}
               />
               <Slider
-- 
cgit v1.2.3-70-g09d2