LT-115: Grouping tools schemas

Packages/ohif-measurements/both/configuration/measurements.js

@@ -134,7 +134,7 @@ class MeasurementApi {
                 $nin: numbers
             }
         };
-        
+
         return collection.find(filter).fetch();
     }
 
@@ -144,7 +144,7 @@ class MeasurementApi {
         const hasNoDataAtTimepoint = this.hasNoDataAtTimepoint;
 
         const includedTools = tools.filter(tool => {
-            return (tool.options && tool.options.includeInCaseProgress === true);
+            return (tool.options && tool.options.caseProgress && tool.options.caseProgress.include);
         });
 
         let overallMeasurementNumber = 1;
@@ -227,7 +227,7 @@ class MeasurementApi {
 
         // Next, handle New Measurements (i.e. no baseline data)
         // Note that this cannot be combined with the loop above due to the incrementing of the overallMeasurementNumber
-        includedTools.forEach(tool => { 
+        includedTools.forEach(tool => {
             const collection = this[tool.id];
             const toolType = tool.cornerstoneToolType;
             const measurements = hasNoDataAtTimepoint(collection, baselineTimepointId);

Packages/ohif-measurements/client/components/caseProgress/caseProgress.js

@@ -66,7 +66,7 @@ Template.caseProgress.onRendered(() => {
 
     const config = OHIF.measurements.MeasurementApi.getConfiguration();
     const tools = config.measurementTools;
-    const toolsToInclude = tools.filter(tool => tool.options && tool.options.includeInCaseProgress);
+    const toolsToInclude = tools.filter(tool => tool.options && tool.options.caseProgress && tool.options.caseProgress.include);
     const toolIds = toolsToInclude.map(tool => tool.id);
     const api = instance.data.measurementApi;
 

Packages/ohif-measurements/client/components/measurementTable/measurementTableTimepointCell/measurementTableTimepointCell.js

@@ -37,7 +37,7 @@ Template.measurementTableTimepointCell.helpers({
             // TODO: Figure out what is going on here?
             console.warn('Something went wrong?');
         }
-        const displayFunction = tool.options.measurementTableOptions.displayFunction;
+        const displayFunction = tool.options.measurementTable.displayFunction;
         return displayFunction(data);
     }
 });

Packages/ohif-measurements/client/components/measurementTable/measurementTableView/measurementTableView.html

@@ -2,7 +2,7 @@
     <div class="measurementTableView scrollArea">
         {{#let config=measurementConfiguration}}
             {{#each measurementType in config.measurementTools}}
-                {{#if measurementType.options.showInMeasurementTable}}
+                {{#if measurementType.options.measurementTable.displayFunction}}
                     {{#let collection=(groupByMeasurementNumber measurementType.id)}}
                         {{>measurementTableHeaderRow
                             measurementType=measurementType