* Add the convoluted temporal method

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

diff --git a/CNAQ.fig b/CNAQ.fig
index e6a1b1b1227aa8837cd05593f37024ab47fa7c8d..3e9d3e7483cda6caadad6b6ac6c6cc3b5a371fde 100644 (file)
Binary files a/CNAQ.fig and b/CNAQ.fig differ

diff --git a/CNAQ.m b/CNAQ.m
index 8fb27c6eff9b0d2e6cc4309f2d80fba68fa6490c..52f30c0cd429b0bc0920012467b64078f7c70e26 100644 (file)
--- a/CNAQ.m
+++ b/CNAQ.m
@@ -169,36 +169,11 @@ set(handles.sig_type,'String','Sinus|Chirp|White noise|Pink noise');
 set(handles.voices_in,'String','1|1 2|1 2 3|1 2 3 4');\r
 set(handles.voices_out,'String','1|1 2|1 2 3|1 2 3 4');\r
 \r
+set(handles.mes_type,'String','Transfert function|Impulse response');\r
 set(handles.in_on_off,'UserData',device);\r
 set(handles.save_button,'UserData',latency);\r
 \r
     \r
-%============================================\r
-% TOOLS\r
-%============================================\r
-    \r
-function set_fs(handles, f_s)\r
-    if f_s == 44100\r
-        fs_ind = 1;\r
-    elseif f_s == 48000\r
-        fs_ind = 2;\r
-    elseif f_s == 88200\r
-        fs_ind = 3;\r
-    elseif f_s == 96000\r
-        fs_ind = 4;\r
-    elseif f_s == 192000\r
-        fs_ind = 5;\r
-    end\r
-    set(handles.f_s,'Value',fs_ind);\r
-    \r
-function set_nbits(handles, nbits)\r
-    if nbits == 16\r
-        nb_ind = 1;\r
-    elseif nbits == 24\r
-        nb_ind = 2;\r
-    end\r
-    set(handles.nbits,'Value', nb_ind);\r
-    \r
 %============================================\r
 % DATA\r
 %============================================\r
@@ -391,7 +366,7 @@ function mes_type_CreateFcn(hObject, eventdata, handles)
 \r
 function mes_on_Callback(hObject, eventdata, handles, device)\r
     measurement(handles)\r
-    plot_Callback(hObject, eventdata, handles)\r
+    plot_main(handles)\r
     \r
 % Close all figures\r
 % --- Executes on button press in close_button.\r

diff --git a/tools/measurement.m b/tools/measurement.m
index 2b8f2bb5b4ca99f89974391742763dcdd64d685e..ac13ef2b416ad9638e68a560e53b94ff4dcbcf0a 100644 (file)
--- a/tools/measurement.m
+++ b/tools/measurement.m
@@ -56,7 +56,7 @@ function measurement(handles)
     % Measure
     sig_mes = pa_wavplayrecord(sig_out, device, f_s, 0, voice_first, voice_last, device, 'asio');
     %    Usage:
-    %      inputbuffer = pa_wavplayrecord(playbuffer,[playdevice],[samplerate],
+    %    inputbuffer = pa_wavplayrecord(playbuffer,[playdevice],[samplerate],
     %                       [recnsamples], [recfirstchannel], [reclastchannel],
     %                       [recdevice], [devicetype])
     

diff --git a/tools/plot_main.m b/tools/plot_main.m
index 179105e02675c05b60bc394c01b81df59ee3c139..e5c7ffe2800f4901113b0caf1a2228967bde959c 100644 (file)
--- a/tools/plot_main.m
+++ b/tools/plot_main.m
@@ -13,9 +13,11 @@ function plot_main(handles)
     username = get(handles.username,'String');
     comment = get(handles.comment,'String');
     id = get(handles.ID,'String');
+    mes_type = get(handles.mes_type,'Value');
+    
+    % Compute excitation spectrum    
+    [rep_imp_exc, spec_exc] = get_ri_spec(f, sig_exc, sig_exc, f_s);
     
-    % Compute excitation spectrum
-    [rep_imp_exc, spec_exc] = fonc_trans(f, sig_exc, sig_exc);
     len_spec_exc = length(spec_exc);
     spec_exc = spec_exc(1:len_spec_exc/2);
     
@@ -25,7 +27,7 @@ function plot_main(handles)
     % Compute all Ris and specs
     for i=1:n_col_sig_mes
         voice = num2str(i);
-        [rep_imp_mes, spec_mes] = fonc_trans(f, sig_exc, sig_mes(:,i));
+        [rep_imp_mes, spec_mes] = get_ri_spec(f, sig_exc, sig_mes(:,i), f_s);
         len_spec_mes = length(spec_mes);    
         spec_mes = spec_mes(1:len_spec_mes/2);
         % Plot results