Changeset 1183

Timestamp:

Nov 3, 2025, 2:54:33 PM (5 weeks ago)

Author:

sommeria

Message:

bed_scan added + bug repairs

Location:

trunk/src

Files:

• imadoc2struct.m (modified) (1 diff)
• keyboard_callback.m (modified) (2 diffs)
• series.m (modified) (1 diff)
• series/bed_scan.m (modified) (1 diff)
• series/civ_series.m (modified) (2 diffs)
• uvmat.m (modified) (3 diffs)
• xml2struct.m (modified) (5 diffs)

trunk/src/imadoc2struct.m

@@ -41 +41 @@
 [tild,tild,FileExt]=fileparts(ImaDoc);
 
-if nargin ==1
+if nargin ==1% no additional input variable beyond 'ImaDoc'
     [s,Heading,errormsg]=xml2struct(ImaDoc);% convert the whole xml file in a structure s
-elseif nargin ==2
+elseif nargin ==2 %one additional input variable beyond 'ImaDoc'specifying the subtree to read
     [s,Heading,errormsg]=xml2struct(ImaDoc,varargin{1});% convert the xml file in a structure s, keeping only the subtree defined in input
-else %TODO: deal with more than two subtrees?
+else % case of two subtrees, TODO: deal with more than two subtrees?
     [s,Heading,errormsg]=xml2struct(ImaDoc,varargin{1},varargin{2});% convert the xml file in a structure s, keeping only the subtree defined in input
 end

trunk/src/keyboard_callback.m

@@ -25 +25 @@
 if ~isempty(xx)
     switch xx
-        case {29,28,30,31}    %arrows for displacement
+        case {29,28,30,31,8592,8593,8594,8595}  %arrows for displacement (linux or windows)
             hhh=get(hObject,'CurrentObject');
             AxeData=get(cur_axes,'UserData');
@@ -37 +37 @@
                 dx=(xlimit(2)-xlimit(1))/10;
                 dy=(ylimit(2)-ylimit(1))/10;
-                if isequal(xx,29)%move arrow right
-                    xlimit=xlimit+dx;
-                elseif isequal(xx,28)%move arrow left
-                    xlimit=xlimit-dx;
-                elseif isequal(xx,30)%move arrow up
-                    ylimit=ylimit+dy;
-                elseif isequal(xx,31)%move arrow down
-                    ylimit=ylimit-dy;
+                switch xx
+                    case{29,8594}%move arrow right
+                        xlimit=xlimit+dx;
+                    case{28,8592}%move arrow left
+                        xlimit=xlimit-dx;
+                    case {30,8593}%move arrow up
+                        ylimit=ylimit+dy;
+                    case{31,8595}%move arrow down%move arrow down
+                        ylimit=ylimit-dy;
                 end
                 set(cur_axes,'XLim',xlimit)

trunk/src/series.m

@@ -3422 +3422 @@
 %% use a browser to choose the xml file containing the processing config
 InputTable=get(handles.InputTable,'Data');
+oldfile='';
+if isempty(InputTable)
+    oldfile='';
+else
 oldfile=InputTable{1,1}; % current path in InputTable
+end
 if isempty(oldfile)
     % use a file name stored in prefdir

trunk/src/series/bed_scan.m

@@ -196 +196 @@
 tic
 nb_scan=10;
-nb_scan=10;
 for img=1:nb_scan
      img

trunk/src/series/civ_series.m

@@ -503 +503 @@
                 j1=j1_series_Civ1(ifield);
             end
-            if ~isempty(i2_series_Civ1)% case of volume,masks act on different j levels
+            if ~isempty(i2_series_Civ1)&& ~isequal(i1_series_Civ1,i2_series_Civ1)% case of volume,masks act on different j levels
                 maskname=fullfile_uvmat(RootPath_mask,SubDir_mask,RootFile_mask,Ext_mask,'_1',j1);
             elseif isfield(par_civ1,'NbSlice')
@@ -766 +766 @@
         if par_civ2.CheckMask && ~isempty(par_civ2.Mask)
             [RootPath_mask,SubDir_mask,RootFile_mask,~,~,~,~,Ext_mask]=fileparts_uvmat(Param.ActionInput.Civ2.Mask);
-            if ~isempty(i2_series_Civ2) % we do PIV among indices i,  at given indices j (volume scan), mask depends on position j
+            if ~isempty(i2_series_Civ2) && ~isequal(i1_series_Civ2,i2_series_Civ2) % we do PIV among indices i,  at given indices j (volume scan), mask depends on position j
                 j1=1;
                 if ~isempty(j1_series_Civ2)

trunk/src/uvmat.m

@@ -13 +13 @@
 
 %=======================================================================
-% Copyright 2008-2024, LEGI UMR 5519 / CNRS UGA G-INP, Grenoble, ileSeriesrance
+% Copyright 2008-2024, LEGI UMR 5519 / CNRS UGA G-INP, Grenoble, France
 %   http://www.legi.grenoble-inp.fr
 %   Joel.Sommeria - Joel.Sommeria (A) univ-grenoble-alpes.fr
@@ -536 +536 @@
 function MenuExportFigure_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-hfig=figure;
-hc=copyobj(handles.PlotAxes,hfig);
-set(hc,'Position',[0.1 0.1 0.8 0.8])
+hfig=figure;%create a new figure
+hc=copyobj(handles.PlotAxes,hfig);%copy the current axis content on the new fig
+set(hc,'Position',[0.1 0.1 0.8 0.8])% adjust the position of the axis on the figure
 title_menu=get(handles.FieldName,'String');
-title_string=title_menu{get(handles.FieldName,'Value')};
+title_string=title_menu{get(handles.FieldName,'Value')};% get the name of the plotted field
 title(title_string);
+set(hc,'FontSize',16); %set the sdize of titles and labels
+
+%% copy the colormap to the new fig if relevant
 h=findobj(handles.PlotAxes,'tag','ima'); %look for image in the plot
-if ~isempty(h)
+if ~isempty(h)% copy the colorbar to the new fig if relevant
     map=colormap(handles.PlotAxes);
     colormap(map);%transmit the current colormap to the new fig
@@ -2878 +2881 @@
 else
     index_string=get(handles.FileIndex,'String');
-    if isfield(UvData,'XmlData')&& isfield(UvData.XmlData{1},'FileSeries')% The frame indexing is determined through the xml file, section FileSeries
+    if isfield(UvData,'XmlData')&& isfield(UvData.XmlData{1},'FileSeries')
         i1=str2double(get(handles.i1,'String'));
         j1=str2double(get(handles.j1,'String'));
         NbField_j_cell=get(handles.MaxIndex_j,'String');
         NbField_j=str2double(NbField_j_cell{1});
-        [RootFile,index_string,FrameIndex]=index2filename(UvData.XmlData{1}.FileSeries,i1,j1,NbField_j);% convert frame index i1 j1 to index in the files
+        [RootFile,index_string,FrameIndex]=index2filename(UvData.XmlData{1}.FileSeries,i1,j1,NbField_j);
         set(handles.RootFile,'String',RootFile)
     else

trunk/src/xml2struct.m

@@ -39 +39 @@
 catch ME
     errormsg=ME.message;
-    if ~isempty(regexp(ME.message,'Undefined function'))||~isempty(regexp(ME.message,'Missing'))
+    if ~isempty(regexp(ME.message,'Undefined function','once'))||~isempty(regexp(ME.message,'Missing','once'))
         errormsg=[errormsg ': package xmltree not correctly installed, reload it from www.artefact.tk/software/matlab/xml'];
     end
@@ -52 +52 @@
     end
 end
-if nargin>1
+if nargin>1 % additional input vartiable(s) beyond filename, select specified subtrees
     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);
+        ss=convert(t);%transform the xmltree object into a Matlab structure.
+        s=convert_string(ss);% explore the sub-structures if needed
     catch ME
         errormsg=ME.message;
@@ -86 +86 @@
     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
+        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)
@@ -102 +102 @@
                 end
             end
-%         end
+         end
     case 'cell'
         out={};%default