From: yomguy Date: Thu, 27 Mar 2008 13:42:40 +0000 (+0000) Subject: * Fix handles X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=941d537f0614e8824b28f9e0c824cb4290ca9f92;p=cnaq.git * 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 69a00df..c2fda07 100644 --- a/CNAQ.m +++ b/CNAQ.m @@ -111,11 +111,6 @@ varargout{1} = handles.output; % uiwait(handles.figure1); % ============================================================== -cnaq_version = get_version(); - -% ============================================================== - - % ============================================================== % INIT % ============================================================== @@ -129,6 +124,7 @@ path(path, cnaq_path); path(path, tools_path); path(path, pa_path); path(path, config_path); +cnaq_version = get_version(); % Get audio device parameters [device, latency] = asio(); @@ -137,9 +133,9 @@ path(path, config_path); home_dir = uigetdir(root_dir, 'Choose your workspace'); % Get/Set ID +set(handles.home_dir_box,'String',home_dir); id = get_id(handles); set(handles.ID,'String',id); -set(handles.home_dir_box,'String',home_dir); set(handles.info1_text,'String',['CNAQ v' cnaq_version ' - Copyright (C) 2007-2008']); set(handles.info2_text,'String','Guillaume Pellerin, Manuel Melon CNAM Paris http://svn.parisson.org/cnaq/'); @@ -264,6 +260,7 @@ function voices_out_CreateFcn(hObject, eventdata, handles) if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor')) set(hObject,'BackgroundColor','white'); end + %============================================ % GENERATOR @@ -276,6 +273,7 @@ function sig_type_CreateFcn(hObject, eventdata, handles) set(hObject,'BackgroundColor','white'); end + % TIME function time_gen_min_Callback(hObject, eventdata, handles) @@ -343,8 +341,7 @@ function f_gen_min_CreateFcn(hObject, eventdata, handles) function f_gen_Callback(hObject, eventdata, handles) set(handles.freq_value,'String',num2str(get(handles.f_gen,'Value'))); - - + function f_gen_CreateFcn(hObject, eventdata, handles) if isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor')) set(hObject,'BackgroundColor',[.9 .9 .9]); @@ -378,20 +375,17 @@ function close_button_Callback(hObject, eventdata, handles) % handles structure with handles and user data (see GUIDATA) close all; - % --- Executes on button press in plot. function plot_Callback(hObject, eventdata, handles) % hObject handle to plot (see GCBO) % eventdata reserved - to be defined in a future version of MATLAB % handles structure with handles and user data (see GUIDATA) plot_main(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) % hObject handle to load (see GCBO) @@ -399,3 +393,5 @@ function load_Callback(hObject, eventdata, handles) % handles structure with handles and user data (see GUIDATA) load_mes(handles) + + diff --git a/config/asio.m b/config/asio.m index 29208be..46ede20 100644 --- a/config/asio.m +++ b/config/asio.m @@ -4,7 +4,7 @@ function [device, latency] = asio() % The ASIO device number in the audio sytem -device = 1; +device = 0; % The number of samples in the buffer of the sound card % (delay * f_s = latency time) diff --git a/tools/get_fs.m b/tools/get_fs.m index 0f67ee2..07cd8a0 100644 --- 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 05c2678..93e501c 100644 --- 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 09c6198..73d813b 100644 --- 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 8908e6a..a963eaa 100644 --- 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 7afb30e..8cef0df 100644 --- 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);