Add f_s to RI_FT

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

diff --git a/CNAQ.m b/CNAQ.m
index c2fda0701a7f27c38f751ff4957fa4f6d76f117c..8fb27c6eff9b0d2e6cc4309f2d80fba68fa6490c 100644 (file)
--- a/CNAQ.m
+++ b/CNAQ.m
@@ -173,6 +173,32 @@ set(handles.in_on_off,'UserData',device);
 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
@@ -385,13 +411,40 @@ function plot_Callback(hObject, eventdata, handles)
 % SAVE all data in a mat file \r
 function save_button_Callback(hObject, eventdata, handles)  \r
     save_mes(handles)\r
+    \r
 \r
 % --- Executes on button press in load.\r
-function load_Callback(hObject, eventdata, handles)\r
+function load_Callback(hObject, eventdata, handless)\r
 % hObject    handle to load (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
-    load_mes(handles)\r
-\r
+% handless    structure with handless and user data (see GUIDATA)\r
+    \r
+    [filename, pathname, filterindex] = uigetfile('*.mat', 'Pick a saved MAT file');\r
+    load([pathname filename]);\r
     \r
+    % Set data\r
+    set(handless.username,'String',username);\r
+    set(handless.home_dir_box,'String',home_dir);\r
+    set(handless.comment,'String',comment);\r
+    set(handless.id_title,'UserData',sig_exc);\r
+    set(handless.ID,'UserData',sig_mes);\r
+    set(handless.mes_on,'UserData',f_log);\r
+    set(handless.close_button,'UserData',f_lin);\r
+    set(handless.mes_on,'UserData', f);\r
+    set(handless.plot,'UserData', t);\r
+    set(handless.f_gen_min,'String', num2str(f_min));\r
+    set(handless.f_gen_max,'String', num2str(f_max));\r
+    set(handless.f_gen,'Value', f);\r
+    set(handless.freq_value,'String',num2str(f));\r
+    set(handless.time_gen,'Value', time);\r
+    set(handless.time_value,'String',num2str(time));\r
+    set(handless.gain_in,'Value', gain_in);\r
+    set(handless.gain_out,'Value', gain_out);\r
+    set(handless.gain_in_value,'String',num2str(gain_in));\r
+    set(handless.gain_out_value,'String',num2str(gain_out));\r
+    set(handless.freq_value,'String',num2str(f));\r
+    set(handless.time_value,'String',num2str(time));\r
+    set_fs(handless, f_s);\r
+    set_nbits(handless, nbits);\r
     \r
+\r

diff --git a/tools/RI_FT.m b/tools/RI_FT.m
index b2cf3bc041b14aabff325c921a48ebf145339c81..dd3cb761eb4e9f68f92cb28fda0426c1e6b85b6c 100644 (file)
--- a/tools/RI_FT.m
+++ b/tools/RI_FT.m
@@ -1,4 +1,4 @@
-function [ri,ft]=RI_FT(f, sig_exc, sig_mes)\r
+function [ri,ft]=RI_FT(f, sig_exc, sig_mes, f_s)\r
 %calcul d'une fonction de tranfert mesurée par l'interface CNAQ\r
 %Sorties : fonction de transfert et réponse impulsionnelle \r
 \r

diff --git a/tools/load_mes.m b/tools/load_mes.m
index a963eaa3b0aab14d9c11f988f60150092c753daa..838ae085438a881b7fc378e1f12e6307f802e701 100644 (file)
--- a/tools/load_mes.m
+++ b/tools/load_mes.m
@@ -1,29 +1,31 @@
-function load_mes(handles)
+function load_mes(handless)
 
     [filename, pathname, filterindex] = uigetfile('*.mat', 'Pick a saved MAT file');
     load([pathname filename]);
     
     % Set data
-    set(handles.username,'String',username);
-    set(handles.home_dir_box,'String',home_dir);
-    set(handles.comment,'String',comment);
-    set(handles.id_title,'UserData',sig_exc);
-    set(handles.ID,'UserData',sig_mes);
-    set(handles.mes_on,'UserData',f_log);
-    set(handles.close_button,'UserData',f_lin);
-    set_fs(handles, f_s);
-    set_nbits(handles, nbits);
-    set(handles.mes_on,'UserData', f);
-    set(handles.plot,'UserData', t);
-    set(handles.f_gen_min,'String', num2str(f_min));
-    set(handles.f_gen_max,'String', num2str(f_max));
-    set(handles.f_gen,'Value', f);
-    set(handles.freq_value,'String',num2str(f));
-    set(handles.time_gen,'Value', time);
-    set(handles.time_value,'String',num2str(time));
-    set(handles.gain_in,'Value', gain_in);
-    set(handles.gain_out,'Value', gain_out);
-    set(handles.gain_in_value,'String',num2str(gain_in));
-    set(handles.gain_out_value,'String',num2str(gain_out));
+    set(handless.username,'String',username);
+    set(handless.home_dir_box,'String',home_dir);
+    set(handless.comment,'String',comment);
+    set(handless.id_title,'UserData',sig_exc);
+    set(handless.ID,'UserData',sig_mes);
+    set(handless.mes_on,'UserData',f_log);
+    set(handless.close_button,'UserData',f_lin);
+    set(handless.mes_on,'UserData', f);
+    set(handless.plot,'UserData', t);
+    set(handless.f_gen_min,'String', num2str(f_min));
+    set(handless.f_gen_max,'String', num2str(f_max));
+    set(handless.f_gen,'Value', f);
+    %set(handless.freq_value,'String',num2str(f));
+    set(handless.time_gen,'Value', time);
+    %set(handless.time_value,'String',num2str(time));
+    set(handless.gain_in,'Value', gain_in);
+    set(handless.gain_out,'Value', gain_out);
+    set(handless.gain_in_value,'String',num2str(gain_in));
+    set(handless.gain_out_value,'String',num2str(gain_out));
+    set(handless.freq_value,'String',num2str(f));
+    set(handless.time_value,'String',num2str(time));
+    set_fs(handless, f_s);
+    set_nbits(handless, nbits);
     
 end
\ No newline at end of file