From: yomguy <yomguy@5fc3e0e6-29bc-4d03-b52b-c088cb822bde>
Date: Mon, 31 Mar 2008 12:06:51 +0000 (+0000)
Subject: Add f_s to RI_FT
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dfb975a1d94c6dffe74f51d05fcd645593b222fd;p=cnaq.git

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 c2fda07..8fb27c6 100644
--- a/CNAQ.m
+++ b/CNAQ.m
@@ -173,6 +173,32 @@ set(handles.in_on_off,'UserData',device);
 set(handles.save_button,'UserData',latency);
 
     
+%============================================
+% TOOLS
+%============================================
+    
+function set_fs(handles, f_s)
+    if f_s == 44100
+        fs_ind = 1;
+    elseif f_s == 48000
+        fs_ind = 2;
+    elseif f_s == 88200
+        fs_ind = 3;
+    elseif f_s == 96000
+        fs_ind = 4;
+    elseif f_s == 192000
+        fs_ind = 5;
+    end
+    set(handles.f_s,'Value',fs_ind);
+    
+function set_nbits(handles, nbits)
+    if nbits == 16
+        nb_ind = 1;
+    elseif nbits == 24
+        nb_ind = 2;
+    end
+    set(handles.nbits,'Value', nb_ind);
+    
 %============================================
 % DATA
 %============================================
@@ -385,13 +411,40 @@ function plot_Callback(hObject, eventdata, handles)
 % SAVE all data in a mat file 
 function save_button_Callback(hObject, eventdata, handles)  
     save_mes(handles)
+    
 
 % --- Executes on button press in load.
-function load_Callback(hObject, eventdata, handles)
+function load_Callback(hObject, eventdata, handless)
 % hObject    handle to load (see GCBO)
 % eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-    load_mes(handles)
-
+% handless    structure with handless and user data (see GUIDATA)
+    
+    [filename, pathname, filterindex] = uigetfile('*.mat', 'Pick a saved MAT file');
+    load([pathname filename]);
     
+    % Set data
+    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);
     
+
diff --git a/tools/RI_FT.m b/tools/RI_FT.m
index b2cf3bc..dd3cb76 100644
--- a/tools/RI_FT.m
+++ b/tools/RI_FT.m
@@ -1,4 +1,4 @@
-function [ri,ft]=RI_FT(f, sig_exc, sig_mes)
+function [ri,ft]=RI_FT(f, sig_exc, sig_mes, f_s)
 %calcul d'une fonction de tranfert mesurée par l'interface CNAQ
 %Sorties : fonction de transfert et réponse impulsionnelle 
 
diff --git a/tools/load_mes.m b/tools/load_mes.m
index a963eaa..838ae08 100644
--- 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