Changeset 537 for trunk/src

Timestamp:

Sep 3, 2012, 7:15:36 PM (12 years ago)

Author:

sommeria

Message:

various bugs fixed. Use of the free pair option '*-*' in series.

Location:

trunk/src

Files:

• get_field.m (modified) (2 diffs)
• get_file_series.m (modified) (3 diffs)
• mouse_motion.m (modified) (3 diffs)
• plot_field.m (modified) (1 diff)
• proj_field.m (modified) (1 diff)
• read_multimadoc.m (modified) (1 diff)

trunk/src/get_field.m

@@ -224 +224 @@
     return
 end  
-for icell=1:numel(CellInfo)
-    NbDim(icell)=max(NbDim(icell),numel(CellInfo{icell}.VarIndex));
-end
+% for icell=1:numel(CellInfo)
+%     NbDim(icell)=max(NbDim(icell),numel(CellInfo{icell}.VarIndex));
+% end
 [maxdim,imax]=max(NbDim);
    
@@ -891 +891 @@
         set(hh.Coord_x,'Value',1)
         set(hh.Coord_x,'String',{get_field_GUI.Panel1Dplot.abscissa})
-        set(hh.Coord_y,'String',{get_field_GUI.Panel1Dplot.ordinate})
+        set(hh.Coord_y,'String',get_field_GUI.Panel1Dplot.ordinate)
         set(hh.Coord_y,'Value',1:numel(get_field_GUI.Panel1Dplot.ordinate))
         set(hfield,'Value',1)

trunk/src/get_file_series.m

@@ -41 +41 @@
         if isempty(r)
             r=regexp(Param.IndexRange.PairString{iview,1},'(?<num1>\d+)(?<mode>-)(?<num2>\d+)','names');
-        end        
+        end
         % TODO case of free pairs:
         %r=regexp(pair_string,'.*\D(?<num1>[\d+|*])(?<delim>[-||])(?<num2>[\d+|*])','names');
@@ -48 +48 @@
         r(1).num1='';
         r(1).num2='';
+        if strcmp(Param.IndexRange.PairString{iview,1},'j=*-*')
+            r(1).mode='*-*';
+        else
         r(1).mode='';
+        end
     end
-    [i1_series{iview},i2_series{iview},j1_series{iview},j2_series{iview}]=find_file_indices(ref_i,ref_j,str2num(r.num1),str2num(r.num2),r.mode);
+    if isequal(r(1).mode,'*-*')% free pairs
+        FilePath=fullfile(InputTable{iview,1},InputTable{iview,2});
+        fileinput=[InputTable{iview,3} InputTable{iview,4} InputTable{iview,5}];
+        [tild,tild,tild,i1_series{iview},i2_series{iview},j1_series{iview},j2_series{iview},NomType,FileType,MovieObject,i1_input,i2_input,j1_input,j2_input]=find_file_series(FilePath,fileinput);
+        i1_series{iview}=squeeze(i1_series{iview}(1,:,:)); %first  pair index
+        check_select=i1_series{iview}>=first_i & i1_series{iview}<=last_i;
+        i1_series{iview}=i1_series{iview}(check_select);    
+        i2_series{iview}=[]; %first  pair index
+        j1_series{iview}=squeeze(j1_series{iview}(1,:,:)); %first  pair index
+        j2_series{iview}=squeeze(j2_series{iview}(1,:,:)); %first  pair index
+        j1_series{iview}=j1_series{iview}(check_select);
+        j2_series{iview}=j2_series{iview}(check_select);
+    else
+        [i1_series{iview},i2_series{iview},j1_series{iview},j2_series{iview}]=find_file_indices(ref_i,ref_j,str2num(r.num1),str2num(r.num2),r.mode);
+    end
+        
     %case of pairs (.nc files)
     i2=[];j1=[];j2=[];
@@ -64 +83 @@
             j2=j2_series{iview}(ifile);
         end
-        filecell{iview,ifile}=fullfile_uvmat(InputTable{iview,1},InputTable{iview,2},InputTable{iview,3},InputTable{iview,5},InputTable{iview,4}...
-            ,i1,i2,j1,j2);
+         filecell{iview,ifile}=fullfile_uvmat(InputTable{iview,1},InputTable{iview,2},InputTable{iview,3},InputTable{iview,5},InputTable{iview,4},i1,i2,j1,j2);
     end
 end

trunk/src/mouse_motion.m

@@ -135 +135 @@
                                         VarName=Field.ListVarName{CellInfo{icell}.VarIndex(ivar)};
                                         VarVal=Field.(VarName)(ivec);
-                                        var_text=[VarName '=' num2str(VarVal,3) ','];
+                                        var_text=[VarName '=' num2str(VarVal,4) ','];
                                         if isequal(ivar,CellInfo{icell}.CoordIndex(end))||isequal(ivar,CellInfo{icell}.CoordIndex(end-1))||isequal(ivar,CellInfo{icell}.CoordIndex(1))
                                             text_displ_1=[text_displ_1 var_text];
@@ -181 +181 @@
                             yName='y';
                         end
-                        text_displ_1=[xName '=' num2str(xy(1,1),3) ', ' yName '=' num2str(xy(1,2),3) ','];
+                        text_displ_1=[xName '=' num2str(xy(1,1),4) ', ' yName '=' num2str(xy(1,2),4) ','];
                     end
               %display the z coordinate if defined by the projection plane
@@ -203 +203 @@
                     end
                     if ~isempty(z)
-                        text_displ_1=[text_displ_1 ' z=' num2str(z,3)];
+                        text_displ_1=[text_displ_1 ' z=' num2str(z,4)];
                     end
                % case of PIV correlation display

trunk/src/plot_field.m

@@ -306 +306 @@
     end
     if numel(VarValue)<10
-        Data =[Data [VarNameCell; num2cell(VarValue)]];
+        if isempty(VarValue)
+            VarValueCell={'[]'};
+        else
+            VarValueCell=num2cell(VarValue);
+        end
+        if isempty(Data)
+            Data =[VarNameCell; VarValueCell];
+        else
+            Data =[Data [VarNameCell; VarValueCell]];
+        end
     else
+        if isempty(Data)
+            Data =[VarNameCell; num2cell(VarValue)];
+        else
         Data =[Data [VarNameCell; {['size ' num2str(size(VarValue))]}]];
+        end
     end
     if size(VarValue,1)==1

trunk/src/proj_field.m

@@ -484 +484 @@
             ProjData.VarDimName=[ProjData.VarDimName {VarName} {VarName} {'one'} {'one'} {'one'}];
         end
+        if isfield(FieldData,'VarAttribute')&& numel(FieldData.VarAttribute)>=ivar
         ProjData.VarAttribute=[ProjData.VarAttribute FieldData.VarAttribute{ivar} {[]} {[]} {[]} {[]}];
+        end
     end
 end

trunk/src/read_multimadoc.m

@@ -54 +54 @@
 
 function time=get_time(timeimadoc,i1_series,i2_series,j1_series,j2_series)
-if size(timeimadoc,1) < i2_series(end) ||( ~isempty(j2_series) && size(timeimadoc,2) < j2_series(end))% time array absent or too short in ImaDoc xml file'
+if isempty(i2_series)||size(timeimadoc,1) < i2_series(end) ||( ~isempty(j2_series) && size(timeimadoc,2) < j2_series(end))% time array absent or too short in ImaDoc xml file'
     time=[];
 else