* Fix handles

* Fix ID detection

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

diff --git a/CNAQ.m b/CNAQ.m
index 69a00df94b19528e7bd2f62af1088fe74a8502f9..c2fda0701a7f27c38f751ff4957fa4f6d76f117c 100644 (file)
--- a/CNAQ.m
+++ b/CNAQ.m
@@ -111,11 +111,6 @@ varargout{1} = handles.output;
 % uiwait(handles.figure1);\r
 % ==============================================================\r
 \r
-cnaq_version = get_version();\r
-\r
-% ==============================================================\r
-\r
-\r
 % ==============================================================\r
 % INIT\r
 % ==============================================================\r
@@ -129,6 +124,7 @@ path(path, cnaq_path);
 path(path, tools_path);\r
 path(path, pa_path);\r
 path(path, config_path);\r
+cnaq_version = get_version();\r
 \r
 % Get audio device parameters\r
 [device, latency] = asio();\r
@@ -137,9 +133,9 @@ path(path, config_path);
 home_dir = uigetdir(root_dir, 'Choose your workspace');\r
 \r
 % Get/Set ID\r
+set(handles.home_dir_box,'String',home_dir);\r
 id = get_id(handles);\r
 set(handles.ID,'String',id);\r
-set(handles.home_dir_box,'String',home_dir);\r
 set(handles.info1_text,'String',['CNAQ v' cnaq_version ' - Copyright (C) 2007-2008']);\r
 set(handles.info2_text,'String','Guillaume Pellerin, Manuel Melon  CNAM Paris   http://svn.parisson.org/cnaq/');\r
 \r
@@ -264,6 +260,7 @@ function voices_out_CreateFcn(hObject, eventdata, handles)
     if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))\r
         set(hObject,'BackgroundColor','white');\r
     end\r
+  \r
     \r
 %============================================\r
 % GENERATOR\r
@@ -276,6 +273,7 @@ function sig_type_CreateFcn(hObject, eventdata, handles)
         set(hObject,'BackgroundColor','white');\r
     end\r
 \r
+    \r
 % TIME\r
 \r
 function time_gen_min_Callback(hObject, eventdata, handles)\r
@@ -343,8 +341,7 @@ function f_gen_min_CreateFcn(hObject, eventdata, handles)
 \r
 function f_gen_Callback(hObject, eventdata, handles)\r
     set(handles.freq_value,'String',num2str(get(handles.f_gen,'Value')));\r
-\r
-\r
+    \r
 function f_gen_CreateFcn(hObject, eventdata, handles)\r
     if isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))\r
         set(hObject,'BackgroundColor',[.9 .9 .9]);\r
@@ -378,20 +375,17 @@ function close_button_Callback(hObject, eventdata, handles)
 % handles    structure with handles and user data (see GUIDATA)\r
     close all;\r
         \r
-     \r
 % --- Executes on button press in plot.\r
 function plot_Callback(hObject, eventdata, handles)\r
 % hObject    handle to plot (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
     plot_main(handles)\r
-    \r
-    \r
+     \r
 % 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
 % hObject    handle to load (see GCBO)\r
@@ -399,3 +393,5 @@ function load_Callback(hObject, eventdata, handles)
 % handles    structure with handles and user data (see GUIDATA)\r
     load_mes(handles)\r
 \r
+    \r
+    \r

diff --git a/config/asio.m b/config/asio.m
index 29208be57815a499bbdfc4cfc3e4044d059b1336..46ede206bf131cbaa9ee29a3ccf90be33980c066 100644 (file)
--- a/config/asio.m
+++ b/config/asio.m
@@ -4,7 +4,7 @@
 function [device, latency] = asio()\r
 \r
 % The ASIO device number in the audio sytem\r
-device = 1;  \r
+device = 0;  \r
 \r
 % The number of samples in the buffer of the sound card\r
 % (delay * f_s = latency time)\r

diff --git a/tools/get_fs.m b/tools/get_fs.m
index 0f67ee206f15ed2e4980347623c21cac4c6420f1..07cd8a0fd5c493828535e5fb1d94d9b9afa7ae7a 100644 (file)
--- a/tools/get_fs.m
+++ b/tools/get_fs.m
@@ -6,7 +6,11 @@ function f_s = get_fs(handles)
     elseif fs_ind == 2
         f_s = 48000;
     elseif fs_ind == 3
+        f_s = 88200;
+    elseif fs_ind == 4
         f_s = 96000;
+    elseif fs_ind == 5
+        f_s = 192000;
     end
 
 end
\ No newline at end of file

diff --git a/tools/get_id.m b/tools/get_id.m
index 05c2678e7f2ad6ce2d43cdddc533419bc53027b0..93e501ce62299611c8d15f79524ced514acc66ae 100644 (file)
--- a/tools/get_id.m
+++ b/tools/get_id.m
@@ -1,5 +1,4 @@
 function id = get_id(handles)
-
     home_dir = get(handles.home_dir_box,'String');
     id_file = [home_dir '\ID.m'];
     if exist(id_file) == 0

diff --git a/tools/get_version.m b/tools/get_version.m
index 09c6198824df4c4a3c61c24bbc325291bfc37207..73d813bee4808a9d47464f628115f2306678f951 100644 (file)
--- a/tools/get_version.m
+++ b/tools/get_version.m
@@ -1,2 +1,2 @@
 function version = get_version()
-    version = '0.2'
+    version = '0.2';

diff --git a/tools/load_mes.m b/tools/load_mes.m
index 8908e6ac744efecb5b9c7920ac96435370c9fb6c..a963eaa3b0aab14d9c11f988f60150092c753daa 100644 (file)
--- a/tools/load_mes.m
+++ b/tools/load_mes.m
@@ -1,29 +1,29 @@
-function load_mes(handless)
+function load_mes(handles)
 
     [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_fs(handless, f_s);
-    set_nbits(handless, nbits);
-    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(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));
     
 end
\ No newline at end of file

diff --git a/tools/save_mes.m b/tools/save_mes.m
index 7afb30eb58ad2f41550ec18ca0c6668c86814fcb..8cef0df83d8ef4e0dd5742026cc6bbdae7d8fd47 100644 (file)
--- a/tools/save_mes.m
+++ b/tools/save_mes.m
@@ -26,9 +26,9 @@ function save_mes(handles)
     save(file);
     
     % Clear big data
-    set(handles.ID,'UserData',[]);
-    set(handles.id_title,'UserData',[]);
-    set(handles.mes_on,'UserData',[]);
+    % set(handles.ID,'UserData',[]);
+    % set(handles.id_title,'UserData',[]);
+    % set(handles.mes_on,'UserData',[]);
     
     % Increment ID
     increment_id(handles);