Changeset 216

Timestamp:

Mar 8, 2011, 11:38:22 PM (14 years ago)

Author:

sommeria

Message:

correct bug on xml reading

File:

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

trunk/src/series/relabel_i_j.m

@@ -20 +20 @@
 RootPath=get(hseries.RootPath,'String');
 RootFile=get(hseries.RootFile,'String');
+if ~iscell(RootFile)
+    msgbox_uvmat('ERROR','please enter an input image series from RDVision system')%error message for xml file reading
+    return
+end
 basename=fullfile(RootPath{1},RootFile{1}); 
+[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
+end
+nbfield1=size(XmlData.Time,1);
+nbfield2=size(XmlData.Time,2);
+
+set(hseries.first_i,'String',num2str(first_label))% display the first image in the process
+set(hseries.last_i,'String',num2str(nbfield1*nbfield2-1+first_label))% display the last image in the process
+set(hseries.nb_field,'String',{num2str(nbfield1*nbfield2-1+first_label)})% display the total nbre of images
 SeriesData=get(hGUI,'UserData');
 if ~strcmp(SeriesData.NomType,'_000001')
@@ -28 +42 @@
     msgbox_uvmat('CONFIRMATION','this function will relabel the file series from RDvision and correct the xml file')%error message for directory creation
 end
-[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
-end
-nbfield1=size(XmlData.Time,1);
-nbfield2=size(XmlData.Time,2);
-
-set(hseries.first_i,'String',num2str(first_label))% display the first image in the process
-set(hseries.last_i,'String',num2str(nbfield1*nbfield2-1+first_label))% display the last image in the process
-set(hseries.nb_field,'String',{num2str(nbfield1*nbfield2-1+first_label)})% display the total nbre of images
 
 %% stop program ther when it is selected in the menu (no run action)
@@ -82 +86 @@
     %%%% correction RDvision %%%%
     uid_NbDtj=find(t,'ImaDoc/Camera/BurstTiming/NbDtj');
-    t=set(t,uid_NbDtj,'value',num2str(s.NbDtj))
+    t=set(t,uid_NbDtj,'value',num2str(XmlData.NbDtj));
     uid_NbDtk=find(t,'ImaDoc/Camera/BurstTiming/NbDtk');
-    t=set(t,uid_NbDtk,'value',num2str(s.NbDtk))
+    t=set(t,uid_NbDtk,'value',num2str(XmlData.NbDtk));
     %%%