Changeset 41 for trunk/src/series/merge_proj.m

Timestamp:

Mar 10, 2010, 11:03:36 AM (14 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

File:

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

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