From 664b78f42c176cf48c812ee2790a6724870c7fb2 Mon Sep 17 00:00:00 2001
From: Aysel Afsar <aysel.afsar@gmail.com>
Date: Fri, 13 Apr 2018 12:08:27 -0400
Subject: [PATCH] fix(lesionTable) Remove plus icon from measurements header

---
 .../measurementTableHeaderRow.html            |  7 ----
 .../measurementTableHeaderRow.js              | 32 -------------------
 .../measurementTableHeaderRow.styl            |  2 +-
 3 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html
index 86cbc8073..2989a2ef3 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.html
@@ -1,12 +1,5 @@
 <template name="measurementTableHeaderRow">
     <div class="measurementTableHeaderRow">
-        {{#if anyUnmarkedLesionsLeft}}
-            <div class="add js-setTool">
-                <svg>
-                    <use xlink:href={{absoluteUrl "packages/ohif_viewerbase/assets/icons.svg#icon-ui-add"}}></use>
-                </svg>
-            </div>
-        {{/if}}
         <div class="type">{{toolGroup.name}}</div>
         <div class="max {{#if gt numberOfMeasurements maxNumMeasurements}}warning{{/if}}">
             {{#if getMax toolGroup.id}}
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.js b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.js
index aa78e099a..5021418a2 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.js
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.js
@@ -29,37 +29,5 @@ Template.measurementTableHeaderRow.helpers({
         } else if (toolGroupId === 'newTargets') {
             return conformanceCriteria.maxNewTargets.get();
         }
-    },
-
-    anyUnmarkedLesionsLeft() {
-        // Skip New Lesions section
-        const instance = Template.instance();
-        const { toolGroup, measurementRows, timepointApi, measurementApi } = instance.data;
-        if (!measurementRows) return;
-
-        const config = OHIF.measurements.MeasurementApi.getConfiguration();
-        if (config.newLesions && config.newLesions.find(o => o.id === toolGroup.id)) return;
-
-        const current = timepointApi.current();
-        const prior = timepointApi.prior();
-        if (!prior) return true;
-
-        const currentFilter = { timepointId: current.timepointId };
-        const priorFilter = { timepointId: prior.timepointId };
-        const toolGroupId = toolGroup.id;
-
-        const numCurrent = measurementApi.fetch(toolGroupId, currentFilter).length;
-        const numPrior = measurementApi.fetch(toolGroupId, priorFilter).length;
-        const remaining = Math.max(numPrior - numCurrent, 0);
-        return remaining > 0;
-    }
-});
-
-Template.measurementTableHeaderRow.events({
-    'click .js-setTool'(event, instance) {
-        const { toolGroup } = instance.data;
-        const toolType = toolGroup.childTools[0].cornerstoneToolType;
-        const activeToolId = Array.isArray(toolType) ? toolType[0] : toolType;
-        Viewerbase.toolManager.setActiveTool(activeToolId);
     }
 });
diff --git a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.styl b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.styl
index 4ba442b63..eb160983a 100644
--- a/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.styl
+++ b/Packages/ohif-measurements/client/components/measurementTable/measurementTableHeaderRow/measurementTableHeaderRow.styl
@@ -45,7 +45,7 @@ $headerRowHeight = 63px
     font-size: 22px
     font-weight: 300
     line-height: $headerRowHeight
-    padding: 0 10px
+    padding: 0 10px 0 40px
     text-align: left
 
   .numberOfMeasurements