Changeset 215 for trunk/src/proj_field.m

Timestamp:

Mar 8, 2011, 11:36:29 PM (14 years ago)

Author:

sommeria

Message:

proj_field: correct the projection mode filter on a line
uvmat: correct bug for avi movies extraction
imadoc2struct: cleaning

File:

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

trunk/src/proj_field.m

@@ -220 +220 @@
     ProjData.ListVarName={'Y','X','NbVal'};
     ProjData.VarDimName={'nb_points','nb_points','nb_points'};
-    %ProjData.VarDimIndex={[1],[1],[1]}; 
     ProjData.VarAttribute{1}.Role='ancillary';
     ProjData.VarAttribute{2}.Role='ancillary';
@@ -227 +226 @@
         VarName=FieldData.ListVarName{ivar};
         ProjData.ListVarName=[ProjData.ListVarName {VarName}];
-        %ProjData.VarDimIndex=[ProjData.VarDimIndex {[1]}];
         ProjData.VarDimName=[ProjData.VarDimName {'nb_points'}];
     end
@@ -253 +251 @@
                FFName=FieldData.ListVarName{ivar_FF};
                eval(['FF=FieldData.' FFName '(indsel);'])
-               ind_indsel=find(~FF);
-               indsel=indsel(ind_indsel);
+               %ind_indsel=find(~FF);
+               indsel=indsel(~FF);
            end
            ProjData.NbVal(ipoint,1)=length(indsel);
@@ -750 +748 @@
                 Xproj=linelength/(2*npoint):linelength/npoint:linelength-linelength/(2*npoint);
                 siz=size(X_sel);
-                xregij=cos(theta(ip))*Xproj'*ones(1,siz(2))+ObjectData.Coord(ip,1);
-                yregij=sin(theta(ip))*Xproj'*ones(1,siz(2))+ObjectData.Coord(ip,2);
-                xij=ones(npoint,1)*X_sel;
-                yij=ones(npoint,1)*Y_sel;
+                xregij=cos(theta(ip))*ones(siz(1),1)*Xproj+ObjectData.Coord(ip,1);
+                yregij=sin(theta(ip))*ones(siz(1),1)*Xproj+ObjectData.Coord(ip,2);
+                xij=X_sel*ones(1,npoint);
+                yij=Y_sel*ones(1,npoint);
                 Aij=exp(-lambda*((xij-xregij).*(xij-xregij)+(yij-yregij).*(yij-yregij)));
-                norm=ones(1,siz(2))*Aij';
+                norm=Aij'*ones(siz(1),1);
                 for ivar=1:numel(ProjVar)
                      if ~isempty(ProjVar{ivar})
-                        ProjVar{ivar}=ProjVar{ivar}*Aij'./norm;
+                        ProjVar{ivar}=Aij'*ProjVar{ivar}./norm;
                      end
                 end              
@@ -1256 +1254 @@
         VarName=FieldData.ListVarName{VarIndex(1)};%get the first variable of the cell to get the input matrix dimensions
         eval(['DimValue=size(FieldData.' VarName ');'])%input matrix dimensions
-        DimValue(find(DimValue==1))=[];%remove singleton dimensions       
+        DimValue(DimValue==1)=[];%remove singleton dimensions       
         NbDim=numel(DimValue);%update number of space dimensions
         nbcolor=1; %default number of 'color' components: third matrix index without corresponding coordinate