Changeset 387 for trunk/src/uvmat.m

Timestamp:

Apr 4, 2012, 3:31:30 PM (12 years ago)

Author:

sommeria

Message:

several bugs corrected: mask, color image...

File:

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

trunk/src/uvmat.m

@@ -2647 +2647 @@
         end
         siz=size(UvData.XmlData{2}.Time);
-        if siz(1)>=max(num_i1,num_i2) && siz(2)>=max(num_j1,num_j2)
+        if ~isempty(num_i1) && siz(1)>=max(num_i1,num_i2) && siz(2)>=max(num_j1,num_j2)
             abstime_1=(UvData.XmlData{2}.Time(num_i1,num_j1)+UvData.XmlData{2}.Time(num_i2,num_j2))/2;%overset the time read from files
         end
@@ -4203 +4203 @@
                     end
                 end
-                if isfield(ObjectData,'Coord')&& isfield(ObjectData,'Style')
+                if isfield(ObjectData,'Coord')&& isfield(ObjectData,'Type')
                     if isequal(ObjectData.Type,'polygon')
                         X=ObjectData.Coord(:,1);
@@ -4248 +4248 @@
     masknumber=num2str(length(list));
     maskindex=get(handles.masklevel,'Value');
-    mask_name=fullfile_uvmat(RootPath,SubDir,[RootFile '_' masknumber 'mask'],'.png','_1',maskindex);
+    mask_name=fullfile_uvmat(RootPath,'',[RootFile '_' masknumber 'mask'],'.png','_1',maskindex);
     %mask_name=name_generator([filebase '_' masknumber 'mask'],maskindex,1,'.png','_i');
     imflag=uint8(255*(0.392+0.608*flag));% =100 for flag=0 (vectors not computed when 20<imflag<200)
@@ -4270 +4270 @@
     end
     set(handles.ListObject,'Value',1)
-    set(handles.ListObject,'Max',1)
+%     set(handles.ListObject,'Max',1)
 end
 
@@ -4421 +4421 @@
 data.TypeMenu={'polygon'};
 data.ProjMode='mask_inside';%default
-data.ProjMenu={'mask_inside';'mask_outside'};
+data.ProjModeMenu={'mask_inside';'mask_outside'};
 create_object(data,handles)