LT-115: Grouping tools schemas

Packages/ohif-lesiontracker/both/configuration/measurementTools.js

@@ -1,15 +1,9 @@
-import { target } from './target';
+import { targets } from './toolGroups/targets';
-import { targetCR } from './targetCR';
+import { nonTargets } from './toolGroups/nonTargets';
-import { targetUN } from './targetUN';
+import { temp } from './toolGroups/temp';
-import { nonTarget } from './nonTarget';
-import { length } from './length';
-import { ellipse } from './ellipse';
 
 export const measurementTools = [
-    target,
+    targets,
-    targetCR,
+    nonTargets,
-    targetUN,
+    temp
-    nonTarget,
-    length,
-    ellipse
 ];

Packages/ohif-lesiontracker/both/configuration/toolGroups/nonTargets.js

@@ -0,0 +1,20 @@
+import { SimpleSchema } from 'meteor/aldeed:simple-schema';
+import { nonTarget } from '../tools/nonTarget';
+
+const NonTargetSchema = new SimpleSchema({
+    toolId: {
+        type: String,
+        label: 'Tool ID'
+    },
+    toolItemUid: {
+        type: String,
+        label: 'Tool Item UID'
+    }
+});
+
+export const nonTargets = {
+    id: 'nonTargets',
+    name: 'Non-Targets',
+    childTools: [nonTarget],
+    schema: NonTargetSchema
+};

Packages/ohif-lesiontracker/both/configuration/toolGroups/targets.js

@@ -0,0 +1,22 @@
+import { SimpleSchema } from 'meteor/aldeed:simple-schema';
+import { bidirectional } from '../tools/bidirectional';
+import { targetCR } from '../tools/targetCR';
+import { targetUN } from '../tools/targetUN';
+
+const TargetSchema = new SimpleSchema({
+    toolId: {
+        type: String,
+        label: 'Tool ID'
+    },
+    toolItemUid: {
+        type: String,
+        label: 'Tool Item UID'
+    }
+});
+
+export const targets = {
+    id: 'targets',
+    name: 'Targets',
+    childTools: [bidirectional, targetCR, targetUN],
+    schema: TargetSchema
+};

Packages/ohif-lesiontracker/both/configuration/toolGroups/temp.js

@@ -0,0 +1,21 @@
+import { SimpleSchema } from 'meteor/aldeed:simple-schema';
+import { length } from '../tools/length';
+import { ellipse } from '../tools/ellipse';
+
+const TempSchema = new SimpleSchema({
+    toolId: {
+        type: String,
+        label: 'Tool ID'
+    },
+    toolItemUid: {
+        type: String,
+        label: 'Tool Item UID'
+    }
+});
+
+export const temp = {
+    id: 'temp',
+    name: 'Temporary',
+    childTools: [length, ellipse],
+    schema: TempSchema
+};

Packages/ohif-lesiontracker/both/configuration/tools/bidirectional.js

@@ -3,7 +3,7 @@ import { MeasurementSchemaTypes } from 'meteor/ohif:measurements/both/schema/mea
 
 const CornerstoneHandleSchema = MeasurementSchemaTypes.CornerstoneHandleSchema;
 
-const TargetHandlesSchema = new SimpleSchema({
+const BidirectionalHandlesSchema = new SimpleSchema({
     start: {
         type: CornerstoneHandleSchema,
         label: 'Start'
@@ -26,11 +26,15 @@ const TargetHandlesSchema = new SimpleSchema({
     },
 });
 
-const TargetSchema = new SimpleSchema([MeasurementSchemaTypes.CornerstoneToolMeasurement, {
+const BidirectionalSchema = new SimpleSchema([MeasurementSchemaTypes.CornerstoneToolMeasurement, {
     handles: {
-        type: TargetHandlesSchema,
+        type: BidirectionalHandlesSchema,
         label: 'Handles'
     },
+    measurementNumber: {
+        type: Number,
+        label: 'Measurement Number'
+    },
     location: {
         type: String,
         label: 'Location',
@@ -58,7 +62,7 @@ const TargetSchema = new SimpleSchema([MeasurementSchemaTypes.CornerstoneToolMea
     }
 }]);
 
-function displayFunction(data) {
+const displayFunction = data => {
     // Check whether this is a Nodal or Extranodal Measurement
     // const targetType = 'target';
     // const nodalType = data.isNodal ? 'nodal' : 'extraNodal';
@@ -79,19 +83,18 @@ function displayFunction(data) {
     }
 
     return data.longestDiameter;
-}
+};
 
-export const target = {
+export const bidirectional = {
-    id: 'targets',
+    toolGroup: 'targets',
-    name: 'Targets',
     cornerstoneToolType: 'bidirectional',
-    schema: TargetSchema,
+    schema: BidirectionalSchema,
     options: {
-        showInMeasurementTable: true,
+        measurementTable: {
-        measurementTableOptions: {
+            displayFunction
-            key: 'targets',
-            displayFunction: displayFunction
         },
-        includeInCaseProgress: true,
+        caseProgress: {
+            include: true
+        }
     }
 };

Packages/ohif-lesiontracker/both/configuration/tools/nonTarget.js

@@ -23,6 +23,10 @@ const NonTargetSchema = new SimpleSchema([MeasurementSchemaTypes.CornerstoneTool
         type: NonTargetHandlesSchema,
         label: 'Handles'
     },
+    measurementNumber: {
+        type: Number,
+        label: 'Measurement Number'
+    },
     response: {
         type: String,
         label: 'Response',
@@ -40,21 +44,16 @@ const NonTargetSchema = new SimpleSchema([MeasurementSchemaTypes.CornerstoneTool
     }
 }]);
 
-function displayFunction(data) {
-    return data.response;
-}
-
 export const nonTarget = {
-    id: 'nonTargets',
+    toolGroup: 'nonTargets',
-    name: 'Non-Targets',
     cornerstoneToolType: 'nonTarget',
     schema: NonTargetSchema,
-    displayFunction: displayFunction,
     options: {
-        showInMeasurementTable: true,
+        measurementTable: {
-        measurementTableOptions: {
+            displayFunction: data => data.response
-            displayFunction: displayFunction
         },
-        includeInCaseProgress: true,
+        caseProgress: {
+            include: true
+        }
     }
 };

Packages/ohif-lesiontracker/both/configuration/tools/targetCR.js

@@ -23,11 +23,20 @@ const TargetCRSchema = new SimpleSchema([MeasurementSchemaTypes.CornerstoneToolM
         type: TargetCRHandlesSchema,
         label: 'Handles'
     },
+    measurementNumber: {
+        type: Number,
+        label: 'Measurement Number'
+    },
     location: {
         type: String,
         label: 'Location',
         optional: true
     },
+    response: {
+        type: String,
+        label: 'Response',
+        optional: true // Optional because it is added after initial drawing, via a callback
+    },
     description: {
         type: String,
         label: 'Description',
@@ -40,17 +49,16 @@ const TargetCRSchema = new SimpleSchema([MeasurementSchemaTypes.CornerstoneToolM
     }
 }]);
 
-function displayFunction(data) {
-    return data.location;
-}
-
 export const targetCR = {
-    id: 'targetsCR',
+    toolGroup: 'targets',
-    memberOf: 'targets',
-    name: 'CR Targets',
     cornerstoneToolType: 'targetCR',
     schema: TargetCRSchema,
     options: {
-        includeInCaseProgress: true,
+        measurementTable: {
+            displayFunction: data => data.response
+        },
+        caseProgress: {
+            include: true
+        }
     }
 };

Packages/ohif-lesiontracker/both/configuration/tools/targetUN.js

@@ -23,11 +23,20 @@ const TargetUNSchema = new SimpleSchema([MeasurementSchemaTypes.CornerstoneToolM
         type: TargetUNHandlesSchema,
         label: 'Handles'
     },
+    measurementNumber: {
+        type: Number,
+        label: 'Measurement Number'
+    },
     location: {
         type: String,
         label: 'Location',
         optional: true
     },
+    response: {
+        type: String,
+        label: 'Response',
+        optional: true // Optional because it is added after initial drawing, via a callback
+    },
     description: {
         type: String,
         label: 'Description',
@@ -40,17 +49,16 @@ const TargetUNSchema = new SimpleSchema([MeasurementSchemaTypes.CornerstoneToolM
     }
 }]);
 
-function displayFunction(data) {
-    return data.location;
-}
-
 export const targetUN = {
-    id: 'targetsUN',
+    toolGroup: 'targets',
-    memberOf: 'targets',
-    name: 'UN Targets',
     cornerstoneToolType: 'targetUN',
     schema: TargetUNSchema,
     options: {
-        includeInCaseProgress: true,
+        measurementTable: {
+            displayFunction: data => data.response
+        },
+        caseProgress: {
+            include: true
+        }
     }
 };

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