Changeset 109 for trunk/src/series

Timestamp:

Oct 4, 2010, 10:39:11 PM (14 years ago)

Author:

sommeria

Message:

merge_proj.m, proj_field.m: bugs repaired merging of images
plot_field.m: minor cleaning
imadoc2struct: introduce the possibility of readying the calibration point coordinates
sub_field.m:bugs repaired
geometry_calib, create_grid: introduction of new calibration methods, improvement of detect_grid

File:

• trunk/src/series/merge_proj.m (modified) (9 diffs)

trunk/src/series/merge_proj.m

@@ -59 +59 @@
 nbview=length(Series.RootFile);%number of views (file series to merge)
 nbfield=size(num_i1{1},1)*size(num_i1{1},2);%number of fields in the time series
-transform=Series.CoordType; %  field transform function
+% transform=Series.CoordType; %  field transform function
 hhh=which('mmreader');
 for iview=1:nbview
@@ -72 +72 @@
 
 %Calibration data and timing: read the ImaDoc files
-mode=''; %default
+% mode=''; %default
 timecell={};
 itime=0;
@@ -152 +152 @@
 
 % Field and velocity type (the same for all views)
+FieldName='';
+if strcmp(get(hseries.FieldMenu,'Visible'),'on')
 Field_str=get(hseries.FieldMenu,'String');
 val=get(hseries.FieldMenu,'Value');
@@ -163 +165 @@
     hget_field=findobj(allchild(0),'Name','get_field');%find the get_field... GUI
     SubField=get_field('read_get_field',hObject,eventdata,hget_field); %read the names of the variables to plot in the get_field GUI
+end
 end
 %detect whether all the files are 'images' or 'netcdf'
@@ -238 +241 @@
     if isequal(stopstate,'queue')% enable STOP command from the 'series' interface
          update_waitbar(hseries.waitbar,WaitbarPos,ifile/nbfield)
-         Amerge=0;
+%          Amerge=0;
          
          %----------LOOP ON VIEWS----------------------
@@ -258 +261 @@
                 end % TODO: introduce ListVarName
                 npxy=size(Field{iview}.A);
+                Field{iview}.ListVarName={'AX','AY','A'};
+                Field{iview}.VarDimName={'AX','AY',{'AY','AX'}};
                 Field{iview}.AX=[0.5 npxy(2)-0.5]; % coordinates of the first and last pixel centers
                 Field{iview}.AY=[npxy(1)-0.5 0.5];
                 Field{iview}.CoordType='px'; 
                 Field{iview}.AName='image';
+                timeread(iview)=0;
             else
                 if testcivx
@@ -287 +293 @@
             end
             if testcivx
-                    Field{iview}=calc_field(FieldName,Field{iview});
+                Field{iview}=calc_field(FieldName,Field{iview});
             end
 
@@ -393 +399 @@
     return
 end
-for iview=1:nbview
-    if ~isequal(MergeData.ListDimName,Data{iview}.ListDimName)
-        error=1;
-    end
-    if ~isequal(MergeData.ListVarName,Data{iview}.ListVarName)
-        error=1;
-    end
-end
-if error
-    MergeData.Txt='ERROR: attempt at merging fields of incompatible type';
-    return
-end
-
-
-
-
+% for iview=1:nbview
+%     if ~isequal(MergeData.ListDimName,Data{iview}.ListDimName)
+%         error=1;
+%     end
+%     if ~isequal(MergeData.ListVarName,Data{iview}.ListVarName)
+%         error=1;
+%     end
+% end
+% if error
+%     MergeData.Txt='ERROR: attempt at merging fields of incompatible type';
+%     return
+% end
+% 
 %group the variables (fields of 'FieldData') in cells of variables with the same dimensions
 [CellVarIndex,NbDim,VarTypeCell]=find_field_indices(Data{1});
@@ -414 +417 @@
 % CellVarIndex=cells of variable index arrays
 ivar_new=0; % index of the current variable in the projected field
-icoord=0;
 for icell=1:length(CellVarIndex)
     if NbDim(icell)==1