summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/client/audio/wav2pix.js2
-rw-r--r--app/client/modules/pix2wav/pix2wav.reducer.js2
-rw-r--r--app/client/modules/pix2wav/views/spectrogram.upload.js19
3 files changed, 18 insertions, 5 deletions
diff --git a/app/client/audio/wav2pix.js b/app/client/audio/wav2pix.js
index 9bd7a15..1a84e16 100644
--- a/app/client/audio/wav2pix.js
+++ b/app/client/audio/wav2pix.js
@@ -101,7 +101,7 @@ export const buildZip = (name, file, { frame_step=FRAME_STEP, frame_start=0, max
// dispatch event
dispatch({ type: types.wav2pix.finish, message: 'Rendered ' + count + ' images' })
zip.generateAsync({ type: "blob" }).then(content => {
- dispatch({ type: types.wav2pix.zip })
+ dispatch({ type: types.wav2pix.zip, size: content.size })
// FileSaver.saveAs(content, "wav2pix_" + name + ".zip")
resolve({
zip: content,
diff --git a/app/client/modules/pix2wav/pix2wav.reducer.js b/app/client/modules/pix2wav/pix2wav.reducer.js
index 18caad7..f255bd8 100644
--- a/app/client/modules/pix2wav/pix2wav.reducer.js
+++ b/app/client/modules/pix2wav/pix2wav.reducer.js
@@ -35,7 +35,7 @@ const pix2wavReducer = (state = pix2wavInitialState, action) => {
case types.wav2pix.zip:
return {
...state,
- status: 'Built zip file',
+ status: 'Built zip file ' + util.hush_size(state.size)[1],
}
case types.wav2pix.uploading:
return {
diff --git a/app/client/modules/pix2wav/views/spectrogram.upload.js b/app/client/modules/pix2wav/views/spectrogram.upload.js
index 8dbff21..7b5e618 100644
--- a/app/client/modules/pix2wav/views/spectrogram.upload.js
+++ b/app/client/modules/pix2wav/views/spectrogram.upload.js
@@ -17,6 +17,8 @@ import * as wav2pixActions from '../../../audio/wav2pix'
import pix2wavModule from '../pix2wav.module'
+const date_stamp = () => moment().format("_YYYYMMDD_HHmm")
+
class SpectrogramUpload extends Component {
constructor(props){
super(props)
@@ -24,6 +26,7 @@ class SpectrogramUpload extends Component {
file: null,
pcm: null,
name: "",
+ datasetName: "",
frames: [],
frame_start: 0,
max: 3000,
@@ -45,7 +48,12 @@ class SpectrogramUpload extends Component {
.replace(/\s+/g, '_')
.replace(/-/g, '_')
.replace(/_+/g, '_')
- this.setState({ file, name, pcm: '' }, () => {
+ this.setState({
+ file,
+ name: name + date_stamp(),
+ datasetName: name,
+ pcm: ''
+ }, () => {
if (file.size < 2 << 20) {
this.rebuildFrames()
}
@@ -146,7 +154,9 @@ class SpectrogramUpload extends Component {
value={this.state.frame_start}
defaultValue={0}
onChange={frame_start => {
- this.setState({ frame_start }, () => {
+ this.setState({
+ frame_start
+ }, () => {
this.rebuildFrames()
})
}}
@@ -166,9 +176,12 @@ class SpectrogramUpload extends Component {
onChange={frame_step => {
const total_frame_count = Math.floor((duration * 44100 - wav2pixActions.FRAME_LENGTH) / frame_step)
this.setState({
+ name: this.state.datasetName + '_step_' + frame_step + date_stamp(),
frame_step,
max: Math.min(this.state.max, total_frame_count)
- }, () => { this.rebuildFrames() })
+ }, () => {
+ this.rebuildFrames()
+ })
}}
/>
<Button