Reverting wrong logic for baseline time points

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

@@ -86,12 +86,12 @@ class MeasurementApi {
 
                     // Get the current location (if already defined)
                     let location;
-                    const previousTimepoint = timepointApi.priorOrBaseline();
+                    const baselineTimepoint = timepointApi.baseline();
-                    const previousGroupEntry = groupCollection.findOne({
+                    const baselineGroupEntry = groupCollection.findOne({
-                        timepointId: previousTimepoint.timepointId
+                        timepointId: baselineTimepoint.timepointId
                     });
-                    if (previousGroupEntry) {
+                    if (baselineGroupEntry) {
-                        const tool = this.tools[previousGroupEntry.toolId];
+                        const tool = this.tools[baselineGroupEntry.toolId];
                         const found = tool.findOne({ measurementNumber });
                         if (found) {
                             location = found.location;
@@ -273,7 +273,7 @@ class MeasurementApi {
         });
     }
 
-    sortMeasurements() {
+    sortMeasurements(baselineTimepointId) {
         const tools = configuration.measurementTools;
 
         const includedTools = tools.filter(tool => {

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

@@ -167,11 +167,6 @@ class TimepointApi {
         });
     }
 
-    // Return the prior timepoint or baseline if not found
-    priorOrBaseline() {
-        return this.prior() || this.baseline();
-    }
-
     // Return only the current and prior Timepoints
     currentAndPrior() {
         const timepoints = [];

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

@@ -83,8 +83,8 @@ Template.measurementTableRow.events({
             measurementApi.deleteMeasurements(measurementTypeId, { measurementNumber });
 
             // Sync the new measurement data with cornerstone tools
-            const previous = timepointApi.priorOrBaseline();
+            const baseline = timepointApi.baseline();
-            measurementApi.sortMeasurements(previous.timepointId);
+            measurementApi.sortMeasurements(baseline.timepointId);
 
             // Repaint the images on all viewports without the removed measurements
             _.each($('.imageViewerViewport'), element => cornerstone.updateImage(element));

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

@@ -111,8 +111,8 @@ Template.measurementTableTimepointCell.events({
                 });
 
                 // Sync the new measurement data with cornerstone tools
-                const previous = timepointApi.priorOrBaseline();
+                const baseline = timepointApi.baseline();
-                measurementApi.sortMeasurements(previous.timepointId);
+                measurementApi.sortMeasurements(baseline.timepointId);
 
                 // Repaint the images on all viewports without the removed measurements
                 _.each($('.imageViewerViewport'), element => cornerstone.updateImage(element));

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

@@ -55,26 +55,27 @@ Template.measurementTableView.helpers({
     newMeasurements(toolGroup) {
         const { measurementApi, timepointApi } = Template.instance().data;
         const current = timepointApi.current();
-        const previous = timepointApi.priorOrBaseline();
+        const baseline = timepointApi.baseline();
 
-        if (!measurementApi || !timepointApi || !current || !previous) return;
+        if (!measurementApi || !timepointApi || !current || !baseline) return;
 
         // If this is a baseline, stop here since there are no new measurements to display
+
         if (!current || current.timepointType === 'baseline') {
             OHIF.log.info('Skipping New Measurements section');
             return;
         }
 
         // Retrieve all the data for this Measurement type (e.g. 'targets')
-        // which was recorded at previous timepoint.
+        // which was recorded at baseline.
         const measurementTypeId = toolGroup.measurementTypeId;
-        const atPrevious = measurementApi.fetch(measurementTypeId, {
+        const atBaseline = measurementApi.fetch(measurementTypeId, {
-            timepointId: previous.timepointId
+            timepointId: baseline.timepointId
         });
 
         // Obtain a list of the Measurement Numbers from the
-        // measurements which have previous timepoint's data
+        // measurements which have baseline data
-        const numbers = atPrevious.map(m => m.measurementNumber);
+        const numbers = atBaseline.map(m => m.measurementNumber);
 
         // Retrieve all the data for this Measurement type which
         // do NOT match the Measurement Numbers obtained above

Packages/ohif-measurements/client/conformance/criteria/BaseCriterion.js

@@ -26,7 +26,6 @@ export class BaseCriterion {
         if (options.newTarget) {
             _.each(data.targets, target => {
                 const { measurementNumber } = target.measurement;
-                // FIXME we might not have the baseline timepoint
                 if (target.timepoint.timepointType === 'baseline') {
                     baselineMeasurementNumbers.push(measurementNumber);
                 }

Packages/ohif-measurements/client/lib/MeasurementHandlers.js

@@ -139,8 +139,8 @@ class MeasurementHandlers {
         });
 
         // Sync the new measurement data with cornerstone tools
-        const previous = timepointApi.priorOrBaseline();
+        const baseline = timepointApi.baseline();
-        measurementApi.sortMeasurements(previous.timepointId);
+        measurementApi.sortMeasurements(baseline.timepointId);
 
         // Repaint the images on all viewports without the removed measurements
         _.each($('.imageViewerViewport'), element => cornerstone.updateImage(element));

Packages/ohif-measurements/client/lib/getMeasurementsGroupedByNumber.js

@@ -40,22 +40,22 @@ OHIF.measurements.getMeasurementsGroupedByNumber = (measurementApi, timepointApi
     // Create the result object
     const groupedMeasurements = [];
 
-    const previous = timepointApi.priorOrBaseline();
+    const baseline = timepointApi.baseline();
-    if (!previous) return;
+    if (!baseline) return;
 
     configuration.measurementTools.forEach(toolGroup => {
         // Skip this tool group if it should not be displayed
         if (!displayToolGroupMap[toolGroup.id]) return;
 
         // Retrieve all the data for this Measurement type (e.g. 'targets')
-        // which was recorded at previous timepoint.
+        // which was recorded at baseline.
-        const atPrevious = measurementApi.fetch(toolGroup.id, {
+        const atBaseline = measurementApi.fetch(toolGroup.id, {
-            timepointId: previous.timepointId
+            timepointId: baseline.timepointId
         });
 
         // Obtain a list of the Measurement Numbers from the
-        // measurements which have previous timepoint's data
+        // measurements which have baseline data
-        const numbers = atPrevious.map(m => m.measurementNumber);
+        const numbers = atBaseline.map(m => m.measurementNumber);
 
         // Retrieve all the data for this Measurement type which
         // match the Measurement Numbers obtained above

Packages/ohif-viewerbase/client/lib/prepareViewerData.js

@@ -89,11 +89,12 @@ const getDataFromTimepoint = timepoint => {
         };
     }
 
-    // Otherwise, this is a follow-up exam, so we should also find the prior timepoint,
+    // Otherwise, this is a follow-up exam, so we should also find the baseline timepoint,
-    // and all studies related to it. We also enforce that the Prior should have a studyDate
+    // and all studies related to it. We also enforce that the Baseline should have a studyDate
     // prior to the latest studyDate in the current (Follow-up) Timepoint.
     const Timepoints = OHIF.studylist.timepointApi.timepoints;
-    const priorTimepoint = Timepoints.findOne({
+    const baseline = Timepoints.findOne({
+        timepointType: 'baseline',
         patientId: timepoint.patientId,
         latestDate: {
             $lte: timepoint.latestDate
@@ -101,11 +102,11 @@ const getDataFromTimepoint = timepoint => {
     });
 
     let timepointIds = [];
-    if (priorTimepoint) {
+    if (baseline) {
-        relatedStudies = relatedStudies.concat(priorTimepoint.studyInstanceUids);
+        relatedStudies = relatedStudies.concat(baseline.studyInstanceUids);
-        timepointIds.push(priorTimepoint.timepointId);
+        timepointIds.push(baseline.timepointId);
     } else {
-        OHIF.log.warn('No prior Timepoint found while opening a Follow-up Timepoint');
+        OHIF.log.warn('No Baseline found while opening a Follow-up Timepoint');
     }
 
     timepointIds.push(timepoint.timepointId);