* add time/frequency to the analysis menu

git-svn-id: http://svn.parisson.org/svn/CNAQ/trunk@183 5fc3e0e6-29bc-4d03-b52b-c088cb822bde

diff --git a/CNAQ.m b/CNAQ.m
index 9e30e4159dc20c796873cb148d2bde463d0f86f8..4dc49914383766b1a4f0110c8c4b3673b29959c9 100644 (file)
--- a/CNAQ.m
+++ b/CNAQ.m
@@ -34,7 +34,7 @@ function varargout = CNAQ(varargin)
 \r
 %  Author: Guillaume Pellerin <guillaume.pellerin@cnam.fr>\r
 \r
-% Last Modified by GUIDE v2.5 08-Apr-2008 18:19:43
+% Last Modified by GUIDE v2.5 08-Apr-2008 18:19:43\r
 \r
 %      CNAQ, by itself, creates a new CNAQ or raises the existing\r
 %      singleton*.\r
@@ -171,7 +171,7 @@ set(handles.channels_out,'String','1|1 2|1 2 3|1 2 3 4|1 2 3 4 5 6 7 8');
 \r
 set(handles.analysis_type,'String','Default');\r
 set(handles.analysis_method,'String','Transfert function|Deconvolution');\r
-set(handles.analysis_domain,'String','Frequency|Time');\r
+set(handles.analysis_domain,'String','Frequency|Time|Time/Frequency & THD');\r
 set(handles.in_on_off,'UserData',device);\r
 set(handles.save_button,'UserData',latency);\r
 \r
@@ -423,51 +423,51 @@ function load_Callback(hObject, eventdata, handless)
 %      set(handles.time_value,'String',num2str(time));\r
 \r
 \r
-
-
-% --- Executes on selection change in analysis_type.
-function analysis_type_Callback(hObject, eventdata, handles)
-% hObject    handle to analysis_type (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
-% Hints: contents = get(hObject,'String') returns analysis_type contents as cell array
-%        contents{get(hObject,'Value')} returns selected item from analysis_type
-
-
-% --- Executes during object creation, after setting all properties.
-function analysis_type_CreateFcn(hObject, eventdata, handles)
-% hObject    handle to analysis_type (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    empty - handles not created until after all CreateFcns called
-
-% Hint: popupmenu controls usually have a white background on Windows.
-%       See ISPC and COMPUTER.
-if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
-    set(hObject,'BackgroundColor','white');
-end
-
-
-% --- Executes on selection change in analysis_domain.
-function analysis_domain_Callback(hObject, eventdata, handles)
-% hObject    handle to analysis_domain (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
-% Hints: contents = get(hObject,'String') returns analysis_domain contents as cell array
-%        contents{get(hObject,'Value')} returns selected item from analysis_domain
-
-
-% --- Executes during object creation, after setting all properties.
-function analysis_domain_CreateFcn(hObject, eventdata, handles)
-% hObject    handle to analysis_domain (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    empty - handles not created until after all CreateFcns called
-
-% Hint: popupmenu controls usually have a white background on Windows.
-%       See ISPC and COMPUTER.
-if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
-    set(hObject,'BackgroundColor','white');
-end
-
-
+\r
+\r
+% --- Executes on selection change in analysis_type.\r
+function analysis_type_Callback(hObject, eventdata, handles)\r
+% hObject    handle to analysis_type (see GCBO)\r
+% eventdata  reserved - to be defined in a future version of MATLAB\r
+% handles    structure with handles and user data (see GUIDATA)\r
+\r
+% Hints: contents = get(hObject,'String') returns analysis_type contents as cell array\r
+%        contents{get(hObject,'Value')} returns selected item from analysis_type\r
+\r
+\r
+% --- Executes during object creation, after setting all properties.\r
+function analysis_type_CreateFcn(hObject, eventdata, handles)\r
+% hObject    handle to analysis_type (see GCBO)\r
+% eventdata  reserved - to be defined in a future version of MATLAB\r
+% handles    empty - handles not created until after all CreateFcns called\r
+\r
+% Hint: popupmenu controls usually have a white background on Windows.\r
+%       See ISPC and COMPUTER.\r
+if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))\r
+    set(hObject,'BackgroundColor','white');\r
+end\r
+\r
+\r
+% --- Executes on selection change in analysis_domain.\r
+function analysis_domain_Callback(hObject, eventdata, handles)\r
+% hObject    handle to analysis_domain (see GCBO)\r
+% eventdata  reserved - to be defined in a future version of MATLAB\r
+% handles    structure with handles and user data (see GUIDATA)\r
+\r
+% Hints: contents = get(hObject,'String') returns analysis_domain contents as cell array\r
+%        contents{get(hObject,'Value')} returns selected item from analysis_domain\r
+\r
+\r
+% --- Executes during object creation, after setting all properties.\r
+function analysis_domain_CreateFcn(hObject, eventdata, handles)\r
+% hObject    handle to analysis_domain (see GCBO)\r
+% eventdata  reserved - to be defined in a future version of MATLAB\r
+% handles    empty - handles not created until after all CreateFcns called\r
+\r
+% Hint: popupmenu controls usually have a white background on Windows.\r
+%       See ISPC and COMPUTER.\r
+if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))\r
+    set(hObject,'BackgroundColor','white');\r
+end\r
+\r
+\r

diff --git a/tools/plot_mes.m b/tools/plot_mes.m
index 69786df6d02f1a126c1eafe8e094daa3487425b6..01c662821993e1be6fc178b8c0b9c011da5bd2de 100644 (file)
--- a/tools/plot_mes.m
+++ b/tools/plot_mes.m
@@ -35,6 +35,8 @@ elseif domain == 2
     % Time\r
     figure;\r
     subplot(2,1,1);\r
+    size(t)\r
+    size(sig_mes)\r
     plot(t, sig_mes);\r
     %semilogx(t, sig_mes);\r
     axis([0 t(length(t)) min(sig_mes)-0.01 max(sig_mes)+0.01]);\r
@@ -56,6 +58,12 @@ elseif domain == 2
     title(['Measured impulse response (group: ' group ', id: ' id ', channel : ' channel ')']);\r
     grid on;\r
 \r
+\r
+elseif domain == 3\r
+    % Time - frequency\r
+    spectro2hd(sig_mes,f_s,f_min,f_max,5);\r
+\r
+\r
 end\r
 \r
 \r