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

LT-115: Linking the tool data with tool group data

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-12-29 14:01:09 -02:00
parent f13080309e
commit d6aeebe712
5 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Packages/ohif-lesiontracker/both/configuration/toolGroups/nonTargets.js
View File

@ -6,9 +6,12 @@ const NonTargetSchema = new SimpleSchema({
type: String,
label: 'Tool ID'
},
toolItemUid: {
toolItemId: {
type: String,
label: 'Tool Item UID'
label: 'Tool Item ID'
},
createdAt: {
type: Date
}
});

7
Packages/ohif-lesiontracker/both/configuration/toolGroups/targets.js
View File

@ -8,9 +8,12 @@ const TargetSchema = new SimpleSchema({
type: String,
label: 'Tool ID'
},
toolItemUid: {
toolItemId: {
type: String,
label: 'Tool Item UID'
label: 'Tool Item ID'
},
createdAt: {
type: Date
}
});

7
Packages/ohif-lesiontracker/both/configuration/toolGroups/temp.js
View File

@ -7,9 +7,12 @@ const TempSchema = new SimpleSchema({
type: String,
label: 'Tool ID'
},
toolItemUid: {
toolItemId: {
type: String,
label: 'Tool Item UID'
label: 'Tool Item ID'
},
createdAt: {
type: Date
}
});

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

@ -23,16 +23,53 @@ class MeasurementApi {
this.tools = {};
configuration.measurementTools.forEach(toolGroup => {
const collection = new Mongo.Collection(null);
collection._debugName = toolGroup.name;
collection.attachSchema(toolGroup.schema);
this.toolGroups[toolGroup.id] = collection;
const groupCollection = new Mongo.Collection(null);
groupCollection._debugName = toolGroup.name;
groupCollection.attachSchema(toolGroup.schema);
this.toolGroups[toolGroup.id] = groupCollection;
toolGroup.childTools.forEach(tool => {
const collection = new Mongo.Collection(null);
collection._debugName = tool.name;
collection.attachSchema(tool.schema);
this.tools[tool.id] = collection;
collection.find().observe({
added(measurement) {
groupCollection.insert({
toolId: tool.id,
toolItemUid: measurement._id,
createdAt: measurement.createdAt
});
const measurementCount = groupCollection.find().count();
collection.update(measurement._id, {
$set: {
measurementNumber: measurementCount
}
});
},
removedAt(measurement, atIndex) {
groupCollection.remove({
toolItemUid: measurement._id
});
toolGroup.childTools.forEach(childTool => {
this.tools[childTool.id].update({
measurementNumber: {
$gt: atIndex
}
}, {
$inc: {
measurementNumber: -1
}
}, {
multi: true
});
});
}
});
});
});
}

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

@ -75,9 +75,7 @@ class MeasurementHandlers {
Collection._c2._simpleSchema.clean(measurement);
// Insert the new measurement into the collection
console.warn('>>>>INSERTING', measurement);
measurementData._id = Collection.insert(measurement);
console.warn('>>>>INSERTED', measurementData);
// Signal unsaved changes
OHIF.ui.unsavedChanges.set('viewer.studyViewer.measurements.' + eventData.toolType);