Update

EMVizScripts/EMVizGUI.m → EMVizMATLAB/EMVizGUI/EMVizGUI.m

@@ -27,11 +27,11 @@
 % Begin initialization code - DO NOT EDIT
 gui_Singleton = 1;
 gui_State = struct('gui_Name',       mfilename, ...
-                   'gui_Singleton',  gui_Singleton, ...
-                   'gui_OpeningFcn', @EMVizGUI_OpeningFcn, ...
-                   'gui_OutputFcn',  @EMVizGUI_OutputFcn, ...
-                   'gui_LayoutFcn',  [] , ...
-                   'gui_Callback',   []);
+    'gui_Singleton',  gui_Singleton, ...
+    'gui_OpeningFcn', @EMVizGUI_OpeningFcn, ...
+    'gui_OutputFcn',  @EMVizGUI_OutputFcn, ...
+    'gui_LayoutFcn',  [] , ...
+    'gui_Callback',   []);
 if nargin && ischar(varargin{1})
     gui_State.gui_Callback = str2func(varargin{1});
 end
@@ -75,7 +75,7 @@ function EMVizGUI_OpeningFcn(hObject, eventdata, handles, varargin)
 
 
 % --- Outputs from this function are returned to the command line.
-function varargout = EMVizGUI_OutputFcn(hObject, eventdata, handles) 
+function varargout = EMVizGUI_OutputFcn(hObject, eventdata, handles)
 % varargout  cell array for returning output args (see VARARGOUT);
 % hObject    handle to figure
 % eventdata  reserved - to be defined in a future version of MATLAB
@@ -100,7 +100,7 @@ function pushbutton1_Callback(hObject, eventdata, handles)
 title=get(handles.edit2,'String');
 type=get(handles.listbox3,'Value')
 try
-cmin=str2num(get(handles.edit3,'String'));
+    cmin=str2num(get(handles.edit3,'String'));
 catch
     cmin=5;
 end
@@ -121,7 +121,7 @@ function pushbutton1_Callback(hObject, eventdata, handles)
 handles.nmat=nmat;
 set(handles.nmatFound,'Value',nmatFound);
 handles.nmatFound=nmatFound;
- guidata(hObject,handles);
+guidata(hObject,handles);
 
 
 %% "SELECT MIDI FILE"
@@ -142,13 +142,13 @@ function pushbutton2_Callback(hObject, eventdata, handles)
 set(handles.edit1,'String','');
 set(handles.edit2,'String','');
 [filename, pathname] = uigetfile('*.mid');
- set(handles.filename, 'String',filename);
- handles.filename = filename
- set(handles.pathname, 'String',pathname);
- handles.pathname = pathname;
-  set(handles.text9, 'String',filename);
-  %handles.text9 = filename;
- guidata(hObject,handles);
+set(handles.filename, 'String',filename);
+handles.filename = filename
+set(handles.pathname, 'String',pathname);
+handles.pathname = pathname;
+set(handles.text9, 'String',filename);
+%handles.text9 = filename;
+guidata(hObject,handles);
 
 
 % --- Executes on selection change in listbox1.
@@ -194,9 +194,9 @@ function replot_Callback(hObject, eventdata, handles)
 stringSelect
 stringNumbers
 if isempty(stringNumbers)==1
- r=arcPlot(r,nmat,nmatFound,title,0);   
+    r=arcPlot(r,nmat,nmatFound,title,0);
 else
-r=arcPlot(r,nmat,nmatFound,title,0,stringNumbers,stringSelect);
+    r=arcPlot(r,nmat,nmatFound,title,0,stringNumbers,stringSelect);
 end
 handles.stringSelect=[];
 handles.stringNumbers=[];
@@ -240,37 +240,37 @@ function pushbutton4_Callback(hObject, eventdata, handles)
 stringNumbers(end+1)=temp;
 temp2=get(handles.edit1,'String')
 if iscell(temp2)==1
-stringName=temp2{1};
+    stringName=temp2{1};
 else
     stringName=temp2;
 end
 set(handles.edit1,'String','');
 try
-stringSelect{1}
+    stringSelect{1}
 catch
     stringSelect
 end
 stringName
 try
     if strcmp(stringSelect{1},'initialize')==1
         if strcmp(stringName,'')==1
-        stringSelect{1}=strcat('String ',num2str(temp));
+            stringSelect{1}=strcat('String ',num2str(temp));
         else
-          stringSelect{1}=stringName;  
+            stringSelect{1}=stringName;
         end
     elseif strcmp(stringName,'')==1
-
+        
         stringSelect{end+1}=strcat('String ',num2str(temp));
     else
-          stringSelect{end+1}=stringName;  
-
+        stringSelect{end+1}=stringName;
+        
     end
 catch
-        if strcmp(stringName,'')==1
+    if strcmp(stringName,'')==1
         stringSelect{end+1}=strcat('String ',num2str(temp));
-        else
-          stringSelect{end+1}=stringName;  
-        end
+    else
+        stringSelect{end+1}=stringName;
+    end
 end
 handles.stringSelect=[];
 handles.stringNumbers=[];
@@ -324,11 +324,11 @@ function plotString_Callback(hObject, eventdata, handles)
 for i=1:card
     pitches(i)=nmatFound(ind+i-1,4)
     onsets(i)=nmatFound(ind+i-1,1)
-plot([nmatFound(ind+i-1,1)-timeAdj,nmatFound(ind+i-1,1)+nmatFound(ind+i-1,2)-timeAdj],...
-    [nmatFound(ind+i-1,4),nmatFound(ind+i-1,4)],'Color','k','LineWidth', 10);
-% if i>10
-%     break
-% end
+    plot([nmatFound(ind+i-1,1)-timeAdj,nmatFound(ind+i-1,1)+nmatFound(ind+i-1,2)-timeAdj],...
+        [nmatFound(ind+i-1,4),nmatFound(ind+i-1,4)],'Color','k','LineWidth', 10);
+    % if i>10
+    %     break
+    % end
 end
 ylim([min(pitches)-3 max(pitches)+3]);
 xlim([onsets(1)-1-timeAdj onsets(end)+2-timeAdj]);
@@ -385,8 +385,6 @@ function listbox3_CreateFcn(hObject, eventdata, handles)
     set(hObject,'BackgroundColor','white');
 end
 
-
-
 function edit3_Callback(hObject, eventdata, handles)
 % hObject    handle to edit3 (see GCBO)
 % eventdata  reserved - to be defined in a future version of MATLAB
@@ -408,7 +406,6 @@ function edit3_CreateFcn(hObject, eventdata, handles)
     set(hObject,'BackgroundColor','white');
 end
 
-
 % --- Executes on button press in pushbutton6.
 function pushbutton6_Callback(hObject, eventdata, handles)
 % hObject    handle to pushbutton6 (see GCBO)

EMVizScripts/dur.m → EMVizMATLAB/EMVizScripts/dur.m

@@ -12,7 +12,7 @@
 %
 %  Date		Time	Prog	Note
 % 4.6.2002	18:36	TE	Created under MATLAB 5.3 (Mac)
-%� Part of the MIDI Toolbox, Copyright � 2004, University of Jyvaskyla, Finland
+%© Part of the MIDI Toolbox, Copyright © 2004, University of Jyvaskyla, Finland
 % See License.txt
 
 if isempty(nmat), d = []; return; end

EMVizScripts/midi2hz.m → EMVizMATLAB/EMVizScripts/midi2hz.m

@@ -12,7 +12,7 @@
 %
 %  Author		Date
 %  T. Eerola	1.2.2003
-%� Part of the MIDI Toolbox, Copyright � 2004, University of Jyvaskyla, Finland
+%© Part of the MIDI Toolbox, Copyright © 2004, University of Jyvaskyla, Finland
 % See License.txt
 
 if isempty(m), return; end

EMVizScripts/nmat2snd.m → EMVizMATLAB/EMVizScripts/nmat2snd.m

@@ -42,7 +42,7 @@
 %                       semitones lower than desired. To fix, transpose input up by 3 semitones
 %                       (3 midi notes) to get correct pitch with better envelope.
 % 2.5.2005	9:30	TE	Almost a total revision if the shepard function
-%� Part of the MIDI Toolbox, Copyright � 2004, University of Jyvaskyla, Finland
+%© Part of the MIDI Toolbox, Copyright © 2004, University of Jyvaskyla, Finland
 % See License.txt
 
 if isempty(nmat), return; end

EMVizScripts/onset.m → EMVizMATLAB/EMVizScripts/onset.m

@@ -12,7 +12,7 @@
 %
 %  Date		Time	Prog	Note
 % 4.6.2002	18:36	TE	Created under MATLAB 5.3 (Mac)
-%� Part of the MIDI Toolbox, Copyright � 2004, University of Jyvaskyla, Finland
+%© Part of the MIDI Toolbox, Copyright © 2004, University of Jyvaskyla, Finland
 % See License.txt
 
 if isempty(nmat), ob = []; return; end

EMVizScripts/velocity.m → EMVizMATLAB/EMVizScripts/velocity.m

@@ -11,7 +11,7 @@
 %
 %  Date		Time	Prog	Note
 % 4.6.2002	18:36	TE	Created under MATLAB 5.3 (Mac)
-%� Part of the MIDI Toolbox, Copyright � 2004, University of Jyvaskyla, Finland
+%© Part of the MIDI Toolbox, Copyright © 2004, University of Jyvaskyla, Finland
 % See License.txt
 
 if isempty(nmat), return; end