Changeset 1089 for trunk

Timestamp:

Jan 19, 2021, 9:57:06 AM (3 years ago)

Author:

sommeria

Message:

cleaning of civ files, ima2vol updated

Location:

trunk/src

Files:

• check_files.m (modified) (1 diff)
• civ.fig (deleted)
• civ.m (deleted)
• get_file_info.m (modified) (2 diffs)
• series/civ_3D.m (added)
• series/civ_input_3D.fig (added)
• series/civ_series.m (modified) (1 diff)
• series/ima2vol.m (modified) (1 diff)

trunk/src/check_files.m

@@ -41 +41 @@
     'cell2tab';... %transform a Matlab cell in a character array suitable for display in a table
     'check_files';...
-    'civ';...   %function associated with the interface 'civ.fig' for PIV and spline interpolation (to be replaced by civ_series)
-    'civ.fig';...
-    'civ_3D';... % function associated with the interface 'civ_3D.fig' for PIV in volume (TODO: combine with civ.m)
-    'civ_3D.fig';...
     'compile';...% compile a Matlab function, create a binary in a subdirectory /bin
     'copyfields';...% copy fields between two matlab structures

trunk/src/get_file_info.m

@@ -7 +7 @@
 %      .FileType: type of file, needed as input of read_field.m
 %               ='figure': Matlab figure
+%               ='mat': Matlab data file
 %               ='xml': xml file
 %               ='xls': Excel file
@@ -191 +192 @@
 end
 
-if ismember (FileInfo.FileType,{'image','image_DaVis','multimage','mmreader','cine_phantom','video','netcdf','civdata'})
+if ismember (FileInfo.FileType,{'mat','image','image_DaVis','multimage','mmreader','cine_phantom','video','netcdf','civdata'})
         FileInfo.FileIndexing='on'; % allow to detect file index for scanning series
 else

trunk/src/series/civ_series.m

@@ -54 +54 @@
     addpath(fullfile(path_series,'series'))
     Data=civ_input(Param);% introduce the civ parameters using the GUI civ_input
+    %Data=civ_input_App(Param);% introduce the civ parameters using the GUI civ_input
     if isempty(Data)
         Data=Param;% if  civ_input has been cancelled, keep previous parameters

trunk/src/series/ima2vol.m

@@ -137 +137 @@
         end
         VolData.A(jfile,:,:)=Data.A;%concacene along y
-        VolData.Coord_z(jfile)=Data.PlaneCoord(3);
+        VolData.Coord_z(jfile)=XmlData{1}.GeometryCalib.SliceCoord(jfile,3);
     end
 %         npx=size(Data.A,2);