From: yomguy Date: Fri, 21 Nov 2008 11:00:33 +0000 (+0000) Subject: Add comment to saved file and plot titles X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cebb337a4a0a8ca43c42e56f1a5cb4e767ec4f0e;p=cnaq.git Add comment to saved file and plot titles git-svn-id: http://svn.parisson.org/svn/CNAQ/trunk@201 5fc3e0e6-29bc-4d03-b52b-c088cb822bde --- diff --git a/CNAQ.fig b/CNAQ.fig index a186180..1aeedf3 100644 Binary files a/CNAQ.fig and b/CNAQ.fig differ diff --git a/CNAQ.m b/CNAQ.m index 599bd74..0ab4b62 100644 --- a/CNAQ.m +++ b/CNAQ.m @@ -34,7 +34,7 @@ function varargout = CNAQ(varargin) % Author: Guillaume Pellerin -% Last Modified by GUIDE v2.5 21-Nov-2008 10:49:08 +% Last Modified by GUIDE v2.5 21-Nov-2008 11:36:46 % CNAQ, by itself, creates a new CNAQ or raises the existing % singleton*. @@ -593,3 +593,28 @@ if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgr end + + + +function r_c_Callback(hObject, eventdata, handles) +% hObject handle to r_c (see GCBO) +% eventdata reserved - to be defined in a future version of MATLAB +% handles structure with handles and user data (see GUIDATA) + +% Hints: get(hObject,'String') returns contents of r_c as text +% str2double(get(hObject,'String')) returns contents of r_c as a double + + +% --- Executes during object creation, after setting all properties. +function r_c_CreateFcn(hObject, eventdata, handles) +% hObject handle to r_c (see GCBO) +% eventdata reserved - to be defined in a future version of MATLAB +% handles empty - handles not created until after all CreateFcns called + +% Hint: edit controls usually have a white background on Windows. +% See ISPC and COMPUTER. +if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor')) + set(hObject,'BackgroundColor','white'); +end + + diff --git a/tools/plot_mes.m b/tools/plot_mes.m index cd15583..f3ebfe8 100644 --- a/tools/plot_mes.m +++ b/tools/plot_mes.m @@ -17,7 +17,7 @@ if domain == 1 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]); xlabel('Frequency (Hz)'); ylabel('Amplitude (dB)'); - title(['Modulus of the transfer function (group: ' group ', id: ' id ', channel : ' channel ')']); + title(['Modulus of the transfer function (group: ' group ', id: ' id ', channel : ' channel ', comment :' comment ')']); grid on; subplot(2,1,2); @@ -29,7 +29,7 @@ if domain == 1 grid on; xlabel('Frequency (Hz)'); ylabel('Phasis (rad)'); - title(['Phasis of the transfer function (group: ' group ', id: ' id ', channel : ' channel ')']); + title(['Phasis of the transfer function (group: ' group ', id: ' id ', channel : ' channel ', comment :' comment ')']); elseif domain == 2 % Time @@ -42,7 +42,7 @@ elseif domain == 2 %axis([1 t(length(t)) min(sig_mes)-0.01 max(sig_mes)+0.01]); xlabel('Time (s)'); ylabel('Amplitude'); - title(['Measured temporal signal (group: ' group ', id: ' id ', channel : ' channel ')']); + title(['Measured temporal signal (group: ' group ', id: ' id ', channel : ' channel ', comment :' comment ')']); grid on; subplot(2,1,2); @@ -54,7 +54,7 @@ elseif domain == 2 axis([-t_ri(len_ri) t_ri(len_ri) min(rep_imp_mes)-0.01 max(rep_imp_mes)+0.01]); xlabel('Time (s)'); ylabel('Amplitude'); - title(['Measured impulse response (group: ' group ', id: ' id ', channel : ' channel ')']); + title(['Measured impulse response (group: ' group ', id: ' id ', channel : ' channel ', comment :' comment ')']); grid on; diff --git a/tools/save_mes.m b/tools/save_mes.m index 5923c59..966d269 100644 --- a/tools/save_mes.m +++ b/tools/save_mes.m @@ -26,7 +26,7 @@ function save_mes(handles) gain_out = get(handles.gain_out,'Value'); % Save it - file = [home_dir '\' username '_' id '.mat']; + file = [home_dir '\' username '_' id '_' comment '.mat']; save(file); % Clear big data