Changeset 1152 for trunk/src/series

Timestamp:

Jul 4, 2024, 4:23:43 PM (6 months ago)

Author:

sommeria

Message:

update_xml simlified, bug on civ_series corrected

Location:

trunk/src/series

Files:

• civ_3D.m (modified) (1 diff)
• civ_input.fig (modified) (previous)
• civ_input.m (modified) (1 diff)
• civ_series.m (modified) (2 diffs)
• merge_proj.m (modified) (1 diff)
• stereo_civ.m (modified) (1 diff)

trunk/src/series/civ_3D.m

@@ -189 +189 @@
 %% get timing from the ImaDoc file or input video
 if iview_A~=0
-    XmlFileName=find_imadoc(RootPath_A,SubDir_A,RootFile_A,FileExt_A);
+    XmlFileName=find_imadoc(RootPath_A,SubDir_A);
     Time=[];
     if ~isempty(XmlFileName)

trunk/src/series/civ_input.m

@@ -2362 +2362 @@
 % --- Executes on selection change in field_ref2.
 function field_ref2_Callback(hObject, eventdata, handles)
-
-
-

trunk/src/series/civ_series.m

@@ -256 +256 @@
 %% get timing from the ImaDoc file or input video
 if iview_A~=0
-    XmlFileName=find_imadoc(RootPath_A,SubDir_A,RootFile_A,FileExt_A);
+    XmlFileName=find_imadoc(RootPath_A,SubDir_A);
     Time=[];
     if ~isempty(XmlFileName)
@@ -488 +488 @@
         end
         if strcmp(Param.ActionInput.ListCompareMode, 'PIV volume')
-            Data.ListVarName=[Data.ListVarName 'Civ1_Z'];
-            Data.Civ1_X=[];Data.Civ1_Y=[];Data.Civ1_Z=[];
-            Data.Civ1_U=[];Data.Civ1_V=[];Data.Civ1_C=[];
-            for ivol=1:NbSlice
-                % caluclate velocity data (y and v in indices, reverse to y component)
-                [xtable, ytable, utable, vtable, ctable, F, result_conv, errormsg] = civ (par_civ1);
-                if ~isempty(errormsg)
-                    disp_uvmat('ERROR',errormsg,checkrun)
-                    return
-                end
-                Data.Civ1_X=[Data.Civ1_X reshape(xtable,[],1)];
-                Data.Civ1_Y=[Data.Civ1_Y reshape(Param.Civ1.ImageHeight-ytable+1,[],1)];
-                Data.Civ1_Z=[Data.Civ1_Z ivol*ones(numel(xtable),1)];% z=image index in image coordinates
-                Data.Civ1_U=[Data.Civ1_U reshape(utable,[],1)];
-                Data.Civ1_V=[Data.Civ1_V reshape(-vtable,[],1)];
-                Data.Civ1_C=[Data.Civ1_C reshape(ctable,[],1)];
-                Data.Civ1_FF=[Data.Civ1_FF reshape(F,[],1)];
-            end
+            % Data.ListVarName=[Data.ListVarName 'Civ1_Z'];
+            % Data.Civ1_X=[];Data.Civ1_Y=[];Data.Civ1_Z=[];
+            % Data.Civ1_U=[];Data.Civ1_V=[];Data.Civ1_C=[];
+            % for ivol=1:NbSlice
+            %     % caluclate velocity data (y and v in indices, reverse to y component)
+            %     [xtable, ytable, utable, vtable, ctable, F, result_conv, errormsg] = civ (par_civ1);
+            %     if ~isempty(errormsg)
+            %         disp_uvmat('ERROR',errormsg,checkrun)
+            %         return
+            %     end
+            %     Data.Civ1_X=[Data.Civ1_X reshape(xtable,[],1)];
+            %     Data.Civ1_Y=[Data.Civ1_Y reshape(Param.Civ1.ImageHeight-ytable+1,[],1)];
+            %     Data.Civ1_Z=[Data.Civ1_Z ivol*ones(numel(xtable),1)];% z=image index in image coordinates
+            %     Data.Civ1_U=[Data.Civ1_U reshape(utable,[],1)];
+            %     Data.Civ1_V=[Data.Civ1_V reshape(-vtable,[],1)];
+            %     Data.Civ1_C=[Data.Civ1_C reshape(ctable,[],1)];
+            %     Data.Civ1_FF=[Data.Civ1_FF reshape(F,[],1)];
+            % end
         else %usual PIV
             % caluclate velocity data (y and v in indices, reverse to y component)

trunk/src/series/merge_proj.m

@@ -338 +338 @@
             end
             [MaskData,~,errormsg] = read_field(maskname,'image');
+            if ~isempty(NbSlice_calib)
+            MaskData.ZIndex=mod(i1_series{iview}(index)-1,NbSlice_calib{iview})+1;%Zindex for phys transform
+        end
             if ~isempty(transform_fct) && nargin(transform_fct)>=2
                 MaskData=transform_fct(MaskData,XmlData{iview});

trunk/src/series/stereo_civ.m

@@ -95 +95 @@
 time=[];
 for iview=1:size(Param.InputTable,1)
-    XmlFileName=find_imadoc(Param.InputTable{iview,1},Param.InputTable{iview,2},Param.InputTable{iview,3},Param.InputTable{iview,5});
+    XmlFileName=find_imadoc(Param.InputTable{iview,1},Param.InputTable{iview,2});
     if isempty(XmlFileName)
         disp_uvmat('ERROR', [XmlFileName ' not found'],checkrun)