[ismrmrd] 148/177: Merge branch 'development' of ssh://git.code.sf.net/p/ismrmrd/code into development

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to annotated tag v1.1.0.beta.1
in repository ismrmrd.

commit 0bd173ebae359ac7a62efdb949e1f3619c344f30
Merge: f89ca8c 810e83b
Author: Souheil Inati <souheil.inati at nih.gov>
Date:   Fri Oct 17 08:50:52 2014 -0400

    Merge branch 'development' of ssh://git.code.sf.net/p/ismrmrd/code into development
    
    Fixed minor conflics:
    	matlab/+ismrmrd/+xml/serialize.m

 matlab/+ismrmrd/+xml/serialize.m | 13 +++++++------
 matlab/+ismrmrd/+xml/validate.m  | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --cc matlab/+ismrmrd/+xml/serialize.m
index 28611f6,c9cbe4b..91f7186
--- a/matlab/+ismrmrd/+xml/serialize.m
+++ b/matlab/+ismrmrd/+xml/serialize.m
@@@ -100,23 -100,23 +100,24 @@@ for enc = header.encoding(:
      
      n2 = docNode.createElement('encodingLimits');
      
 -    append_encoding_limits(docNode,node,'kspace_encoding_step_0',enc);
 -    append_encoding_limits(docNode,node,'kspace_encoding_step_1',enc);
 -    append_encoding_limits(docNode,node,'kspace_encoding_step_2',enc);
 -    append_encoding_limits(docNode,node,'average',enc);
 -    append_encoding_limits(docNode,node,'slice',enc);
 -    append_encoding_limits(docNode,node,'contrast',enc);
 -    append_encoding_limits(docNode,node,'phase',enc);
 -    append_encoding_limits(docNode,node,'repetition',enc);
 -    append_encoding_limits(docNode,node,'set',enc);
 -    append_encoding_limits(docNode,node,'segment',enc);
 +    append_encoding_limits(docNode,n2,'kspace_encoding_step_0',enc.encodingLimits);
 +    append_encoding_limits(docNode,n2,'kspace_encoding_step_1',enc.encodingLimits);
 +    append_encoding_limits(docNode,n2,'kspace_encoding_step_2',enc.encodingLimits);
 +    append_encoding_limits(docNode,n2,'average',enc.encodingLimits);
 +    append_encoding_limits(docNode,n2,'slice',enc.encodingLimits);
 +    append_encoding_limits(docNode,n2,'contrast',enc.encodingLimits);
 +    append_encoding_limits(docNode,n2,'phase',enc.encodingLimits);
 +    append_encoding_limits(docNode,n2,'repetition',enc.encodingLimits);
 +    append_encoding_limits(docNode,n2,'set',enc.encodingLimits);
 +    append_encoding_limits(docNode,n2,'segment',enc.encodingLimits);
 +    node.appendChild(n2);
 +
      append_node(docNode,node,enc,'trajectory');
+     node.appendChild(n2);
      
 -    
      if isfield(enc,'trajectoryDescription')
          n2 = docNode.createElement('trajectoryDescription');
 -        append_node(docNode,node,enc.trajectoryDescription,'identifier');
 +        append_node(docNode,n2,enc.trajectoryDescription,'identifier');
          append_user_parameter(docNode,n2,enc.trajectoryDescription,'userParameterLong', at int2str);
          append_user_parameter(docNode,n2,enc.trajectoryDescription,'userParameterDouble', at num2str);
          append_optional(docNode,n2,enc.trajectoryDescription,'comment');      
@@@ -130,15 -130,15 +131,15 @@@
          parallelImaging = enc.parallelImaging;
          append_node(docNode,n3,parallelImaging.accelerationFactor,'kspace_encoding_step_1', at int2str);
          append_node(docNode,n3,parallelImaging.accelerationFactor,'kspace_encoding_step_2', at int2str);
-         n2.appendChild(n3)
+         n2.appendChild(n3);
          
          append_optional(docNode,n2,parallelImaging,'calibrationMode'); 
 -        append_optional(docNode,n2,parallelImaging,'interleavingDimension'); 
 +        append_optional(docNode,n2,parallelImaging,'interleavingDimension', at int2str); 
          
-         node.appendChild(n2)
+         node.appendChild(n2);
      end
          
 -    append_optional(docNode,node,enc,'echoTrainLength');
 +    append_optional(docNode,node,enc,'echoTrainLength', at int2str);
      
      docRootNode.appendChild(node);
      

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ismrmrd.git