changeset 58:69b54aa5a9bb

Added plottrack.m and redid drum plots with whole track plot.

Binary file draft.pdf has changed

Binary file drum_plots.tar.gz has changed

--- a/matlab/drumplot.m	Fri Mar 16 18:05:56 2012 +0000
+++ b/matlab/drumplot.m	Fri Mar 16 20:52:56 2012 +0000
@@ -3,9 +3,11 @@
 	opts=prefs('basename',[],varargin{:});
 	plots=drumplots(BDT,opts);
 	if isempty(opts.basename)
-		plotfn=@(f,p)paperplot(f,p,opts);
+		plotfn=@(f,p)paperplot(f,p,'size',[8,8],opts);
+		paperplot(40,@()plottrack(BDT),opts,'size',[25,5]);
 	else
-		plotfn=@(f,p)paperplot(f,p,'epsfile',sprintf('%s-%d.eps',opts.basename,f),opts);
+		plotfn=@(f,p)paperplot(f,p,'epsfile',sprintf('%s-%d.eps',opts.basename,f),'size',[8,8],opts);
+		paperplot(40,@()plottrack(BDT),'epsfile',sprintf('%s-track.eps',opts.basename),opts,'size',[25,5]);
 	end
 	zipwith(plotfn,num2cell(40+(1:length(plots))),plots);
 end

--- a/matlab/fileplot.m	Fri Mar 16 18:05:56 2012 +0000
+++ b/matlab/fileplot.m	Fri Mar 16 20:52:56 2012 +0000
@@ -1,5 +1,5 @@
 function fileplot(file,varargin)
 	disp(file{1});
-	drumplot(read_shift(file),varargin{:});
+	drumplot(read_shift(file),varargin{:},'pause',0);
 	optpause(prefs('pause',1,'drawnow',1,varargin{:}));
 end

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/matlab/plottrack.m	Fri Mar 16 20:52:56 2012 +0000
@@ -0,0 +1,16 @@
+function h=plottrack(X)
+	times=(X(:,1)-X(1,1))/1000;
+	Kick=find(X(:,2)==1);
+	Snare=find(X(:,2)==2);
+	plot(flatten([times';times']),flatten(X(:,[8,7])')/log(2)-2,'Color',[1,1,1]*0.25);
+	hold on;
+	stem(times(Kick),X(Kick,6)/log(2),'ro');
+	stem(times(Snare),X(Snare,6)/log(2),'bx');
+	hold off;
+	ylim([0,ceil(max(X(:,8))/log(2))-3]);
+	xlim([0,X(end,1)-X(1,1)]/1000);
+	legend({'entropy','info (kick)','info (snare)'});
+	xlabel('time/s');
+	ylabel('bits');
+	h=gca;
+end

--- a/matlab/shift_beat.m	Fri Mar 16 18:05:56 2012 +0000
+++ b/matlab/shift_beat.m	Fri Mar 16 20:52:56 2012 +0000
@@ -2,18 +2,6 @@
 	beatpos=X(:,4);
 	if any(diff(beatpos)<0)
 		disp('WARNING: metrical position not monotonic');
-		figure(70); 
-		times=(X(:,1)-X(1,1))/1000;
-		Kick=find(X(:,2)==1);
-		Snare=find(X(:,2)==2);
-		plot(flatten([times';times']),flatten(X(:,[8,7])'));
-	%	[times,,X(:,[7,8]));
-		hold on;
-		stem(times(Kick),X(Kick,6),'ro');
-		stem(times(Snare),X(Snare,6),'gx');
-		hold off;
-		xlim([0,30]);
-		pan on;
 	end
 	X(:,4)=beatpos+delta;
 end