Changeset 249 for trunk/src/series

Timestamp:

May 9, 2011, 12:33:08 AM (13 years ago)

Author:

sommeria

Message:

bug repaired in relabel_i_j (xml file no more corrupted)

File:

• trunk/src/series/relabel_i_j.m (modified) (8 diffs)

trunk/src/series/relabel_i_j.m

@@ -25 +25 @@
 end
 basename=fullfile(RootPath{1},RootFile{1}); 
-[XmlData,warntext]=imadoc2struct([basename '.xml'])% read the xml file appended to the present function (containing bug corrections)
+[XmlData,warntext]=imadoc2struct([basename '.xml']);% read the xml file appended to the present function (containing bug corrections)
 if ~isempty(warntext)
     msgbox_uvmat('ERROR',warntext)%error message for xml file reading
@@ -63 +63 @@
 if exist([basename '.xml'],'file')
     try
-    copyfile([basename '.xml'],[basename '.xml~']);% backup the xml file
+        copyfile([basename '.xml'],[basename '.xml~']);% backup the xml file
     catch ME
-            msgbox_uvmat('ERROR',ME.message);
-            return
+        msgbox_uvmat('ERROR',ME.message);
+        return
     end
     t=xmltree([basename '.xml']);
@@ -74 +74 @@
     if isempty(uid_Heading)
         [t,uid_Heading]=add(t,1,'element','Heading');
-    end   
+    end
     uid_ImageName=find(t,'ImaDoc/Heading/ImageName');
     ImageName=name_generator(basename,1,1,'.png','_i_j');
@@ -80 +80 @@
     ImageName=[ImageName '.png'];
     if isempty(uid_ImageName)
-       [t,uid_ImageName]=add(t,uid_Heading,'element','ImageName');
+        [t,uid_ImageName]=add(t,uid_Heading,'element','ImageName');
     end
     uid_value=children(t,uid_ImageName);
@@ -91 +91 @@
     %%%% correction RDvision %%%%
     if isfield(XmlData,'NbDtj')
-    uid_NbDtj=find(t,'ImaDoc/Camera/BurstTiming/NbDtj');
-    uid_value=children(t,uid_NbDtj);
-    if ~isempty(uid_value)
-        t=set(t,uid_value(1),'value',num2str(XmlData.NbDtj));
-    end
+        uid_NbDtj=find(t,'ImaDoc/Camera/BurstTiming/NbDtj');
+        uid_value=children(t,uid_NbDtj);
+        if ~isempty(uid_value)
+            t=set(t,uid_value(1),'value',num2str(XmlData.NbDtj));
+        end
     end
     if isfield(XmlData,'NbDtk')
-    uid_NbDtk=find(t,'ImaDoc/Camera/BurstTiming/NbDtk');
-    uid_value=children(t,uid_NbDtk);
-    if ~isempty(uid_value)
-        t=set(t,uid_value(1),'value',num2str(XmlData.NbDtk));
-    end
+        uid_NbDtk=find(t,'ImaDoc/Camera/BurstTiming/NbDtk');
+        uid_value=children(t,uid_NbDtk);
+        if ~isempty(uid_value)
+            t=set(t,uid_value(1),'value',num2str(XmlData.NbDtk));
+        end
     end
     if strcmp(nomtype,'_i') && isfield(XmlData,'NbDti')
+        uid_Dti=find(t,'ImaDoc/Camera/BurstTiming/Dti');
+        t=add(t,uid_Dti,'chardata',num2str(XmlData.Dti));
         uid_NbDti=find(t,'ImaDoc/Camera/BurstTiming/NbDti');
-        uid_value=children(t,uid_NbDti);
-        if ~isempty(uid_value)
-            t=set(t,uid_value(1),'value',num2str(XmlData.NbDti));
-        end
+        t=add(t,uid_NbDti,'chardata',num2str(XmlData.NbDti));
+%         uid_value=children(t,uid_NbDti);
+%         if ~isempty(uid_value)
+%             t=set(t,uid_value(1),'value',num2str(XmlData.NbDti));
+%         end
         uid_NbDtj=find(t,'ImaDoc/Camera/BurstTiming/NbDtj');
         uid_NbDtk=find(t,'ImaDoc/Camera/BurstTiming/NbDtk');
@@ -117 +120 @@
         uid_Dtk=find(t,'ImaDoc/Camera/BurstTiming/Dtk');
         t=delete(t,uid_Dtj);
-        t=delete(t,uid_Dtk);    
+        t=delete(t,uid_Dtk);
     end
     %%%
@@ -139 +142 @@
             return
         end
-    catch
-        errormsg=lasterr
-        msgbox_uvmat('ERROR',errormsg);
+    catch ME
+        msgbox_uvmat('ERROR',ME.message);
         return
     end
@@ -236 +238 @@
 %                 s.NbDtj=NbDtj;
 %                 %%%%
-                Dti=get_value(subt,'/BurstTiming/Dti',[])
-                NbDti=get_value(subt,'/BurstTiming/NbDti',1)
+                Dti=get_value(subt,'/BurstTiming/Dti',[]);
+                NbDti=get_value(subt,'/BurstTiming/NbDti',1);
                  %%%% correction RDvision %%%%
                 if isempty(Dti)% series 
-                     Dti=Dtj
-                      NbDti=NbDtj
+                     Dti=Dtj;
+                      NbDti=NbDtj;
                      Dtj=[];
                      s.Dti=Dti;
-                     'TESTrxml'
-                     s.NbDti=NbDti
                 else
                      NbDtj=NbDtj/numel(Dtj);%bursts