Fix syncing bug LT-177, update Cornerstone package libraries

This commit is contained in:
Erik Ziegler committed 2016-02-13 17:42:10 +01:00
1 parent f7e24b8b10
commit b624d12762
24 files changed
+1240 -708

No files matched your search

@@ -0,0 +1,4 @@
ViewerStudies = new Meteor.Collection(null);
ViewerStudies._debugName = 'ViewerStudies';
ClientId = Random.id();
@@ -322,7 +322,7 @@ function loadSeriesIntoViewport(data, templateData) {
}
// Temporary until we have a real window manager with events for series/study changed
console.log('Set NewSeriesLoaded');
log.info('Set NewSeriesLoaded');
Session.set('NewSeriesLoaded', Random.id());
// Run any renderedCallback that exists in the data context
@@ -412,7 +412,7 @@ Meteor.startup(function() {
});
Template.imageViewerViewport.onCreated(function() {
console.log('imageViewerViewport onCreated');
log.info('imageViewerViewport onCreated');
});
Template.imageViewerViewport.onRendered(function() {
+1 -1
View File
@@ -1,5 +1,5 @@
applyWLPreset = function(presetName, element) {
console.log("Applying WL Preset: " + presetName);
log.info("Applying WL Preset: " + presetName);
var viewport = cornerstone.getViewport(element);
if (presetName === 'Default') {
+1 -1
View File
@@ -55,6 +55,6 @@ getWADORSImageId = function(instance) {
var imageId = cornerstoneWADOImageLoader.imageManager.add(image);
console.log('WADO-RS ImageID: ' + imageId);
log.info('WADO-RS ImageID: ' + imageId);
return imageId;
};
+9 -1
View File
@@ -27,6 +27,10 @@ Package.onUse(function (api) {
// TODO= Find a meteor package for this
api.addFiles('client/compatibility/jquery.hotkeys.js', 'client');
// ---------- Collections ----------
api.addFiles('client/collections.js', 'client');
// ---------- Components ----------
// Basic components
@@ -148,8 +152,12 @@ Package.onUse(function (api) {
api.export('toolManager', 'client');
api.export('WindowManager', 'client');
// Global data object
// Global objects
api.export('OHIF', 'client');
api.export('ClientId', 'client');
// Collections
api.export('ViewerStudies', 'client');
// UI Helpers
api.addFiles('lib/helpers/formatDA.js', 'client');
@@ -26,7 +26,7 @@ function getSourceImageInstanceUid(instance) {
* @returns {{seriesList: Array, patientName: *, patientId: *, accessionNumber: *, studyDate: *, modalities: *, studyDescription: *, imageCount: *, studyInstanceUid: *}}
*/
function resultDataToStudyMetadata(studyInstanceUid, resultData) {
console.log('resultDataToStudyMetadata');
log.info('resultDataToStudyMetadata');
var seriesMap = {};
var seriesList = [];
@@ -32,7 +32,7 @@ function resultDataToStudies(resultData) {
Services.DIMSE.Studies = function(filter) {
console.log('Services.DIMSE.Studies');
log.info('Services.DIMSE.Studies');
var parameters = {
0x00100010: filter.patientName,
0x00100020: filter.patientId,