Changeset 452 for trunk

Timestamp:

Jun 12, 2012, 8:53:51 PM (13 years ago)

Author:

sommeria

Message:

bugs repaired

Location:

trunk/src

Files:

• civ.fig (modified) (previous)
• civ.m (modified) (1 diff)
• civ_matlab.m (modified) (5 diffs)
• read_field.m (modified) (3 diffs)
• uvmat.m (modified) (5 diffs)

trunk/src/civ.m

@@ -2100 +2100 @@
                 detect=exist(filename,'file')==2;
                 if detect% if a netcdf file already exists
-                    answer=msgbox_uvmat('INPUT_Y-N',['delete files in ' subdir_civ1_new]);
-                    if ~strcmp(answer,'Yes')
+                    answer=msgbox_uvmat('INPUT_Y-N',['overwrite existing civ files in ' subdir_civ1_new]);
+                    if strcmp(answer,'Yes')
+                        detect=0;
+                        filecell.nc.civ1(ifile,j)={filename};
+                    else
                         r=regexp(subdir_civ1_new,'(?<root>.*\D)(?<num1>\d+)$','names');%detect whether name ends by a number
                         if isempty(r)

trunk/src/civ_matlab.m

@@ -51 +51 @@
 check_civ1=0;%default
 check_patch1=0;%default
-
+        ImageFileA=Param.Civ1.ImageA;
+        ImageFileB=Param.Civ1.ImageB;
+        if isfield(Param,'Civ2')
+            ImageFileA_civ2=Param.Civ2.ImageA;
+             ImageFileB_civ2=Param.Civ2.ImageB;
+        end
 % case of input Param set by an xml file (batch mode)
 if ischar(Param)
@@ -98 +103 @@
     else
         if isfield(par_civ1,'ImageA')&&(ischar(par_civ1.ImageA)||strcmp(class(par_civ1.ImageA),'VideoReader')) % case with no image: only the PIV grid is calculated           
-            [Field,ParamOut,errormsg] = read_field(par_civ1.ImageA,par_civ1.FileTypeA,[],par_civ1.FrameIndexA);
+            [Field,ParamOut,errormsg] = read_field(ImageFileA,par_civ1.FileTypeA,par_civ1.ImageA,par_civ1.FrameIndexA);
             if ~isempty(errormsg)
                 errormsg=['error in civ_matlab/read_field:' errormsg];
@@ -106 +111 @@
         end
         if isfield(par_civ1,'ImageB')&& (ischar(par_civ1.ImageB)||strcmp(class(par_civ1.ImageB),'VideoReader'))
-            [Field,ParamOut,errormsg] = read_field(par_civ1.ImageB,par_civ1.FileTypeB,[],par_civ1.FrameIndexB);
+            [Field,ParamOut,errormsg] = read_field(ImageFileB,par_civ1.FileTypeB,par_civ1.ImageB,par_civ1.FrameIndexB);
             if ~isempty(errormsg)
                 errormsg=['error in civ_matlab/read_field:' errormsg];
@@ -242 +247 @@
     if ~isfield (Param,'Civ1') || ~strcmp(Param.Civ1.ImageA,par_civ2.ImageA)
         %read first image if not already done for civ1
-        [Field,ParamOut,errormsg] = read_field(par_civ2.ImageA,par_civ2.FileTypeA,[],par_civ2.FrameIndexA);
+        [Field,ParamOut,errormsg] = read_field(ImageFileA_civ2,par_civ2.FileTypeA,par_civ2.ImageA,par_civ2.FrameIndexA);
                     if ~isempty(errormsg)
                 errormsg=['error in civ_matlab/read_field:' errormsg];
@@ -253 +258 @@
     if ~isfield (Param,'Civ1') || ~strcmp(Param.Civ1.ImageB,par_civ2.ImageB)
         %read first image if not already done for civ1
-        [Field,ParamOut,errormsg] = read_field(par_civ2.ImageB,par_civ2.FileTypeB,[],par_civ2.FrameIndexB);
+        [Field,ParamOut,errormsg] = read_field(ImageFileB_civ2,par_civ2.FileTypeB,par_civ2.ImageB,par_civ2.FrameIndexB);
          if ~isempty(errormsg)
                 errormsg=['error in civ_matlab/read_field:' errormsg];

trunk/src/read_field.m

@@ -164 +164 @@
 %% case of image
 if ~isempty(A)
+    if isstruct(ParamOut)
     ParamOut.FieldName='image';
     ParamOut.FieldList={'image'};
+    end
     Npz=1;%default
     npxy=size(A);
@@ -178 +180 @@
             Field.AY=[npxy(1)-0.5 0.5];
             Field.AX=[0.5 npxy(2)-0.5]; % coordinates of the first and last pixel centers
+            if isstruct(ParamOut)
             ParamOut.Npx=npxy(2);% display image size on the interface
             ParamOut.Npy=npxy(1);
+            end
             Field.VarAttribute{3}.Mesh=1;
         else
@@ -188 +192 @@
             Field.AY=[npxy(2)-0.5 0.5];
             Field.AX=[0.5 npxy(3)-0.5]; % coordinates of the first and last pixel centers
+            if isstruct(ParamOut)
             ParamOut.Npx=npxy(3);% display image size on the interface
             ParamOut.Npy=npxy(2);
+             end
             Field.VarAttribute{4}.Mesh=1;
         end

trunk/src/uvmat.m

@@ -1458 +1458 @@
             axes(handles.axes3)
             hold on    
-            MaskData.maskhandle=image(Mask.AX,Mask.AY,imflag,'Tag','mask','HitTest','off','AlphaData',0.6*flagmask);
+            size(flagmask)
+           % MaskData.maskhandle=image(Mask.AX,Mask.AY,imflag,'Tag','mask','HitTest','off','AlphaData',0.6*flagmask);
+            MaskData.maskhandle=image(Mask.AX,Mask.AY,imflag,'Tag','mask','HitTest','off','AlphaData',0.6*ones(size(flagmask)));
 %             set(MaskData.maskhandle,'AlphaData',0.6*flagmask)
             set(handles.CheckMask,'UserData',MaskData)
@@ -2054 +2056 @@
             end
     end
+    if isstruct (ParamIn)
     ParamIn.FieldName=FieldName;
     ParamIn.VelType=VelType;
     ParamIn.GUIName='get_field';
+    end
     [Field{1},ParamOut,errormsg] = read_field(FileName,UvData.FileType{1},ParamIn,frame_index);
     if ~isempty(errormsg)
@@ -2186 +2190 @@
 end
 % display the Fields menu from the input file and pick the selected one: 
+if isstruct(ParamOut)
 field_index=strcmp(ParamOut.FieldName,ParamOut.FieldList);
 set(handles.Fields,'String',ParamOut.FieldList); %update the field menu
 set(handles.Fields,'Value',find(field_index,1))
+end
 
 %% update the display menu for the second velocity type (second menuline)
@@ -2194 +2200 @@
 if isempty(FileName_1)
     set(handles.Fields_1,'Value',1); %update the field menu
+    if isstruct(ParamOut)
     set(handles.Fields_1,'String',[{''};ParamOut.FieldList]); %update the field menu
+    end
 elseif ~test_keepdata_1
     if (~strcmp(UvData.FileType{2},'netcdf')&&~strcmp(UvData.FileType{2},'civdata')&&~strcmp(UvData.FileType{2},'civx'))|| isequal(FieldName_1,'get_field...')
@@ -2385 +2393 @@
 
 %% calculate scalar
-if ~strcmp(ParamOut.FieldName,'get_field...')&& (strcmp(UvData.FileType{1},'civdata')||strcmp(UvData.FileType{1},'civx'))%&&~strcmp(ParamOut.FieldName,'velocity')&& ~strcmp(ParamOut.FieldName,'get_field...');% ~isequal(ParamOut.CivStage,0)%&&~isempty(FieldName)%
+if isstruct(ParamOut)&&~strcmp(ParamOut.FieldName,'get_field...')&& (strcmp(UvData.FileType{1},'civdata')||strcmp(UvData.FileType{1},'civx'))%&&~strcmp(ParamOut.FieldName,'velocity')&& ~strcmp(ParamOut.FieldName,'get_field...');% ~isequal(ParamOut.CivStage,0)%&&~isempty(FieldName)%
     Field{1}=calc_field([{ParamOut.FieldName} {ParamOut.ColorVar}],Field{1});
 end
-if numel(Field)==2 && ~strcmp(ParamOut_1.FieldName,'get_field...')&& ~test_keepdata_1 && (strcmp(UvData.FileType{2},'civdata')||strcmp(UvData.FileType{2},'civx'))  &&~strcmp(ParamOut_1.FieldName,'velocity') && ~strcmp(ParamOut_1.FieldName,'get_field...')
+if isstruct(ParamOut_1)&& numel(Field)==2 && ~strcmp(ParamOut_1.FieldName,'get_field...')&& ~test_keepdata_1 && (strcmp(UvData.FileType{2},'civdata')||strcmp(UvData.FileType{2},'civx'))  &&~strcmp(ParamOut_1.FieldName,'velocity') && ~strcmp(ParamOut_1.FieldName,'get_field...')
      Field{2}=calc_field([{ParamOut_1.FieldName} {ParamOut_1.ColorVar}],Field{2});
 end