Skip to content

Add Quark file, fix two issues #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
celesteh wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add Quark file, fix two issues #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff06f8
Quark file
celesteh Mar 24, 2023
5b07624
The treatment of Rests has changed. isActive is not member data.
celesteh Mar 24, 2023
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
9 changes: 9 additions & 0 deletions AlgoScore2.quark
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
(
name: "AlgoScore2",
summary: "A graphical environment for algorithmic composition, where music is constructed directly in an interactive graphical score.",
version: "2.0.0",
schelp: "Algoscore",
dependencies: [],
//license: "GPL",
copyright: "Jonatan Liljedahl. 2012"
)
9 changes: 6 additions & 3 deletions classes/PatternPlotter.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ PplotPart {
^Prout({ | ev |
var a, cleanup;
cleanup = EventStreamCleanup.new;
a = (type: \plotPart, isRest: true, dur: 0, plotID: id, plotCleanupFuncs:List[]);
a = (type: \plotPart, isRest: Rest(0), dur: 0, plotID: id, plotCleanupFuncs:List[]);
cleanup.addFunction(a, { a.plotCleanupFuncs.do(_.value); a.plotCleanupFuncs.clear });
ev = a.yield;
ev = Pchain(pattern, (plotID: id)).embedInStream(ev);
Expand Down Expand Up @@ -494,7 +494,9 @@ PatternPlotter {
pen.stroke;
};
};
plot.isActive = false;
//plot.isActive = false;
//"plot stop".postln;
plot.stop; // isActive is a method, not a member boolean
};
};
var doHelpLines = {|plot,v,end,op,x,yy|
Expand Down Expand Up @@ -556,7 +558,8 @@ PatternPlotter {
plot.state = IdentityDictionary.new; // should this be here? I guess so.
plot.lastValueString = nil;
plot.startX = x;
plot.isActive = true;
//plot.isActive = true;
plot.resume; // The above is illegal
ev.plotCleanupFuncs.add {
plot.plotIDs.debug("plotPart cleanup [plotspec %]".format(i));
plotEnd.value(plot, x);
Expand Down