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 a186180f7387924c02973692357eba1fc788275a..1aeedf3a394cf8408fc72ddc891251dad91b254b 100644 (file)
Binary files a/CNAQ.fig and b/CNAQ.fig differ

diff --git a/CNAQ.m b/CNAQ.m
index 599bd746cfbab023f1b390d7503a9d9b93bb8077..0ab4b62160352e09792f583d27677b8ae685fc43 100644 (file)
--- a/CNAQ.m
+++ b/CNAQ.m
@@ -34,7 +34,7 @@ function varargout = CNAQ(varargin)
 \r
 %  Author: Guillaume Pellerin <guillaume.pellerin@cnam.fr>\r
 \r
-% Last Modified by GUIDE v2.5 21-Nov-2008 10:49:08\r
+% Last Modified by GUIDE v2.5 21-Nov-2008 11:36:46
 \r
 %      CNAQ, by itself, creates a new CNAQ or raises the existing\r
 %      singleton*.\r
@@ -593,3 +593,28 @@ if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgr
 end\r
 \r
 \r
+
+
+
+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 cd155831dfe508ed302fa9603ba5b5204f11a883..f3ebfe81c03c4c0d87e652161226f6efd92b58b7 100644 (file)
--- 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]);\r
     xlabel('Frequency (Hz)');\r
     ylabel('Amplitude (dB)');\r
-    title(['Modulus of the transfer function (group: ' group ', id: ' id ', channel : ' channel ')']);\r
+    title(['Modulus of the transfer function (group: ' group ', id: ' id ', channel : ' channel ', comment :' comment ')']);\r
     grid on;\r
 \r
     subplot(2,1,2);\r
@@ -29,7 +29,7 @@ if domain == 1
     grid on;\r
     xlabel('Frequency (Hz)');\r
     ylabel('Phasis (rad)');\r
-    title(['Phasis of the transfer function (group: ' group ', id: ' id ', channel : ' channel ')']);\r
+    title(['Phasis of the transfer function (group: ' group ', id: ' id ', channel : ' channel ', comment :' comment ')']);\r
 \r
 elseif domain == 2\r
     % Time\r
@@ -42,7 +42,7 @@ elseif domain == 2
     %axis([1 t(length(t)) min(sig_mes)-0.01 max(sig_mes)+0.01]);\r
     xlabel('Time (s)');\r
     ylabel('Amplitude');\r
-    title(['Measured temporal signal (group: ' group ', id: ' id ', channel : ' channel ')']);\r
+    title(['Measured temporal signal (group: ' group ', id: ' id ', channel : ' channel ', comment :' comment ')']);\r
     grid on;\r
 \r
     subplot(2,1,2);\r
@@ -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]);\r
     xlabel('Time (s)');\r
     ylabel('Amplitude');\r
-    title(['Measured impulse response (group: ' group ', id: ' id ', channel : ' channel ')']);\r
+    title(['Measured impulse response (group: ' group ', id: ' id ', channel : ' channel ', comment :' comment ')']);\r
     grid on;\r
 \r
 \r

diff --git a/tools/save_mes.m b/tools/save_mes.m
index 5923c59289a2f3966a202d5e01a6e24dfff168fa..966d269f1be3708cc42d43ccee09598ad2801ea8 100644 (file)
--- 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