othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LT-115: Adjusting functions to save and retrieve measurements again

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-12-29 13:04:58 -02:00
parent c9c2cd548e
commit f13080309e
4 changed files with 36 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LesionTracker/client/components/viewer/viewer.js
View File

@ -138,7 +138,9 @@ Template.viewer.onCreated(() => {
// to hang the first measurement's imageId immediately, rather // to hang the first measurement's imageId immediately, rather
// than changing images after initial loading... // than changing images after initial loading...
const config = OHIF.measurements.MeasurementApi.getConfiguration(); const config = OHIF.measurements.MeasurementApi.getConfiguration();
const measurementTypeId = config.measurementTools[0].id; const tools = config.measurementTools[0].childTools;
const firstTool = tools[Object.keys(tools)[0]];
const measurementTypeId = firstTool.id;
const measurementApi = instance.data.measurementApi; const measurementApi = instance.data.measurementApi;
const timepointApi = instance.data.timepointApi; const timepointApi = instance.data.timepointApi;

2
Packages/ohif-lesiontracker/client/components/measurementLocationDialog/measurementLocationDialog.js
View File

@ -70,7 +70,7 @@ Template.measurementLocationDialog.onCreated(() => {
setMeasurementNumberCallback: getSetMeasurementNumberCallbackFunction(measurementTypeId, measurementApi, timepointApi), setMeasurementNumberCallback: getSetMeasurementNumberCallbackFunction(measurementTypeId, measurementApi, timepointApi),
// TODO: Check the position for these, the Add Label button position seems very awkward // TODO: Check the position for these, the Add Label button position seems very awkward
getMeasurementLocationCallback: toggleLabel, getMeasurementLocationCallback: toggleLabel,
changeMeasurementLocationCallback: toggleLabel, changeMeasurementLocationCallback: toggleLabel
}; };

17
Packages/ohif-measurements/both/configuration/measurements.js
View File

@ -54,7 +54,7 @@ class MeasurementApi {
measurements.forEach(measurement => { measurements.forEach(measurement => {
delete measurement._id; delete measurement._id;
this.tools[measurementTypeId].insert(measurement); this.tools[measurement.toolType].insert(measurement);
}); });
}); });
@ -70,9 +70,14 @@ class MeasurementApi {
} }
let measurementData = {}; let measurementData = {};
configuration.measurementTools.forEach(tool => { configuration.measurementTools.forEach(toolGroup => {
const measurementTypeId = tool.id; toolGroup.childTools.forEach(tool => {
measurementData[measurementTypeId] = this.tools[measurementTypeId].find().fetch(); if (!measurementData[toolGroup.id]) {
measurementData[toolGroup.id] = [];
}
measurementData[toolGroup.id] = measurementData[toolGroup.id].concat(this.tools[tool.id].find().fetch());
});
}); });
const timepointIds = timepoints.map(t => t.timepointId); const timepointIds = timepoints.map(t => t.timepointId);
@ -97,12 +102,14 @@ class MeasurementApi {
} }
syncMeasurementsAndToolData() { syncMeasurementsAndToolData() {
configuration.measurementTools.forEach(tool => { configuration.measurementTools.forEach(toolGroup => {
toolGroup.childTools.forEach(tool => {
const measurements = this.tools[tool.id].find().fetch(); const measurements = this.tools[tool.id].find().fetch();
measurements.forEach(measurement => { measurements.forEach(measurement => {
OHIF.measurements.syncMeasurementAndToolData(measurement); OHIF.measurements.syncMeasurementAndToolData(measurement);
}); });
}); });
});
} }
// TODO: Create a better function to combine hasDataAtTimepoint and hasNoDataAtTimepoint // TODO: Create a better function to combine hasDataAtTimepoint and hasNoDataAtTimepoint

56
Packages/ohif-measurements/client/lib/MeasurementHandlers.js
View File

@ -5,19 +5,15 @@ import { OHIF } from 'meteor/ohif:core';
class MeasurementHandlers { class MeasurementHandlers {
static onAdded(e, instance, eventData) { static onAdded(e, instance, eventData) {
const config = OHIF.measurements.MeasurementApi.getConfiguration(); const measurementData = eventData.measurementData;
const toolTypes = config.measurementTools.map(tool => tool.cornerstoneToolType); const measurementApi = instance.data.measurementApi;
const Collection = measurementApi.tools[eventData.toolType];
const index = toolTypes.indexOf(eventData.toolType); // Stop here if collection was not found for the given tool
if (index === -1) { if (!Collection) {
return; return;
} }
const measurementData = eventData.measurementData;
const measurementToolConfiguration = config.measurementTools[index];
const measurementApi = instance.data.measurementApi;
const Collection = measurementApi.tools[measurementToolConfiguration.id];
// Get the Cornerstone imageId // Get the Cornerstone imageId
const enabledElement = cornerstone.getEnabledElement(eventData.element); const enabledElement = cornerstone.getEnabledElement(eventData.element);
const imageId = enabledElement.image.imageId; const imageId = enabledElement.image.imageId;
@ -76,13 +72,15 @@ class MeasurementHandlers {
} }
// Clean the measurement according to the Schema // Clean the measurement according to the Schema
measurementToolConfiguration.schema.clean(measurement); Collection._c2._simpleSchema.clean(measurement);
// Insert the new measurement into the collection // Insert the new measurement into the collection
console.warn('>>>>INSERTING', measurement);
measurementData._id = Collection.insert(measurement); measurementData._id = Collection.insert(measurement);
console.warn('>>>>INSERTED', measurementData);
// Signal unsaved changes // Signal unsaved changes
OHIF.ui.unsavedChanges.set('viewer.studyViewer.measurements.' + measurementToolConfiguration.id); OHIF.ui.unsavedChanges.set('viewer.studyViewer.measurements.' + eventData.toolType);
// Update the Overall Measurement Numbers for all Measurements // Update the Overall Measurement Numbers for all Measurements
if (timepointApi) { if (timepointApi) {
@ -97,18 +95,8 @@ class MeasurementHandlers {
static onModified(e, instance, eventData) { static onModified(e, instance, eventData) {
const measurementData = eventData.measurementData; const measurementData = eventData.measurementData;
const config = OHIF.measurements.MeasurementApi.getConfiguration();
const toolTypes = config.measurementTools.map(tool => tool.cornerstoneToolType);
const index = toolTypes.indexOf(eventData.toolType);
if (index === -1) {
return;
}
const measurementToolConfiguration = config.measurementTools[index];
const measurementApi = instance.data.measurementApi; const measurementApi = instance.data.measurementApi;
const Collection = measurementApi.tools[measurementToolConfiguration.id]; const Collection = measurementApi.tools[eventData.toolType];
OHIF.log.info('CornerstoneToolsMeasurementModified'); OHIF.log.info('CornerstoneToolsMeasurementModified');
@ -123,12 +111,12 @@ class MeasurementHandlers {
// If the measurement configuration includes a value for Viewport, // If the measurement configuration includes a value for Viewport,
// we will populate this with the Cornerstone Viewport // we will populate this with the Cornerstone Viewport
if (measurementToolConfiguration.schema.schema('viewport')) { if (Collection._c2._simpleSchema.schema('viewport')) {
measurement.viewport = cornerstone.getViewport(eventData.element); measurement.viewport = cornerstone.getViewport(eventData.element);
} }
// Clean the measurement according to the Schema // Clean the measurement according to the Schema
measurementToolConfiguration.schema.clean(measurement); Collection._c2._simpleSchema.clean(measurement);
// Insert the new measurement into the collection // Insert the new measurement into the collection
Collection.update(measurementId, { Collection.update(measurementId, {
@ -136,30 +124,20 @@ class MeasurementHandlers {
}); });
// Signal unsaved changes // Signal unsaved changes
OHIF.ui.unsavedChanges.set('viewer.studyViewer.measurements.' + measurementToolConfiguration.id); OHIF.ui.unsavedChanges.set('viewer.studyViewer.measurements.' + eventData.toolType);
} }
static onRemoved(e, instance, eventData) { static onRemoved(e, instance, eventData) {
const measurementData = eventData.measurementData;
const config = OHIF.measurements.MeasurementApi.getConfiguration();
const toolTypes = config.measurementTools.map(tool => tool.cornerstoneToolType);
const index = toolTypes.indexOf(measurementData.toolType);
if (index === -1) {
return;
}
OHIF.log.info('CornerstoneToolsMeasurementRemoved'); OHIF.log.info('CornerstoneToolsMeasurementRemoved');
const measurementData = eventData.measurementData;
const measurementToolConfiguration = config.measurementTools[index];
const measurementApi = instance.data.measurementApi; const measurementApi = instance.data.measurementApi;
const Collection = measurementApi.tools[measurementToolConfiguration.id]; const Collection = measurementApi.tools[eventData.toolType];
// Remove the measurement from the collection
Collection.remove(measurementData._id); Collection.remove(measurementData._id);
// Signal unsaved changes // Signal unsaved changes
OHIF.ui.unsavedChanges.set('viewer.studyViewer.measurements.' + measurementToolConfiguration.id); OHIF.ui.unsavedChanges.set('viewer.studyViewer.measurements.' + eventData.toolType);
// Update the Overall Measurement Numbers for all Measurements // Update the Overall Measurement Numbers for all Measurements
const timepointApi = instance.data.timepointApi; const timepointApi = instance.data.timepointApi;