Skip to content

Commit

Permalink
Fluid.jit.plotter (#389)
Browse files Browse the repository at this point in the history 
* add basic fluid.jit.plotter abstraction

* changed interface to "refer" and more efficient ds loading via patcher scripting

* handle bpatcher resizing

* add force square aspect ratio

* make mousing work with any size

* implement xrange, yrange, and range messages

* add color-matching highlighted points, rename resize pworld script

* use fluid.dataset refer method instead of caveman-style, implement de-refer

* change labelset interface to refer

* implement click'n'drag, remove unused

* remove clipping from mesh vertex scaling

* report zoomxrange zoomyrange

* fix vertex array and color array size mismatch

* remove junk

* enable fsaa on jit.pworld

* massive cleanup

* add init txt

* add ref xml, add seealso to fluid.plotter

* fix wrong label colors (mixing buf samps w ds ids)

* add missing bgcolor method

* hide highlighted mesh upon refer dataset

* fix retaining colors from prev ds when ds changes/updates

* just some patching

* fix busted zoom rect when opt/alt lifted before trigger zoom

* fix rogue highlight after zoom

* fix range not resetting upon refer

* implement colorscheme message

* pass unmatched messages on the right to the left

* fix not updating highlighted point colors when changing colorscheme

* start resize polling upon creation to avoid weirdnesses

* add help patcher

* small text change

* save on built-in screen lol

* add fluid.jit.plotter to overview

* minor positioning stuff in help

* support dictionary message for datasets (left inlet)

* implement clear and reset (alias to refer w no args)

* fix style mismatch in help

* renamed js files

* remove "2017-2019" after copyright from refs

* changed digest in ref

* resizing help jsui after changing ref

* save on local screen to avoid pain lolz

* fix comment grammar

* add panning mousing mode

* fix rouge highlight once when transitioning from panning to zooming

* document panning mode in help

* add panfactor method to doc xml

* fix comment

* add [p ?] to both fluid.plotter and fluid.jit.plotter helps

* add dump example to help, document clear and reset

* add large dataset tab to fluid.plotter

* avoid pop-up [p ?] subpatch on Windows

* better comments in fluid.plotter help

* use 100K points in the "large datasets" tab of fluid.plotter
  • Loading branch information
@balintlaczko
balintlaczko authored Sep 17, 2023
1 parent 32d618b commit a1a00d9
Show file tree
Hide file tree
Showing 9 changed files with 21,791 additions and 129 deletions.
120 changes: 60 additions & 60 deletions extras/Fluid Corpus Manipulation Toolkit.maxpat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
,
"classnamespace" : "box",
"rect" : [ 35.0, 88.0, 890.0, 777.0 ],
"rect" : [ 243.0, 239.0, 890.0, 777.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
Expand Down Expand Up @@ -50,14 +50,14 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
,
"classnamespace" : "box",
"rect" : [ 35.0, 114.0, 890.0, 751.0 ],
"rect" : [ 243.0, 265.0, 890.0, 751.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
Expand Down Expand Up @@ -165,8 +165,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -447,9 +447,9 @@
}
,
"valueof" : {
"parameter_enum" : [ "fluid.ampfeature~", "fluid.chroma~", "fluid.loudness~", "fluid.melbands~", "fluid.mfcc~", "fluid.pitch~", "fluid.noveltyfeature~", "fluid.onsetfeature~", "fluid.pitch~", "fluid.spectralshape~" ],
"parameter_enum" : [ "fluid.bufnmf~", "fluid.sines~", "fluid.transients~", "fluid.hpss~", "fluid.nmfmorph~", "fluid.bufnmfcross~", "fluid.audiotransport~" ],
"parameter_longname" : "live.tab[8]",
"parameter_mmax" : 9,
"parameter_mmax" : 6,
"parameter_shortname" : "live.tab",
"parameter_type" : 2,
"parameter_unitstyle" : 9
Expand Down Expand Up @@ -640,8 +640,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -1085,8 +1085,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -1265,8 +1265,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -2103,8 +2103,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -2305,8 +2305,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -2589,8 +2589,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -2921,8 +2921,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -3023,15 +3023,15 @@
"fontname" : "Lato",
"fontsize" : 14.0,
"id" : "obj-90",
"linecount" : 4,
"linecount" : 2,
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 5.0, 195.0, 352.0, 74.0 ],
"patching_rect" : [ 5.0, 195.0, 352.0, 40.0 ],
"presentation" : 1,
"presentation_linecount" : 4,
"presentation_rect" : [ 5.0, 5.0, 352.0, 74.0 ],
"text" : "The foundation of many sound corpora workflows is to first analyse the corpus using audio-descriptors. This collection of objects encapsulate several useful algorithms for doing this in realtime and in non-realtime using buffers~.",
"presentation_linecount" : 2,
"presentation_rect" : [ 5.0, 5.0, 352.0, 40.0 ],
"text" : "A selection of patches, abstractions and objects that assist in building and working with corpora.",
"textcolor" : [ 0.0, 0.0, 0.0, 1.0 ]
}

Expand Down Expand Up @@ -3152,14 +3152,14 @@
"maxclass" : "bpatcher",
"numinlets" : 1,
"numoutlets" : 1,
"offset" : [ -820.0, 0.0 ],
"offset" : [ -2050.0, 0.0 ],
"outlettype" : [ "" ],
"patcher" : {
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -3254,8 +3254,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -3446,14 +3446,14 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
,
"classnamespace" : "box",
"rect" : [ 35.0, 88.0, 996.0, 777.0 ],
"rect" : [ 35.0, 100.0, 996.0, 777.0 ],
"bglocked" : 0,
"openinpresentation" : 1,
"default_fontsize" : 12.0,
Expand Down Expand Up @@ -3515,9 +3515,9 @@
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 200.0, 101.0, 92.0, 21.0 ],
"patching_rect" : [ 200.0, 113.0, 92.0, 21.0 ],
"presentation" : 1,
"presentation_rect" : [ 253.0, 100.0, 92.0, 21.0 ],
"presentation_rect" : [ 253.0, 117.0, 92.0, 21.0 ],
"text" : "Corpus Building",
"textjustification" : 1
}
Expand Down Expand Up @@ -3545,24 +3545,24 @@
"fontsize" : 12.0,
"id" : "obj-60",
"maxclass" : "live.tab",
"num_lines_patching" : 2,
"num_lines_presentation" : 2,
"num_lines_patching" : 3,
"num_lines_presentation" : 3,
"numinlets" : 1,
"numoutlets" : 3,
"outlettype" : [ "", "", "float" ],
"parameter_enable" : 1,
"patching_rect" : [ 200.0, 27.0, 197.5, 48.5 ],
"patching_rect" : [ 200.0, 27.0, 197.5, 72.0 ],
"presentation" : 1,
"presentation_rect" : [ 200.0, 27.0, 198.0, 48.5 ],
"presentation_rect" : [ 200.0, 27.0, 198.0, 81.0 ],
"saved_attribute_attributes" : {
"activebgoncolor" : {
"expression" : "themecolor.live_value_bar"
}
,
"valueof" : {
"parameter_enum" : [ "fluid.plotter", "fluid.waveform~" ],
"parameter_enum" : [ "fluid.plotter", "fluid.jit.plotter", "fluid.waveform~" ],
"parameter_longname" : "live.tab[35]",
"parameter_mmax" : 1,
"parameter_mmax" : 2,
"parameter_shortname" : "live.tab",
"parameter_type" : 2,
"parameter_unitstyle" : 9
Expand All @@ -3581,8 +3581,8 @@
"fontsize" : 12.0,
"id" : "obj-59",
"maxclass" : "live.tab",
"num_lines_patching" : 9,
"num_lines_presentation" : 9,
"num_lines_patching" : 8,
"num_lines_presentation" : 8,
"numinlets" : 1,
"numoutlets" : 3,
"outlettype" : [ "", "", "float" ],
Expand All @@ -3598,7 +3598,7 @@
"valueof" : {
"parameter_enum" : [ "fluid.bufcompose~", "fluid.bufscale~", "fluid.bufthresh~", "fluid.bufselect~", "fluid.bufselectevery~", "fluid.bufflatten~", "fluid.buf2list", "fluid.list2buf" ],
"parameter_longname" : "live.tab[36]",
"parameter_mmax" : 8,
"parameter_mmax" : 7,
"parameter_shortname" : "live.tab",
"parameter_type" : 2,
"parameter_unitstyle" : 9
Expand All @@ -3623,9 +3623,9 @@
"numoutlets" : 3,
"outlettype" : [ "", "", "float" ],
"parameter_enable" : 1,
"patching_rect" : [ 200.0, 123.0, 197.5, 48.5 ],
"patching_rect" : [ 200.0, 135.0, 197.5, 48.5 ],
"presentation" : 1,
"presentation_rect" : [ 200.0, 123.0, 198.0, 48.5 ],
"presentation_rect" : [ 200.0, 135.0, 198.0, 53.0 ],
"saved_attribute_attributes" : {
"activebgoncolor" : {
"expression" : "themecolor.live_value_bar"
Expand Down Expand Up @@ -3696,8 +3696,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -3890,8 +3890,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -4320,8 +4320,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -4513,8 +4513,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down Expand Up @@ -4771,8 +4771,8 @@
"fileversion" : 1,
"appversion" : {
"major" : 8,
"minor" : 3,
"revision" : 3,
"minor" : 5,
"revision" : 5,
"architecture" : "x64",
"modernui" : 1
}
Expand Down
Loading

0 comments on commit a1a00d9

Please sign in to comment.