Skip to content

Commit

Permalink
Merge pull request #18 from groupeLIAMG/dev3D
Browse files Browse the repository at this point in the history 
display picked time
  • Loading branch information
@bernard-giroux
bernard-giroux committed Mar 31, 2016
2 parents 7063ec0 + 629424c commit 69786e3
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 17 deletions.
Binary file modified bh_tomo/bh_tomo_tt.fig
View file
Binary file not shown.
52 changes: 35 additions & 17 deletions bh_tomo/bh_tomo_tt.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,11 @@ function trace_traite_Callback(hObject, eventdata, handles)
function update_tout(hObject, eventdata, handles)
h = getappdata(handles.fig_bh_tomo_tt, 'h');
set(handles.trace_traite,'String',num2str(h.no_trace))
if h.pick_et(h.no_trace) ~= -1
set(handles.text_tt_info,'String',['Picked Time: ',num2str(h.pick(h.no_trace)),' ± ',num2str(h.pick_et(h.no_trace))])
else
set(handles.text_tt_info,'String',['Picked Time: ',num2str(h.pick(h.no_trace))])
end
update_trace_simple(hObject, eventdata, handles)
update_traces_contigues(hObject, eventdata, handles)
update_positions_info(hObject, eventdata, handles)
Expand Down Expand Up @@ -588,10 +593,8 @@ function a_zoom_Callback(hObject, eventdata, handles)
%
function update_positions_info(hObject, eventdata, handles)
h = getappdata(handles.fig_bh_tomo_tt, 'h');
mog = getappdata(handles.fig_bh_tomo_tt, 'mog');
av = getappdata(handles.fig_bh_tomo_tt, 'av');
ap = getappdata(handles.fig_bh_tomo_tt, 'ap');
if (get(handles.radiobutton_data,'Value')==1)
mog = getappdata(handles.fig_bh_tomo_tt, 'mog');
Tx_x = mog.data.Tx_x(h.no_trace);
Tx_y = mog.data.Tx_y(h.no_trace);
Tx_z = mog.data.Tx_z(h.no_trace);
Expand All @@ -601,6 +604,7 @@ function update_positions_info(hObject, eventdata, handles)
Tx_d = mog.Tx_z_orig(h.no_trace);
in = mog.in;
elseif (get(handles.radiobutton_av,'Value')==1)
av = getappdata(handles.fig_bh_tomo_tt, 'av');
Tx_x = av.data.Tx_x(h.no_trace);
Tx_y = av.data.Tx_y(h.no_trace);
Tx_z = av.data.Tx_z(h.no_trace);
Expand All @@ -610,6 +614,7 @@ function update_positions_info(hObject, eventdata, handles)
Tx_d = av.d_TxRx(h.no_trace);
in = av.in;
elseif (get(handles.radiobutton_ap,'Value')==1)
ap = getappdata(handles.fig_bh_tomo_tt, 'ap');
Tx_x = ap.data.Tx_x(h.no_trace);
Tx_y = ap.data.Tx_y(h.no_trace);
Tx_z = ap.data.Tx_z(h.no_trace);
Expand Down Expand Up @@ -638,9 +643,9 @@ function pointe(hObject, eventdata, handles)
if get(handles.checkbox_pickTx,'Value') == 1
pointe_simple(hObject, eventdata, handles)
elseif get(handles.action,'Value') == 1
pointe_ecart_type(hObject, eventdata, handles)
pointe_ecart_type(hObject, eventdata, handles)
elseif get(handles.action,'Value') == 2
pointe_simple(hObject, eventdata, handles)
pointe_simple(hObject, eventdata, handles)
end
update_tout(hObject, eventdata, handles)
set(handles.pushbutton_active_pointe,'Value',0)
Expand Down Expand Up @@ -701,7 +706,12 @@ function pointe_ecart_type(hObject, eventdata, handles)
elseif button==3
et = abs(t1-tt);
update_images(hObject, eventdata, handles, tt, et)
end
end
if et ~= -1
set(handles.text_tt_info,'String',['Picked Time: ',num2str(tt),' ± ',num2str(et)])
else
set(handles.text_tt_info,'String',['Picked Time: ',num2str(tt)])
end
[t1,a,button] = ginput(1);
pushOnce=false;
end
Expand Down Expand Up @@ -772,19 +782,20 @@ function pointe_simple(hObject, eventdata, handles)
n_trace_traite = 0;
tt = pick(h.no_trace);
while pointe_actif
update_tout(hObject, eventdata, handles)
[t1,a,button] = ginput(1);
pushOnce=true;
while button ~= 2
if gca ~= handles.trace_simple || t1<xlim(1) || t1>xlim(2) || a<ylim(1) || a>ylim(2)
%pointe_actif=0;
setappdata(handles.fig_bh_tomo_tt, 'h', h)
return
end
if button==1
update_tout(hObject, eventdata, handles)
[t1,a,button] = ginput(1);
pushOnce=true;
while button ~= 2
if gca ~= handles.trace_simple || t1<xlim(1) || t1>xlim(2) || a<ylim(1) || a>ylim(2)
%pointe_actif=0;
setappdata(handles.fig_bh_tomo_tt, 'h', h)
return
end
if button==1
tt = t1;
update_images(hObject, eventdata, handles, tt, -1)
end
end
set(handles.text_tt_info,'String',['Picked Time: ',num2str(tt)])
[t1,a,button] = ginput(1);
pushOnce=false;
end
Expand Down Expand Up @@ -1474,6 +1485,7 @@ function pointe_contigues_simple(hObject, eventdata, handles)
set(handles.trace_traite,'String',num2str(h.no_trace))
setappdata(handles.fig_bh_tomo_tt, 'h', h)
update_tout(hObject, eventdata, handles)
set(handles.text_tt_info,'String',['Picked Time: ',num2str(h.pick(h.no_trace))])
n_trace_traite = n_trace_traite+1;
if rem(n_trace_traite,50)==0 && get(handles.checkbox_interm_save,'Value')==1
sauve_mat(handles,true)
Expand Down Expand Up @@ -1541,6 +1553,12 @@ function pointe_contigues_ecart_type(hObject, eventdata, handles)
set(handles.trace_traite,'String',num2str(h.no_trace))
setappdata(handles.fig_bh_tomo_tt, 'h', h)
update_tout(hObject, eventdata, handles)
if h.pick_et(h.no_trace) ~= -1
set(handles.text_tt_info,'String',['Picked Time: ',num2str(h.pick(h.no_trace)),' ± ',num2str(h.pick_et(h.no_trace))])
else
set(handles.text_tt_info,'String',['Picked Time: ',num2str(h.pick(h.no_trace))])
end

n_trace_traite = n_trace_traite+1;
if rem(n_trace_traite,50)==0 && get(handles.checkbox_interm_save,'Value')==1
sauve_mat(handles,true)
Expand Down

0 comments on commit 69786e3

Please sign in to comment.