Changeset 223

Timestamp:

Mar 17, 2011, 8:21:26 PM (14 years ago)

Author:

sommeria

Message:

bug corrected: update the xml file

File:

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

trunk/src/series/relabel_i_j.m

@@ +1 @@
+
 % relabel_i_j: relabel an image series with two indices, and correct errors from the RDvision transfer program
 %----------------------------------------------------------------------
@@ -14 +15 @@
 %% PARAMETERS (for RDvision system)
 display('RDvision system')
-first_label=0 %image numbers start from 0
+first_label=0; %image numbers start from 0
 %errorfactor=1 %correct a factor of 2 in NbDk+1
 
@@ -25 +26 @@
 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
@@ -47 +48 @@
     return
 end
-
-answer=msgbox_uvmat('CONFIRMATION',[num2str(nbfield1) ' bursts containing ' num2str(nbfield2) ' images each'])%error message for directory creation
-
-%% apply the image rescaling function 'level' (avoid bright particles)
-% answer=msgbox_uvmat('INPUT_Y-N','apply image rescaling function levels.m');
-% test_level=isequal(answer,'Yes');
+answer=msgbox_uvmat('CONFIRMATION',[num2str(nbfield1) ' bursts containing ' num2str(nbfield2) ' images each']);%error message for directory creation
 
 %% copy and adapt the xml file
@@ -73 +69 @@
     ImageName=name_generator(basename,1,1,'.png','_i_j');
     [pth,ImageName]=fileparts(ImageName);
-    ImageName=[ImageName '.png']
+    ImageName=[ImageName '.png'];
     if isempty(uid_ImageName)
        [t,uid_ImageName]=add(t,uid_Heading,'element','ImageName');
@@ -86 +82 @@
     %%%% correction RDvision %%%%
     uid_NbDtj=find(t,'ImaDoc/Camera/BurstTiming/NbDtj');
-    t=set(t,uid_NbDtj,'value',num2str(XmlData.NbDtj));
+    uid_value=children(t,uid_NbDtj);
+    if ~isempty(uid_value)
+        t=set(t,uid_value(1),'value',num2str(XmlData.NbDtj));
+    end
     uid_NbDtk=find(t,'ImaDoc/Camera/BurstTiming/NbDtk');
-    t=set(t,uid_NbDtk,'value',num2str(XmlData.NbDtk));
+    uid_value=children(t,uid_NbDtk);
+    if ~isempty(uid_value)
+        t=set(t,uid_value(1),'value',num2str(XmlData.NbDtk));
+    end
     %%%
     
@@ -185 +187 @@
 
 function [s,errormsg]=imadoc2struct(ImaDoc,option) 
+
 %% default input and output
 if ~exist('option','var')
@@ -273 +276 @@
                 NbDtk=get_value(subt,'/BurstTiming/NbDtk',1);
                 %%%% correction RDvision %%%%
-                NbDtk=-1+(NbDtk+1)/(NbDti+1)
+                if ~isequal(NbDtk,1)
+                    NbDtk=-1+(NbDtk+1)/(NbDti+1);
+                end
                 s.NbDtk=NbDtk;
                 %%%%%