Changeset 191 for trunk/src/imadoc2struct.m

Timestamp:

Feb 5, 2011, 11:25:38 PM (13 years ago)

Author:

sommeria

Message:

introduce edit boxes to set axis limits. rationalisation of names FixScal?, FixLimits?....
introduce volume scan in calibration procedures

File:

• trunk/src/imadoc2struct.m (modified) (3 diffs)

trunk/src/imadoc2struct.m

@@ -112 +112 @@
 end
 
+%% motor
+if strcmp(option,'*') || strcmp(option,'GeometryCalib')
+    uid_subtree=find(t,'/ImaDoc/TranslationMotor');
+    if length(uid_subtree)==1
+        subt=branch(t,uid_subtree);%subtree under GeometryCalib
+       [s.TranslationMotor,errormsg]=read_subtree(subt,{'Nbslice','ZStart','ZEnd'},[1 1 1],[1 1 1])
+    end 
+end
 %%  geometric calibration
 if strcmp(option,'*') || strcmp(option,'GeometryCalib')
@@ -200 +208 @@
                 end
             end
+            uid_VolumeScan=find(subt,'/GeometryCalib/VolumeScan');
+            if ~isempty(uid_VolumeScan)
+                tsai.VolumeScan=get(subt,children(subt,uid_VolumeScan),'value');
+            end
             if strcmp(option,'GeometryCalib')
                 tsai.PointCoord=get_value(subt,'/GeometryCalib/SourceCalib/PointCoord',[0 0 0 0 0]);
@@ -207 +219 @@
     end
 end
+
+%--------------------------------------------------
+%  read a subtree
+% INPUT: 
+% t: xltree
+% head_element: head elelemnt of the subtree
+% Data, structure containing 
+%    .Key: element name
+%    .Type: type of element ('charg', 'float'....)
+%    .NbOccur: nbre of occurrence, NaN for un specified number 
+function [s,errormsg]=read_subtree(subt,Data,NbOccur,NumTest)
+%--------------------------------------------------
+s=[];%default
+errormsg='';
+head_element=get(subt,1,'name')
+    cont=get(subt,1,'contents');
+    if ~isempty(cont)
+        for ilist=1:length(Data)
+            uid_key=find(subt,[head_element '/' Data{ilist}])
+            if ~isequal(length(uid_key),NbOccur(ilist))
+                errormsg=['wrong number of occurence for ' Data{ilist}]
+                return
+            end
+            for ival=1:length(uid_key)
+                val=get(subt,children(subt,uid_key(ival)),'value')
+                if ~NumTest(ilist)
+                    eval(['s.' Data{ilist} '=val;']);
+                else
+                    eval(['s.' Data{ilist} '=str2double(val);'])
+                end
+            end
+        end
+    end
+
 
 %--------------------------------------------------