Fixed use of bytes vs valueBytes in DicomAttributesSink

slicebox · May 15, 2017 · 5fc1700 · 5fc1700
1 parent 0b47550
commit 5fc1700
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/scala/se/nimsa/dcm4che/streams/DicomAttributesSink.scala b/src/main/scala/se/nimsa/dcm4che/streams/DicomAttributesSink.scala
@@ -36,7 +36,7 @@ object DicomAttributesSink {
     if (header.length == 0)
       fmi.setNull(header.tag, header.vr)
     else {
-      val bytes = dicomAttribute.bytes.toArray
+      val bytes = dicomAttribute.valueBytes.toArray
       if (!DicomParsing.isGroupLength(header.tag)) {
         if (dicomAttribute.bigEndian != fmi.bigEndian) header.vr.toggleEndian(bytes, false)
         fmi.setBytes(header.tag, header.vr, bytes)
@@ -52,7 +52,7 @@ object DicomAttributesSink {
       attributesData
     }
     else {
-      val bytes = dicomAttribute.bytes.toArray
+      val bytes = dicomAttribute.valueBytes.toArray
       if (!DicomParsing.isGroupLength(header.tag)) {
         if (attributesData.attributesStack.nonEmpty && dicomAttribute.bigEndian != attributesData.attributesStack.head.bigEndian)
           header.vr.toggleEndian(bytes, false)

diff --git a/src/test/scala/se/nimsa/dcm4che/streams/DicomPartsTest.scala b/src/test/scala/se/nimsa/dcm4che/streams/DicomPartsTest.scala
@@ -47,8 +47,9 @@ class DicomPartsTest extends FlatSpecLike with Matchers {
     val value = DicomValueChunk(false, patientNameJohnDoe.drop(8) ,true)
     val attribute = DicomAttribute(header, Seq(value))
     val updatedAttribute = attribute.withUpdatedStringValue("Jimmyboy^Doe")
-    updatedAttribute.bytes.size shouldEqual 12
+    updatedAttribute.valueBytes.size shouldEqual 12
     updatedAttribute.header.length shouldEqual 12
+    updatedAttribute.bytes.size shouldEqual 20
   }
 
   it should "should return a new attribute with updated header and updated value with padding" in {
@@ -58,8 +59,8 @@ class DicomPartsTest extends FlatSpecLike with Matchers {
     val attribute = DicomAttribute(header, Seq(value))
     val updatedAttribute = attribute.withUpdatedStringValue("Jimmy^Doe")
 
-    updatedAttribute.bytes.size shouldEqual 10
+    updatedAttribute.valueBytes.size shouldEqual 10
     updatedAttribute.header.length shouldEqual 10
-    updatedAttribute.bytes.drop(9) shouldEqual ByteString(32)
+    updatedAttribute.valueBytes.drop(9) shouldEqual ByteString(32)
   }
 }