Changeset 535 for trunk/src/uvmat.m

Timestamp:

Sep 3, 2012, 2:02:13 PM (13 years ago)

Author:

sommeria

Message:

various bugs fixed, in particular patch projection with color images

File:

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

trunk/src/uvmat.m

@@ -293 +293 @@
     display_file_name(handles,inputfile)
     %%%%%%%
-    testinputfield=1;
 end
 
@@ -2404 +2403 @@
 %% get bounds and mesh (needed  to propose default options for projection objects)
 if NbDim>1
-    CoordMax=zeros(1,numel(imax));
-    CoordMin=zeros(1,numel(imax));
+    CoordMax=zeros(numel(imax),NbDim);
+    CoordMin=zeros(numel(imax),NbDim);
+    Mesh=zeros(numel(imax),NbDim);
     for ind=1:numel(imax)
         XName=UvData.Field.ListVarName{CellInfo{imax(ind)}.CoordIndex(end)};
         YName=UvData.Field.ListVarName{CellInfo{imax(ind)}.CoordIndex(end-1)};
-        CoordMax(ind,1)=max(max(UvData.Field.(XName)));
-        CoordMin(ind,1)=min(min(UvData.Field.(XName)));
-        CoordMax(ind,2)=max(max(UvData.Field.(YName)));
-        CoordMin(ind,2)=min(min(UvData.Field.(YName)));
+        CoordMax(ind,NbDim)=max(max(UvData.Field.(XName)));
+        CoordMin(ind,NbDim)=min(min(UvData.Field.(XName)));
+        CoordMax(ind,NbDim-1)=max(max(UvData.Field.(YName)));
+        CoordMin(ind,NbDim-1)=min(min(UvData.Field.(YName)));
         %         test_x=1;%test for unstructured coordinates
         if NbDim==3
             ZName=UvData.Field.ListVarName{CellInfo{imax(ind)}.CoordIndex(1)};
-            CoordMax(imax(ind),3)=max(max(UvData.Field.(ZName)));
-            CoordMin(ind,3)=min(min(UvData.Field.(ZName)));
+            CoordMax(imax(ind),1)=max(max(UvData.Field.(ZName)));
+            CoordMin(ind,1)=min(min(UvData.Field.(ZName)));
         end
         
@@ -2423 +2423 @@
             
             case 'scattered' %unstructured coordinates
-                NbPoints(ind)=CellInfo{imax(ind)}.CoordSize;% nbre of points
-                Mesh(ind)=(prod(CoordMax(ind,:)-CoordMin(ind,:))/NbPoints)^(1/NbDim); %(volume or area per point)^(1/NbDim)
+                NbPoints=CellInfo{imax(ind)}.CoordSize;% nbre of points
+                Mesh(ind,:)=(prod(CoordMax(ind,:)-CoordMin(ind,:))/NbPoints)^(1/NbDim); %(volume or area per point)^(1/NbDim)
             case 'grid'%structured coordinate
-                NbPoints=CellInfo{imax(ind)}.CoordSize;% nbre of points
-                Mesh(ind)=min((CoordMax(ind,:)-CoordMin(ind,:))./NbPoints);
-                
+                NbPoints=CellInfo{imax(ind)}.CoordSize;% nbre of points in each direction
+                Mesh(ind,:)=min((CoordMax(ind,:)-CoordMin(ind,:))./(NbPoints-1));                
         end
     end
@@ -2525 +2524 @@
     % main projection object (uvmat display)
     list_object=get(handles.ListObject_1,'String');
-    if isequal(list_object,{''})%refresh list of objects if the menu is empty
+    if isequal(list_object,{''})||isequal(list_object,' ')%refresh list of objects if the menu is empty
         set(handles.ListObject,'Value',1)
         set(handles.ListObject,'String',{'plane'})