Changeset 1191 for trunk/src

Timestamp:

Feb 6, 2026, 5:13:05 PM (2 weeks ago)

Author:

sommeria

Message:

bugs repaired

Location:

trunk/src

Files:

• find_imadoc.m (modified) (3 diffs)
• get_file_info.m (modified) (1 diff)
• series.m (modified) (4 diffs)
• uvmat.m (modified) (4 diffs)
• xml2struct.m (modified) (6 diffs)

trunk/src/find_imadoc.m

@@ -2 +2 @@
 % take into account the old conventions
 %-----------------------------------------------------------------------
-% function XmlFileName=find_imadoc(RootPath,SubDir)
+% function {[XmlFileName,Rank]=find_imadoc(RootPath,SubDir)
 %
 % OUTPUT:
-% XmlFileName: name of the xml file, ='' if none is found
+% XmlFileName: name of the xml file, if the SubDir has suffixes marked with
+%        '.', take the first one going backward, ='' isf no xml file is found
+% Rank: = nbre of suffixes in SubDir
 %
 % INPUT:
@@ -29 +31 @@
 %=======================================================================
 
-function XmlFileName=find_imadoc(RootPath,SubDir)
+function [XmlFileName,Rank]=find_imadoc(RootPath,SubDir)
 XmlFileName=fullfile(RootPath,[SubDir '.xml']);
+Rank=0;
 if ~exist(XmlFileName,'file')
     dotchar=regexp(SubDir,'\.');%detect the dots in the folder name
@@ -38 +41 @@
             XmlFileName=fullfile(RootPath,[SubDir '.xml']);
             if exist(XmlFileName,'file')
-                break
+                Rank=idot;
+                break % take the root name after removing all the dot suffixes
             end
         end

trunk/src/get_file_info.m

@@ -153 +153 @@
         XmlFile=fullfile(RootPath,[SubDir '.xml']);
         CheckWriteImaDoc=true;
-        if exist(XmlFile,'file')
-            [XmlData,~,errormsg]=xml2struct(XmlFile);
-            if ~isempty(errormsg)
-                disp(errormsg)
-                FileInfo.FileType='error';
-                return
-            elseif isfield(XmlData,'FileSeries')
-                CheckWriteImaDoc=false;
-            end
-        end
-        if CheckWriteImaDoc
-            DirContent=dir(Path);
-            NbFiles=0;
-            FileSeries.Convention='telopsIR';
-            for ilist=1:numel(DirContent)
-                FName=DirContent(ilist).name;
-                if ~isempty(regexp(FName,'.hcc$', 'once'))
-                    NbFiles=NbFiles+1;
-                    FileSeries.FileName{NbFiles,1}=FName;
-                end
-            end
-            FileSeries.NbFramePerFile=FileInfo.NumberOfFrames;
-            [checkupdate,xmlfile,errormsg]=update_imadoc(RootPath,SubDir,'FileSeries',FileSeries);
-        end
+%         if exist(XmlFile,'file')
+%             [XmlData,~,errormsg]=xml2struct(XmlFile);
+%             if ~isempty(errormsg)
+%                 disp(errormsg)
+%                 FileInfo.FileType='error';
+%                 return
+%             elseif isfield(XmlData,'FileSeries')
+%                 CheckWriteImaDoc=false;
+%             end
+%         end
+%         if CheckWriteImaDoc
+%             DirContent=dir(Path);
+%             NbFiles=0;
+%             FileSeries.Convention='telopsIR';
+%             for ilist=1:numel(DirContent)
+%                 FName=DirContent(ilist).name;
+%                 if ~isempty(regexp(FName,'.hcc$', 'once'))
+%                     NbFiles=NbFiles+1;
+%                     FileSeries.FileName{NbFiles,1}=FName;
+%                 end
+%             end
+%             FileSeries.NbFramePerFile=FileInfo.NumberOfFrames;
+%             [checkupdate,xmlfile,errormsg]=update_imadoc(RootPath,SubDir,'FileSeries',FileSeries);
+%         end
 
     otherwise

trunk/src/series.m

@@ -608 +608 @@
         RootFile='';
     else
-        XmlFileName=find_imadoc(InputTable{iview,1},InputTable{iview,2});
-        if ~isempty(XmlFileName)
+        [XmlFileName,Rank]=find_imadoc(InputTable{iview,1},InputTable{iview,2});
+        if ~isempty(XmlFileName) && Rank==0
             XmlData=read_imadoc(XmlFileName);
             if ~isempty(XmlData.FileSeries)
@@ -745 +745 @@
 [FilePath,RootFile,FileExt]=fileparts(InputFile);
 [RootPath,SubDir]=fileparts(FilePath);
-XmlFileName=find_imadoc(RootPath,SubDir);
+[XmlFileName,Rank]=find_imadoc(RootPath,SubDir);
 Param.Relabel=false;%no file relabeling by default
 XmlData=[];
 if ~isempty(XmlFileName)
     XmlData=read_imadoc(XmlFileName);
-    if isfield(XmlData,'FileSeries')
+    if isfield(XmlData,'FileSeries') && Rank==0
         set(handles.Relabel,'Visible','on')
         answer=msgbox_uvmat('INPUT_Y-N','relabel the frame  indices according to the xml info?');
@@ -823 +823 @@
     SeriesData.j1_series(iview+1:end)=[];
     SeriesData.j2_series(iview+1:end)=[];
-    SeriesData.FileType(iview+1:end)=[];
+    %SeriesData.FileType(iview+1:end)=[];
     SeriesData.FileInfo(iview+1:end)=[];
     SeriesData.Time(iview+1:end)=[];
@@ -1263 +1263 @@
 if CheckPair% if pairs need to be display for line iview
     [ModeMenu,ModeValue]=update_mode(i1_series,i2_series,j2_series);
-    Menu=update_listpair(i1_series,i2_series,j1_series,j2_series,ModeMenu{ModeValue},Time,TimeUnit,ref_i,ref_j,TimeName,InputTable(iview,:),FileInfo);
+    Menu=update_listpair(i1_series,i2_series,j1_series,j2_series,ModeMenu{ModeValue},Time,TimeUnit,ref_i,ref_j,TimeName,InputTable(iview,:),Param.FileInfo);
     PairString{iview,1}=Menu{1};
 else

trunk/src/uvmat.m

@@ -1958 +1958 @@
 end
 [XmlData,errormsg]=imadoc2struct(XmlFile);
-if isempty(XmlData) || isempty(XmlData.Time)
-    msgbox_uvmat('ERROR',['the timing needs to be documented in the file ' XmlFile])
-    return
-end
+% if isempty(XmlData) || isempty(XmlData.Time)
+%     msgbox_uvmat('ERROR',['the timing needs to be documented in the file ' XmlFile])
+%     return
+% end
 FileInfo=get_file_info(FileName);
 switch FileInfo.FileType
@@ -2289 +2289 @@
 FieldType=FileInfo.FieldType;
 
-%% case of isolated input files without series
+%% case of isolated input files without field indexing, direct display
 if strcmp(FileInfo.FileIndexing,'off')
     switch FieldType
@@ -2316 +2316 @@
 end
 
-%% define the relevant handles for the first field series (input_line=1) or the second file series (input_line=2)
+%% define the relevant handles on the uvmat GUI for the first field series (input_line=1) or the second file series (input_line=2)
 if ~exist('input_line','var')
     input_line=1;
@@ -3734 +3734 @@
     end
 end
-%% case of special file series (PCO)
+%% case of file relabeling (PCO, Telops...)
 if isfield(UvData,'XmlData') && isfield(UvData.XmlData{1},'FileSeries')
     [RootName,~,Ext]=fileparts(FileName);

trunk/src/xml2struct.m

@@ -39 +39 @@
 catch ME
     errormsg=ME.message;
-    if ~isempty(regexp(ME.message,'Undefined function','once'))||~isempty(regexp(ME.message,'Missing','once'))
+    if ~isempty(regexp(ME.message,'Undefined function'))||~isempty(regexp(ME.message,'Missing'))
         errormsg=[errormsg ': package xmltree not correctly installed, reload it from www.artefact.tk/software/matlab/xml'];
     end
@@ -52 +52 @@
     end
 end
-if nargin>1 % additional input vartiable(s) beyond filename, select specified subtrees
+if nargin>1
     for isub=1:nargin-1
         uid_sub=find(t,['/' RootTag '/' varargin{isub}]);
@@ -58 +58 @@
             s.(varargin{isub})=[];
         else
-            tsub=branch(t,uid_sub);
-            if ~isempty(get(tsub,1,'contents'))
-                ss=convert(tsub);
-                s.(varargin{isub})=convert_string(ss);
-            end
+        tsub=branch(t,uid_sub);
+        if ~isempty(get(tsub,1,'contents'))
+        ss=convert(tsub);
+        s.(varargin{isub})=convert_string(ss);
+        end
         end
     end
 else
     try
-        ss=convert(t);%transform the xmltree object into a Matlab structure.
-        s=convert_string(ss);% explore the sub-structures if needed
+    ss=convert(t);%transform the xmltree object into a Matlab structure.
+    s=convert_string(ss);
     catch ME
         errormsg=ME.message;
@@ -85 +85 @@
         end
     case 'char' 
-        % try to convert to number if the char does not correspond to a function (otherwise str2num calls this function as it uses 'eval')
-        if exist(ss,'builtin')||exist(ss,'file')% ss corresponds to the name of a builtin Matlab function or a file
-            out=ss; %reproduce the input string
-        else
-            out=str2num(ss);% convert to number or vector (str2num applied to a fct name executes this fct by 'eval', thus this possibility had to be ruled out above
-            if isempty(out)
+            out=str2double(strsplit(ss));% convert to number or vector (str2num applied to a fct name executes this fct by 'eval', thus this possibility had to be ruled out above
+            if isnan(out)
                 sep_ind=regexp(ss,'\s&\s');% check for separator ' & ' which indicates column separation in tables
                 if ~isempty(sep_ind)
@@ -102 +98 @@
                 end
             end
-         end
     case 'cell'
-        out={};%default
+        out=cell(numel(ss),1);%default
         check_numeric=zeros(size(ss));
         for ilist=1:numel(ss)
-            if ~strcmp(ss{ilist},'image') && ~isempty(str2num(ss{ilist}))
-                out{ilist,1}=str2num(ss{ilist});
+            if  ~isnan(str2double(strsplit(ss{ilist})))
+                out{ilist,1}=str2double(strsplit(ss{ilist}));
                 check_numeric(ilist)=1;
             else
@@ -129 +124 @@
 end
 
+