Changeset 1094 for trunk/src/uvmat.m

Timestamp:

Mar 25, 2021, 9:37:04 AM (4 years ago)

Author:

sommeria

Message:

phys_polar debugged

File:

• trunk/src/uvmat.m (modified) (8 diffs)

trunk/src/uvmat.m

@@ -1538 +1538 @@
 XmlData.LIFCalib.Ray1Coord=LineData{1}.Coord;
 XmlData.LIFCalib.Ray2Coord=LineData{2}.Coord;
+if numel(LineData)<3
+    msgbox_uvmat('ERROR','draw a reference line of direct laser illumination (without dye absorbsion)');
+    return
+end
 XmlData.LIFCalib.RefLineCoord=LineData{3}.Coord;
 
@@ -1545 +1549 @@
 y=linspace(UvData.Field.Coord_y(1),UvData.Field.Coord_y(2),nby)-nby/2;
 [X,Y]=meshgrid(x,y);
-coeff_quad=0.15*4/(nbx*nbx);% image luminosity reduced by 10% at the edge
-UvData.Field.A=double(UvData.Field.A).*(1+coeff_quad*(X.*X+Y.*Y));
+%coeff_quad=0.15*4/(nbx*nbx);% image luminosity reduced by 10% at the edge
+%UvData.Field.A=double(UvData.Field.A).*(1+coeff_quad*(X.*X+Y.*Y));
 
 %% display the current image in polar axes with origin at the  illumination source
@@ -1564 +1568 @@
     y_ref=y_ref-y0;
     [theta_ref,r_ref] = cart2pol(x_ref,y_ref);%theta_ref  and r_ref are the polar coordinates of the points on the line
-    theta_ref=theta_ref*180/pi;% theta_ref in radians
+    theta_ref=theta_ref*180/pi;% theta_ref in degrees
     figure(10)
     plot(theta_ref,r_ref)
@@ -1570 +1574 @@
     ylabel('radius from light source')
     title('ref line in polar coordinates')
-    azimuth_ima=linspace(DataPol.Coord_y(1),DataPol.Coord_y(2),size(DataPol.A,1));%array of angular index on the transformed image
+    azimuth_ima=linspace(DataPol.Coord_y(1),DataPol.Coord_y(2),size(DataPol.A,1))-360;%array of angular indices on the transformed image
     dist_source = interp1(theta_ref,r_ref,azimuth_ima);% get the polar position of the reference line
     dist_source_pixel=round(size(DataPol.A,2)*(dist_source-DataPol.Coord_x(1))/(DataPol.Coord_x(2)-DataPol.Coord_x(1)));
@@ -3719 +3723 @@
 %% choose and read a second field FileName_1 if defined
 ParamOut_1=[];
-if numel(UvData.FileInfo)>1
+if ~isempty(FileName_1)
+    if numel(UvData.FileInfo)==1
+        UvData.FileInfo{2}=UvData.FileInfo{1};
+    end
     VelType_1=[];%default
     FieldName_1=[];
@@ -3736 +3743 @@
         NomType_1=get(handles.NomType,'String');
     end
-    if strcmp(UvData.FileInfo{2}.FieldType,'image')
+    if strcmp(UvData.FileInfo{2}.FileType,'image')
         FieldName_1='image';
         frame_index_1=1;%default
@@ -3761 +3768 @@
     end
     switch UvData.FileInfo{2}.FileType
-        case {'civx','civdata','netcdf','pivdata_fluidimage'};
+        case {'civx','civdata','netcdf','pivdata_fluidimage'}
             list_fields=get(handles.FieldName_1,'String');% list menu fields
             FieldName_1= list_fields{get(handles.FieldName_1,'Value')}; % selected field
@@ -3849 +3856 @@
 %% update the display menu for the second velocity type (second menuline)
 test_veltype_1=0;
-if isempty(FileName_1)
-elseif ~test_keepdata_1
-    if strcmp(UvData.FileInfo{2}.FieldType,'civdata')&& ~strcmp(FieldName_1,'get_field...')
+if ~isempty(FileName_1)
+
+    if strcmp(UvData.FileInfo{2}.FileType,'civdata')&& ~strcmp(FieldName_1,'get_field...')
         test_veltype_1=1;
         set(handles.VelType_1,'Visible','on')