Index: /trunk/src/calc_field_interp.m =================================================================== --- /trunk/src/calc_field_interp.m (revision 532) +++ /trunk/src/calc_field_interp.m (revision 533) @@ -60,48 +60,48 @@ for ilist=1:numel(Operation) if ~check_skipped(ilist) - nbvar=numel(ListVarName); - switch Operator{ilist} - case 'vec' - if exist('XI','var') - VarVal{nbvar+1}=F.(UName{ilist})(XI,YI); - VarVal{nbvar+2}=F.(VName{ilist})(XI,YI); - else - VarVal{nbvar+1}=Data.(UName{ilist}); - VarVal{nbvar+2}=Data.(VName{ilist}); - end - ListVarName{nbvar+1}=UName{ilist}; - ListVarName{nbvar+2}=VName{ilist}; - VarAttribute{nbvar+1}.Role='vector_x'; - VarAttribute{nbvar+2}.Role='vector_y'; - case 'norm' - if exist('XI','var') - U2=F.(UName{ilist})(XI,YI).*F.(UName{ilist})(XI,YI); - V2=F.(VName{ilist})(XI,YI).*F.(VName{ilist})(XI,YI); - else - U2=Data.(UName{ilist}).*Data.(UName{ilist}); - V2=Data.(VName{ilist}).*Data.(VName{ilist}); - end - VarVal{nbvar+1}=sqrt(U2+V2); - ListVarName{nbvar+1}='norm'; - VarAttribute{nbvar+1}.Role='scalar'; - otherwise - if ~isempty(Operation{ilist}) + nbvar=numel(ListVarName); + switch Operator{ilist} + case 'vec' if exist('XI','var') - VarVal{nbvar+1}=F.(Operation{ilist})(XI,YI); + VarVal{nbvar+1}=F.(UName{ilist})(XI,YI); + VarVal{nbvar+2}=F.(VName{ilist})(XI,YI); else - VarVal{nbvar+1}= Data.(Operation{ilist}); + VarVal{nbvar+1}=Data.(UName{ilist}); + VarVal{nbvar+2}=Data.(VName{ilist}); end - ListVarName{nbvar+1}=Operation{ilist}; + ListVarName{nbvar+1}=UName{ilist}; + ListVarName{nbvar+2}=VName{ilist}; + VarAttribute{nbvar+1}.Role='vector_x'; + VarAttribute{nbvar+2}.Role='vector_y'; + case 'norm' + if exist('XI','var') + U2=F.(UName{ilist})(XI,YI).*F.(UName{ilist})(XI,YI); + V2=F.(VName{ilist})(XI,YI).*F.(VName{ilist})(XI,YI); + else + U2=Data.(UName{ilist}).*Data.(UName{ilist}); + V2=Data.(VName{ilist}).*Data.(VName{ilist}); + end + VarVal{nbvar+1}=sqrt(U2+V2); + ListVarName{nbvar+1}='norm'; VarAttribute{nbvar+1}.Role='scalar'; - end - end + otherwise + if ~isempty(Operation{ilist}) + if exist('XI','var') + VarVal{nbvar+1}=F.(Operation{ilist})(XI,YI); + else + VarVal{nbvar+1}= Data.(Operation{ilist}); + end + ListVarName{nbvar+1}=Operation{ilist}; + VarAttribute{nbvar+1}.Role='scalar'; + end + end end end % put an error flag to indicate NaN data if exist('XI','var') -nbvar=numel(ListVarName); -ListVarName{nbvar+1}='FF'; -VarVal{nbvar+1}=isnan(VarVal{nbvar}); -VarAttribute{nbvar+1}.Role='errorflag'; + nbvar=numel(ListVarName); + ListVarName{nbvar+1}='FF'; + VarVal{nbvar+1}=isnan(VarVal{nbvar}); + VarAttribute{nbvar+1}.Role='errorflag'; end Index: /trunk/src/proj_field.m =================================================================== --- /trunk/src/proj_field.m (revision 532) +++ /trunk/src/proj_field.m (revision 533) @@ -184,26 +184,12 @@ % % select types of variables to be projected - ListProject={'VarIndex_scalar','VarIndex_image','VarIndex_color','VarIndex_vector_x','VarIndex_vector_y'}; - check_project=false(size(VarIndex)); - for ilist=1:numel(ListProject) - if isfield(CellInfo{icell},ListProject{ilist}) - check_project(CellInfo{icell}.(ListProject{ilist}))=1; + ListProj={'VarIndex_scalar','VarIndex_image','VarIndex_color','VarIndex_vector_x','VarIndex_vector_y'}; + check_proj=false(size(FieldData.ListVarName)); + for ilist=1:numel(ListProj) + if isfield(CellInfo{icell},ListProj{ilist}) + check_proj(CellInfo{icell}.(ListProj{ilist}))=1; end end - VarIndex=VarIndex(check_project); - -% if isempty(ivar_X) -% test_grid=1;%test for input data on regular grid (e.g. image)coordinates -% else -% if length(ivar_X)>1 || length(ivar_Y)>1 || length(ivar_Z)>1 -% errormsg='multiple coordinate input in proj_field.m'; -% return -% end -% if length(ivar_Y)~=1 -% errormsg='y coordinate not defined in proj_field.m'; -% return -% end -% test_grid=0; -% end + VarIndex=find(check_proj); ProjData.ListVarName={'Y','X','NbVal'}; ProjData.VarDimName={'nb_points','nb_points','nb_points'}; @@ -360,10 +346,5 @@ %group the variables (fields of 'FieldData') in cells of variables with the same dimensions -testfalse=0; -ListIndex={}; -% DimVarIndex=0;%initilise list of indices for dimension variables -idimvar=0; [CellInfo,NbDim,errormsg]=find_field_cells(FieldData); -%[CellVarIndex,NbDim,VarTypeCell,errormsg]=find_field_cells(FieldData); if ~isempty(errormsg) errormsg=['error in proj_field/proj_patch:' errormsg]; @@ -372,52 +353,44 @@ %LOOP ON GROUPS OF VARIABLES SHARING THE SAME DIMENSIONS -dimcounter=0; for icell=1:length(CellInfo) testX=0; testY=0; test_Amat=0; - testfalse=0; - VarIndex=CellInfo{icell}.VarIndex;% indices of the selected variables in the list FieldData.ListVarName - % VarType=VarTypeCell{icell}; - % DimIndices=FieldData.VarDimIndex{VarIndex(1)};%indices of the dimensions of the first variable (common to all variables in the cell) if NbDim(icell)~=2% proj_patch acts only on fields of space dimension 2 continue end - %testX=~isempty(VarType.coord_x) && ~isempty(VarType.coord_y); + ivar_FF=[]; testfalse=isfield(CellInfo{icell},'VarIndex_errorflag'); - testproj(VarIndex)=zeros(size(VarIndex));%default + if testfalse + ivar_FF=CellInfo{icell}.VarIndex_errorflag; + FFName=FieldData.ListVarName{ivar_FF}; + errorflag=FieldData.(FFName); + end + % select types of variables to be projected + ListProj={'VarIndex_scalar','VarIndex_image','VarIndex_color','VarIndex_vector_x','VarIndex_vector_y'}; + check_proj=false(size(FieldData.ListVarName)); + for ilist=1:numel(ListProj) + if isfield(CellInfo{icell},ListProj{ilist}) + check_proj(CellInfo{icell}.(ListProj{ilist}))=1; + end + end + VarIndex=find(check_proj); + ivar_X=CellInfo{icell}.CoordIndex(end); ivar_Y=CellInfo{icell}.CoordIndex(end-1); ivar_Z=[]; - if NbDimArray(icell)==3 + if NbDim(icell)==3 ivar_Z=CellInfo{icell}.CoordIndex(1); end - ivar_rem=[]; - if isfield(CellInfo{icell},'VarIndex_ancillary') - ivar_rem=CellInfo{icell}.VarIndex_ancillary; - end - if isfield(CellInfo{icell},'VarIndex_warnflag') - ivar_rem=[ivar_rem CellInfo{icell}.VarIndex_warnflag]; - end - if isfield(CellInfo{icell},'VarIndex_errorflag') - ivar_rem=[ivar_rem CellInfo{icell}.VarIndex_errorflag]; - ivar_FF=CellInfo{icell}.VarIndex_errorflag; - end - VarIndex([ivar_X ivar_Y ivar_Z ivar_rem])=[];% not projected variables removed frlom list - if strcmp(CellInfo{icell}.CoordType,'scattered')%case of unstructured coordinates - eval(['nbpoint=numel(FieldData.' FieldData.ListVarName{VarIndex(1)} ');']) - for ivar=[VarIndex VarType.coord_x VarType.coord_y VarType.errorflag] - VarName=FieldData.ListVarName{ivar}; - eval(['FieldData.' VarName '=reshape(FieldData.' VarName ',nbpoint,1);']) - end - XName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(end)}; - YName=FieldData.ListVarName{CellInfo{icell}.CoordIndex(end-1)}; - eval(['coord_x=FieldData.' XName ';']) - eval(['coord_y=FieldData.' YName ';']) - end - if testfalse - FFName=FieldData.ListVarName{VarType.errorflag}; - eval(['errorflag=FieldData.' FFName ';']) + %nbpoint=numel(FieldData.(FieldData.ListVarName{VarIndex(1)})); + for ivar=[VarIndex ivar_X ivar_Y ivar_FF] + VarName=FieldData.ListVarName{ivar}; + FieldData.(VarName)=reshape(FieldData.(VarName),[],1); + end + XName=FieldData.ListVarName{ivar_X}; + YName=FieldData.ListVarName{ivar_Y}; + coord_x=FieldData.(XName); + coord_y=FieldData.(YName); end % image or 2D matrix @@ -430,19 +403,10 @@ VarName=FieldData.ListVarName{VarIndex(1)}; DimValue=size(FieldData.(VarName)); - if length(AX)==2 - AX=linspace(AX(1),AX(end),DimValue(2)); - end - if length(AY)==2 - AY=linspace(AY(1),AY(end),DimValue(1)); - end -% for idim=1:length(DimValue) -% Coord_i_str=['Coord_' num2str(idim)]; -% DCoord_min(idim)=1;%default -% Coord{idim}=[0.5 DimValue(idim)]; -% test_direct(idim)=1; -% end -% AX=linspace(Coord{2}(1),Coord{2}(2),DimValue(2)); -% AY=linspace(Coord{1}(1),Coord{1}(2),DimValue(1)); %TODO : 3D case -% testcolor=find(numel(DimValue)==3); + if length(AX)==2 + AX=linspace(AX(1),AX(end),DimValue(2)); + end + if length(AY)==2 + AY=linspace(AY(1),AY(end),DimValue(1)); + end if length(DimValue)==3 testcolor=1; @@ -459,80 +423,67 @@ for ivar=1:length(VarIndex) VarName=FieldData.ListVarName{VarIndex(ivar)}; - FieldData.(VarName)=reshape(FieldData.(VarName),npxy(1)*npxy(2),npxy(3)); % keep only non false vectors - end - end -%select the indices in the range of action + FieldData.(VarName)=reshape(FieldData.(VarName),npxy(1)*npxy(2),npxy(3)); % keep only non false vectors + end + end + %select the indices in the range of action testin=[];%default if isequal(ObjectData.Type,'rectangle') -% if ~isfield(ObjectData,'RangeX')|~isfield(ObjectData,'RangeY') -% errormsg='rectangle half sides RangeX and RangeY needed' -% return -% end - if testX + if strcmp(CellInfo{icell}.CoordType,'scattered') distX=abs(coord_x-ObjectData.Coord(1,1)); distY=abs(coord_y-ObjectData.Coord(1,2)); testin=distX0)); -% [tild,index_max(iview)]=max(SeriesData.i1_series{iview}(SeriesData.i1_series{iview}>0)); -% end for iview=1:numel(SeriesData.i1_series) pair_max{iview}=squeeze(max(SeriesData.i1_series{iview},[],1)); %max on pair index @@ -994,16 +990,14 @@ [index_max,iview_max]=min(index_max); if size(SeriesData.i1_series{iview_min},2)==1% movie - index_first=ref_i(1); - index_last=ref_i(2); -else -%index_first=(ref_i(1)-1)*(size(SeriesData.i1_series{iview_min},2)-1)+ref_j(1); -%index_last=(ref_i(2)-1)*(size(SeriesData.i1_series{iview_max},2)-1)+ref_j(2); -index_first=(ref_i(1))*(size(SeriesData.i1_series{iview_min},2))+ref_j(1)+1; -index_last=(ref_i(2))*(size(SeriesData.i1_series{iview_max},2))+ref_j(2)+1; + index_first=ref_i(1); + index_last=ref_i(2); +else + index_first=(ref_i(1)-1)*(size(SeriesData.i1_series{iview_min},1))+ref_j(1)+1; + index_last=(ref_i(2)-1)*(size(SeriesData.i1_series{iview_max},1))+ref_j(2)+1; end range=index_max-index_min+1; coeff_min=(index_first-index_min)/range; coeff_max=(index_last-index_min+1)/range; -Position=get(handles.Waitbar,'Position'); +Position=get(handles.Waitbar,'Position');% position of the waitbar:= [ x,y, width, height] Position_status=get(handles.FileStatus,'Position'); Position(1)=coeff_min*Position_status(3)+Position_status(1); Index: /trunk/src/set_object.m =================================================================== --- /trunk/src/set_object.m (revision 532) +++ /trunk/src/set_object.m (revision 533) @@ -213,6 +213,6 @@ if ~isempty(hseries) hhseries=guidata(hseries); - set(hhseries.GetObject,'Value',0) - set(hhseries.GetObject,'BackgroundColor',[0 1 0])%put unactivated buttons to green + set(hhseries.CheckObject,'Value',0) + set(hhseries.CheckObject,'BackgroundColor',[0 1 0])%put unactivated buttons to green end