Changeset 548 for trunk

Timestamp:

Oct 10, 2012, 11:25:35 PM (12 years ago)

Author:

sommeria

Message:

various bug repairs

Location:

trunk/src

Files:

• check_files.m (modified) (1 diff)
• civ.m (modified) (1 diff)
• civ_matlab.m (modified) (1 diff)
• read_get_field.m (deleted)
• sub_field.m (modified) (3 diffs)
• uvmat.m (modified) (2 diffs)

trunk/src/check_files.m

@@ -85 +85 @@
     'read_civdata';... reads new civ data from netcdf files
     'read_field';...% read the fields from files in different formats (netcdf files, images, video)
-    'read_get_field';... read the list of selected variables from the GUI get_field (TODO: use read_GUI)
+%     'read_get_field';... read the list of selected variables from the GUI get_field (TODO: use read_GUI)
     'read_GUI';... %read a GUI and provide the data as a Matlab structure
     'read_image';...%read images or video objects

trunk/src/civ.m

@@ -3776 +3776 @@
     set(0,'CurrentFigure',hview_field)
     hhview_field=guihandles(hview_field);
-    set(hview_field,'CurrentAxes',hhview_field.axes3)
+    set(hview_field,'CurrentAxes',hhview_field.PlotAxes)
     ViewData=get(hview_field,'UserData');
     ViewData.CivHandle=handles.civ;% indicate the handle of the civ GUI in view_field
-    ViewData.axes3.B=imread(filecell.ima2.civ1{1});%store the second image in the UserData of the GUI view_field
-    ViewData.axes3.X=Grid.Civ1_X; %keep the set of points in memeory
-    ViewData.axes3.Y=Grid.Civ1_Y;
+    ViewData.PlotAxes.B=imread(filecell.ima2.civ1{1});%store the second image in the UserData of the GUI view_field
+    ViewData.PlotAxes.X=Grid.Civ1_X; %keep the set of points in memeory
+    ViewData.PlotAxes.Y=Grid.Civ1_Y;
     set(hview_field,'UserData',ViewData)
     corrfig=findobj(allchild(0),'tag','corrfig');% look for a current figure for image correlation display

trunk/src/civ_matlab.m

@@ -100 +100 @@
         end
     else
-        if isfield(Param.Civ1,'ImageA')%&&...    
+        if isfield(Param.Civ1,'ImageA') && ischar(Param.Civ1.ImageA) 
              Param.Civ1.ImageA=regexprep(Param.Civ1.ImageA,'''','\');
             [par_civ1.ImageA,VideoObject] = read_image(Param.Civ1.ImageA,par_civ1.FileTypeA,[],par_civ1.FrameIndexA);
         end
-        if isfield(Param.Civ1,'ImageB')%&& ...
+        if isfield(Param.Civ1,'ImageB')&& ischar(Param.Civ1.ImageB)
              Param.Civ1.ImageB=regexprep(Param.Civ1.ImageB,'''','\');
              if strcmp(Param.Civ1.ImageA,Param.Civ1.ImageB)% use the same movie object

trunk/src/sub_field.m

@@ -45 +45 @@
         end
         if ~isfield(Field,AttrName) || ~isequal(Field_1.(AttrName),Field.(AttrName))
-        SubData.ListGlobalAttribute=[SubData.ListGlobalAttribute {AttrNameNew}];
-        SubData.(AttrNameNew)=Field_1.(AttrName);
+            SubData.ListGlobalAttribute=[SubData.ListGlobalAttribute {AttrNameNew}];
+            SubData.(AttrNameNew)=Field_1.(AttrName);
         end
     end
@@ -149 +149 @@
 
 %% substrat fields when possible
-[CellVarIndex,NbDim,CellVarType,errormsg]=find_field_cells(SubData);
+%[CellVarIndex,NbDim,CellVarType,errormsg]=find_field_cells(SubData);
+[CellInfo,NbDim,errormsg]=find_field_cells(SubData)
 ind_remove=zeros(size(SubData.ListVarName));
 ivar=[];
 ivar_1=[];
-for icell=1:numel(CellVarIndex)
-    if ~isempty(CellVarIndex{icell})
-        if isfield(CellVarType{icell},'scalar') && numel(CellVarType{icell}.scalar)==2 && SubData.VarAttribute{CellVarType{icell}.scalar(2)}.CheckSub;
-            ivar=[ivar CellVarType{icell}.scalar(1)];
-            ivar_1=[ivar_1 CellVarType{icell}.scalar(2)];
+for icell=1:numel(CellInfo)
+    if ~isempty(CellInfo{icell})
+        if isfield(CellInfo{icell},'VarIndex_scalar') && numel(CellInfo{icell}.VarIndex_scalar)==2 && SubData.VarAttribute{CellInfo{icell}.VarIndex_scalar(2)}.CheckSub;
+            ivar=[ivar CellInfo{icell}.VarIndex_scalar(1)];
+            ivar_1=[ivar_1 CellInfo{icell}.VarIndex_scalar(2)];
         end
-        if isfield(CellVarType{icell},'vector_x') && numel(CellVarType{icell}.vector_x)==2 && SubData.VarAttribute{CellVarType{icell}.vector_x(2)}.CheckSub;
-            ivar=[ivar CellVarType{icell}.vector_x(1)];
-            ivar_1=[ivar_1 CellVarType{icell}.vector_x(2)];
+        if isfield(CellInfo{icell},'VarIndex_vector_x') && numel(CellInfo{icell}.VarIndex_vector_x)==2 && SubData.VarAttribute{CellInfo{icell}.VarIndex_vector_x(2)}.CheckSub;
+            ivar=[ivar CellInfo{icell}.VarIndex_vector_x(1)];
+            ivar_1=[ivar_1 CellInfo{icell}.VarIndex_vector_x(2)];
         end
-        if isfield(CellVarType{icell},'vector_y') && numel(CellVarType{icell}.vector_y)==2 && SubData.VarAttribute{CellVarType{icell}.vector_y(2)}.CheckSub;
-            ivar=[ivar CellVarType{icell}.vector_y(1)];
-            ivar_1=[ivar_1 CellVarType{icell}.vector_y(2)];
+        if isfield(CellInfo{icell},'VarIndex_vector_y') && numel(CellInfo{icell}.VarIndex_vector_y)==2 && SubData.VarAttribute{CellInfo{icell}.VarIndex_vector_y(2)}.CheckSub;
+            ivar=[ivar CellInfo{icell}.VarIndex_vector_y(1)];
+            ivar_1=[ivar_1 CellInfo{icell}.VarIndex_vector_y(2)];
         end
     end
@@ -172 +173 @@
         VarName=SubData.ListVarName{ivar(imod)};
         VarName_1=SubData.ListVarName{ivar_1(imod)};
-        SubData.(VarName)=SubData.(VarName)-SubData.(VarName_1);
+        SubData.(VarName)=double(SubData.(VarName))-double(SubData.(VarName_1));
         ind_remove(ivar_1(imod))=1;
 end

trunk/src/uvmat.m

@@ -791 +791 @@
 TimeUnit='';%default
 Time=[];
-testima=0; %test for image input
+% testima=0; %test for image input
 imainfo=[];
 ColorType='falsecolor'; %default
-hhh=[];
+% hhh=[];
 UvData.MovieObject{index}=VideoObject;
 if ~isempty(VideoObject)
     imainfo=get(VideoObject);
-    testima=1;
+%     testima=1;
     TimeUnit='s';
     if isempty(j1_series); %frame index along i
         Time=(0:1/imainfo.FrameRate:(imainfo.NumberOfFrames)/imainfo.FrameRate)';
     else
-    Time=ones(size(i1_series,1),1)*(0:1/imainfo.FrameRate:(imainfo.NumberOfFrames)/imainfo.FrameRate);
-    end
-    %nbfield=imainfo.NumberOfFrames;
+        Time=ones(size(i1_series,1),1)*(0:1/imainfo.FrameRate:(imainfo.NumberOfFrames)/imainfo.FrameRate);
+    end
     set(handles.Dt_txt,'String',['Dt=' num2str(1000/imainfo.FrameRate) 'ms']);%display the elementary time interval in millisec
     ColorType='truecolor';
 elseif ~isempty(FileExt(2:end))&&(~isempty(imformats(FileExt(2:end))) || isequal(FileExt,'.vol'))%&& isequal(NomType,'*')% multi-frame image
-    testima=1;
+%     testima=1;
     if ~isequal(SubDir,'')
-        RootFile=get(handles.RootFile,'String');
         imainfo=imfinfo([fullfile(RootPath,SubDir,RootFile) FileIndices FileExt]);
     else
@@ -817 +815 @@
     end
     ColorType=imainfo.ColorType;%='truecolor' for color images
-    if length(imainfo) >1 %case of image with multiple frames
-       % nbfield=length(imainfo);
-       % nbfield_j=1;
-    end
 end
 if isfield(imainfo,'Width') && isfield(imainfo,'Height')