Changeset 206 for trunk/src/uvmat.m

Timestamp:

Feb 27, 2011, 10:40:29 PM (14 years ago)

Author:

sommeria

Message:

bug fixes to deal with volumes, storage of ACTION menu in series fixed

File:

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

trunk/src/uvmat.m

@@ -2389 +2389 @@
     return
 end
-[CellVarIndex,NbDim,VarType,errormsg]=find_field_indices(UvData.Field);
+'testUVMAT'
+UvData.Field
+[CellVarIndex,NbDim,VarType,errormsg]=find_field_indices(UvData.Field)
 if ~isempty(errormsg)
     errormsg=['error in uvmat/refresh_field/find_field_indices: ' errormsg];
@@ -2395 +2397 @@
 end
 [NbDim,imax]=max(NbDim);
+VarType{imax}
 if ~isempty(VarType{imax}.coord_x)  && ~isempty(VarType{imax}.coord_y)    %unstructured coordinates
     XName=UvData.Field.ListVarName{VarType{imax}.coord_x};
@@ -2400 +2403 @@
     eval(['nbvec=length(UvData.Field.' XName ');'])%nbre of measurement points (e.g. vectors)
     test_x=1;%test for unstructured coordinates
+    if ~isempty(VarType{imax}.coord_z)
+        ZName=UvData.Field.ListVarName{VarType{imax}.coord_z};
+    else
+       NbDim=2;
+    end
 elseif VarType{imax}.coord(NbDim)>0 %structured coordinate  
     XName=UvData.Field.ListVarName{VarType{imax}.coord(NbDim)};
@@ -2407 +2415 @@
 end
 if NbDim==3
-    ZName=UvData.Field.ListVarName{VarType{imax}.coord(1)};%structured coordinates in 3D
+    if ~test_x
+        ZName=UvData.Field.ListVarName{VarType{imax}.coord(1)};%structured coordinates in 3D
+    end
     eval(['ZMax=max(UvData.Field.' ZName ');'])
     eval(['ZMin=min(UvData.Field.' ZName ');'])
+    UvData.Field.ZMax=ZMax;
+    UvData.Field.ZMin=ZMin;
     test_z=1;
     if isequal(ZMin,ZMax)%no z dependency
@@ -2417 +2429 @@
 end
 if exist('XName','var')
-eval(['XMax=max(UvData.Field.' XName ');'])
-eval(['XMin=min(UvData.Field.' XName ');'])
-UvData.Field.NbDim=NbDim;
-UvData.Field.XMax=XMax;
-UvData.Field.XMin=XMin;
-if NbDim >1
-    eval(['YMax=max(UvData.Field.' YName ');'])
-    eval(['YMin=min(UvData.Field.' YName ');'])
-    UvData.Field.YMax=YMax;
-    UvData.Field.YMin=YMin;
-end
-eval(['nbvec=length(UvData.Field.' XName ');'])
-if test_x %unstructured coordinates
-    if test_z
-        UvData.Field.Mesh=((XMax-XMin)*(YMax-YMin)*(ZMax-ZMin))/nbvec;% volume per vector
-        UvData.Field.Mesh=(UvData.Field.Mesh)^(1/3);
+    eval(['XMax=max(UvData.Field.' XName ');'])
+    eval(['XMin=min(UvData.Field.' XName ');'])
+    UvData.Field.NbDim=NbDim;
+    UvData.Field.XMax=XMax;
+    UvData.Field.XMin=XMin;
+    if NbDim >1
+        eval(['YMax=max(UvData.Field.' YName ');'])
+        eval(['YMin=min(UvData.Field.' YName ');'])
+        UvData.Field.YMax=YMax;
+        UvData.Field.YMin=YMin;
+    end
+    eval(['nbvec=length(UvData.Field.' XName ');'])
+    if test_x %unstructured coordinates
+        if test_z
+            UvData.Field.Mesh=((XMax-XMin)*(YMax-YMin)*(ZMax-ZMin))/nbvec;% volume per vector
+            UvData.Field.Mesh=(UvData.Field.Mesh)^(1/3);
+        else
+            UvData.Field.Mesh=sqrt((XMax-XMin)*(YMax-YMin)/nbvec);%2D
+        end
     else
-        UvData.Field.Mesh=sqrt((XMax-XMin)*(YMax-YMin)/nbvec);%2D
-    end
-else
-    VarIndex=CellVarIndex{imax}; % list of variable indices
-    DimIndex=UvData.Field.VarDimIndex{VarIndex(1)}; %list of dim indices for the variable
-    nbpoints_x=UvData.Field.DimValue(DimIndex(NbDim));
-    DX=(XMax-XMin)/(nbpoints_x-1);
-    if NbDim >1
-        nbpoints_y=UvData.Field.DimValue(DimIndex(NbDim-1));
-        DY=(YMax-YMin)/(nbpoints_y-1);
-    end
-    if NbDim==3
-        nbpoints_z=UvData.Field.DimValue(DimIndex(1));
-        DZ=(ZMax-ZMin)/(nbpoints_z-1);
-        UvData.Field.Mesh=sqrt(DX*DY*DZ);
-        UvData.Field.ZMax=ZMax;
-        UvData.Field.ZMin=ZMin;
-    else
-        UvData.Field.Mesh=sqrt(DX*DY);
-    end
-end
+        VarIndex=CellVarIndex{imax}; % list of variable indices
+        DimIndex=UvData.Field.VarDimIndex{VarIndex(1)}; %list of dim indices for the variable
+        nbpoints_x=UvData.Field.DimValue(DimIndex(NbDim));
+        DX=(XMax-XMin)/(nbpoints_x-1);
+        if NbDim >1
+            nbpoints_y=UvData.Field.DimValue(DimIndex(NbDim-1));
+            DY=(YMax-YMin)/(nbpoints_y-1);
+        end
+        if NbDim==3
+            nbpoints_z=UvData.Field.DimValue(DimIndex(1));
+            DZ=(ZMax-ZMin)/(nbpoints_z-1);
+            UvData.Field.Mesh=sqrt(DX*DY*DZ);
+            UvData.Field.ZMax=ZMax;
+            UvData.Field.ZMin=ZMin;
+        else
+            UvData.Field.Mesh=sqrt(DX*DY);
+        end
+    end
 end
 
@@ -2481 +2493 @@
         UvData.Object{1}.RangeZ=UvData.Field.Mesh;%main plotting plane
         UvData.Object{1}.Coord(1,3)=(UvData.Field.ZMin+UvData.Field.ZMax)/2;%section at a middle plane chosen
-        UvData.Object{1}.Phi=0;
-        UvData.Object{1}.Theta=0;
-        UvData.Object{1}.Psi=0;
+        UvData.Object{1}.Angle=[0 0 0];
+%         UvData.Object{1}.Theta=0;
+%         UvData.Object{1}.Psi=0;
         UvData.Object{1}.HandlesDisplay=plot(0,0,'Tag','proj_object');% A REVOIR
-        PlotHandles=get_plot_handles(handles);
+%         PlotHandles=get_plot_handles(handles);
         UvData.Object{1}.Name='1-PLANE';
         UvData.Object{1}.enable_plot=1;
-        set_object(UvData.Object{1},PlotHandles,ZBounds);
+        set_object(UvData.Object{1},handles,ZBounds);
         set(handles.list_object_1,'Value',1);
         set(handles.list_object_1,'String',{'1-PLANE'});
@@ -2504 +2516 @@
             siz=size(XmlData.PlaneAngle);
             indangle=min(siz(1),UvData.ZIndex);%take first angle if a single angle is defined (translating scanning)
-            UvData.Object{1}.Phi=XmlData.PlaneAngle(indangle,1);
-            UvData.Object{1}.Theta=XmlData.PlaneAngle(indangle,2);
-            UvData.Object{1}.Psi=XmlData.PlaneAngle(indangle,3);
+            UvData.Object{1}.PlaneAngle=XmlData.PlaneAngle(indangle,:);
         end
     elseif isfield(UvData,'ZIndex')
@@ -2562 +2572 @@
 %loop on the projection objects: one or two
 for imap=1:numel(IndexObj)
-    iobj=IndexObj(imap);    
+    iobj=IndexObj(imap);
     [ObjectData,errormsg]=proj_field(UvData.Field,UvData.Object{iobj});% project field on the object
     if testnewseries && isfield(ObjectData,'CoordUnit')