Index: /trunk/src/mouse_motion.m =================================================================== --- /trunk/src/mouse_motion.m (revision 969) +++ /trunk/src/mouse_motion.m (revision 970) @@ -215,7 +215,7 @@ text_displ_1=[xName '=' num2str(xy(1,1),4) ', ' yName '=' num2str(xy(1,2),4) ',']; end - %display the z coordinate if defined by the projection plane + %display the original phys x,y,z coordinates if defined by the projection plane if isfield(Field,'ProjObjectType') && strcmp(Field.ProjObjectType,'plane') && isfield(Field,'ProjObjectCoord') && length(Field.ProjObjectCoord)>=3 - pos=[xy(1,1) xy(1,2) 0]; + pos=[xy(1,1) xy(1,2) 0];%coordinates on the graph if isfield(Field,'ProjObjectAngle')&&~isequal(Field.ProjObjectAngle,[0 0 0]) om=norm(Field.ProjObjectAngle);%norm of rotation angle in radians Index: /trunk/src/phys_ima.m =================================================================== --- /trunk/src/phys_ima.m (revision 969) +++ /trunk/src/phys_ima.m (revision 970) @@ -67,4 +67,15 @@ SliceCoord=Calib.SliceCoord(ZIndex,:); zphys=SliceCoord(3); %to generalize for non-parallel planes + +% if isfield(Calib,'SliceAngle')&&~isequal(Calib.SliceAngle,[0 0 0]) +% om=norm(Calib.SliceAngle);%norm of rotation angle in radians +% OmAxis=Calib.SliceAngle/om; %unit vector marking the rotation axis +% cos_om=cos(pi*om/180); +% sin_om=sin(pi*om/180); +% pos=[xy(1,1) xy(1,2) 0]; +% pos=cos_om*pos+sin_om*cross(OmAxis,pos)+(1-cos_om)*(OmAxis*pos')*OmAxis; +% end + + % if isfield(Calib,'InterfaceCoord') && isfield(Calib,'RefractionIndex') % H=Calib.InterfaceCoord(3); Index: /trunk/src/series.m =================================================================== --- /trunk/src/series.m (revision 969) +++ /trunk/src/series.m (revision 970) @@ -2722,9 +2722,17 @@ if isequal(FileInfo.FileType,'civdata') if ismember(TimeName,{'civ1','filter1'}) + if isfield(Data,'Civ1_Time') TimeValue=Data.Civ1_Time; + end + if isfield(Data,'Civ1_Dt') DtValue=Data.Civ1_Dt; + end else + if isfield(Data,'Civ2_Time') TimeValue=Data.Civ2_Time; + end + if isfield(Data,'Civ2_Dt') DtValue=Data.Civ2_Dt; + end end else Index: /trunk/src/series/time_series.m =================================================================== --- /trunk/src/series/time_series.m (revision 969) +++ /trunk/src/series/time_series.m (revision 970) @@ -172,12 +172,12 @@ ImageTypeOptions={'image','multimage','mmreader','video'}; NcTypeOptions={'netcdf','civx','civdata'}; -FileType=cell(1,nbview); -FileInfo=cell(1,nbview); -MovieObject=cell(1,nbview); -CheckImage=cell(1,nbview); -CheckNc=cell(1,nbview); -frame_index=cell(1,nbview); - -for iview=1:nbview +FileType=cell(1,NbView); +FileInfo=cell(1,NbView); +MovieObject=cell(1,NbView); +CheckImage=cell(1,NbView); +CheckNc=cell(1,NbView); +frame_index=cell(1,NbView); + +for iview=1:NbView if ~exist(filecell{iview,1}','file') disp_uvmat('ERROR',['the first input file ' filecell{iview,1} ' does not exist'],checkrun) @@ -233,5 +233,5 @@ return end -if nbview==2 && ~isequal(CheckImage{1},CheckImage{2}) +if NbView==2 && ~isequal(CheckImage{1},CheckImage{2}) disp_uvmat('ERROR','input must be two image series or two netcdf file series',checkrun) return @@ -252,10 +252,10 @@ %% Set field names and velocity types InputFields{1}=[];%default (case of images) -if nbview==2 +if NbView==2 InputFields{2}=[];%default (case of images) end if isfield(Param,'InputFields') InputFields{1}=Param.InputFields; - if nbview==2 + if NbView==2 InputFields{2}=Param.InputFields;%default if isfield(Param.InputFields,'FieldName_1') @@ -311,15 +311,15 @@ %%%%%%%%%%%%%%%% loop on field indices %%%%%%%%%%%%%%%% -for index=1:nbfield - update_waitbar(WaitbarHandle,index/nbfield) +for index=1:NbField + update_waitbar(WaitbarHandle,index/NbField) if ~isempty(RUNHandle) && ~strcmp(get(RUNHandle,'BusyAction'),'queue') disp('program stopped by user') break % leave the loop if stop is ordered end - Data=cell(1,nbview);%initiate the set Data; + Data=cell(1,NbView);%initiate the set Data; nbtime=0; dt=[]; %%%%%%%%%%%%%%%% loop on views (input lines) %%%%%%%%%%%%%%%% - for iview=1:nbview + for iview=1:NbView % reading input file(s) [Data{iview},tild,errormsg] = read_field(filecell{iview,index},FileType{iview},InputFields{iview},frame_index{iview}(index)); @@ -407,5 +407,5 @@ testsum(ivar)=1; DataOut.(VarName)=Field.(VarName); - DataOut.([VarName 'Histo'])=zeros([nbfield numel(DataOut.(VarName))]); + DataOut.([VarName 'Histo'])=zeros([NbField numel(DataOut.(VarName))]); VarMesh=Field.(VarName)(2)-Field.(VarName)(1); end @@ -444,5 +444,5 @@ VarName=Field.ListVarName{ivar}; siz=size(Field.(VarName)); - DataOut.(VarName)=zeros([nbfield siz]); + DataOut.(VarName)=zeros([NbField siz]); end end @@ -466,9 +466,9 @@ if MaxIndex_new>MaxIndex% the variable max for the current field exceeds the previous one DataOut.(VarName)=[DataOut.(VarName) VarMesh*(MaxIndex+1:MaxIndex_new)];% append the new variable values - DataOut.([VarName 'Histo'])=[DataOut.([VarName 'Histo']) zeros(nbfield,MaxIndex_new-MaxIndex)]; % append the new histo values + DataOut.([VarName 'Histo'])=[DataOut.([VarName 'Histo']) zeros(NbField,MaxIndex_new-MaxIndex)]; % append the new histo values end if MinIndex_new <= MinIndex-1 DataOut.(VarName)=[VarMesh*(MinIndex_new:MinIndex-1) DataOut.(VarName)];% insert the new variable values - DataOut.([VarName 'Histo'])=[zeros(nbfield,MinIndex-MinIndex_new) DataOut.([VarName 'Histo'])];% insert the new histo values + DataOut.([VarName 'Histo'])=[zeros(NbField,MinIndex-MinIndex_new) DataOut.([VarName 'Histo'])];% insert the new histo values ind_start=1; else @@ -560,5 +560,5 @@ test_time=diff(DataOut.Time)>0;% test that the readed time is increasing (not constant) if ~test_time - DataOut.Time=1:nbfield; + DataOut.Time=1:NbField; end Index: /trunk/src/set_object.m =================================================================== --- /trunk/src/set_object.m (revision 969) +++ /trunk/src/set_object.m (revision 970) @@ -38,5 +38,5 @@ function varargout = set_object(varargin) -% Last Modified by GUIDE v2.5 09-Jul-2016 20:25:37 +% Last Modified by GUIDE v2.5 09-Nov-2016 15:46:04 % Begin initialization code - DO NOT REFRESH @@ -823,20 +823,8 @@ -% --- Executes on key press with focus on num_Angle_1 and none of its controls. -function num_Angle_1_KeyPressFcn(hObject, eventdata, handles) -% hObject handle to num_Angle_1 (see GCBO) -% eventdata structure with the following fields (see MATLAB.UI.CONTROL.UICONTROL) -% Key: name of the key that was pressed, in lower case -% Character: character interpretation of the key(s) that was pressed -% Modifier: name(s) of the modifier key(s) (i.e., control, shift) pressed -% handles structure with handles and user data (see GUIDATA) - - -% --- Executes on key press with focus on num_Angle_2 and none of its controls. -function num_Angle_2_KeyPressFcn(hObject, eventdata, handles) -% hObject handle to num_Angle_2 (see GCBO) -% eventdata structure with the following fields (see MATLAB.UI.CONTROL.UICONTROL) -% Key: name of the key that was pressed, in lower case -% Character: character interpretation of the key(s) that was pressed -% Modifier: name(s) of the modifier key(s) (i.e., control, shift) pressed -% handles structure with handles and user data (see GUIDATA) +% + + +% --- Executes on key press with focus on num_RangeX_2 and none of its controls. +function suggest_refresh(hObject, eventdata, handles) +set(handles.REFRESH,'BackgroundColor',[1 0 1])