Changeset 575 for trunk/src/uvmat.m

Timestamp:

Feb 27, 2013, 6:39:32 PM (11 years ago)

Author:

sommeria

Message:

various bugs corrected

File:

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

trunk/src/uvmat.m

@@ -2498 +2498 @@
         end
     end
-    UvData.Field.Mesh=min(Mesh);
+    UvData.Field.CoordMesh=min(Mesh);
     UvData.Field.XMax=max(CoordMax(ind,end));
     UvData.Field.XMin=min(CoordMin(ind,end));
@@ -2508 +2508 @@
     end
     % adjust the mesh to a value 1, 2 , 5 *10^n
-    ord=10^(floor(log10(UvData.Field.Mesh)));%order of magnitude
-    if UvData.Field.Mesh/ord>=5
-        UvData.Field.Mesh=5*ord;
-    elseif UvData.Field.Mesh/ord>=2
-        UvData.Field.Mesh=2*ord;
+    ord=10^(floor(log10(UvData.Field.CoordMesh)));%order of magnitude
+    if UvData.Field.CoordMesh/ord>=5
+        UvData.Field.CoordMesh=5*ord;
+    elseif UvData.Field.CoordMesh/ord>=2
+        UvData.Field.CoordMesh=2*ord;
     else
-        UvData.Field.Mesh=ord;
+        UvData.Field.CoordMesh=ord;
     end
     % default projection plane
@@ -2535 +2535 @@
             delete_object(1);% delete the current projection object in the list UvData.Object, delete its graphic representations and update the list displayed in handles.ListObject and 2
             UvData.Object{1}.NbDim=NbDim;%test for 3D objects
-            UvData.Object{1}.RangeZ=UvData.Field.Mesh;%main plotting plane
+            UvData.Object{1}.RangeZ=UvData.Field.CoordMesh;%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}.Angle=[0 0 0];
@@ -2689 +2689 @@
                 [PlotType,PlotParamOut]=plot_field(ObjectData,haxes(imap),PlotParam{imap},PosColorbar{imap});
                 write_plot_param(plot_handles{imap},PlotParamOut) %update the auto plot parameters
-                if isfield(Field,'Mesh')&&~isempty(Field.Mesh)
-                    ObjectData.Mesh=Field.Mesh; % gives an estimated mesh size (useful for mouse action on the plot)
+                if isfield(Field,'CoordMesh')&&~isempty(Field.CoordMesh)
+                    ObjectData.CoordMesh=Field.CoordMesh; % gives an estimated mesh size (useful for mouse action on the plot)
                 end
             end
@@ -3363 +3363 @@
         data.CoordType=UvData.CoordType;
     end
-    if isfield(UvData.Field,'Mesh')&~isempty(UvData.Field.Mesh)
+    if isfield(UvData.Field,'CoordMesh')&~isempty(UvData.Field.CoordMesh)
         data.RangeX=[UvData.Field.XMin UvData.Field.XMax];
         data.RangeY=[UvData.Field.YMin UvData.Field.YMax];
-        data.DX=UvData.Field.Mesh;
-        data.DY=UvData.Field.Mesh;
+        data.DX=UvData.Field.CoordMesh;
+        data.DY=UvData.Field.CoordMesh;
     elseif isfield(UvData.Field,'AX')&isfield(UvData.Field,'AY')& isfield(UvData.Field,'A')%only image
         np=size(UvData.Field.A);
@@ -4527 +4527 @@
 if isfield(UvData,'Field')
     Field=UvData.Field;
-    if isfield(UvData.Field,'Mesh')&&~isempty(UvData.Field.Mesh)
+    if isfield(UvData.Field,'CoordMesh')&&~isempty(UvData.Field.CoordMesh)
         data.RangeX=[UvData.Field.XMin UvData.Field.XMax];
         if strcmp(data.Type,'line')||strcmp(data.Type,'polyline')||strcmp(data.Type,'points')
-            data.RangeY=UvData.Field.Mesh;
+            data.RangeY=UvData.Field.CoordMesh;
         else
             data.RangeY=[UvData.Field.YMin UvData.Field.YMax];
         end
-        data.DX=UvData.Field.Mesh;
-        data.DY=UvData.Field.Mesh;
+        data.DX=UvData.Field.CoordMesh;
+        data.DY=UvData.Field.CoordMesh;
     end
     if isfield(Field,'NbDim')&& isequal(Field.NbDim,3)