Changeset 614


Ignore:
Timestamp:
Apr 19, 2013, 8:26:37 AM (8 years ago)
Author:
sommeria
Message:

error messages improved

Location:
trunk/src/series
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series/civ_series.m

    r610 r614  
    156156    else
    157157           [FileType_B,FileInfo,VideoObject_B]=get_file_type(filecell{2,1});
    158         if isempty(strcmp(FileType_B,{'multimage','mmreader','video'}))
     158        if isempty(find(strcmp(FileType_B,{'multimage','mmreader','video'})))
    159159            displ(['ERROR: the file line ' num2str(iview_B) ' must be an image'])
    160160        end   
     
    200200        end
    201201end
    202 if ~isempty(strcmp(FileType_A,{'mmreader','video'}))% case of video input
     202if ~isempty(find(strcmp(FileType_A,{'mmreader','video'})))% case of video input
    203203    time=zeros(2,FileInfo_A.NumberOfFrames+1);
    204204    time(2,:)=(0:1/FileInfo_A.FrameRate:(FileInfo_A.NumberOfFrames)/FileInfo_A.FrameRate);
     
    257257            j2=j2_series_Civ1(ifield);
    258258        end
    259         Data.Civ1_Time=(time(j2+1,i2+1)+time(j1+1,i1+1))/2;
    260         Data.Civ1_Dt=time(j2+1,i2+1)-time(j1+1,i1+1)
     259        Data.Civ1_Time=(time(i2+1,j2+1)+time(i1+1,j1+1))/2;
     260        Data.Civ1_Dt=time(i2+1,j2+1)-time(i1+1,j1+1);
    261261        for ilist=1:length(list_param)
    262262            Data.(Civ1_param{4+ilist})=Param.ActionInput.Civ1.(list_param{ilist});
  • trunk/src/series/merge_proj.m

    r606 r614  
    200200        [Data{iview},tild,errormsg] = read_field(filecell{iview,index},FileType{iview},Param.InputFields,frame_index{iview}(index));
    201201        if ~isempty(errormsg)
    202             errormsg=['merge_proj/read_field/' errormsg];
    203             display(errormsg)
    204             break
     202            disp(['ERROR in merge_proj/read_field/' errormsg])
     203            return
    205204        end
    206205        timeread(iview)=0;
     
    239238
    240239        %% calculate tps coeff if needed
    241         check_proj_tps= ~isempty(Param.ProjObject)&& strcmp(Param.ProjObject.ProjMode,'filter')&&~isfield(Data{iview},'Coord_tps');
     240        check_proj_tps= isfield(Param,'ProjObject')&&~isempty(Param.ProjObject)&& strcmp(Param.ProjObject.ProjMode,'interp_tps')&&~isfield(Data{iview},'Coord_tps');
    242241        Data{iview}=tps_coeff_field(Data{iview},check_proj_tps);
    243242
     
    246245            [Data{iview},errormsg]=proj_field(Data{iview},Param.ProjObject);
    247246            if ~isempty(errormsg)
    248                 displ_uvmat('ERROR',['error in merge_proge/proj_field: ' errormsg],checkrun)
     247                disp(['ERROR in merge_proge/proj_field: ' errormsg])
    249248                return
    250249            end
     
    256255    MergeData=merge_field(Data);
    257256    if isfield(MergeData,'Txt')
    258         displ_uvmat('ERROR',MergeData.Txt,checkrun)
     257        disp(MergeData.Txt);
    259258        return
    260259    end
Note: See TracChangeset for help on using the changeset viewer.