Changeset 1151 for trunk

Timestamp:

Jun 26, 2024, 6:37:49 PM (6 months ago)

Author:

sommeria

Message:

civ_3D updated

Location:

trunk/src

Files:

• geometry_calib.m (modified) (3 diffs)
• series/civ_3D.m (modified) (1 diff)
• update_imadoc.m (modified) (2 diffs)

trunk/src/geometry_calib.m

@@ -180 +180 @@
 if ~isempty(hhuvmat.RootPath)&& ~isempty(hhuvmat.RootFile)
     RootPath=get(hhuvmat.RootPath,'String');% path to the currently displayed image
-    SubDirBase=regexprep(get(hhuvmat.SubDir,'String'),'\..+$','');
-    outputfile=[fullfile(RootPath,SubDirBase) '.xml'];%xml file associated with the currently displayed image
+    %SubDirBase=regexprep(get(hhuvmat.SubDir,'String'),'\..+$','');
+    outputfile=[fullfile(RootPath,get(hhuvmat.SubDir,'String')) '.xml'];%xml file associated with the currently displayed image
 else
     question={'save the calibration data and point coordinates in'};
@@ -295 +295 @@
             SourceDir=get(BrowseData.SourceDir,'String');
             ListExp=get(BrowseData.ListExperiments,'String');
-            ExpIndices=get(BrowseData.ListExperiments,'Value');
-            ListExp=ListExp(ExpIndices);
+            ListExp=ListExp(get(BrowseData.ListExperiments,'Value'));% list of selected experiments
             ListDevices=get(BrowseData.ListDevices,'String');
-            DeviceIndices=get(BrowseData.ListDevices,'Value');
-            ListDevices=ListDevices(DeviceIndices);
+            ListDevices=ListDevices(get(BrowseData.ListDevices,'Value'));% list of selected devices
             ListDataSeries=get(BrowseData.DataSeries,'String');
-            DataSeriesIndices=get(BrowseData.DataSeries,'Value');
-            ListDataSeries=ListDataSeries(DataSeriesIndices);
+            ListDataSeries=ListDataSeries(get(BrowseData.DataSeries,'Value'));% list of selected data series
+            if find(~cellfun('isempty',strfind(ListDataSeries,'.xml')))
+                msgbox_uvmat('ERROR','select folders in browse_data, not xml files');
+                return
+            end
+            if find(~cellfun('isempty',strfind(ListDataSeries,'.')))
+                msgbox_uvmat('ERROR','select only folders at the root, without dot (.) in the name');
+                return
+            end
             NbExp=0; % counter of the number of experiments set by the GUI browse_data
             for iexp=1:numel(ListExp)
@@ -344 +349 @@
                 else
                     if check_update
-                        display([XmlName ' updated with calibration parameters' dispmessage])
+                        disp([XmlName ' updated with calibration parameters' dispmessage]);
                     else
-                        display([XmlName ' created with calibration parameters: no timing defined' dispmessage])
+                        disp([XmlName ' created with calibration parameters: no timing defined' dispmessage]);
                     end
                 end

trunk/src/series/civ_3D.m

@@ -289 +289 @@
         par_civ1.ImageA=zeros(2*SearchRange_z+1,npy,npx);
         par_civ1.ImageB=zeros(2*SearchRange_z+1,npy,npx);
-
-        for islice=par_civ1.Dz:NbSlice
-            if par_civ1.Dz<2*SearchRange_z+1 
-            par_civ1.ImageA=circshift(par_civ1.ImageA,-par_civ1.Dz);
+        %first vertical block centered at image index islice=par_civ1.Dz
+        islice=par_civ1.Dz;
+         for iz=1:par_civ1.Dz+SearchRange_z
+              ImageName_A=fullfile_uvmat(RootPath_A,SubDir_A,RootFile_A,FileExt_A,NomType_A,i1_series_Civ1(1,ifield),[],j1_series_Civ1(iz,1));%
+            A= read_image(ImageName_A,FileType_A);
+            ImageName_B=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2_series_Civ1(1,ifield),[],j1_series_Civ1(iz,1));
+            B= read_image(ImageName_B,FileType_B);
+            par_civ1.ImageA(iz+par_civ1.Dz-1,:,:) = A;
+            par_civ1.ImageB(iz+par_civ1.Dz-1,:,:) = B;
+         end
+         % caluclate velocity data (y and v in indices, reverse to y component)
+            [Data.Civ1_X(islice,:,:),Data.Civ1_Y(islice,:,:), utable, vtable,wtable, ctable, FF, result_conv, errormsg] = civ3D (par_civ1);
+            if ~isempty(errormsg)
+                disp_uvmat('ERROR',errormsg,checkrun)
+                return
+            end
+        for islice=2*par_civ1.Dz:NbSlice% loop on slices for the first image in the pair 
+            par_civ1.ImageA=circshift(par_civ1.ImageA,-par_civ1.Dz);%shift the indces in the block upward by par_civ1.Dz
             par_civ1.ImageB=circshift(par_civ1.ImageA,-par_civ1.Dz);
-            end
               for iz=1:par_civ1.Dz
-            ImageName_A=fullfile_uvmat(RootPath_A,SubDir_A,RootFile_A,FileExt_A,NomType_A,i1_series_Civ1(1,ifield),[],j1_series_Civ1(islice+SearchRange_z-iz+1,1));
+            ImageName_A=fullfile_uvmat(RootPath_A,SubDir_A,RootFile_A,FileExt_A,NomType_A,i1_series_Civ1(1,ifield),[],j1_series_Civ1(islice+SearchRange_z-par_civ1.Dz+iz,1));%
             A= read_image(ImageName_A,FileType_A);
-            ImageName_B=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2_series_Civ1(1,ifield),[],j1_series_Civ1(islice+SearchRange_z-iz+1,1));
+            ImageName_B=fullfile_uvmat(RootPath_B,SubDir_B,RootFile_B,FileExt_B,NomType_B,i2_series_Civ1(1,ifield),[],j1_series_Civ1(islice+SearchRange_z-par_civ1.Dz+iz,1));
             B= read_image(ImageName_B,FileType_B);
-            par_civ1.ImageA(2*SearchRange_z+2-iz,:,:) = A;
-            par_civ1.ImageB(2*SearchRange_z+2-iz,:,:) = B;
+            par_civ1.ImageA(2*SearchRange_z+1-par_civ1.Dz+iz,:,:) = A;
+            par_civ1.ImageB(2*SearchRange_z+1-par_civ1.Dz+iz,:,:) = B;
             end
             % caluclate velocity data (y and v in indices, reverse to y component)

trunk/src/update_imadoc.m

@@ -30 +30 @@
 errormsg='';
 testappend=0;
-%% backup the output file if it already exist, and read it
-if exist(outputfile,'file')%=1 if the output file already exists, 0 else
-    testappend=1;
-    backupfile=outputfile;
-    t=xmltree(outputfile); %read the file
-    title=get(t,1,'name');
-    if strcmp(title,'ImaDoc')
-        %         testappend=1;
-        %rename the existing file for backup
-        testexist=2;
+
+%% set the output xml file at the root, hide other existing  xml files
+dotchar=regexp(outputfile,'\.');
+for idot=1:numel(dotchar)
+    outputfile=[outputfile(1:dotchar(end-idot+1)-1) '.xml'];
+    if exist(outputfile,'file')
+         backupfile=outputfile;
+         testexist=2;
         while testexist==2
             backupfile=[backupfile '~'];
@@ -49 +47 @@
             return
         end
-        %if the xml file is  ImaDoc
-        uid_calib=find(t,['ImaDoc/' StructName]);
-        if isempty(uid_calib)  %if Struct does not already exists, create it
-            [t,uid_calib]=add(t,1,'element',StructName);
-        else %if Struct already exists, delete its content
-            uid_child=children(t,uid_calib);
-            t=delete(t,uid_child);
-        end
+    end
+end
+
+
+%% backup the output file if it already exist, and read it
+if exist(outputfile,'file')%=1 if the output file already exists, 0 else
+    testappend=1;
+    t=xmltree(outputfile); %read the file
+    title=get(t,1,'name');
+    if ~strcmp(title,'ImaDoc')
+        errormsg=[outputfile ' not appropriate for calibration'];
+        return
+    end
+    uid_calib=find(t,['ImaDoc/' StructName]);
+    if isempty(uid_calib)  %if Struct does not already exists, create it
+        [t,uid_calib]=add(t,1,'element',StructName);
+    else %if Struct already exists, delete its content
+        uid_child=children(t,uid_calib);
+        t=delete(t,uid_child);
     end
 end