Merge pull request #861 from cornerstonejs/bidirectional

fix(bidirectional): Use labels property to show additional labels in bidirectional callout
cornerstonejs · Feb 28, 2019 · d6c3647 · d6c3647
2 parents af3f237 + 1d3f68c
commit d6c3647
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/tools/annotation/bidirectionalTool/renderToolData.js b/src/tools/annotation/bidirectionalTool/renderToolData.js
@@ -109,12 +109,7 @@ export default function(evt) {
         handles.perpendicularStart,
         handles.perpendicularEnd,
       ];
-      let textLines = getTextBoxText(data, rowPixelSpacing, colPixelSpacing);
-
-      if (data.additionalData && Array.isArray(data.additionalData)) {
-        textLines = data.additionalData.concat(textLines);
-      }
-
+      const textLines = getTextBoxText(data, rowPixelSpacing, colPixelSpacing);
       drawLinkedTextBox(
         context,
         element,
@@ -173,8 +168,9 @@ const getTextBoxText = (data, rowPixelSpacing, colPixelSpacing) => {
   const lengthText = ` L ${data.longestDiameter}${suffix}`;
   const widthText = ` W ${data.shortestDiameter}${suffix}`;
 
-  if (data.lesionNamingNumber) {
-    return [`Target ${data.lesionNamingNumber}`, lengthText, widthText];
+  const { labels } = data;
+  if (labels && Array.isArray(labels)) {
+    return [...labels, lengthText, widthText];
   }
 
   return [lengthText, widthText];