Changeset 236 for trunk/src/proj_field.m

Timestamp:

Apr 12, 2011, 12:12:19 AM (13 years ago)

Author:

sommeria

Message:

correct Matlab PIV, remove call to image tool box. Improve menu of uvmat VelType? (replacement of buttons)

File:

• trunk/src/proj_field.m (modified) (6 diffs)

trunk/src/proj_field.m

@@ -1189 +1189 @@
             end
         elseif isequal(ObjectData.ProjMode,'interp')||isequal(ObjectData.ProjMode,'filter')%interpolate data on a regular grid
+            if isequal(ObjectData.ProjMode,'filter')
+                rho=1000;%smoothing parameter, (small for strong smoothing)
+            else
+                rho=0;
+            end
             coord_x_proj=XMin:DX:XMax;
             coord_y_proj=YMin:DY:YMax;
@@ -1225 +1230 @@
                         eval(['FieldData.' VarName '=FieldData.' VarName '(indsel);'])
                     end
-                    eval(['ProjData.' VarName '=griddata_uvmat(double(coord_X),double(coord_Y),double(FieldData.' VarName '),coord_x_proj,coord_y_proj'');'])
+                    eval(['ProjData.' VarName '=griddata_uvmat(double(coord_X),double(coord_Y),double(FieldData.' VarName '),coord_x_proj,coord_y_proj'',rho);'])
                     eval(['varline=reshape(ProjData.' VarName ',1,length(coord_y_proj)*length(coord_x_proj));'])
                     FFlag= isnan(varline); %detect undefined values NaN
@@ -1394 +1399 @@
                 ProjData=FieldData;% no change by projection
             else
-                test_direct
-                indY=NbDim-1
+                indY=NbDim-1;
                 if test_direct(indY)
                     min_indy=ceil((YMin-Coord{indY}(1))/DYinit)+1;
@@ -1402 +1406 @@
                     Ybound(2)=Coord{indY}(1)+DYinit*(max_indy-1);
                 else
-                    min_indy=ceil((Coord{indY}(1)-YMax)/DYinit)+1
-                    max_indy=floor((Coord{indY}(1)-YMin)/DYinit)+1
-                    Ybound(2)=Coord{indY}(1)-DYinit*(max_indy-1)
-                    Ybound(1)=Coord{indY}(1)-DYinit*(min_indy-1)
+                    min_indy=ceil((Coord{indY}(1)-YMax)/DYinit)+1;
+                    max_indy=floor((Coord{indY}(1)-YMin)/DYinit)+1;
+                    Ybound(2)=Coord{indY}(1)-DYinit*(max_indy-1);
+                    Ybound(1)=Coord{indY}(1)-DYinit*(min_indy-1);
                 end
                 if test_direct(NbDim)==1
@@ -1423 +1427 @@
                 if test90y
                     ind_new=[3 2 1];
-                    DimCell={AYProjName,AXProjName}
+                    DimCell={AYProjName,AXProjName};
 %                     DimValue=DimValue(ind_new);
                     iz=ceil((ObjectData.Coord(1,1)-Coord{3}(1))/DX)+1;
@@ -1568 +1572 @@
 ProjData
 ProjData.VarDimName{3}
+
 %-----------------------------------------------------------------
 %projection in a volume