Index: /trunk/src/check_files.m =================================================================== --- /trunk/src/check_files.m (revision 827) +++ /trunk/src/check_files.m (revision 828) @@ -65,6 +65,6 @@ 'get_field';...% choose and plot a field from a Netcdf file 'get_field.fig';...%interface for get_field + 'get_file_info';...% determine info about a file (image, multimage, civdata,...) . 'get_file_series';...% determine the list of file names and file indices for functions called by 'series'. - 'get_file_type';...% determine info about a file (image, multimage, civdata,...) . 'hist_update';...% update of a current global histogram by inclusion of a new field 'imadoc2struct';...%convert the image documentation file ImaDoc into a Matlab structure Index: unk/src/get_file_type.m =================================================================== --- /trunk/src/get_file_type.m (revision 827) +++ (revision ) @@ -1,127 +1,0 @@ -%'get_file_type': OBSOLETE, replaced by get_file_info -%------------------------------------------------------------------------ -% [FileType,FileInfo,Object]=get_file_type(fileinput) -% -% OUTPUT: -% FileInfo: structure containing info on the file (case of images or video), in particular -% .FileType: type of file, needed as input of read_field.m -% .Height: image height in pixels -% .Width: image width in pixels -% .BitDepth: nbre of bits per pixel (8 of 16) -% .ColorType: 'greyscale' or 'color' -% .NumberOfFrames -% .FrameRate: nbre of frames per second, =[] for images -% Object: in case of video -% -% INPUT: -% fileinput: name, including path, of the file to analyse - -%======================================================================= -% Copyright 2008-2014, LEGI UMR 5519 / CNRS UJF G-INP, Grenoble, France -% http://www.legi.grenoble-inp.fr -% Joel.Sommeria - Joel.Sommeria (A) legi.cnrs.fr -% -% This file is part of the toolbox UVMAT. -% -% UVMAT is free software; you can redistribute it and/or modify -% it under the terms of the GNU General Public License as published -% by the Free Software Foundation; either version 2 of the license, -% or (at your option) any later version. -% -% UVMAT is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -% GNU General Public License (see LICENSE.txt) for more details. -%======================================================================= - -function [FileType,FileInfo,VideoObject]=get_file_type(fileinput) -VideoObject=[]; -if exist(fileinput,'file') - FileInfo.FileName=fileinput; - FileInfo.FileType='txt'; %default -else - FileInfo.FileType=''; - FileType=FileInfo.FileType; - return -end -[tild,tild,FileExt]=fileparts(fileinput);%get the fiel extension FileExt - -switch FileExt - case '.fig' - FileInfo.FileType='figure'; - case {'.xml','.xls','.dat','.bin'} - FileInfo.FileType=regexprep(FileExt,'^.','');% eliminate the dot of the extension; - otherwise - if ~isempty(FileExt)% exclude empty extension - FileExt=regexprep(FileExt,'^.','');% eliminate the dot of the extension - if ~isempty(FileExt) - if ~isempty(imformats(FileExt))%case of images - try - imainfo=imfinfo(fileinput); - if length(imainfo) >1 %case of image with multiple frames - FileInfo=imainfo(1);%take info from the first frame - FileInfo.FileType='multimage'; - FileInfo.NumberOfFrames=length(imainfo); - else - FileInfo=imainfo; - FileInfo.FileType='image'; - FileInfo.NumberOfFrames=1; - end - FileInfo.FileName=FileInfo.Filename; %correct the info given by imfinfo - end - else - error_nc=0; - try - [Data,tild,tild,errormsg]=nc2struct(fileinput,[]); - if ~isempty(errormsg) - error_nc=1; - else - if isfield(Data,'absolut_time_T0') && isfield(Data,'hart') && ~isempty(Data.absolut_time_T0) && ~isempty(Data.hart) - FileInfo.FileType='civx'; - FileType='civx'; % test for civx velocity fields - if isfield(Data,'patch2') && isequal(Data.patch2,1) - FileInfo.CivStage=6; - elseif isfield(Data,'fix2') && isequal(Data.fix2,1) - FileInfo.CivStage=5; - elseif isfield(Data,'civ2')&& isequal(Data.civ2,1) - FileInfo.CivStage=4; - elseif isfield(Data,'patch')&&isequal(Data.patch,1) - FileInfo.CivStage=3; - elseif isfield(Data,'fix')&&isequal(Data.fix,1) - FileInfo.CivStage=2; - else - FileInfo.CivStage=1; - end - elseif isfield(Data,'Conventions') && strcmp(Data.Conventions,'uvmat/civdata') - FileInfo.FileType='civdata'; % test for civx velocity fields - % FileType='civdata'; % test for civx velocity fields - FileInfo.CivStage=Data.CivStage; - else - FileInfo.FileType='netcdf'; - %FileType='netcdf'; - FileInfo.ListVarName=Data.ListVarName; - end - end - catch ME - error_nc=1; - end - if error_nc - try - if exist('VideoReader.m','file')%recent version of Matlab - VideoObject=VideoReader(fileinput); - FileInfo=get(VideoObject); - FileInfo.FileType='video'; - elseif exist('mmreader.m','file')% Matlab 2009a - VideoObject=mmreader(fileinput); - FileInfo=get(VideoObject); - FileInfo.FileType='mmreader'; - end - FileInfo.FileName=fileinput; - FileInfo.BitDepth=FileInfo.BitsPerPixel/3; - end - end - end - end - end -end -FileType=FileInfo.FileType; Index: /trunk/src/read_multimadoc.m =================================================================== --- /trunk/src/read_multimadoc.m (revision 827) +++ /trunk/src/read_multimadoc.m (revision 828) @@ -70,5 +70,5 @@ Time=cat(1,Time,shiftdim(time_line,-1)); else - msgbox_uvmat('WARNING','inconsistent time array dimensions in ImaDoc fields, the time for the first series is used') + warnmsg='inconsistent time array dimensions in ImaDoc fields, the time for the first series is used'; Time=cat(1,Time,Time(1,:,:));% copy times of the first line break