Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
203 commits
Select commit Hold shift + click to select a range
4ef129f
Working skeleton blocks + Magenta import
nadah09 Nov 20, 2020
d9ab94e
Music Creation First Iteration
nadah09 Dec 4, 2020
543d9e9
Music Creation piano visual added
nadah09 Dec 6, 2020
c1e0c54
volume changes work
nadah09 Dec 6, 2020
ffee739
Added volume and instrument reporters
nadah09 Dec 6, 2020
c841411
magenta works
nadah09 Jan 17, 2021
86779ab
adding missing dependency
nadah09 Jan 17, 2021
3fee5ca
preliminary viz done
nadah09 Jan 24, 2021
a5d4d58
added all notes to sheet music viz
nadah09 Jan 27, 2021
87f7d07
added bass clef
nadah09 Jan 28, 2021
f63be36
consolidating signal vis and music creation
nadah09 Feb 3, 2021
6e3bd6c
created symbols file
nadah09 Feb 3, 2021
57c78b8
synchronous viz + music playing worksgit add packages/scratch-vm/src/…
nadah09 Feb 4, 2021
1f2b9bc
split up viz functions into new file
nadah09 Feb 6, 2021
cf87000
refactored into subclasses for each module
nadah09 Feb 7, 2021
e3d8b52
added signal comparison/analysis class
nadah09 Feb 9, 2021
0f0be57
added waveform vis and changed waveform axes to include negatives
nadah09 Feb 12, 2021
90ff922
made Magenta configurable, connected to user inputs, and added play f…
nadah09 Feb 13, 2021
845f422
lots of small fixes
nadah09 Mar 11, 2021
d6b2bd3
added spectrogram code, dynamic markings, color coded waveform viz
nadah09 Mar 15, 2021
00ab9d9
split up viz
nadah09 Apr 2, 2021
3d88885
pushing legend + viz refactor fixes
nadah09 Apr 6, 2021
7f5d40b
fixed error
nadah09 Apr 7, 2021
ee5c7ce
added text box functionality
nadah09 Apr 8, 2021
78cf641
added text and axis labels to all viz
nadah09 Apr 11, 2021
bb1a674
sheet music has treble and bass, text exists, added note menu dropdown
nadah09 Apr 11, 2021
d648624
added bass clef, staff line labels
nadah09 Apr 11, 2021
e30d532
fixed volume issue for saving sb3
nadah09 Apr 14, 2021
d8ec587
added ledger lines and bass clef dynamic markings
nadah09 Apr 15, 2021
7d693b3
reverting again
nadah09 Apr 18, 2021
d48d094
waveform legend text
nadah09 Apr 18, 2021
ed2423a
sheet music has time signature
nadah09 Apr 18, 2021
12459e9
sharps and flats in sheet music
nadah09 Apr 18, 2021
0decc23
measures on treble and bass
nadah09 Apr 19, 2021
782c748
added rests
nadah09 Apr 19, 2021
ece31d0
split up notes in prep for ties, added dotted half rest
nadah09 Apr 19, 2021
d9d6959
multiline ties exist, doesnt break anymore
nadah09 Apr 19, 2021
b4d2a18
added real harmonics, got rid of 1/32 note, added multi line ties
nadah09 Apr 19, 2021
125a358
fixed harmonics in fft and spectrogram
nadah09 Apr 20, 2021
4b2ba6a
magenta notes working again
nadah09 Nov 13, 2021
30b0dcb
Magenta works in viz
nadah09 Nov 15, 2021
f7a65ce
added display dropdown
May 16, 2022
7e070ac
add dropdown display menu
May 17, 2022
3c20e1a
plays first note of 'complete music'
May 19, 2022
475d0f5
internalize sound playing for 'complete music..'
May 24, 2022
3dcc8e2
fix: can't affect curr notes with switch instrument while executing '…
May 24, 2022
ce4a570
initial commit
p-buddy May 25, 2022
3ebd909
Merge pull request #91 from mitmedialab/parker/ControllingStackTimerI…
DolevArtzi May 25, 2022
9dc37e3
fix highlighting, modularize, internalize audio playing for 'complete…
May 25, 2022
89a47f4
fix dropdown dup. bug and remove unnescessary dependency
May 26, 2022
6ce04f1
further documentation
May 31, 2022
479f37a
refactor and cleanup
May 31, 2022
4589a07
initial version of scrolling visualizations
Jun 2, 2022
71aedc3
temporary? fixes to apparent sheet music bugs
Jun 3, 2022
1cc6b97
minor clean up
Jun 3, 2022
e6d61bb
stop on stop sign. Still finishes currently playing note
Jun 7, 2022
6ef8f8a
keep colors the same in waveform scroll
Jun 7, 2022
1a65662
Resolving conflicts in index.js
p-buddy Jun 7, 2022
beefabc
Merge pull request #84 from mitmedialab/dolev-machineaudition
DolevArtzi Jun 7, 2022
9f77cd3
Merge remote-tracking branch 'origin/dolev-internalize-playing-sound'…
Jun 7, 2022
30450e3
Merge remote-tracking branch 'origin/dev-machineaudition' into dolev-…
Jun 7, 2022
75e82ac
minor cleanup
Jun 7, 2022
4b4528d
dependencies on dependencies
Jun 8, 2022
8c7f36a
stop music on stop sign
Jun 8, 2022
80b9110
Setup xml builder
p-buddy Jun 8, 2022
46bec2d
committing sample xml to hang onto it
p-buddy Jun 8, 2022
ca5be34
it worksgit add -u
p-buddy Jun 9, 2022
43ff682
quick fix to null stack frame bug
Jun 9, 2022
b3bd8eb
remove debugging log statements
Jun 9, 2022
3a99ddd
fix limits for freq visualizations
Jun 9, 2022
905198d
Using xml lib now. Able to generate arbitray number of blocks
p-buddy Jun 9, 2022
0cc238f
remove log statements
Jun 9, 2022
eced762
freq to note string converter, fixes legend bug
Jun 9, 2022
99c6778
preparing to integrate with internalize
p-buddy Jun 9, 2022
1102c17
Things are kind of working?
p-buddy Jun 9, 2022
39074c3
Merge pull request #90 from mitmedialab/dolev-internalize-playing-sound
DolevArtzi Jun 10, 2022
6f69188
resolve merge conflicts in musiccreationhelpers.js
Jun 10, 2022
eb160cf
Merge pull request #94 from mitmedialab/dolev-stop-sign
DolevArtzi Jun 10, 2022
ca7f846
Merge remote-tracking branch 'origin/dev-machineaudition' into dolev-viz
Jun 13, 2022
52b6000
Merge remote-tracking branch 'origin/dev-machineaudition' into parker…
Jun 13, 2022
f713321
initial commit of blocks playing notes works. But my computer crashed…
p-buddy Jun 14, 2022
e360aa2
generalizing modifier technique and handling sketchy problems
Jun 14, 2022
99f3ab5
fix 'complete music' bugs
Jun 15, 2022
82453a3
Added the ability to check if modifier should still apply
Jun 15, 2022
bfa4ecf
distinguish continuous scroll from periodic reset scroll
DolevArtzi Jun 17, 2022
0e91e3c
dup notes show up in legend. fixes #100
DolevArtzi Jun 17, 2022
5a4d89b
don't call complete when filtered note list is empty
DolevArtzi Jun 17, 2022
311c955
remove unused data structure and most log statements
DolevArtzi Jun 17, 2022
935a135
minor clean up (remove some log statements and dead code)
DolevArtzi Jun 17, 2022
28be614
clear note buffers on 'reset music'
DolevArtzi Jun 17, 2022
257653d
rename note buf and revert sheet music to continuous scroll
DolevArtzi Jun 17, 2022
bd8e3e1
Adding more comments
p-buddy Jun 17, 2022
2747a99
got only changed files for machine-audition dev
p-buddy Jun 17, 2022
cadfdcd
things are working
p-buddy Jun 17, 2022
49a1a86
adding some comments
p-buddy Jun 17, 2022
bcbe848
more clean up
DolevArtzi Jun 17, 2022
61e04da
make 'adjust' print statements more descriptive'
DolevArtzi Jun 17, 2022
c4f9d9c
fixed merge conflicts
DolevArtzi Jun 30, 2022
1582e2b
Merge branch 'dev-machineaudition' into dolev-viz
DolevArtzi Jun 30, 2022
403d5ae
Merge pull request #98 from mitmedialab/dolev-viz
DolevArtzi Jun 30, 2022
f392119
cast notes to range by octaves
DolevArtzi Jun 30, 2022
0783577
add getTopBlockIDs and isTopBlockID methods
DolevArtzi Jul 1, 2022
fa731ac
remove stale IDs from modifier list
DolevArtzi Jul 1, 2022
9a75e81
deep copy when adjusting notes for RNN
DolevArtzi Jul 5, 2022
27c8ae3
set volume for blocks below
DolevArtzi Jul 6, 2022
ee798fc
merge in changes from dev-machineaudition
DolevArtzi Jul 6, 2022
77a40e2
Resolving conflicts with visualization changes that have merged to dev
p-buddy Jul 6, 2022
abf0a51
adjusting some timings
p-buddy Jul 6, 2022
18bfd75
Changes to hopefully make the add blocks more stable
p-buddy Jul 7, 2022
6564434
add alert and log dom to console on error
Jul 8, 2022
b58c213
remove unnescessary func call that set instrument internally
Jul 8, 2022
f340177
stop currently playing note
Jul 8, 2022
37f2c96
set max listeners to inf
Jul 8, 2022
4d2ff32
set listeners to inf in ctor
Jul 8, 2022
02f3fd7
Merge pull request #102 from mitmedialab/complete-music-bugs
DolevArtzi Jul 8, 2022
6d6002d
adding comment for later
p-buddy Jul 11, 2022
5792de3
fix merge conflicts
Jul 11, 2022
c717465
Merge pull request #108 from mitmedialab/parker-PlayInstrumnetPerChunk
DolevArtzi Jul 11, 2022
ea17d22
use global inst/vol settings for note picker
Jul 11, 2022
b683481
generate blocks for complete music, including previously played notes
Jul 11, 2022
fdc57c5
limit notes completed off of to 20 in generated chunk and throw alert
Jul 11, 2022
a15904b
fix merge conflicts
Jul 11, 2022
6d4bae9
Merge pull request #111 from mitmedialab/stop-currently-playing-note
DolevArtzi Jul 11, 2022
0342ab6
Merge pull request #113 from mitmedialab/use-global-settings-for-note…
DolevArtzi Jul 11, 2022
97ff783
resolved conflicts
p-buddy Jul 11, 2022
4060657
util.sequencer.runtime --> util.runtime
Jul 11, 2022
ea62504
check for undefined thread on stop sign
Jul 12, 2022
2f46077
clear canvas on reset music
Jul 12, 2022
364b70a
inst check for undef/null explicitly
Jul 13, 2022
63cc4ec
Merge pull request #110 from mitmedialab/fix-reporter-bugs
DolevArtzi Jul 13, 2022
e0a4ce4
Merge pull request #115 from mitmedialab/check-for-undef-thread
DolevArtzi Jul 13, 2022
5dd22f6
Merge remote-tracking branch 'origin/dev-machineaudition' into parker…
Jul 13, 2022
587c858
auto reset sheet music viz to top
Jul 13, 2022
0649b00
constraining notes -- confirm with nada about steps issue
p-buddy Jul 13, 2022
c72b2be
Simplified sheet scrolling method
p-buddy Jul 14, 2022
a026872
Merge pull request #116 from mitmedialab/clear-canvas-on-reset
DolevArtzi Jul 14, 2022
ab045fd
Merge pull request #119 from mitmedialab/simpler-sheetmusic-scroll
DolevArtzi Jul 14, 2022
8575e09
updating musicaccompanimenthelpers.js, remove debug logs
p-buddy Jul 14, 2022
6024c42
Merge remote-tracking branch 'origin/dev-machineaudition' into parker…
p-buddy Jul 14, 2022
4051149
remove old viz blocks and reorder side bar
Jul 14, 2022
0375156
fixing viz error
p-buddy Jul 14, 2022
8e02c0b
Removing need for vizhelpers.js to change
p-buddy Jul 14, 2022
bc7a7c7
removing uneeded file
p-buddy Jul 14, 2022
6dbcc34
small change to trigger redeploy
p-buddy Jul 14, 2022
96ffba4
Merge pull request #96 from mitmedialab/parker-ProgrammaticallyAddBlocks
pmalacho-mit Jul 15, 2022
053587a
remove references to 'sig' in drawMusic
Jul 15, 2022
453b802
remove unused trim function
Jul 15, 2022
b405c98
Merge pull request #118 from mitmedialab/fix-sheetmusic-scroll
DolevArtzi Jul 15, 2022
8f62cfb
display empty viz on toggle viz mode
Jul 15, 2022
92eafc8
resolving conflicts
p-buddy Jul 15, 2022
6c3368d
color adjusted notes differently
Jul 15, 2022
60649df
reorged lines
p-buddy Jul 15, 2022
a0baa74
subtract one from inst num
Jul 15, 2022
2f8f505
Merge remote-tracking branch 'origin/dev-machineaudition' into genera…
p-buddy Jul 15, 2022
1cc1175
Merge pull request #114 from mitmedialab/generate-note-blocks-for-com…
pmalacho-mit Jul 15, 2022
fbac896
clear viz on toggle off
Jul 18, 2022
14091b6
purge more opcodes and unused analysisHelper
Jul 18, 2022
797cbf8
merge in updated dev-machineaudition with programmatically add blocks
Jul 18, 2022
b26723f
Merge pull request #123 from mitmedialab/parker-ProgrammaticallyAddBl…
pmalacho-mit Jul 18, 2022
50a40b9
Merge pull request #120 from mitmedialab/clean-up-old-blocks
DolevArtzi Jul 18, 2022
553af53
Merge pull request #121 from mitmedialab/switch-vis-on-toggle
DolevArtzi Jul 18, 2022
22520f7
black pen for vertical lines, remove unneeded line too
Jul 18, 2022
dd8817e
Merge pull request #122 from mitmedialab/color-adjusted-notes
DolevArtzi Jul 18, 2022
789037c
add setting option to createNotesRNN
Jul 18, 2022
5839010
change appearance slightly
Jul 18, 2022
afa25c2
set acceptReporters to false
Jul 18, 2022
1da3fea
clear/show canvas on off/on; keep canvas on same viz form
Jul 18, 2022
6e7b29d
add null checks
Jul 18, 2022
9d8c10c
remove erroneous (last || this._stopped) from STOP_ALL handler
Jul 18, 2022
389c1f6
truthiness rather than null check
Jul 18, 2022
d251ab8
changed display text
p-buddy Jul 18, 2022
0bca749
updating one check to use truthiness
p-buddy Jul 18, 2022
6aea7d7
Merge pull request #124 from mitmedialab/add-option-to-include-comple…
DolevArtzi Jul 19, 2022
f1a5acc
Merge pull request #125 from mitmedialab/dont-clear-current-viz
DolevArtzi Jul 19, 2022
c804e00
Merge pull request #126 from mitmedialab/stackframe-bug
DolevArtzi Jul 19, 2022
7a0c1eb
Made change so the sprite's position is replcaed
p-buddy Jul 25, 2022
96863c0
plays the notes, no stack timer/chaining
Jul 26, 2022
e10cc6b
adding uncleaned code just incase I need to revert to it
Jul 26, 2022
39066e4
got default extension working
Jul 26, 2022
56bf216
removing unnecessary line
Jul 26, 2022
ebf0906
works
Jul 26, 2022
40c43b3
implemented a better way
Jul 26, 2022
8152376
renamed variable
Jul 26, 2022
fa54682
cleaning up
Jul 26, 2022
ac15eab
Merge pull request #133 from mitmedialab/parker-MoveSpriteBack
pmalacho-mit Jul 26, 2022
bc18ff1
Merge remote-tracking branch 'origin/dev-machineaudition' into parker…
Jul 26, 2022
4055ef7
Introducing sine wave sound for a more pure tone
p-buddy Jul 27, 2022
70fff47
Got everything working
p-buddy Jul 27, 2022
bab622b
Merge remote-tracking branch 'origin/parker-ExtDefault' into audition…
p-buddy Jul 27, 2022
df8f3b1
Merge remote-tracking branch 'origin/multi-note' into audition_combined
p-buddy Jul 27, 2022
093c79d
Merge remote-tracking branch 'origin/parker-AddMusicScales' into audi…
p-buddy Jul 27, 2022
f4901e5
Reorging extension menu. Changing some defaults
p-buddy Jul 27, 2022
83755d4
Add pentatonic scale support
p-buddy Jul 27, 2022
ddb6953
Merge branch 'parker-AddMusicScales' into audition_combined
p-buddy Jul 27, 2022
3b7890a
changing language
p-buddy Jul 28, 2022
0ecc14d
Merge remote-tracking branch 'origin/parker-AddMusicScales' into audi…
p-buddy Jul 28, 2022
9c21459
add param to indicate need to start stack timer
Aug 1, 2022
824df23
Merge pull request #134 from mitmedialab/multi-note
DolevArtzi Aug 1, 2022
c0a5338
Merge pull request #135 from mitmedialab/parker-ExtDefault
pmalacho-mit Aug 2, 2022
f7cab60
Merge pull request #137 from mitmedialab/parker-SineWave
pmalacho-mit Aug 2, 2022
694d676
Merge pull request #138 from mitmedialab/parker-AddMusicScales
pmalacho-mit Aug 2, 2022
7b7aaab
Merge remote-tracking branch 'origin/dev-machineaudition' into auditi…
p-buddy Aug 2, 2022
d97e0d8
Merge pull request #139 from mitmedialab/audition_combined
pmalacho-mit Aug 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17,233 changes: 17,233 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

45,884 changes: 30,871 additions & 15,013 deletions packages/scratch-gui/package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions packages/scratch-gui/src/containers/blocks.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,8 @@ class Blocks extends React.Component {
if (error.message) {
error.message = `Workspace Update Error: ${error.message}`;
}
console.log('The erroneous dom:',dom);
alert('Error encountered. Please save your project and reload the page.');
log.error(error);
}
this.workspace.addChangeListener(this.props.vm.blockListener);
Expand Down
113 changes: 113 additions & 0 deletions packages/scratch-gui/src/lib/libraries/extensions/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,22 @@ import gdxforInsetIconURL from './gdxfor/gdxfor-small.svg';
import gdxforConnectionIconURL from './gdxfor/gdxfor-illustration.svg';
import gdxforConnectionSmallIconURL from './gdxfor/gdxfor-small.svg';

import signalAnalysisIconURL from './signalAnalysis/signalAnalysis.png';
import signalAnalysisInsetIconURL from './signalAnalysis/signalAnalysis-small.svg';

import signalVizIconURL from './signalViz/signalViz.png';
import signalVizInsetIconURL from './signalViz/signalViz-small.svg';

import signalControlIconURL from './signalControl/signalControl.png';
import signalControlInsetIconURL from './signalControl/signalControl-small.svg';

import musicCreationIconURL from './musicCreation/musicCreation.png';
import musicCreationInsetIconURL from './musicCreation/musicCreation-small.svg';

import musicAccompanimentIconURL from './musicAccompaniment/musicAccompaniment.png';
import musicAccompanimentInsetIconURL from './musicAccompaniment/musicAccompaniment-small.svg';


export default [
{
name: (
Expand Down Expand Up @@ -317,5 +333,102 @@ export default [
/>
),
helpLink: 'https://scratch.mit.edu/vernier'

},
{
name: 'Signal Analysis',
extensionId: 'signalanalysis',
iconURL: signalAnalysisIconURL,
insetIconURL: signalAnalysisInsetIconURL,
description: (
<FormattedMessage
defaultMessage="Analyze music of your choice."
description="my block"
id="gui.extension.signalanalysis.description"
/>
),
featured: true,
disabled: false,
internetConnectionRequired: true,
bluetoothRequired: false,
helpLink: 'https://scratch.mit.edu/wedo'

},
{
name: 'Signal Visualization',
extensionId: 'signalviz',
iconURL: signalVizIconURL,
insetIconURL: signalVizInsetIconURL,
description: (
<FormattedMessage
defaultMessage="Visualize music of your choice in time, frequency, or sheet music representation."
description="my block"
id="gui.extension.signalviz.description"
/>
),
featured: true,
disabled: false,
internetConnectionRequired: true,
bluetoothRequired: false,
helpLink: 'https://scratch.mit.edu/wedo'

},
{
name: 'Signal Control',
extensionId: 'signalcontrol',
iconURL: signalControlIconURL,
insetIconURL: signalControlInsetIconURL,
description: (
<FormattedMessage
defaultMessage="Utilize properties of signals to add exciting elements to your programs."
description="my block"
id="gui.extension.signalcontrol.description"
/>
),
featured: true,
disabled: false,
internetConnectionRequired: true,
bluetoothRequired: false,
helpLink: 'https://scratch.mit.edu/wedo'

},
{
name: 'Music Creation',
extensionId: 'musiccreation',
iconURL: musicCreationIconURL,
insetIconURL: musicCreationInsetIconURL,
description: (
<FormattedMessage
defaultMessage="Create music of your choice."
description="my block"
id="gui.extension.musiccreation.description"
/>
),
featured: true,
disabled: false,
internetConnectionRequired: true,
bluetoothRequired: false,
helpLink: 'https://scratch.mit.edu/wedo'

},
{
name: 'Music Accompaniment',
extensionId: 'musicaccompaniment',
iconURL: musicAccompanimentIconURL,
insetIconURL: musicAccompanimentInsetIconURL,
description: (
<FormattedMessage
defaultMessage="Design a process to accompany your favorite song, or music of your creation."
description="my block"
id="gui.extension.musicaccompaniment.description"
/>
),
featured: true,
disabled: false,
internetConnectionRequired: true,
bluetoothRequired: false,
helpLink: 'https://scratch.mit.edu/wedo'

}

];
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading