Changeset 782 for trunk/src/series

Timestamp:

Jun 3, 2014, 8:10:03 PM (10 years ago)

Author:

sommeria

Message:

AX and AY changed to Coord_x and Coord_y

Location:

trunk/src/series

Files:

• LIF_series.m (modified) (1 diff)
• beam_forming.m (modified) (1 diff)
• civ_series.m (modified) (1 diff)

trunk/src/series/LIF_series.m

@@ -120 +120 @@
         Resu.ZIndex=Data.ZIndex;
         Resu.z=XmlData.GeometryCalib.SliceCoord(Data.ZIndex,3);
-        Resu.ListVarName={'AY' ,'AX' ,'c','mask'};
-        Resu.VarDimName={'AY','AX',{'AY','AX'},{'AY','AX'}};        
-        Resu.AY=[DataOut.AY(1), DataOut.AY(end)];
-        Resu.AX=[DataOut.AX(1), DataOut.AX(end)];
+        Resu.ListVarName={'Coord_y' ,'Coord_x' ,'c','mask'};
+        Resu.VarDimName={'Coord_y','Coord_x',{'Coord_y','Coord_x'},{'Coord_y','Coord_x'}};        
+        Resu.Coord_y=[DataOut.Coord_y(1), DataOut.Coord_y(end)];
+        Resu.Coord_x=[DataOut.Coord_x(1), DataOut.Coord_x(end)];
         Resu.c=DataOut.A;
         Resu.mask=DataMask.A;%to chnge to  cartesian coordinates (polar2phys)

trunk/src/series/beam_forming.m

@@ -102 +102 @@
 Data.ListGlobalAttribute={'CoordUnit'}; %%TODO: add also time, how to get it  ?????
 Data.CoordUnit='pixel';
-Data.ListVarName={'AX','AY','A'};
-Data.VarDimName={'AX','AY',{'AY','AX'}};
+Data.ListVarName={'Coord_x','Coord_y','A'};
+Data.VarDimName={'Coord_x','Coord_y',{'Coord_y','Coord_x'}};
 %Data.Coord_x=5*(nbvoie_reception-0.5)/numel(nbvoie_reception); % totql length of e
-Data.AX=1:65;
+Data.Coord_x=1:65;
 %Data.Coord_z=(1:A)/133 ;% to check from input parameter ....
-Data.AY=1:332;
+Data.Coord_y=1:332;
 %%%%%%
 %

trunk/src/series/civ_series.m

@@ -239 +239 @@
              par_civ1.ImageB=DataIn.(FieldName_B);
         else
-        [par_civ1.ImageB,VideoObject_B] = read_image(ImageName_B,FileType_B,Param.InputFields,FrameIndex_B_Civ1(1));
+        [par_civ1.ImageB,VideoObject_B] = read_image(ImageName_B,FileType_B,VideoObject_B,FrameIndex_B_Civ1(1));
         end
         NbField=numel(i1_series_Civ1);