Changeset 869 for trunk/src

Timestamp:

Feb 13, 2015, 4:39:15 PM (10 years ago)

Author:

sommeria

Message:

bug_repaired

Location:

trunk/src

Files:

• plot_field.m (modified) (1 diff)
• proj_field.m (modified) (2 diffs)
• series.m (modified) (3 diffs)
• series/aver_stat.m (modified) (2 diffs)

trunk/src/plot_field.m

@@ -1369 +1369 @@
         dxy=[-dxymod/4 dxymod/4];% increase the resolution 4 times
     end
-    xi=[rangx(1):dxy(2):rangx(2)];
-    yi=[rangy(1):dxy(1):rangy(2)];
-    A=griddata_uvmat(vec_X,vec_Y,vec_A,xi,yi'); 
+    xi=rangx(1):dxy(2):rangx(2);
+    yi=rangy(1):dxy(1):rangy(2);
+    A=griddata(vec_X,vec_Y,vec_A,xi,yi'); 
     A=reshape(A,length(yi),length(xi));
 else

trunk/src/proj_field.m

@@ -386 +386 @@
 for icell=1:length(CellInfo)
     CoordType=CellInfo{icell}.CoordType;
-%     testY=0;
     test_Amat=0;
     if NbDim(icell)~=2% proj_patch acts only on fields of space dimension 2
@@ -1292 +1291 @@
                         end
                     end
+                    if isfield (CellInfo{icell},'VarIndex_vector_x')&& isfield (CellInfo{icell},'VarIndex_vector_y')
                     vector_x_proj=CellInfo{icell}.VarIndex_vector_x; %preserve for next cell
                     vector_y_proj=CellInfo{icell}.VarIndex_vector_y; %preserve for next cell
+                    end
             end
             

trunk/src/series.m

@@ -234 +234 @@
     set(handles.FieldName,'Value',Param.index_fields);% selected string index
 end
-if isfield(Param,'Coord_x_str') && ischar(Param.Coord_x_str)
-        set(handles.Coord_x,'String',Param.Coord_x_str);% list menu fields
-end
-if isfield(Param,'Coord_y_str')&& ischar(Param.Coord_y_str)
-        set(handles.Coord_y,'String',Param.Coord_y_str);% list menu fields
-end
+if isfield(Param,'Coordinates')
+    if isfield(Param.Coordinates,'Coord_x')
+        set(handles.Coord_x,'String',Param.Coordinates.Coord_x)
+    end
+    if isfield(Param.Coordinates,'Coord_y')
+        set(handles.Coord_y,'String',Param.Coordinates.Coord_y)
+    end
+    if isfield(Param.Coordinates,'Coord_z')
+        set(handles.Coord_z,'String',Param.Coordinates.Coord_z)
+    end
+end
+% if isfield(Param,'Coord_x_str') && ischar(Param.Coord_x_str)
+%         set(handles.Coord_x,'String',Param.Coord_x_str);% list menu fields
+% end
+% if isfield(Param,'Coord_y_str')&& ischar(Param.Coord_y_str)
+%         set(handles.Coord_y,'String',Param.Coord_y_str);% list menu fields
+% end
 
 %% introduce the input file name(s) if defined from input Param,
@@ -275 +286 @@
     update_rootinfo(handles,Param.HiddenData.i1_series{1},Param.HiddenData.i2_series{1},Param.HiddenData.j1_series{1},Param.HiddenData.j2_series{1},...
         Param.HiddenData.FileInfo{1},Param.HiddenData.MovieObject{1},1)
-    if isfield(Param,'FileName_1')       
+    if isfield(Param,'FileName_1')
         %         display_file_name(handles,Param,2)
         update_rootinfo(handles,Param.HiddenData.i1_series{2},Param.HiddenData.i2_series{2},Param.HiddenData.j1_series{2},Param.HiddenData.j2_series{2},...
@@ -281 +292 @@
     end
     %% enable field and veltype menus, in accordance with the current action
-ActionName_Callback([],[], handles)
-
-%% set length of waitbar
-displ_time(handles)
-
+    ActionName_Callback([],[], handles)
+    
+    %% set length of waitbar
+    displ_time(handles)
+    
 else
     set(handles.REFRESH,'BackgroundColor',[1 0 1])% set REFRESH button to magenta color to indicate that input refresh is needed

trunk/src/series/aver_stat.m

@@ -197 +197 @@
 %% Set field names and velocity types
 InputFields{1}=[];%default (case of images)
+if NbView==2
+    InputFields{2}=[];%default (case of images)
+end
 if isfield(Param,'InputFields')
     InputFields{1}=Param.InputFields;
-end
-if NbView==2
-    InputFields{2}=[];%default (case of images)
-    if isfield(Param,'InputFields')
-        InputFields{2}=Param.InputFields{1};%default
+    if NbView==2
+        InputFields{2}=Param.InputFields;%default
         if isfield(Param.InputFields,'FieldName_1')
             InputFields{2}.FieldName=Param.InputFields.FieldName_1;
@@ -212 +212 @@
     end
 end
-
 % for i_slice=1:NbSlice
 % index_slice=i_slice:NbSlice:nbfield;% select file indices of the slice