* Fixed f_s value request for the monitor

* Full english in plots

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

diff --git a/tools/monitor.m b/tools/monitor.m
index 16c716da30b807e7945ec854933689d153850756..0160c59d9be0c27176de26a286f5ed1a103ef838 100644 (file)
--- a/tools/monitor.m
+++ b/tools/monitor.m
@@ -3,7 +3,8 @@ function monitor(handles)
     device = get(handles.in_on_off,'UserData');
     buffer = 8192;
     window = hanning(buffer);
-    f_s = get_fs(handles);
+    fs_id = get(handles.f_s,'Value');
+    f_s = get_fs(fs_id);
     time = buffer/f_s;
     t = [0:1/f_s:time-1/f_s];
     

diff --git a/tools/plot_main.m b/tools/plot_main.m
index 5c247ba5219f3c126bde3ebf77436bc4c5cade80..38b3d4342e03490e2ce60cbe0cfc050790a557ab 100644 (file)
--- a/tools/plot_main.m
+++ b/tools/plot_main.m
@@ -8,8 +8,8 @@ function plot_main(handles)
     f_min = str2double(get(handles.f_gen_min,'String'));
     f_max = str2double(get(handles.f_gen_max,'String'));
     fs_id = get(handles.f_s,'Value');
-    nb_id = get(handles.nbits,'Value');
     f_s = get_fs(fs_id);
+    nb_id = get(handles.nbits,'Value');
     nbits = get_nbits(nb_id);
     size_sig_mes = size(sig_mes);
     n_col_sig_mes = size_sig_mes(2);

diff --git a/tools/plot_mes.m b/tools/plot_mes.m
index 0634c8f839c6001dca1aef9eda39b397689cf15c..06d3ce2cc1c2aa627a528335ec0ff73ce6bd41f7 100644 (file)
--- a/tools/plot_mes.m
+++ b/tools/plot_mes.m
@@ -1,4 +1,4 @@
-function plot_mes(t, f, f_s, f_min, f_max, sig_exc, sig_mes, rep_imp_mes, spec_mes, spec_exc, id, voice, group, comment, i);\r
+function plot_mes(t, f, f_s, f_min, f_max, sig_exc, sig_mes, rep_imp_mes, spec_mes, spec_exc, id, channel, group, comment, i);\r
 \r
 len_spec_mes = length(spec_mes);\r
 %spec = spec(1:len_spec);\r
@@ -10,9 +10,9 @@ plot(t, sig_mes);
 %semilogx(t, sig_mes);\r
 axis([0 t(length(t)) min(sig_mes)-0.01 max(sig_mes)+0.01]);\r
 %axis([1 t(length(t)) min(sig_mes)-0.01 max(sig_mes)+0.01]);\r
-xlabel('Temps (s)');\r
+xlabel('Time (s)');\r
 ylabel('Amplitude');\r
-title(['Signal temporel mesuré (groupe: ' group ', id: ' id ', voie : ' voice ')']);\r
+title(['Measured temporal signal (group: ' group ', id: ' id ', channel : ' channel ')']);\r
 grid on;\r
 \r
 subplot(2,1,2);\r
@@ -22,9 +22,9 @@ t_ri = [(-len_ri)/(2*f_s):1/f_s:(len_ri)/(2*f_s)];
 t_ri = t_ri(1:length(t_ri)-1);\r
 plot(t_ri,rep_imp_mes);\r
 axis([-t_ri(len_ri) t_ri(len_ri) min(rep_imp_mes)-0.01 max(rep_imp_mes)+0.01]);\r
-xlabel('Temps (s)');\r
+xlabel('Time (s)');\r
 ylabel('Amplitude');\r
-title(['Réponse impulsionnelle mesurée (groupe: ' group ', id: ' id ', voie : ' voice ')']);\r
+title(['Measured impulse response (group: ' group ', id: ' id ', channel : ' channel ')']);\r
 grid on;\r
 \r
 \r
@@ -39,9 +39,9 @@ subplot(2,1,1);
 spec_mes_log = 10*log10(abs(spec_mes));\r
 semilogx(f, spec_mes_log);\r
 axis([f_min f_max min(spec_mes_log(f_min_ind:f_max_ind-1000))-6 max(spec_mes_log(f_min_ind:f_max_ind))+6]);\r
-xlabel('Fréquence (Hz)');\r
+xlabel('Frequency (Hz)');\r
 ylabel('Amplitude (dB)');\r
-title(['Module de la fonction de transfert (groupe: ' group ', id: ' id ', voie : ' voice ')']);\r
+title(['Modulus of the transfert function (group: ' group ', id: ' id ', channel : ' channel ')']);\r
 grid on;\r
 \r
 subplot(2,1,2);\r
@@ -53,5 +53,5 @@ axis([f_min f_max min(ang(f_min_ind:f_max_ind)) max(ang(f_min_ind:f_max_ind))]);
 grid on;\r
 xlabel('Fréquence (Hz)');\r
 ylabel('Phase (rad)');\r
-title(['Phase de la fonction de transfert (groupe: ' group ', id: ' id ', voie : ' voice ')']);\r
+title(['Phasis of the transfert function (group: ' group ', id: ' id ', channel : ' channel ')']);\r
 \r