Changeset 41 for trunk/src/series

Timestamp:

Mar 10, 2010, 11:03:36 AM (15 years ago)

Author:

sommeria

Message:

-relabel_i_j: improve the question dlg box for image transform
-aver_stat,time_series,merge_proj: include modification of field transform and call of set_object.
-series: introduce a browser for set_object
-ima2vol: create volume images (png images of a slice concacened along y) for PIV 3D
-set_object: suppress TITLE, introduce Tooltip helps for parameters
-civ: fixed bug on BATCH sequences

Location:

trunk/src/series

Files:

• aver_stat.m (modified) (7 diffs)
• ima2vol.m (added)
• merge_proj.m (modified) (7 diffs)
• relabel_i_j.m (modified) (1 diff)
• time_series.m (modified) (7 diffs)

trunk/src/series/aver_stat.m

@@ -32 +32 @@
 WaitbarPos=get(hseries.waitbar_frame,'Position');
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%projection object
+test_object=get(hseries.GetObject,'Value');
+if test_object%isfield(Series,'sethandles')
+    hset_object=findobj(allchild(0),'Name','set_object');
+    ProjObject=read_set_object(guidata(hset_object));
+    %answeryes=questdlg({['field series projected on ' Series.ProjObject.Style]});
+    answeryes=msgbox_uvmat('INPUT_Y-N',['field series projected on ' ProjObject.Style ' before averaging']);
+    if ~isequal(answeryes,'Yes')
+        return
+    end
+end
+
 %root input file and type
 if ~iscell(Series.RootPath)% case of a single input field series
@@ -145 +158 @@
 end
 if ~isequal(FieldName,{'get_field...'})
+    if isequal(FieldName,{''}) && ~testima
+        msgbox_uvmat('ERROR','an input field needs to be selected')
+        return
+    end
     testcivx=testnc;
 end
@@ -235 +252 @@
 % Root name of output files (TO GENERALISE FOR TWO INPUT SERIES)
 subdir_result='aver_stat';
-% filebasesub=fullfile(RootPath{1},subdir_result,RootFile{1});
-% if isempty(SubDir{1}) % create a subdirectory '/aver_stat'
-%     subdir_result='aver_stat';
-%     filebasemean=fullfile(RootPath{1},subdir_result);
 if ~exist(fullfile(RootPath{1},subdir_result),'dir')
     dircur=pwd; %record current working directory
@@ -249 +262 @@
 end
 filebase_out=filebase{1}; 
-% else
-%    subdir_result=SubDir{1};
-%    filebase_out=[filebase{1} '_mean'];% output root name obtained by adding the suffix _mean to the input
-% end
-%output nomtype (to generalise)
 NomTypeOut=nomtype2pair(NomType{1},num_i2{end}(end)-num_i1{1}(1),num_j2{end}(end)-num_j1{1}(1));
-    
-% if NbSlice==1  
-%     filebase_out=[filebasesub '_mean'];
-% else
-%     filebase_out=[filebasesub '_' NbSlice_name 'mean'];
-%     answeryes=questdlg({['will make average in ' num2str(NbSlice) ' slices'];['results stored as files ' filebase_out ' ...']});
-%     if ~isequal(answeryes,'Yes')
-%         return
-%     end
-% end
 
 % coordinate transform or other user defined transform
-Coord_menu=get(hseries.CoordType,'String');
-menu_val=get(hseries.CoordType,'Value');
-usrfct=Coord_menu{menu_val};
-testfct=~isequal(usrfct,'');
+transform_fct=[];%default
+if isfield(Series,'transform_fct')
+    transform_fct=Series.transform_fct;
+end
 
 %slice loop
@@ -312 +310 @@
              end   
              % coordinate transform (or other user defined transform)
-             if ~isequal(Series.CoordType,'')
+             if ~isempty(transform_fct)
                  % z index
                 if ~isempty(NbSlice_calib)
@@ -318 +316 @@
                 end
                 if nbview==2
-                    [Data{1},Data{2}]=feval(Series.CoordType,Data{1},XmlData{1},Data{2},XmlData{2});
+                    [Data{1},Data{2}]=transform_fct(Data{1},XmlData{1},Data{2},XmlData{2});
                     if isempty(Data{2})
                         Data(2)=[];
                     end
                 else
-                    Data{1}=feval(Series.CoordType,Data{1},XmlData);
+                    Data{1}=transform_fct(Data{1},XmlData);
                 end
              end     
@@ -338 +336 @@
                 Field=Data{1};
             end
-            if isfield(Series,'ProjObject')
-                [Field,errormsg]=proj_field(Field,Series.ProjObject);
+            if test_object
+                [Field,errormsg]=proj_field(Field,ProjObject);
                  if ~isempty(errormsg)
                     msgbox_uvmat('ERROR',['error in aver_stat/proj_field:' errormsg])

trunk/src/series/merge_proj.m

@@ -23 +23 @@
 WaitbarPos=get(hseries.waitbar_frame,'Position'); %positiopn of waitbar frame
 %-------------------------------------------------
+
+%projection object
+test_object=get(hseries.GetObject,'Value');
+if test_object
+    hset_object=findobj(allchild(0),'Name','set_object');
+    ProjObject=read_set_object(guidata(hset_object));
+    if ~isfield(ProjObject,'Style')
+            msgbox_uvmat('ERROR','Undefined projection object style')
+            return
+    end
+    if ~isequal(ProjObject.Style,'plane')
+            msgbox_uvmat('ERROR','The projection object must be a plane')
+            return
+    end
+    %answeryes=questdlg({['field series projected on ' Series.ProjObject.Style]});
+    answeryes=msgbox_uvmat('INPUT_Y-N',['field series projected on ' ProjObject.Style]);
+    if ~isequal(answeryes,'Yes')
+        return
+    end
+end
 
 %numbers of view fields (nbre of inputs in RootPath)
@@ -125 +145 @@
 end
 
+% coordinate transform or other user defined transform
+transform_fct=[];%default
+if isfield(Series,'transform_fct')
+    transform_fct=Series.transform_fct;
+end
+
 % Field and velocity type (the same for all views)
 Field_str=get(hseries.FieldMenu,'String');
@@ -170 +196 @@
     testcivx=testnc;
 end
+
 %name of output files and directory:
 % res_subdir=fullfile(Series.RootPath{1},[Series.SubDir{1} '_STAT']);
@@ -178 +205 @@
 if isequal(length(RootPath),1)
     fulldir=RootPath{1};
-    subdir='GRID';
+    subdir='merge_proj';
     res_subdir=fullfile(fulldir,subdir);
 else
@@ -209 +236 @@
 filebasesub=fullfile(res_subdir,Series.RootFile{1});
 filebase_merge=fullfile(res_subdir,'merged');%root name for the merged files
-
-%projection object
-if isfield(Series,'sethandles')
-    if ishandle(Series.sethandles.set_object)
-        Series.ProjObject=read_set_object(Series.sethandles);
-        if ~isfield(Series.ProjObject,'Style')
-            msgbox_uvmat('ERROR','Undefined projection object style')
-            return
-        end
-        if ~isequal(Series.ProjObject.Style,'plane')
-            msgbox_uvmat('ERROR','The projection object must be a plane')
-            return
-        end
-    end
-end
 
     %MAIN LOOP
@@ -271 +283 @@
                 Field{iview}.ZIndex=mod(num_i1{iview}(ifile)-1,NbSlice_calib{1})+1;
             end
-            if ~isequal(transform,'')
-                Field{iview}=feval(Series.CoordType,Field{iview},XmlData{iview});%transform to phys if requested
+            if ~isempty(transform_fct)
+                Field{iview}=transform_fct(Field{iview},XmlData{iview});%transform to phys if requested
             end
             if testcivx
@@ -279 +291 @@
 
             %projection on object (gridded plane)
-            if isfield(Series,'ProjObject')
-                Field{iview}=proj_field(Field{iview},Series.ProjObject);
+            if test_object
+                Field{iview}=proj_field(Field{iview},ProjObject);
             end
         end    

trunk/src/series/relabel_i_j.m

@@ -29 +29 @@
 nbfield2=size(XmlData.Time,2)
 
-answer=msgbox_uvmat('CONFIRMATION','apply image rescaling function levels.m')
+answer=msgbox_uvmat('INPUT_Y-N','apply image rescaling function levels.m')
 test_level=isequal(answer,'Yes')
 

trunk/src/series/time_series.m

@@ -34 +34 @@
 %projection object
 test_object=get(hseries.GetObject,'Value');
-if test_object%isfield(Series,'sethandles')
-    Series.ProjObject=read_set_object(Series.sethandles);
+if test_object
+    hset_object=findobj(allchild(0),'Name','set_object');
+    ProjObject=read_set_object(guidata(hset_object));
     %answeryes=questdlg({['field series projected on ' Series.ProjObject.Style]});
-    answeryes=msgbox_uvmat('INPUT_Y-N',['field series projected on ' Series.ProjObject.Style]);
+    answeryes=msgbox_uvmat('INPUT_Y-N',['field series projected on ' ProjObject.Style]);
     if ~isequal(answeryes,'Yes')
         return
@@ -170 +171 @@
 
 % Root name of output files (TO GENERALISE FOR TWO INPUT SERIES)
-filebasesub=fullfile(RootPath{1},RootFile{1});
-if NbSlice==1
-    filebase_out=[filebasesub '_time'];
-else
-    filebase_out=[filebasesub '_' NbSlice_name 'mtim'];
-    increment=num_i1{1}(2)-num_i1{1}(1);
-    if ~isequal(increment,1) % if an increment is set
-        answeryes=msgbox_uvmat('INPUT_Y-N',['will take time series in ' num2str(NbSlice) 'slices with increment = ' num2str(increment) '!']); 
-    else    
-        answeryes=msgbox_uvmat('INPUT_Y-N',{['will take time series in ' num2str(NbSlice) ' slices'];['results stored as files ' filebase_out ' ...']});
-    end
-    if ~isequal(answeryes,'Yes')
-        return
-    end
-end
+% filebasesub=fullfile(RootPath{1},RootFile{1});
+% if NbSlice==1
+%     filebase_out=[filebasesub '_time'];
+% else
+%     filebase_out=[filebasesub '_' NbSlice_name 'mtim'];
+%     increment=num_i1{1}(2)-num_i1{1}(1);
+%     if ~isequal(increment,1) % if an increment is set
+%         answeryes=msgbox_uvmat('INPUT_Y-N',['will take time series in ' num2str(NbSlice) 'slices with increment = ' num2str(increment) '!']); 
+%     else    
+%         answeryes=msgbox_uvmat('INPUT_Y-N',{['will take time series in ' num2str(NbSlice) ' slices'];['results stored as files ' filebase_out ' ...']});
+%     end
+%     if ~isequal(answeryes,'Yes')
+%         return
+%     end
+% end
 VelType_str=get(hseries.VelTypeMenu,'String');
 VelType_val=get(hseries.VelTypeMenu,'Value');
@@ -269 +270 @@
 end
 
-% image or scalar processing programme set by user
-Coord_menu=get(hseries.CoordType,'String');
-menu_val=get(hseries.CoordType,'Value');
-usrfct=Coord_menu{menu_val};
-testfct=~isequal(usrfct,'');
+% Root name of output files (TO GENERALISE FOR TWO INPUT SERIES)
+subdir_result='time_series';
+% filebasesub=fullfile(RootPath{1},subdir_result,RootFile{1});
+% if isempty(SubDir{1}) % create a subdirectory '/aver_stat'
+%     subdir_result='aver_stat';
+%     filebasemean=fullfile(RootPath{1},subdir_result);
+if ~exist(fullfile(RootPath{1},subdir_result),'dir')
+    dircur=pwd; %record current working directory
+    cd(RootPath{1})% goes to the iamge directory
+    [m1,m2,m3]=mkdir(subdir_result);
+    if ~isequal(m2,'')
+         msgbox_uvmat('CONFIRMATION',m2);%error message for directory creation
+    end
+    cd(dircur) %back to the initial working directory
+end
+filebase_out=filebase{1}; 
+NomTypeOut=nomtype2pair(NomType{1},num_i2{end}(end)-num_i1{1}(1),num_j2{end}(end)-num_j1{1}(1));
+
+% coordinate transform or other user defined transform
+transform_fct=[];%default
+if isfield(Series,'transform_fct')
+    transform_fct=Series.transform_fct;
+end
 
 % to update:
@@ -331 +350 @@
                 end
              end
-            % geometry transform or other user defined transform
-            if ~isequal(Series.CoordType,'')           
+             
+             % coordinate transform (or other user defined transform)
+            if ~isempty(transform_fct)
+                 % z index
+                if ~isempty(NbSlice_calib)
+                    Data{iview}.ZIndex=mod(num_i1{iview}(ifile)-1,NbSlice_calib{1})+1;%Zindex for phys transform
+                end
                 if nbview==2
-                    [Data{1},Data{2}]=feval(Series.CoordType,Data{1},XmlData{1},Data{2},XmlData{2});
+                    [Data{1},Data{2}]=transform_fct(Data{1},XmlData{1},Data{2},XmlData{2});
                     if isempty(Data{2})
                         Data(2)=[];
                     end
                 else
-                    Data{1}=feval(Series.CoordType,Data{1},XmlData{1});
-                end
-            end
+                    Data{1}=transform_fct(Data{1},XmlData);
+                end
+            end     
             if testcivx
                     Data{iview}=calc_field(FieldName,Data{iview});%calculate field (vort..)
@@ -354 +378 @@
                 Field=Data{1};
             end
-            if isfield(Series,'ProjObject')
-                Series.ProjObject
-                [Field,errormsg]=proj_field(Field,Series.ProjObject);
+            if test_object
+                [Field,errormsg]=proj_field(Field,ProjObject);
                 if ~isempty(errormsg)
                     msgbox_uvmat('ERROR',['error in time_series/proj_field:' errormsg])
@@ -393 +416 @@
                                 end
                                 % check whether the variable ivar is a dimension variable
-                                %index=Field.VarDimIndex{ivar};%dimension indices of the variable #ivar
                                 DimCell=Field.VarDimName{ivar};
                                 if ischar(DimCell)
@@ -416 +438 @@
                     if testsum(ivar)==2% test for recorded variable 
                         eval(['VarVal=Field.' VarName ';']);
-                        if isequal(Series.ProjObject.ProjMode,'inside')% take the average in the domain for 'inside' mode
+                        if isequal(ProjObject.ProjMode,'inside')% take the average in the domain for 'inside' mode
                             if isempty(VarVal)
                                 msgbox_uvmat('ERROR',['empty result at frame index ' num2str(num_i1{iview}(ifile))])