{{ >imageViewerViewport}}
diff --git a/Packages/viewerbase/client/components/viewer/gridLayout/gridLayout.js b/Packages/viewerbase/client/components/viewer/gridLayout/gridLayout.js
new file mode 100644
index 000000000..076e45d72
--- /dev/null
+++ b/Packages/viewerbase/client/components/viewer/gridLayout/gridLayout.js
@@ -0,0 +1,38 @@
+Template.gridLayout.helpers({
+ height: function() {
+ var rows = this.rows || 1;
+ return 100 / rows;
+ },
+ width: function() {
+ var columns = this.columns || 1;
+ return 100 / columns;
+ },
+ viewports: function() {
+ var numViewports = this.rows * this.columns;
+ var viewportData = this.viewportData;
+ var numViewportsWithData = this.viewportData.length;
+
+ if (numViewportsWithData < numViewports) {
+ var difference = numViewports - numViewportsWithData;
+ for (var i = 0; i < difference; i++) {
+ viewportData.push({
+ viewportIndex: numViewportsWithData + i + 1,
+ rows: this.rows,
+ columns: this.columns
+ });
+ }
+ } else if (numViewportsWithData > numViewports) {
+ return viewportData.slice(0, numViewports);
+ }
+
+ return viewportData;
+ }
+});
+
+Template.gridLayout.onRendered(function() {
+ OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('CornerstoneNewImage', cornerstoneTools.updateImageSynchronizer);
+});
+
+Template.gridLayout.onDestroyed(function() {
+ OHIF.viewer.updateImageSynchronizer.destroy();
+});
diff --git a/Packages/viewerbase/client/components/viewer/imageViewerViewports/imageViewerViewports.styl b/Packages/viewerbase/client/components/viewer/gridLayout/gridLayout.styl
similarity index 91%
rename from Packages/viewerbase/client/components/viewer/imageViewerViewports/imageViewerViewports.styl
rename to Packages/viewerbase/client/components/viewer/gridLayout/gridLayout.styl
index 65693b725..bb821b51d 100644
--- a/Packages/viewerbase/client/components/viewer/imageViewerViewports/imageViewerViewports.styl
+++ b/Packages/viewerbase/client/components/viewer/gridLayout/gridLayout.styl
@@ -1,7 +1,7 @@
#imageViewerViewports
- height: calc(100% - 30px)
+ height: 100%
width: 100%
-
+
.viewportContainer
float: left
border: 2px solid #777
diff --git a/Packages/viewerbase/client/components/viewer/hangingProtocolButtons/hangingProtocolButtons.js b/Packages/viewerbase/client/components/viewer/hangingProtocolButtons/hangingProtocolButtons.js
deleted file mode 100644
index 7bdeff472..000000000
--- a/Packages/viewerbase/client/components/viewer/hangingProtocolButtons/hangingProtocolButtons.js
+++ /dev/null
@@ -1,11 +0,0 @@
-Template.hangingProtocolButtons.helpers({
- isNextAvailable: function() {
- var presentationGroup = Session.get('WindowManagerPresentationGroup');
- var numPresentationGroups = WindowManager.getNumPresentationGroups();
- return presentationGroup < numPresentationGroups;
- },
- isPreviousAvailable: function() {
- var presentationGroup = Session.get('WindowManagerPresentationGroup');
- return presentationGroup > 1;
- }
-});
diff --git a/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
index 95ea848d4..1b53d6cdd 100644
--- a/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
+++ b/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
@@ -21,6 +21,7 @@ function loadSeriesIntoViewport(data, templateData) {
// The viewport index is often used to store information about a viewport element
var element = data.element;
var viewportIndex = $('.imageViewerViewport').index(element);
+ layoutManager.viewportData[viewportIndex].viewportIndex = viewportIndex;
// Get the contentID of the current worklist tab, if the viewport is running
// alongside the worklist package
@@ -140,15 +141,47 @@ function loadSeriesIntoViewport(data, templateData) {
return;
}
- // If there is a saved object containing Cornerstone viewport data
- // (e.g. scale, invert, window settings) in the input data, apply it now.
- //
- // Otherwise, display the loaded image in the viewport element with the
- // default viewport settings.
- if (data.viewport) {
+ // Update the enabled element with the image and viewport data
+ // This is not usually necessary, but we need them stored in case
+ // a sopClassUid-specific viewport setting is present.
+ enabledElement.image = image;
+ enabledElement.viewport = cornerstone.getDefaultViewport(enabledElement.canvas, image);
+
+ // Check if there are default viewport settings for this sopClassUid
+ if (!series.instances || !series.instances.length) {
+ return;
+ }
+
+ var instance = series.instances[0];
+ var instanceClassViewport = getInstanceClassDefaultViewport(instance, enabledElement, image.imageId);
+
+ // If there are sopClassUid-specific viewport settings, apply them
+ if (instanceClassViewport) {
+ cornerstone.displayImage(element, image, instanceClassViewport);
+
+ // Mark that this element should not be fit to the window in the resize listeners
+ // TODO: Find another way to do this?
+ enabledElement.fitToWindow = false;
+
+ // Resize the canvas to fit the current viewport element size.
+ cornerstone.resize(element, false);
+ } else if (data.viewport) {
+ // If there is a saved object containing Cornerstone viewport data
+ // (e.g. scale, invert, window settings) in the input data, apply it now.
cornerstone.displayImage(element, image, data.viewport);
+
+ // Resize the canvas to fit the current viewport element size. Fit the displayed
+ // image to the canvas dimensions.
+ cornerstone.resize(element, true);
} else {
+ // If no saved viewport settings or modality-specific settings exists,
+ // display the loaded image in the viewport element with no loaded viewport
+ // settings.
cornerstone.displayImage(element, image);
+
+ // Resize the canvas to fit the current viewport element size. Fit the displayed
+ // image to the canvas dimensions.
+ cornerstone.resize(element, true);
}
// Remove the data for this viewport from the ViewportLoading object
@@ -159,10 +192,6 @@ function loadSeriesIntoViewport(data, templateData) {
// (e.g. hide the progress text box)
endLoadingHandler(element);
- // Resize the canvas to fit the current viewport element size. Fit the displayed
- // image to the canvas dimensions.
- cornerstone.resize(element, true);
-
// Remove the 'empty' class from the viewport to hide any instruction text
element.classList.remove('empty');
@@ -172,7 +201,7 @@ function loadSeriesIntoViewport(data, templateData) {
$(element).siblings('.imageViewerViewportOverlay').show();
// Add stack state managers for the stack tool, CINE tool, and reference lines
- cornerstoneTools.addStackStateManager(element, [ 'stack', 'playClip', 'referenceLines' ]);
+ cornerstoneTools.addStackStateManager(element, ['stack', 'playClip', 'referenceLines']);
// Get the current viewport settings
var viewport = cornerstone.getViewport(element);
@@ -206,7 +235,7 @@ function loadSeriesIntoViewport(data, templateData) {
// Use the tool manager to enable the currently active tool for this
// newly rendered element
var activeTool = toolManager.getActiveTool();
- toolManager.setActiveTool(activeTool, [ element ]);
+ toolManager.setActiveTool(activeTool, [element]);
// Define a function to run whenever the Cornerstone viewport is rendered
// (e.g. following a change of window or zoom)
@@ -220,6 +249,7 @@ function loadSeriesIntoViewport(data, templateData) {
// Save the current viewport into the ViewerData global variable, as well as the
// Meteor Session. This lets the viewport be saved/reloaded on a hot-code reload
var viewport = cornerstone.getViewport(element);
+ layoutManager.viewportData[viewportIndex].viewport = viewport;
ViewerData[contentId].loadedSeriesData[viewportIndex].viewport = viewport;
Session.set('ViewerData', ViewerData);
}
@@ -240,6 +270,7 @@ function loadSeriesIntoViewport(data, templateData) {
// This allows the template helpers to update reactively
templateData.imageId = eventData.enabledElement.image.imageId;
Session.set('CornerstoneNewImage' + viewportIndex, Random.id());
+ layoutManager.viewportData[viewportIndex].imageId = eventData.enabledElement.image.imageId;
// Get the element and stack data
var element = e.target;
@@ -260,6 +291,7 @@ function loadSeriesIntoViewport(data, templateData) {
var stack = cornerstoneTools.getToolState(element, 'stack');
if (stack && stack.data.length && stack.data[0].imageIds.length > 1) {
var imageIdIndex = stack.data[0].imageIds.indexOf(templateData.imageId);
+ layoutManager.viewportData[viewportIndex].currentImageIdIndex = imageIdIndex;
ViewerData[contentId].loadedSeriesData[viewportIndex].currentImageIdIndex = imageIdIndex;
Session.set('ViewerData', ViewerData);
}
@@ -327,14 +359,17 @@ function loadSeriesIntoViewport(data, templateData) {
$(element).off(allCornerstoneEvents, sendActivationTrigger);
$(element).on(allCornerstoneEvents, sendActivationTrigger);
- // Store the current series data inside a global variable
- OHIF.viewer.loadedSeriesData[viewportIndex] = {
+ // Store the current series data inside the Layout Manager
+ layoutManager.viewportData[viewportIndex] = {
+ imageId: imageId,
studyInstanceUid: data.studyInstanceUid,
seriesInstanceUid: data.seriesInstanceUid,
currentImageIdIndex: data.currentImageIdIndex,
- viewport: viewport
+ viewport: viewport,
+ viewportIndex: viewportIndex
};
- ViewerData[contentId].loadedSeriesData = OHIF.viewer.loadedSeriesData;
+
+ ViewerData[contentId].loadedSeriesData = layoutManager.viewportData;
// Check if image plane (orientation / loction) data is present for the current image
var imagePlane = cornerstoneTools.metaData.get('imagePlane', image.imageId);
@@ -443,7 +478,7 @@ Meteor.startup(function() {
});
Template.imageViewerViewport.onCreated(function() {
- log.info('imageViewerViewport onCreated');
+ log.info('imageViewerViewport onCreated');
});
Template.imageViewerViewport.onRendered(function() {
@@ -487,23 +522,6 @@ Template.imageViewerViewport.onRendered(function() {
});
var seriesInstanceUid = this.data.seriesInstanceUid;
- // TODO: This code block might be refactored
- // Load previous measurement study when reloading a patient
- if (!study) {
- getStudyMetadata(this.data.studyInstanceUid, function(study) {
- // Once we have retrieved the data, we sort the series' by series
- // and instance number in ascending order
- if (!study) {
- return;
- }
-
- sortStudy(study);
- data.study = study;
-
- setSeries(data, seriesInstanceUid, templateData);
- })
- }
-
data.study = study;
setSeries(data, seriesInstanceUid, templateData);
});
@@ -539,5 +557,9 @@ Template.imageViewerViewport.events({
'click .imageViewerViewport': function(e) {
var viewportIndex = $('.imageViewerViewport').index(e.currentTarget);
Session.set('activeViewport', viewportIndex);
+ },
+ 'dblclick .imageViewerViewport': function(e) {
+ var viewportIndex = $('.imageViewerViewport').index(e.currentTarget);
+ layoutManager.toggleEnlargement(viewportIndex);
}
-});
+});
\ No newline at end of file
diff --git a/Packages/viewerbase/client/components/viewer/imageViewerViewports/imageViewerViewports.js b/Packages/viewerbase/client/components/viewer/imageViewerViewports/imageViewerViewports.js
deleted file mode 100644
index c672bf0fd..000000000
--- a/Packages/viewerbase/client/components/viewer/imageViewerViewports/imageViewerViewports.js
+++ /dev/null
@@ -1,201 +0,0 @@
-ViewerWindows = new Meteor.Collection(null);
-ViewerWindows._debugName = 'ViewerWindows';
-
-Template.imageViewerViewports.helpers({
- height: function() {
- var viewportRows = this.viewportRows || 1;
- return 100 / viewportRows;
- },
- width: function() {
- var viewportColumns = this.viewportColumns || 1;
- return 100 / viewportColumns;
- },
- viewerWindow: function() {
- log.info('ViewerWindows');
- //log.info(ViewerWindows.find().fetch());
- ViewerWindows.remove({});
-
- log.info('imageViewerViewports viewportArray');
-
- var viewportRows = this.viewportRows || 1;
- var viewportColumns = this.viewportColumns || 1;
-
- var contentId = Session.get('activeContentId');
- if (this.viewportRows && this.viewportColumns) {
- viewportRows = this.viewportRows || 1;
- viewportColumns = this.viewportColumns || 1;
- } else if (ViewerData[contentId].viewportRows && ViewerData[contentId].viewportColumns) {
- viewportRows = ViewerData[contentId].viewportRows;
- viewportColumns = ViewerData[contentId].viewportColumns;
- }
-
- var viewportData;
- if (!$.isEmptyObject(ViewerData[contentId].loadedSeriesData)) {
- viewportData = ViewerData[contentId].loadedSeriesData;
- }
-
- var inputData = {
- viewportColumns: viewportColumns,
- viewportRows: viewportRows
- };
-
- inputData.DisplaySetPresentationGroup = Session.get('WindowManagerPresentationGroup');
- var hangingProtocolViewportData = WindowManager.getHangingProtocol(inputData);
- if (Session.get('UseHangingProtocol')) {
- viewportData = hangingProtocolViewportData.viewports;
- viewportRows = hangingProtocolViewportData.viewportRows || viewportRows;
- viewportColumns = hangingProtocolViewportData.viewportColumns || viewportColumns;
- }
-
- // Update viewerData
- ViewerData[contentId].viewportRows = viewportRows;
- ViewerData[contentId].viewportColumns = viewportColumns;
- Session.set('ViewerData', ViewerData);
-
- this.viewportRows = viewportRows;
- this.viewportColumns = viewportColumns;
-
- var numViewports = viewportRows * viewportColumns;
- for (var i = 0; i < numViewports; ++i) {
- var data = {
- viewportIndex: i,
- // These two are necessary because otherwise the width and height helpers
- // don't get the right data context. Seems to be related to the "each" loop.
- viewportColumns: viewportColumns,
- viewportRows: viewportRows
- };
-
- if (viewportData && !$.isEmptyObject(viewportData[i])) {
- data.seriesInstanceUid = viewportData[i].seriesInstanceUid;
- data.studyInstanceUid = viewportData[i].studyInstanceUid;
- data.currentImageIdIndex = viewportData[i].currentImageIdIndex;
- data.viewport = viewportData[i].viewport;
- } else if (hangingProtocolViewportData && !$.isEmptyObject(hangingProtocolViewportData.viewports[i])) {
- data.seriesInstanceUid = hangingProtocolViewportData.viewports[i].seriesInstanceUid;
- data.studyInstanceUid = hangingProtocolViewportData.viewports[i].studyInstanceUid;
- data.currentImageIdIndex = hangingProtocolViewportData.viewports[i].currentImageIdIndex;
- data.viewport = hangingProtocolViewportData.viewports[i].viewport;
- }
-
- ViewerWindows.insert(data);
- }
-
- // Here we will find out if we need to load any other studies into the viewer
-
- // We will make a list of unique studyInstanceUids
- var uniqueStudyInstanceUids = [];
-
- // Meteor doesn't support Mongo's 'distinct' function, so we have to do this in a loop
- var windows = ViewerWindows.find({}, {
- reactive: false
- }).fetch();
-
- windows.forEach(function(window) {
- var studyInstanceUid = window.studyInstanceUid;
- if (!studyInstanceUid) {
- return;
- }
-
- // If this studyInstanceUid is already in the list, stop here
- if (uniqueStudyInstanceUids.indexOf(studyInstanceUid) > -1) {
- return;
- }
-
- // Otherwise, add it to the list
- uniqueStudyInstanceUids.push(studyInstanceUid);
-
- // If any of the associated studies is not already loaded, load it now
- var loadedStudy = ViewerStudies.findOne({
- studyInstanceUid: studyInstanceUid
- }, {
- reactive: false
- });
-
- if (!loadedStudy) {
- // Load the study
- getStudyMetadata(studyInstanceUid, function(study) {
- log.info("imageViewerViewports GetStudyMetadata: " + studyInstanceUid);
-
- // Sort the study's series and instances by series and instance number
- sortStudy(study);
-
- // Insert it into the ViewerStudies Collection
- ViewerStudies.insert(study);
- });
- }
- });
-
- return ViewerWindows.find({}, {
- reactive: false
- }).fetch();
- }
-});
-
-var savedSeriesData,
- savedViewportRows,
- savedViewportColumns;
-
-Template.imageViewerViewports.events({
- 'CornerstoneMouseDoubleClick .imageViewerViewport': function(e) {
- var container = $('.viewerMain').get(0);
- var data;
- var contentId = this.contentId || $('#viewer').parents('.tab-pane.active').attr('id');
-
- // If there is more than one viewport on screen
- // And one of them is double-clicked, it should be rendered alone
- // If it is double-clicked again, the viewer should revert to the previous layout
- if ($(e.currentTarget).hasClass('zoomed')) {
- // Revert to saved settings
- ViewerData[contentId].loadedSeriesData = $.extend(true, {}, savedSeriesData);
- ViewerData[contentId].viewportRows = savedViewportRows;
- ViewerData[contentId].viewportColumns = savedViewportColumns;
-
- savedViewportRows = 0;
- savedViewportColumns = 0;
-
- data = {
- viewportRows: ViewerData[contentId].viewportRows,
- viewportColumns: ViewerData[contentId].viewportColumns
- };
-
- // Render the imageViewerViewports template with these settings
- $('#imageViewerViewports').remove();
- UI.renderWithData(Template.imageViewerViewports, data, container);
-
- // Remove the 'zoomed' class from any viewports
- $('.imageViewerViewport').removeClass('zoomed');
- } else {
- // Zoom to single viewport
-
- // If only one viewport is on-screen, stop here
- if (ViewerData[contentId].viewportRows === 1 &&
- ViewerData[contentId].viewportColumns === 1) {
- return;
- }
-
- // Save the current settings
- savedSeriesData = $.extend(true, {}, ViewerData[contentId].loadedSeriesData);
- savedViewportRows = ViewerData[contentId].viewportRows;
- savedViewportColumns = ViewerData[contentId].viewportColumns;
-
- // Get the clicked-on viewport's index
- var viewportIndex = this.viewportIndex;
-
- // Set the first viewport's data to be the same as the currently clicked-on viewport
- ViewerData[contentId].loadedSeriesData[0] = ViewerData[contentId].loadedSeriesData[viewportIndex];
-
- // Set the basic template data
- data = {
- viewportRows: 1,
- viewportColumns: 1
- };
-
- // Render the imageViewerViewports template with these settings
- $('#imageViewerViewports').remove();
- UI.renderWithData(Template.imageViewerViewports, data, container);
-
- // Add the 'zoomed' class to the lone remaining viewport
- $('.imageViewerViewport').eq(0).addClass('zoomed');
- }
- }
-});
diff --git a/Packages/viewerbase/client/components/viewer/layoutButton/layoutButton.html b/Packages/viewerbase/client/components/viewer/layoutButton/layoutButton.html
deleted file mode 100644
index 20a60e9b7..000000000
--- a/Packages/viewerbase/client/components/viewer/layoutButton/layoutButton.html
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- {{ >layoutChooser }}
-
\ No newline at end of file
diff --git a/Packages/viewerbase/client/components/viewer/layoutChooser/layoutChooser.html b/Packages/viewerbase/client/components/viewer/layoutChooser/layoutChooser.html
index 031ba6eba..e5959c991 100644
--- a/Packages/viewerbase/client/components/viewer/layoutChooser/layoutChooser.html
+++ b/Packages/viewerbase/client/components/viewer/layoutChooser/layoutChooser.html
@@ -1,20 +1,29 @@
-
-
\ No newline at end of file
diff --git a/Packages/worklist/client/components/worklistResult/worklistResult.js b/Packages/worklist/client/components/worklistResult/worklistResult.js
index 1d2994c1d..048327bf5 100644
--- a/Packages/worklist/client/components/worklistResult/worklistResult.js
+++ b/Packages/worklist/client/components/worklistResult/worklistResult.js
@@ -164,7 +164,7 @@ function search() {
});
if (WorklistStudies.find().count() === 0) {
- // Show notFound text
+ // Show studyNotFound text
searchResults.showNotFoundMessage = true;
Session.set('searchResults', searchResults);
}
diff --git a/Packages/worklist/client/components/worklistResult/worklistResult.styl b/Packages/worklist/client/components/worklistResult/worklistResult.styl
index 1cbc5d1d1..2c5c550e2 100644
--- a/Packages/worklist/client/components/worklistResult/worklistResult.styl
+++ b/Packages/worklist/client/components/worklistResult/worklistResult.styl
@@ -104,4 +104,4 @@
border-top: 0.5px dashed #dddddd
border-bottom: 0.5px dashed #dddddd
color: white
- background-color: #009BD2
+ background-color: #009BD2
\ No newline at end of file
diff --git a/Packages/viewerbase/lib/exportStudies.js b/Packages/worklist/client/lib/exportStudies.js
similarity index 100%
rename from Packages/viewerbase/lib/exportStudies.js
rename to Packages/worklist/client/lib/exportStudies.js
diff --git a/Packages/worklist/lib/getStudiesMetadata.js b/Packages/worklist/client/lib/getStudiesMetadata.js
similarity index 95%
rename from Packages/worklist/lib/getStudiesMetadata.js
rename to Packages/worklist/client/lib/getStudiesMetadata.js
index 7942b9ca6..9a82b4646 100644
--- a/Packages/worklist/lib/getStudiesMetadata.js
+++ b/Packages/worklist/client/lib/getStudiesMetadata.js
@@ -22,10 +22,6 @@ getStudiesMetadata = function(studyInstanceUids, doneCallback, failCallback) {
// retrieval call
var promises = [];
- // Create an empty array to hold all the results of the promises
- var studies = [];
-
-
// Loop through the array of studyInstanceUids
studyInstanceUids.forEach(function(studyInstanceUid) {
// Create a new Deferred to monitor the progress of the asynchronous
diff --git a/Packages/worklist/lib/getStudyMetadata.js b/Packages/worklist/client/lib/getStudyMetadata.js
similarity index 94%
rename from Packages/worklist/lib/getStudyMetadata.js
rename to Packages/worklist/client/lib/getStudyMetadata.js
index 9b6f5a55a..fc772763a 100644
--- a/Packages/worklist/lib/getStudyMetadata.js
+++ b/Packages/worklist/client/lib/getStudyMetadata.js
@@ -24,12 +24,12 @@ getStudyMetadata = function(studyInstanceUid, doneCallback, failCallback) {
// If no study metadata is in the cache variable, we need to retrieve it from
// the server with a call.
Meteor.call('GetStudyMetadata', studyInstanceUid, function(error, study) {
- if (Meteor.user()) {
+ if (Meteor.user && Meteor.user()) {
var hipaaEvent = {
- eventType: "viewed",
+ eventType: 'viewed',
userId: Meteor.userId(),
userName: Meteor.user().profile.fullName,
- collectionName: "Study",
+ collectionName: 'Study',
recordId: studyInstanceUid,
patientId: study.patientId,
patientName: study.patientName
@@ -55,4 +55,4 @@ getStudyMetadata = function(studyInstanceUid, doneCallback, failCallback) {
// Finally, we fire the doneCallback with this study meta data
doneCallback(study);
});
-};
\ No newline at end of file
+};
diff --git a/Packages/worklist/lib/openNewTab.js b/Packages/worklist/client/lib/openNewTab.js
similarity index 95%
rename from Packages/worklist/lib/openNewTab.js
rename to Packages/worklist/client/lib/openNewTab.js
index b77591bfb..05b9b11e2 100644
--- a/Packages/worklist/lib/openNewTab.js
+++ b/Packages/worklist/client/lib/openNewTab.js
@@ -15,6 +15,7 @@ openNewTab = function(studyInstanceUid, title) {
WorklistTabs.insert({
title: title,
contentid: contentid,
+ studyInstanceUid: studyInstanceUid,
active: false
});
diff --git a/Packages/worklist/lib/switchToTab.js b/Packages/worklist/client/lib/switchToTab.js
similarity index 100%
rename from Packages/worklist/lib/switchToTab.js
rename to Packages/worklist/client/lib/switchToTab.js
diff --git a/Packages/worklist/lib/worklist.js b/Packages/worklist/client/lib/worklist.js
similarity index 100%
rename from Packages/worklist/lib/worklist.js
rename to Packages/worklist/client/lib/worklist.js
diff --git a/Packages/worklist/package.js b/Packages/worklist/package.js
index c2cbe9ce3..c84fee2f0 100644
--- a/Packages/worklist/package.js
+++ b/Packages/worklist/package.js
@@ -5,7 +5,7 @@ Package.describe({
});
Package.onUse(function (api) {
- api.versionsFrom('1.2.0.2');
+ api.versionsFrom('1.2.1');
api.use('standard-app-packages');
api.use('jquery');
@@ -17,11 +17,13 @@ Package.onUse(function (api) {
// Our custom packages
api.use('dicomweb');
+ api.use('dimseservice');
+ api.use('orthanc-remote');
// This sets the default logging level of the package using the
// loglevel package. It can be overridden in the JavaScript
// console for debugging purposes
- api.addFiles('log.js', 'client');
+ api.addFiles('log.js');
// Components
api.addFiles('client/components/worklist.html', 'client');
@@ -51,12 +53,40 @@ Package.onUse(function (api) {
api.addFiles('client/components/worklistToolbar/worklistToolbar.js', 'client');
api.addFiles('client/components/worklistToolbar/worklistToolbar.styl', 'client');
- // Library functions
- api.addFiles('lib/getStudyMetadata.js', 'client');
- api.addFiles('lib/getStudiesMetadata.js', 'client');
- api.addFiles('lib/openNewTab.js', 'client');
- api.addFiles('lib/switchToTab.js', 'client');
- api.addFiles('lib/worklist.js', 'client');
+ api.addFiles('client/components/progressDialog/progressDialog.html', 'client');
+ api.addFiles('client/components/progressDialog/progressDialog.styl', 'client');
+ api.addFiles('client/components/progressDialog/progressDialog.js', 'client');
+
+ // Client-side library functions
+ api.addFiles('client/lib/getStudyMetadata.js', 'client');
+ api.addFiles('client/lib/getStudiesMetadata.js', 'client');
+ api.addFiles('client/lib/openNewTab.js', 'client');
+ api.addFiles('client/lib/switchToTab.js', 'client');
+ api.addFiles('client/lib/exportStudies.js', 'client');
+ api.addFiles('client/lib/worklist.js', 'client');
+
+ // Server-side functions
+ api.addFiles('server/lib/namespace.js', 'server');
+ api.addFiles('server/lib/encodeQueryData.js', 'server');
+ api.addFiles('server/methods/getStudyMetadata.js', 'server');
+ api.addFiles('server/methods/worklistSearch.js', 'server');
+
+ // DICOMWeb instance, study, and metadata retrieval
+ api.addFiles('server/services/qido/instances.js', 'server');
+ api.addFiles('server/services/qido/studies.js', 'server');
+ api.addFiles('server/services/wado/retrieveMetadata.js', 'server');
+
+ // DIMSE instance, study, and metadata retrieval
+ api.addFiles('server/services/dimse/instances.js', 'server');
+ api.addFiles('server/services/dimse/studies.js', 'server');
+ api.addFiles('server/services/dimse/retrieveMetadata.js', 'server');
+
+ // Study, instance, and metadata retrieval from remote PACS via Orthanc as a proxy
+ api.addFiles('server/services/remote/instances.js', 'server');
+ api.addFiles('server/services/remote/studies.js', 'server');
+ api.addFiles('server/services/remote/retrieveMetadata.js', 'server');
+
+ api.export('Services', 'server');
// Export Worklist helper functions for usage in Routes
api.export('getTimepointName', 'client');
@@ -65,6 +95,7 @@ Package.onUse(function (api) {
api.export('openNewTab', 'client');
api.export('setWorklistSubscriptions', 'client');
api.export('switchToTab', 'client');
+ api.export('progressDialog', 'client');
api.export('Worklist');
// Export the global ViewerData object
diff --git a/Packages/worklist/server/lib/encodeQueryData.js b/Packages/worklist/server/lib/encodeQueryData.js
new file mode 100644
index 000000000..f466b3a20
--- /dev/null
+++ b/Packages/worklist/server/lib/encodeQueryData.js
@@ -0,0 +1,18 @@
+/**
+ * Converts the properties to URL query parameters. Based on:
+ * http://stackoverflow.com/questions/111529/create-query-parameters-in-javascript
+ *
+ * @param data
+ * @returns {string}
+ */
+encodeQueryData = function(data) {
+ var ret = [];
+
+ for (var d in data) {
+ if (data[d]) {
+ ret.push(encodeURIComponent(d) + '=' + encodeURIComponent(data[d]));
+ }
+ }
+
+ return ret.join('&');
+};
diff --git a/Packages/viewerbase/server/lib/namespace.js b/Packages/worklist/server/lib/namespace.js
similarity index 98%
rename from Packages/viewerbase/server/lib/namespace.js
rename to Packages/worklist/server/lib/namespace.js
index 8c8432d33..08718df35 100644
--- a/Packages/viewerbase/server/lib/namespace.js
+++ b/Packages/worklist/server/lib/namespace.js
@@ -6,4 +6,4 @@ Services.REMOTE = {};
remoteGetValue = function(obj) {
return obj ? obj.Value : null;
-}
+};
diff --git a/Packages/viewerbase/server/methods/getStudyMetadata.js b/Packages/worklist/server/methods/getStudyMetadata.js
similarity index 100%
rename from Packages/viewerbase/server/methods/getStudyMetadata.js
rename to Packages/worklist/server/methods/getStudyMetadata.js
diff --git a/Packages/viewerbase/server/methods/worklistSearch.js b/Packages/worklist/server/methods/worklistSearch.js
similarity index 100%
rename from Packages/viewerbase/server/methods/worklistSearch.js
rename to Packages/worklist/server/methods/worklistSearch.js
diff --git a/Packages/viewerbase/server/services/dimse/instances.js b/Packages/worklist/server/services/dimse/instances.js
similarity index 100%
rename from Packages/viewerbase/server/services/dimse/instances.js
rename to Packages/worklist/server/services/dimse/instances.js
diff --git a/Packages/viewerbase/server/services/dimse/retrieveMetadata.js b/Packages/worklist/server/services/dimse/retrieveMetadata.js
similarity index 96%
rename from Packages/viewerbase/server/services/dimse/retrieveMetadata.js
rename to Packages/worklist/server/services/dimse/retrieveMetadata.js
index f8a45bc0d..a04455db4 100755
--- a/Packages/viewerbase/server/services/dimse/retrieveMetadata.js
+++ b/Packages/worklist/server/services/dimse/retrieveMetadata.js
@@ -11,7 +11,6 @@ function getSourceImageInstanceUid(instance) {
// This is a really poor workaround for now.
// Later we should probably parse the whole sequence.
var SourceImageSequence = instance[0x00082112];
- log.info('SourceImageSequence ' + SourceImageSequence);
if (SourceImageSequence && SourceImageSequence.length) {
return SourceImageSequence[0][0x00081155];
}
diff --git a/Packages/viewerbase/server/services/dimse/studies.js b/Packages/worklist/server/services/dimse/studies.js
similarity index 100%
rename from Packages/viewerbase/server/services/dimse/studies.js
rename to Packages/worklist/server/services/dimse/studies.js
diff --git a/Packages/viewerbase/server/services/qido/instances.js b/Packages/worklist/server/services/qido/instances.js
similarity index 100%
rename from Packages/viewerbase/server/services/qido/instances.js
rename to Packages/worklist/server/services/qido/instances.js
diff --git a/Packages/viewerbase/server/services/qido/studies.js b/Packages/worklist/server/services/qido/studies.js
similarity index 100%
rename from Packages/viewerbase/server/services/qido/studies.js
rename to Packages/worklist/server/services/qido/studies.js
diff --git a/Packages/viewerbase/server/services/remote/instances.js b/Packages/worklist/server/services/remote/instances.js
similarity index 100%
rename from Packages/viewerbase/server/services/remote/instances.js
rename to Packages/worklist/server/services/remote/instances.js
diff --git a/Packages/viewerbase/server/services/remote/retrieveMetadata.js b/Packages/worklist/server/services/remote/retrieveMetadata.js
similarity index 100%
rename from Packages/viewerbase/server/services/remote/retrieveMetadata.js
rename to Packages/worklist/server/services/remote/retrieveMetadata.js
diff --git a/Packages/viewerbase/server/services/remote/studies.js b/Packages/worklist/server/services/remote/studies.js
similarity index 100%
rename from Packages/viewerbase/server/services/remote/studies.js
rename to Packages/worklist/server/services/remote/studies.js
diff --git a/Packages/viewerbase/server/services/wado/retrieveMetadata.js b/Packages/worklist/server/services/wado/retrieveMetadata.js
similarity index 98%
rename from Packages/viewerbase/server/services/wado/retrieveMetadata.js
rename to Packages/worklist/server/services/wado/retrieveMetadata.js
index 2b64afbb5..e2b3c783b 100644
--- a/Packages/viewerbase/server/services/wado/retrieveMetadata.js
+++ b/Packages/worklist/server/services/wado/retrieveMetadata.js
@@ -59,7 +59,7 @@ function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
modalities: DICOMWeb.getString(anInstance['00080061']),
studyDescription: DICOMWeb.getString(anInstance['00081030']),
imageCount: DICOMWeb.getString(anInstance['00201208']),
- studyInstanceUid: DICOMWeb.getString(anInstance['0020000D']),
+ studyInstanceUid: DICOMWeb.getString(anInstance['0020000D'])
};
resultData.forEach(function(instance) {
@@ -110,7 +110,7 @@ function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
};
if (server.imageRendering === 'wadouri') {
- instanceSummary.wadouri = server.wadoUriRoot + '?requestType=WADO&studyUID=' + studyInstanceUid + '&seriesUID=' + seriesInstanceUid + '&objectUID=' + sopInstanceUid + "&contentType=application%2Fdicom";
+ instanceSummary.wadouri = server.wadoUriRoot + '?requestType=WADO&studyUID=' + studyInstanceUid + '&seriesUID=' + seriesInstanceUid + '&objectUID=' + sopInstanceUid + '&contentType=application%2Fdicom';
} else {
instanceSummary.wadorsuri = server.wadoRoot + '/studies/' + studyInstanceUid + '/series/' + seriesInstanceUid + '/instances/' + sopInstanceUid + '/frames/1';
}
@@ -134,11 +134,11 @@ Services.WADO.RetrieveMetadata = function(server, studyInstanceUid) {
var study = resultDataToStudyMetadata(server, studyInstanceUid, result.data);
if (!study) {
- study = {};
+ study = {};
}
study.wadoUriRoot = server.wadoUriRoot;
study.studyInstanceUid = studyInstanceUid;
return study;
-};
\ No newline at end of file
+};