Changeset 116 for trunk/src/series

Timestamp:

Oct 16, 2010, 5:56:00 PM (14 years ago)

Author:

sommeria

Message:

geometry_calib is now updated when a new image is viewed by uvmat
imadoc2struct corrected for time reading

File:

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

trunk/src/series/merge_proj.m

@@ -23 +23 @@
 WaitbarPos=get(hseries.waitbar_frame,'Position'); %positiopn of waitbar frame
 %-------------------------------------------------
+
+
 
 %projection object
@@ -229 +231 @@
 if ~exist(res_subdir,'dir')
     dircur=pwd;
-    cd(fulldir)
-    error=mkdir(subdir);
-    cd(dircur)
+    cd(fulldir);
+    succeed=mkdir(subdir);
+    if succeed
+    cd(dircur);
+    else
+    msgbox_uvmat('ERROR',['Cannot create directory ' fulldir])
+    return
+    end        
 end
 filebasesub=fullfile(res_subdir,Series.RootFile{1});
@@ -286 +293 @@
             % coord transform
             % z index
+      
             if ~isempty(NbSlice_calib)
-                Field{iview}.ZIndex=mod(num_i1{iview}(ifile)-1,NbSlice_calib{1})+1;
-            end
+                Field{iview}.ZIndex=mod(num_i1{iview}(ifile)-1,NbSlice_calib{1})+1
+            end
+%              Field{iview}.ZIndex=1;
             if ~isempty(transform_fct)
-                Field{iview}=transform_fct(Field{iview},XmlData{iview});%transform to phys if requested
+                XmlData{iview}.GeometryCalib
+                Field{iview}=transform_fct(Field{iview},XmlData{iview});                
+                %transform to phys if requested
             end
             if testcivx
@@ -301 +312 @@
             end
         end    
-        
          %----------END LOOP ON VIEWS----------------------
          
@@ -376 +386 @@
             %MergeData.dt=1;
             MergeData.Time=time_i;
-            error=struct2nc(mergename,MergeData); %save result file
+            error=struct2nc(mergename,MergeData);%save result file
             if isempty(error)
                 display(['output file ' mergename ' written'])