diff --git a/LesionTracker/.gagarin/.gitignore b/LesionTracker/.gagarin/.gitignore
deleted file mode 100644
index 408303742..000000000
--- a/LesionTracker/.gagarin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-local
diff --git a/LesionTracker/.meteor/packages b/LesionTracker/.meteor/packages
index e62f8de5a..4786bac69 100644
--- a/LesionTracker/.meteor/packages
+++ b/LesionTracker/.meteor/packages
@@ -41,7 +41,6 @@ ohif:cornerstone-settings
ohif:viewerbase
ohif:studies
ohif:study-list
-ohif:dicom-services
ohif:hanging-protocols
ohif:metadata
diff --git a/LesionTracker/.meteor/versions b/LesionTracker/.meteor/versions
index e1488d5dd..9539121c6 100644
--- a/LesionTracker/.meteor/versions
+++ b/LesionTracker/.meteor/versions
@@ -92,8 +92,6 @@ ohif:core@0.0.1
ohif:cornerstone@0.0.1
ohif:cornerstone-settings@0.0.1
ohif:design@0.0.1
-ohif:dicom-services@0.0.1
-ohif:dicomweb-client@0.0.1
ohif:hanging-protocols@0.0.1
ohif:header@0.0.1
ohif:hotkeys@0.0.1
@@ -143,7 +141,6 @@ tracker@1.2.0
ui@1.0.13
underscore@1.0.10
url@1.2.0
-validatejs@0.0.1
webapp@1.6.2
webapp-hashing@1.0.9
zuuk:stale-session@1.0.8
diff --git a/LesionTracker/client/components/app/app.html b/LesionTracker/client/components/app/app.html
index ad36371ca..8b020bafc 100644
--- a/LesionTracker/client/components/app/app.html
+++ b/LesionTracker/client/components/app/app.html
@@ -14,6 +14,9 @@
{{/if}}
{{/section}}
{{#section 'headerMenu'}}
+
+ INVESTIGATIONAL USE ONLY
+
{{userName}}
-
-
-
+ {{#if paginationButtonsEnabled}}
+
-
+ {{/if}}
{{this.conflictedFunctionName}} is already using the {{this.hotkeyCombination}} shortcut.
- Do you want to use the shortcut to the {{this.newFunctionName}} function instead?
+ Do you want to use the shortcut for the {{this.newFunctionName}} function instead?
{{/popoverForm}}
diff --git a/Packages/ohif-hotkeys/client/index.js b/Packages/ohif-hotkeys/client/index.js
index a3b6ff5b9..758f32245 100644
--- a/Packages/ohif-hotkeys/client/index.js
+++ b/Packages/ohif-hotkeys/client/index.js
@@ -1,2 +1 @@
import './components';
-import './lib';
diff --git a/Packages/ohif-hotkeys/client/lib/index.js b/Packages/ohif-hotkeys/client/lib/index.js
deleted file mode 100644
index 86c73e446..000000000
--- a/Packages/ohif-hotkeys/client/lib/index.js
+++ /dev/null
@@ -1 +0,0 @@
-import './routes';
diff --git a/Packages/ohif-hotkeys/client/lib/routes.js b/Packages/ohif-hotkeys/client/lib/routes.js
deleted file mode 100644
index b434438e9..000000000
--- a/Packages/ohif-hotkeys/client/lib/routes.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Router } from 'meteor/clinical:router';
-import { Session } from 'meteor/session';
-import { hotkeys } from 'meteor/ohif:hotkeys';
-
-Router.onBeforeAction(function() {
- const lastRoute = Session.get('lastRoute');
- const currentRoute = this.router.current().route.getName();
- if (currentRoute !== lastRoute) {
- hotkeys.switchToContext(null);
- Session.set('lastRoute', currentRoute);
- }
-
- this.next();
-});
diff --git a/Packages/ohif-hotkeys/package.js b/Packages/ohif-hotkeys/package.js
index 933549260..3d3949651 100644
--- a/Packages/ohif-hotkeys/package.js
+++ b/Packages/ohif-hotkeys/package.js
@@ -9,7 +9,7 @@ Npm.depends({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
// Meteor packages
api.use([
diff --git a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/calculateLongestAndShortestDiameters.js b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/calculateLongestAndShortestDiameters.js
new file mode 100644
index 000000000..db7ca9b6d
--- /dev/null
+++ b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/calculateLongestAndShortestDiameters.js
@@ -0,0 +1,32 @@
+// Calculate the longest and shortest diameters for the given measurementData
+export default function(eventData, measurementData) {
+ const { rowPixelSpacing, columnPixelSpacing } = eventData.image;
+ const { start, end, perpendicularStart, perpendicularEnd } = measurementData.handles;
+
+ // updatePerpendicularLineHandles(eventData, measurementData);
+
+ // Calculate the long axis length
+ const dx = (start.x - end.x) * (columnPixelSpacing || 1);
+ const dy = (start.y - end.y) * (rowPixelSpacing || 1);
+ let length = Math.sqrt(dx * dx + dy * dy);
+
+ // Calculate the short axis length
+ const wx = (perpendicularStart.x - perpendicularEnd.x) * (columnPixelSpacing || 1);
+ const wy = (perpendicularStart.y - perpendicularEnd.y) * (rowPixelSpacing || 1);
+ let width = Math.sqrt(wx * wx + wy * wy);
+ if (!width) {
+ width = 0;
+ }
+
+ // Length is always longer than width
+ if (width > length) {
+ const tempW = width;
+ const tempL = length;
+ length = tempW;
+ width = tempL;
+ }
+
+ // Set measurement text to show lesion table
+ measurementData.longestDiameter = length.toFixed(1);
+ measurementData.shortestDiameter = width.toFixed(1);
+}
diff --git a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/invertHandles.js b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/invertHandles.js
new file mode 100644
index 000000000..8405a9c09
--- /dev/null
+++ b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/invertHandles.js
@@ -0,0 +1,42 @@
+const swapAttribute = (a, b, attribute) => {
+ const originalA = a[attribute];
+ const originalB = b[attribute];
+ a[attribute] = originalB;
+ b[attribute] = originalA;
+};
+
+const swapHandles = (a, b) => {
+ swapAttribute(a, b, 'x');
+ swapAttribute(a, b, 'y');
+ swapAttribute(a, b, 'moving');
+ swapAttribute(a, b, 'hover');
+ swapAttribute(a, b, 'active');
+ swapAttribute(a, b, 'selected');
+};
+
+function invertHandles(eventData, measurementData, handle) {
+ const { rowPixelSpacing, columnPixelSpacing } = eventData.image;
+ const { handles } = measurementData;
+ const { start, end, perpendicularStart, perpendicularEnd } = handles;
+
+ // Calculate the long axis length
+ const dx = (start.x - end.x) * (columnPixelSpacing || 1);
+ const dy = (start.y - end.y) * (rowPixelSpacing || 1);
+ const length = Math.sqrt(dx * dx + dy * dy);
+
+ // Calculate the short axis length
+ const wx = (perpendicularStart.x - perpendicularEnd.x) * (columnPixelSpacing || 1);
+ const wy = (perpendicularStart.y - perpendicularEnd.y) * (rowPixelSpacing || 1);
+ const width = Math.sqrt(wx * wx + wy * wy) || 0;
+
+ if (width > length) {
+ swapHandles(start, end);
+ swapHandles(start, perpendicularStart);
+ swapHandles(end, perpendicularEnd);
+ return Object.values(handles).find(h => h.moving === true);
+ }
+
+ return handle;
+}
+
+export default invertHandles;
diff --git a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/mouseDownCallback.js b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/mouseDownCallback.js
index 6bff924d0..f762cb54c 100644
--- a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/mouseDownCallback.js
+++ b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/mouseDownCallback.js
@@ -5,6 +5,7 @@ import { toolType, distanceThreshold } from './definitions';
import mouseMoveCallback from './mouseMoveCallback';
import pointNearTool from './pointNearTool';
import moveHandle from './moveHandle';
+import invertHandles from './invertHandles';
// Clear the selected state for the given handles object
const unselectAllHandles = handles => {
@@ -88,9 +89,14 @@ export default function(event) {
for (let i = 0; i < toolData.data.length; i++) {
data = toolData.data[i];
const handleParams = [element, data.handles, coords, distanceThreshold];
- const handle = cornerstoneTools.getHandleNearImagePoint(...handleParams);
+ let handle = cornerstoneTools.getHandleNearImagePoint(...handleParams);
if (handle) {
+ handle.moving = true;
+
+ // Invert handles if needed
+ handle = invertHandles(eventData, data, handle);
+
// Hide the cursor to improve precision while resizing the line or set to move
// if dragging text box
$element.css('cursor', handle.hasBoundingBox ? 'move' : 'none');
@@ -99,7 +105,6 @@ export default function(event) {
data.active = true;
unselectAllHandles(data.handles);
- handle.moving = true;
moveHandle(eventData, toolType, data, handle, () => handleDoneMove(handle));
event.stopImmediatePropagation();
event.stopPropagation();
diff --git a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/moveHandle/moveHandle.js b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/moveHandle/moveHandle.js
index a1bd5d4e4..f53a1aade 100644
--- a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/moveHandle/moveHandle.js
+++ b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/moveHandle/moveHandle.js
@@ -1,5 +1,6 @@
import { cornerstone } from 'meteor/ohif:cornerstone';
import setHandlesPosition from './setHandlesPosition';
+import calculateLongestAndShortestDiameters from '../calculateLongestAndShortestDiameters';
export default function (mouseEventData, toolType, data, handle, doneMovingCallback, preventHandleOutsideImage) {
const element = mouseEventData.element;
@@ -29,14 +30,23 @@ export default function (mouseEventData, toolType, data, handle, doneMovingCallb
cornerstone.updateImage(element);
- const eventType = 'cornerstonetoolsmeasurementmodified';
- const modifiedEventData = {
- toolType,
- element,
- measurementData: data
+ const measurementModifiedHandler = () => {
+ const eventType = 'cornerstonetoolsmeasurementmodified';
+ const modifiedEventData = {
+ toolType,
+ element,
+ measurementData: data
+ };
+
+ calculateLongestAndShortestDiameters(mouseEventData, data);
+
+ cornerstone.triggerEvent(element, eventType, modifiedEventData);
+
+ element.removeEventListener('cornerstoneimagerendered', measurementModifiedHandler);
};
- cornerstone.triggerEvent(element, eventType, modifiedEventData);
+ // Wait on image render before triggering the modified event
+ element.addEventListener('cornerstoneimagerendered', measurementModifiedHandler);
};
element.addEventListener('cornerstonetoolsmousedrag', mouseDragCallback);
diff --git a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/onImageRendered/onImageRendered.js b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/onImageRendered/onImageRendered.js
index 1f8b4b94b..2101eefd2 100644
--- a/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/onImageRendered/onImageRendered.js
+++ b/Packages/ohif-lesiontracker/client/compatibility/bidirectionalTool/onImageRendered/onImageRendered.js
@@ -2,11 +2,12 @@ import { cornerstone, cornerstoneMath, cornerstoneTools } from 'meteor/ohif:corn
import { OHIF } from 'meteor/ohif:core';
import { toolType } from '../definitions';
import drawHandles from './drawHandles';
+import calculateLongestAndShortestDiameters from '../calculateLongestAndShortestDiameters';
import updatePerpendicularLineHandles from '../updatePerpendicularLineHandles';
import drawPerpendicularLine from './drawPerpendicularLine';
import drawSelectedMarker from './drawSelectedMarker';
-export default function(event) {
+export default function onImageRendered(event) {
const eventData = event.detail;
const { element, canvasContext } = eventData;
@@ -41,9 +42,7 @@ export default function(event) {
for (let i = 0; i < toolData.data.length; i++) {
const data = toolData.data[i];
- if (data.visible === false) {
- continue;
- }
+ if (data.visible === false) continue;
const { start, end, perpendicularStart, perpendicularEnd, textBox } = data.handles;
const strokeWidth = lineWidth;
@@ -65,10 +64,16 @@ export default function(event) {
color = cornerstoneTools.toolColors.getToolColor();
}
- // draw the line
- const handleStartCanvas = cornerstone.pixelToCanvas(element, start);
- const handleEndCanvas = cornerstone.pixelToCanvas(element, end);
- const canvasTextLocation = cornerstone.pixelToCanvas(element, textBox);
+ // Update the perpendicular handles to draw it correctly
+ updatePerpendicularLineHandles(eventData, data);
+
+ // Draw the line
+ const { pixelToCanvas } = cornerstone;
+ const handleStartCanvas = pixelToCanvas(element, start);
+ const handleEndCanvas = pixelToCanvas(element, end);
+ const handlePerpendicularStartCanvas = pixelToCanvas(element, perpendicularStart);
+ const handlePerpendicularEndCanvas = pixelToCanvas(element, perpendicularEnd);
+ const canvasTextLocation = pixelToCanvas(element, textBox);
context.beginPath();
context.strokeStyle = color;
@@ -78,7 +83,6 @@ export default function(event) {
context.stroke();
// Draw perpendicular line
- updatePerpendicularLineHandles(eventData, data);
drawPerpendicularLine(context, element, data, color, strokeWidth);
// Draw the handles
@@ -88,26 +92,8 @@ export default function(event) {
// Draw the selected marker
drawSelectedMarker(eventData, data.handles, '#FF9999');
- // Calculate the long axis length
- const dx = (start.x - end.x) * (colPixelSpacing || 1);
- const dy = (start.y - end.y) * (rowPixelSpacing || 1);
- let length = Math.sqrt(dx * dx + dy * dy);
-
- // Calculate the short axis length
- const wx = (perpendicularStart.x - perpendicularEnd.x) * (colPixelSpacing || 1);
- const wy = (perpendicularStart.y - perpendicularEnd.y) * (rowPixelSpacing || 1);
- let width = Math.sqrt(wx * wx + wy * wy);
- if (!width) {
- width = 0;
- }
-
- // Length is always longer than width
- if (width > length) {
- const tempW = width;
- const tempL = length;
- length = tempW;
- width = tempL;
- }
+ // Calculate the longest and shortest diameters, storing it in the respective attributes
+ calculateLongestAndShortestDiameters(eventData, data);
if (data.measurementNumber) {
// Draw the textbox
@@ -116,9 +102,14 @@ export default function(event) {
suffix = ' pixels';
}
- const lengthText = ' L ' + length.toFixed(1) + suffix;
- const widthText = ' W ' + width.toFixed(1) + suffix;
- const textLines = [`Target ${data.measurementNumber}`, lengthText, widthText];
+ const lengthText = ' L ' + data.longestDiameter + suffix;
+ const widthText = ' W ' + data.shortestDiameter + suffix;
+ let textLines = [`Target ${data.measurementNumber}`, lengthText, widthText];
+
+ // Append extra text lines when applies
+ if (data.additionalData && Array.isArray(data.additionalData.extraTextLines)) {
+ textLines = textLines.concat(data.additionalData.extraTextLines);
+ }
const boundingBox = cornerstoneTools.drawTextBox(
context,
@@ -139,12 +130,39 @@ export default function(event) {
end: {}
};
- const midpointCanvas = {
- x: (handleStartCanvas.x + handleEndCanvas.x) / 2,
- y: (handleStartCanvas.y + handleEndCanvas.y) / 2,
+ const longLine = {
+ start: handleStartCanvas,
+ end: handleEndCanvas
};
- const points = [ handleStartCanvas, handleEndCanvas, midpointCanvas ];
+ const perpendicularLine = {
+ start: handlePerpendicularStartCanvas,
+ end: handlePerpendicularEndCanvas
+ };
+
+ // Check if the perpendicular line has some length (start and end are not equal)
+ // Note: this check is needed to prevent NaN value on the intersection result
+ const { distance } = cornerstoneMath.point;
+ const lineHasLength = distance(perpendicularLine.start, perpendicularLine.end) > 0;
+
+ // Define the lines intersection point
+ let linesIntersection;
+ if (lineHasLength) {
+ // As the line has length, define it as the intersection between the lines
+ const { intersectLine } = cornerstoneMath.lineSegment;
+ linesIntersection = intersectLine(longLine, perpendicularLine);
+ } else {
+ // As the line has no length, the tool is in its start position
+ linesIntersection = longLine.start;
+ }
+
+ const points = [
+ handleStartCanvas,
+ handleEndCanvas,
+ handlePerpendicularStartCanvas,
+ handlePerpendicularEndCanvas,
+ linesIntersection
+ ];
link.end.x = canvasTextLocation.x;
link.end.y = canvasTextLocation.y;
@@ -181,10 +199,6 @@ export default function(event) {
context.stroke();
}
- // Set measurement text to show lesion table
- data.longestDiameter = length.toFixed(1);
- data.shortestDiameter = width.toFixed(1);
-
context.restore();
}
-}
+}
\ No newline at end of file
diff --git a/Packages/ohif-lesiontracker/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js b/Packages/ohif-lesiontracker/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
index e3a0dab44..fb093038b 100644
--- a/Packages/ohif-lesiontracker/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
+++ b/Packages/ohif-lesiontracker/client/components/longitudinal/longitudinalViewportOverlay/longitudinalViewportOverlay.js
@@ -35,7 +35,13 @@ Template[defaultTemplate].onRendered(() => {
if (computation.firstRun) return;
computation.stop();
const imageIndex = instance.getImageIndex();
- OHIF.studies.loadStudy(studyInstanceUid).then(studyMetadata => {
+
+ if (!studyInstanceUid || !seriesInstanceUid) {
+ return;
+ }
+
+ OHIF.studies.loadStudy(studyInstanceUid).then(study => {
+ const studyMetadata = OHIF.viewerbase.getStudyMetadata(study);
const seriesMetadata = studyMetadata.getSeriesByUID(seriesInstanceUid);
const instanceMetadata = seriesMetadata.getInstanceByIndex(imageIndex);
if (!instanceMetadata) return;
diff --git a/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js b/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js
index a004c3eef..4ed7a2c8c 100644
--- a/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js
+++ b/Packages/ohif-lesiontracker/client/components/timepointBrowser/item.js
@@ -62,7 +62,7 @@ Template.timepointBrowserItem.onCreated(() => {
});
Template.timepointBrowserItem.events({
- 'ohif.lesiontracker.timepoint.load .timepoint-item'(event, instance) {
+ 'ohif.measurements.timepoint.load .timepoint-item'(event, instance) {
instance.loadStudies();
},
@@ -71,7 +71,7 @@ Template.timepointBrowserItem.events({
const $element = $(element);
const triggerClick = () => {
- $element.trigger('ohif.lesiontracker.timepoint.click', instance.data.timepoint);
+ $element.trigger('ohif.measurements.timepoint.click', instance.data.timepoint);
};
if (!instance.studiesData.get()) {
diff --git a/Packages/ohif-lesiontracker/client/components/timepointBrowser/quickSwitch.js b/Packages/ohif-lesiontracker/client/components/timepointBrowser/quickSwitch.js
index e562e423d..905845dad 100644
--- a/Packages/ohif-lesiontracker/client/components/timepointBrowser/quickSwitch.js
+++ b/Packages/ohif-lesiontracker/client/components/timepointBrowser/quickSwitch.js
@@ -72,7 +72,7 @@ Template.timepointBrowserQuickSwitch.onRendered(() => {
});
Template.timepointBrowserQuickSwitch.events({
- 'ohif.lesiontracker.timepoint.click'(event, instance) {
+ 'ohif.measurements.timepoint.click'(event, instance) {
const $element = $(event.currentTarget);
$element.toggleClass('active');
instance.updateActiveStudy();
diff --git a/Packages/ohif-lesiontracker/client/components/timepointBrowser/sidebar.js b/Packages/ohif-lesiontracker/client/components/timepointBrowser/sidebar.js
index a71c11cd9..dac2222bc 100644
--- a/Packages/ohif-lesiontracker/client/components/timepointBrowser/sidebar.js
+++ b/Packages/ohif-lesiontracker/client/components/timepointBrowser/sidebar.js
@@ -19,7 +19,7 @@ Template.timepointBrowserSidebar.onRendered(() => {
// Runs this computation every time the timepointViewType is changed
const type = instance.timepointViewType.get();
if (type !== instance.lastType) {
- const eventKey = 'ohif.lesiontracker.timepoint.changeViewType';
+ const eventKey = 'ohif.measurements.timepoint.changeViewType';
instance.$browserList.trigger(eventKey, type);
}
@@ -49,7 +49,7 @@ Template.timepointBrowserSidebar.events({
});
},
- 'ohif.lesiontracker.timepoint.click'(event, instance) {
+ 'ohif.measurements.timepoint.click'(event, instance) {
const $element = $(event.currentTarget);
// Defer the active class toggling to wait for child template rendering
diff --git a/Packages/ohif-lesiontracker/package.js b/Packages/ohif-lesiontracker/package.js
index 2e9a302d1..8e63f1572 100644
--- a/Packages/ohif-lesiontracker/package.js
+++ b/Packages/ohif-lesiontracker/package.js
@@ -5,7 +5,7 @@ Package.describe({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
api.use('ecmascript');
api.use('standard-app-packages');
@@ -13,8 +13,6 @@ Package.onUse(function(api) {
api.use('stylus');
api.use('random');
- api.use('validatejs');
-
// Template overriding
api.use('aldeed:template-extension@4.0.0');
diff --git a/Packages/ohif-log/package.js b/Packages/ohif-log/package.js
index 8c319c55b..4ba86b763 100644
--- a/Packages/ohif-log/package.js
+++ b/Packages/ohif-log/package.js
@@ -9,7 +9,7 @@ Npm.depends({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
api.use('ecmascript');
api.use('standard-app-packages');
diff --git a/Packages/ohif-measurement-table/client/configuration/dataExchange.js b/Packages/ohif-measurement-table/client/configuration/dataExchange.js
index 2a9ce7a9f..9bcc1b880 100644
--- a/Packages/ohif-measurement-table/client/configuration/dataExchange.js
+++ b/Packages/ohif-measurement-table/client/configuration/dataExchange.js
@@ -9,16 +9,12 @@ export const retrieveMeasurements = (patientId, timepointIds) => {
if(!latestSeries) return Promise.resolve({});
- return retrieveMeasurementFromSR(latestSeries).then((value) => {
- return {
- length: value
- }
- });
+ return retrieveMeasurementFromSR(latestSeries);
};
export const storeMeasurements = (measurementData, timepointIds) => {
OHIF.log.info('storeMeasurements');
-
+
const server = OHIF.servers.getCurrentServer();
if (!server || server.type !== 'dicomWeb') {
return Promise.resolve({});
@@ -28,6 +24,8 @@ export const storeMeasurements = (measurementData, timepointIds) => {
return stowSRFromMeasurements(measurementData).then( () => {
OHIF.studies.deleteStudyMetadataPromise(studyInstanceUid);
+ }, error => {
+ throw new Error(error);
});
};
diff --git a/Packages/ohif-measurement-table/client/utils/getLengthMeasurementData.js b/Packages/ohif-measurement-table/client/utils/getLengthMeasurementData.js
deleted file mode 100644
index a571b577c..000000000
--- a/Packages/ohif-measurement-table/client/utils/getLengthMeasurementData.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import { OHIF } from 'meteor/ohif:core';
-import { cornerstone } from 'meteor/ohif:cornerstone';
-import { getInstanceMetadata } from './srUtils';
-
-export default getLengthMeasurementData = (lengthMeasurementContent, displaySets) => {
- let lengthStates = [];
-
- lengthMeasurementContent.forEach(groupItemContent => {
- const lengthContent = groupItemContent.ContentSequence;
- const reference = lengthContent.ContentSequence.ReferencedSOPSequence;
- const lengthState = {};
-
- lengthState.measuredValue = groupItemContent.MeasuredValueSequence.NumericValue;
- lengthState.handles = {start: {}, end: {}};
- [lengthState.handles.start.x,
- lengthState.handles.start.y,
- lengthState.handles.end.x,
- lengthState.handles.end.y] = lengthContent.GraphicData;
-
- // TODO: Save textbox position in GraphicData?
- lengthState.handles.textBox = {
- hasMoved: false,
- movesIndependently: false,
- drawnIndependently: true,
- allowedOutsideImage: true,
- hasBoundingBox: true
- }
-
- lengthState.ReferencedInstanceUID = reference.ReferencedSOPInstanceUID;
- if (reference.ReferencedFrameNumber && reference.ReferencedFrameNumber !== 'NaN') {
- lengthState.ReferencedFrameNumber = reference.ReferencedFrameNumber;
- } else {
- lengthState.ReferencedFrameNumber = 0;
- }
-
- lengthStates.push(lengthState);
- });
-
- const lengthMeasurementData = [];
-
- let measurementNumber = 0;
- lengthStates.forEach(lengthState => {
- const sopInstanceUid = lengthState.ReferencedInstanceUID;
- const instanceMetadata = getInstanceMetadata(displaySets, sopInstanceUid);
- const imageId = OHIF.viewerbase.getImageId(instanceMetadata);
- if (!imageId) {
- return;
- }
-
- const studyInstanceUid = cornerstone.metaData.get('study', imageId).studyInstanceUid;
- const seriesInstanceUid = cornerstone.metaData.get('series', imageId).seriesInstanceUid;
- const patientId = instanceMetadata._study.patientId;
- const frameIndex = lengthState.ReferencedFrameNumber;
- const imagePath = [studyInstanceUid, seriesInstanceUid, sopInstanceUid, frameIndex].join('_');
- const measurement = {
- handles: lengthState.handles,
- length: lengthState.measuredValue,
- imageId,
- imagePath,
- sopInstanceUid,
- seriesInstanceUid,
- studyInstanceUid,
- patientId,
- frameIndex,
- measurementNumber: ++measurementNumber,
- userId: 'UserID',
- timepointId: OHIF.viewer.data.currentTimepointId,
- toolType: 'length',
- _id: imageId + measurementNumber,
- };
-
- lengthMeasurementData.push(measurement);
- });
-
-
- return lengthMeasurementData;
-};
diff --git a/Packages/ohif-measurement-table/client/utils/getLengthMeasurementGroupContentItem.js b/Packages/ohif-measurement-table/client/utils/getLengthMeasurementGroupContentItem.js
deleted file mode 100644
index ff84a5e98..000000000
--- a/Packages/ohif-measurement-table/client/utils/getLengthMeasurementGroupContentItem.js
+++ /dev/null
@@ -1,79 +0,0 @@
-export default measurementGroupContentItem = (measurement, sopClassUid) => {
- const {
- handles,
- length,
- frameIndex,
- sopInstanceUid
- } = measurement;
- const measurementContentItem = [
- {
- RelationshipType: 'HAS OBS CONTEXT',
- ValueType: 'TEXT',
- ConceptNameCodeSequence: {
- CodeValue: '112039',
- CodingSchemeDesignator: 'DCM',
- CodeMeaning: 'Tracking Identifier',
- },
- TextValue: 'web annotation',
- },
- {
- RelationshipType: 'HAS OBS CONTEXT',
- ValueType: 'UIDREF',
- ConceptNameCodeSequence: {
- CodeValue: '112040',
- CodingSchemeDesignator: 'DCM',
- CodeMeaning: 'Tracking Unique Identifier',
- },
- UID: dcmjs.data.DicomMetaDictionary.uid(),
- },
- {
- RelationshipType: 'CONTAINS',
- ValueType: 'CODE',
- ConceptNameCodeSequence: {
- CodeValue: '121071',
- CodingSchemeDesignator: 'DCM',
- CodeMeaning: 'Finding',
- },
- ConceptCodeSequence: {
- CodeValue: 'SAMPLEFINDING',
- CodingSchemeDesignator: '99dcmjs',
- CodeMeaning: 'Sample Finding',
- },
- },
- {
- RelationshipType: 'CONTAINS',
- ValueType: 'NUM',
- ConceptNameCodeSequence: {
- CodeValue: 'G-D7FE',
- CodingSchemeDesignator: 'SRT',
- CodeMeaning: 'Length',
- },
- MeasuredValueSequence: {
- MeasurementUnitsCodeSequence: {
- CodeValue: 'mm',
- CodingSchemeDesignator: 'UCUM',
- CodingSchemeVersion: '1.4',
- CodeMeaning: 'millimeter',
- },
- NumericValue: length,
- },
- ContentSequence: {
- RelationshipType: 'INFERRED FROM',
- ValueType: 'SCOORD',
- GraphicType: 'POLYLINE',
- GraphicData: [ handles.start.x, handles.start.y, handles.end.x, handles.end.y ],
- ContentSequence: {
- RelationshipType: 'SELECTED FROM',
- ValueType: 'IMAGE',
- ReferencedSOPSequence: {
- ReferencedSOPClassUID: sopClassUid,
- ReferencedSOPInstanceUID: sopInstanceUid,
- ReferencedFrameNumber: frameIndex,
- }
- },
- },
- },
- ];
-
- return measurementContentItem;
-};
\ No newline at end of file
diff --git a/Packages/ohif-measurement-table/client/utils/handleSR.js b/Packages/ohif-measurement-table/client/utils/handleSR.js
index a13165df1..9f9c7e2d9 100644
--- a/Packages/ohif-measurement-table/client/utils/handleSR.js
+++ b/Packages/ohif-measurement-table/client/utils/handleSR.js
@@ -1,60 +1,63 @@
import { dcmjs } from 'meteor/ohif:cornerstone';
import retrieveDataFromSR from './retrieveDataFromSR';
import retrieveDataFromMeasurements from './retrieveDataFromMeasurements';
-import {
- multipartEncode
-} from './srUtils';
+
+import DICOMwebClient from 'dicomweb-client';
const retrieveMeasurementFromSR = async (series) => {
- const instance = series.getFirstInstance();
- const options = {
- method: 'GET',
- responseType: 'arraybuffer',
- };
- const url = instance.getDataProperty('wadouri');
+ const server = OHIF.servers.getCurrentServer();
+ const url = WADOProxy.convertURL(server.wadoRoot, server);
- try {
- const result = await DICOMWeb.makeRequest(url, options);
- const data = await result.arrayBuffer();
- const measurementData = retrieveDataFromSR(data);
- return Promise.resolve(measurementData);
- } catch(error) {
- return Promise.reject(error);
- }
+ const config = {
+ url,
+ headers: OHIF.DICOMWeb.getAuthorizationHeader()
+ };
+
+ const dicomWeb = new DICOMwebClient.api.DICOMwebClient(config);
+
+ const instance = series.getFirstInstance();
+ const options = {
+ studyInstanceUID: instance.getStudyInstanceUID(),
+ seriesInstanceUID: instance.getSeriesInstanceUID(),
+ sopInstanceUID: instance.getSOPInstanceUID(),
+ };
+
+ return dicomWeb.retrieveInstance(options).then(retrieveDataFromSR);
};
-/**
- * Retrieve the DICOMWeb STOW-RS URL for the current server.
- *
- * See ftp://medical.nema.org/medical/dicom/current/output/html/part18.html#sect_6.6.1.1
- *
- * @return {string|null} The URL, rerouted to the proxy if the WADOProxy is enabled.
- */
-function getStowRsUrl() {
- const server = OHIF.servers.getCurrentServer();
- const url = `${server.wadoRoot}/studies`;
-
- return WADOProxy.convertURL(url, server);
-}
-
const stowSRFromMeasurements = async (measurements) => {
- const serverUrl = getStowRsUrl();
- const reportDataset = retrieveDataFromMeasurements(measurements);
- const boundary = dcmjs.data.DicomMetaDictionary.uid();
- const options = {
- method: 'POST',
- body: multipartEncode(reportDataset, boundary),
- headers: {
- 'Content-Type': `multipart/related; type=application/dicom; boundary=${boundary}`
- }
+ const server = OHIF.servers.getCurrentServer();
+ const url = WADOProxy.convertURL(server.wadoRoot, server);
+ const dataset = retrieveDataFromMeasurements(measurements);
+ const { DicomMetaDictionary, DicomDict } = dcmjs.data;
+
+ const meta = {
+ FileMetaInformationVersion: dataset._meta.FileMetaInformationVersion.Value,
+ MediaStorageSOPClassUID: dataset.SOPClassUID,
+ MediaStorageSOPInstanceUID: dataset.SOPInstanceUID,
+ TransferSyntaxUID: "1.2.840.10008.1.2.1",
+ ImplementationClassUID: DicomMetaDictionary.uid(),
+ ImplementationVersionName: "dcmjs-0.0",
};
- try {
- await DICOMWeb.makeRequest(serverUrl, options);
- return Promise.resolve();
- } catch(error) {
- return Promise.reject(error);
- }
+ const denaturalized = DicomMetaDictionary.denaturalizeDataset(meta);
+ const dicomDict = new DicomDict(denaturalized);
+
+ dicomDict.dict = DicomMetaDictionary.denaturalizeDataset(dataset);
+
+ const part10Buffer = dicomDict.write();
+
+ const config = {
+ url,
+ headers: OHIF.DICOMWeb.getAuthorizationHeader()
+ };
+
+ const dicomWeb = new DICOMwebClient.api.DICOMwebClient(config);
+ const options = {
+ datasets: [part10Buffer]
+ };
+
+ return dicomWeb.storeInstances(options);
};
export {
diff --git a/Packages/ohif-measurement-table/client/utils/retrieveDataFromMeasurements.js b/Packages/ohif-measurement-table/client/utils/retrieveDataFromMeasurements.js
index 94be65f46..8ec3061ee 100644
--- a/Packages/ohif-measurement-table/client/utils/retrieveDataFromMeasurements.js
+++ b/Packages/ohif-measurement-table/client/utils/retrieveDataFromMeasurements.js
@@ -1,199 +1,27 @@
+import { OHIF } from 'meteor/ohif:core';
import { dcmjs } from 'meteor/ohif:cornerstone';
-import { getInstanceMetadata, getAllDisplaySets } from './srUtils';
-import getLengthMeasurementGroupContentItem from './getLengthMeasurementGroupContentItem';
-
export default retrieveDataFromMeasurements = (measurements) => {
-
- const { studyInstanceUid, seriesInstanceUid, sopInstanceUid } = measurements.allTools[0];
-
- const displaySets = getAllDisplaySets();
- const instanceMetadata = getInstanceMetadata(displaySets, sopInstanceUid);
- const sopClassUid = instanceMetadata._data.sopClassUid;
-
- // TODO: figure out what is needed to make a dcmjs dataset from
- // information available in the viewer. Apparently the raw dicom is not available
- // directly.
- const derivationSourceDataset = {
- StudyInstanceUID: studyInstanceUid,
- SeriesInstanceUID: seriesInstanceUid,
- SOPInstanceUID: sopInstanceUid,
- SOPClassUID: sopClassUid
- };
- report = new dcmjs.derivations.StructuredReport([derivationSourceDataset]);
- dataset = report.dataset;
-
- // TODO: what is the correct metaheader
- // http://dicom.nema.org/medical/Dicom/current/output/chtml/part10/chapter_7.html
- // TODO: move meta creation to dcmjs
- const fileMetaInformationVersionArray = new Uint16Array(1);
- fileMetaInformationVersionArray[0] = 1;
- dataset._meta = {
- FileMetaInformationVersion: fileMetaInformationVersionArray.buffer,
- MediaStorageSOPClassUID: dataset.SOPClassUID,
- MediaStorageSOPInstanceUID: dataset.SOPInstanceUID,
- TransferSyntaxUID: "1.2.840.10008.1.2.1", // Explicit little endian (always for dcmjs?)
- ImplementationClassUID: dcmjs.data.DicomMetaDictionary.uid(), // TODO: could be git hash or other valid id
- ImplementationVersionName: "OHIFViewer"
- };
-
- // TODO: factor out a lot of this back into dcmjs for use in both
- // the example and in the Viewer
- const measurementGroupContentSequence = [];
- for (measurement of measurements.allTools) {
- if (measurement.toolType === 'length') {
- measurementGroupContentSequence.push.apply(measurementGroupContentSequence, getLengthMeasurementGroupContentItem(measurement, sopClassUid));
- }
- }
-
- // TODO: make a TID1550 derivation as an SR subclass
- dataset = Object.assign(dataset, {
- ConceptNameCodeSequence: {
- CodeValue: '126000',
- CodingSchemeDesignator: 'DCM',
- CodeMeaning: 'Imaging Measurement Report'
- },
- ContinuityOfContent: 'SEPARATE',
- PerformedProcedureCodeSequence: [],
- CompletionFlag: 'COMPLETE',
- VerificationFlag: 'UNVERIFIED',
- ReferencedPerformedProcedureStepSequence: [],
- InstanceNumber: 1,
- CurrentRequestedProcedureEvidenceSequence: {
- StudyInstanceUID: dataset.StudyInstanceUID,
- ReferencedSeriesSequence: {
- SeriesInstanceUID: dataset.SeriesInstanceUID,
- ReferencedSOPSequence: {
- ReferencedSOPClassUID: derivationSourceDataset.SOPClassUID,
- ReferencedSOPInstanceUID: derivationSourceDataset.SOPInstanceUID
- },
- },
- },
- CodingSchemeIdentificationSequence: {
- CodingSchemeDesignator: "99dcmjs",
- CodingSchemeName: "Codes used for dcmjs",
- CodingSchemeVersion: "0",
- CodingSchemeResponsibleOrganization: "https://github.com/pieper/dcmjs"
- },
- ContentTemplateSequence: {
- MappingResource: 'DCMR',
- TemplateIdentifier: '1500'
- },
- ContentSequence: [
- {
- RelationshipType: 'HAS CONCEPT MOD',
- ValueType: 'CODE',
- ConceptNameCodeSequence: {
- CodeValue: '121049',
- CodingSchemeDesignator: 'DCM',
- CodeMeaning: 'Language of Content Item and Descendants',
- },
- ConceptCodeSequence: {
- CodeValue: 'eng',
- CodingSchemeDesignator: 'RFC3066',
- CodeMeaning: 'English',
- },
- ContentSequence: {
- RelationshipType: 'HAS CONCEPT MOD',
- ValueType: 'CODE',
- ConceptNameCodeSequence: {
- CodeValue: '121046',
- CodingSchemeDesignator: 'DCM',
- CodeMeaning: 'Country of Language',
- },
- ConceptCodeSequence: {
- CodeValue: 'US',
- CodingSchemeDesignator: 'ISO3166_1',
- CodeMeaning: 'United States',
- }
- }
- },
- {
- RelationshipType: 'HAS OBS CONTEXT',
- ValueType: 'PNAME',
- ConceptNameCodeSequence: {
- CodeValue: '121008',
- CodingSchemeDesignator: 'DCM',
- CodeMeaning: 'Person Observer Name',
- },
- PersonName: 'user^web' // TODO: these can be options argument for constructor
- },
- {
- RelationshipType: 'HAS OBS CONTEXT',
- ValueType: 'TEXT',
- ConceptNameCodeSequence: {
- CodeValue: 'RP-100006',
- CodingSchemeDesignator: '99dcmjs',
- CodeMeaning: "Person Observer's Login Name"
- },
- TextValue: 'user'
- },
- {
- RelationshipType: 'HAS CONCEPT MOD',
- ValueType: 'CODE',
- ConceptNameCodeSequence: {
- CodeValue: '121058',
- CodingSchemeDesignator: 'DCM',
- CodeMeaning: 'Procedure reported'
- },
- ConceptCodeSequence: {
- CodeValue: '1',
- CodingSchemeDesignator: '99dcmjs',
- CodeMeaning: 'Unknown procedure'
- },
- },
- {
- RelationshipType: 'CONTAINS',
- ValueType: 'CONTAINER',
- ConceptNameCodeSequence: {
- CodeValue: '111028',
- CodingSchemeDesignator: 'DCM',
- CodeMeaning: 'Image Library',
- },
- ContinuityOfContent: 'SEPARATE',
- ContentSequence: {
- RelationshipType: 'CONTAINS',
- ValueType: 'CONTAINER',
- ConceptNameCodeSequence: {
- CodeValue: '126200',
- CodingSchemeDesignator: 'DCM',
- CodeMeaning: 'Image Library Group',
- },
- ContinuityOfContent: 'SEPARATE',
- ContentSequence: {
- RelationshipType: 'CONTAINS',
- ValueType: 'IMAGE',
- ReferencedSOPSequence: {
- // TODO: this should refer to the UIDs extracted from the toolState / instance info
- ReferencedSOPClassUID: dataset.SOPClassUID,
- ReferencedSOPInstanceUID: dataset.SOPInstanceUID,
- },
- },
- },
- },
- {
- RelationshipType: 'CONTAINS',
- ValueType: 'CONTAINER',
- ConceptNameCodeSequence: {
- CodeValue: '126010',
- CodingSchemeDesignator: 'DCM',
- CodeMeaning: 'Imaging Measurements', // TODO: would be nice to abstract the code sequences (in a dictionary? a service?)
- },
- ContinuityOfContent: 'SEPARATE',
- ContentSequence: {
- RelationshipType: 'CONTAINS',
- ValueType: 'CONTAINER',
- ConceptNameCodeSequence: {
- CodeValue: '125007',
- CodingSchemeDesignator: 'DCM',
- CodeMeaning: 'Measurement Group',
- },
- ContinuityOfContent: 'SEPARATE',
- ContentSequence: measurementGroupContentSequence,
- },
- },
- ]
- });
-
- return dataset;
+ const { MeasurementReport } = dcmjs.adapters.Cornerstone;
+ const { getImageIdForImagePath } = OHIF.viewerbase;
+
+ const toolState = {};
+
+ Object.keys(measurements).forEach(measurementType => {
+ const annotations = measurements[measurementType];
+
+ annotations.forEach(annotation => {
+ const imageId = getImageIdForImagePath(annotation.imagePath);
+ toolState[imageId] = toolState[imageId] || {};
+ toolState[imageId][annotation.toolType] = toolState[imageId][annotation.toolType] || {
+ data: []
+ };
+
+ toolState[imageId][annotation.toolType].data.push(annotation);
+ });
+ })
+
+ const report = MeasurementReport.generateReport(toolState, cornerstone.metaData);
+
+ return report.dataset;
}
diff --git a/Packages/ohif-measurement-table/client/utils/retrieveDataFromSR.js b/Packages/ohif-measurement-table/client/utils/retrieveDataFromSR.js
index 4c643930c..d5f8e18c4 100644
--- a/Packages/ohif-measurement-table/client/utils/retrieveDataFromSR.js
+++ b/Packages/ohif-measurement-table/client/utils/retrieveDataFromSR.js
@@ -1,36 +1,58 @@
import { dcmjs } from 'meteor/ohif:cornerstone';
-import getLengthMeasurementData from './getLengthMeasurementData';
-import { toArray, codeMeaningEquals, getAllDisplaySets } from './srUtils'
+import {getAllDisplaySets, getInstanceMetadata} from './srUtils'
const imagingMeasurementsToMeasurementData = (dataset, displaySets) => {
- // Identify the Imaging Measurements
- const imagingMeasurementContent = toArray(dataset.ContentSequence).find(codeMeaningEquals("Imaging Measurements"));
+ const { MeasurementReport } = dcmjs.adapters.Cornerstone;
+ const storedMeasurementByToolType = MeasurementReport.generateToolState(dataset);
+ const measurementData = {};
+ let measurementNumber = 0;
- // Retrieve the Measurements themselves
- const measurementGroupContent = toArray(imagingMeasurementContent.ContentSequence).find(codeMeaningEquals("Measurement Group"));
+ Object.keys(storedMeasurementByToolType).forEach(toolType => {
+ const measurements = storedMeasurementByToolType[toolType];
+ measurementData[toolType] = [];
- // For now, bail out if the dataset is not a TID1500 SR with length measurements
- // TODO: generalize to the various kinds of report
- // TODO: generalize to the kinds of measurements the Viewer supports
- if (dataset.ContentTemplateSequence.TemplateIdentifier !== "1500") {
- OHIF.log.warn("This package can currently only interpret DICOM SR TID 1500");
+ measurements.forEach(measurement => {
+ const instanceMetadata = getInstanceMetadata(displaySets, measurement.sopInstanceUid);
+ const imageId = OHIF.viewerbase.getImageId(instanceMetadata);
+ if (!imageId) {
+ return;
+ }
- return {};
- }
+ // TODO: Update the OHIF metadata provider, then switch these to use 'generalSeriesModule'
+ const study = cornerstone.metaData.get('study', imageId);
+ const series = cornerstone.metaData.get('series', imageId);
+ const imagePath = [
+ study.studyInstanceUid,
+ series.seriesInstanceUid,
+ measurement.sopInstanceUid,
+ measurement.frameIndex
+ ].join('_');
- // Filter to find Length measurements in the Structured Report
- const lengthMeasurementContent = toArray(measurementGroupContent.ContentSequence).filter(codeMeaningEquals("Length"));
+ const toolData = Object.assign({}, measurement, {
+ imageId,
+ imagePath,
+ seriesInstanceUid: series.seriesInstanceUid,
+ studyInstanceUid: study.studyInstanceUid,
+ patientId: study.patientId,
+ measurementNumber: ++measurementNumber,
+ timepointId: OHIF.viewer.data.currentTimepointId,
+ toolType,
+ _id: imageId + measurementNumber,
+ });
- // Retrieve Length Measurement Data
- return getLengthMeasurementData(lengthMeasurementContent, displaySets);
+ measurementData[toolType].push(toolData);
+ });
+ })
+
+ return measurementData;
};
export default retrieveDataFromSR = (Part10SRArrayBuffer) => {
const allDisplaySets = getAllDisplaySets();
- // get the dicom data as an Object
- let dicomData = dcmjs.data.DicomMessage.readFile(Part10SRArrayBuffer);
- let dataset = dcmjs.data.DicomMetaDictionary.naturalizeDataset(dicomData.dict);
+ // Get the dicom data as an Object
+ const dicomData = dcmjs.data.DicomMessage.readFile(Part10SRArrayBuffer);
+ const dataset = dcmjs.data.DicomMetaDictionary.naturalizeDataset(dicomData.dict);
// Convert the SR into the kind of object the Measurements package is expecting
return imagingMeasurementsToMeasurementData(dataset, allDisplaySets);
diff --git a/Packages/ohif-measurement-table/client/utils/srUtils.js b/Packages/ohif-measurement-table/client/utils/srUtils.js
index a82eb2e33..8805993b6 100644
--- a/Packages/ohif-measurement-table/client/utils/srUtils.js
+++ b/Packages/ohif-measurement-table/client/utils/srUtils.js
@@ -2,16 +2,6 @@ import { dcmjs } from 'meteor/ohif:cornerstone';
const supportedSopClassUIDs = ['1.2.840.10008.5.1.4.1.1.88.22'];
-const toArray = function(x) {
- return (x.constructor.name === "Array" ? x : [x]);
-};
-
-const codeMeaningEquals = (codeMeaningName) => {
- return (contentItem) => {
- return contentItem.ConceptNameCodeSequence.CodeMeaning === codeMeaningName;
- };
-};
-
const getAllDisplaySets = () => {
const allStudies = OHIF.viewer.Studies.all();
let allDisplaySets = [];
@@ -55,7 +45,7 @@ const getLatestSRSeries = () => {
if (supportedSopClassUIDs.includes(sopClassUid)) {
if(!latestSeries) {
latestSeries = series;
- } else if (series._data.seriesDate > latestSeries._data.seriesDate ||
+ } else if (series._data.seriesDate > latestSeries._data.seriesDate ||
(series._data.seriesDate === latestSeries._data.seriesDate && series._data.seriesTime > latestSeries._data.seriesTime)) {
latestSeries = series;
}
@@ -66,40 +56,8 @@ const getLatestSRSeries = () => {
return latestSeries;
};
-const stringToArray = (string) => {
- return Uint8Array.from(Array.from(string).map(letter => letter.charCodeAt(0)))
-};
-
-const multipartEncode = (dataset, boundary) => {
-
- const denaturalizedMetaheader = dcmjs.data.DicomMetaDictionary.denaturalizeDataset(dataset._meta);
- const dicomDict = new dcmjs.data.DicomDict(denaturalizedMetaheader);
-
- dicomDict.dict = dcmjs.data.DicomMetaDictionary.denaturalizeDataset(dataset);
-
- const part10Buffer = dicomDict.write();
-
- const header = `\r\n--${boundary}\r\nContent-Type: application/dicom\r\n\r\n`;
- const footer = `\r\n--${boundary}--`;
-
- headerArray = stringToArray(header);
- contentArray = new Uint8Array(part10Buffer);
- footerArray = stringToArray(footer);
-
- const multipartArray = new Uint8Array(headerArray.length + contentArray.length + footerArray.length);
-
- multipartArray.set(headerArray, 0);
- multipartArray.set(contentArray, headerArray.length);
- multipartArray.set(footerArray, headerArray.length + contentArray.length);
-
- return(multipartArray.buffer);
-};
-
export {
- codeMeaningEquals,
getAllDisplaySets,
getInstanceMetadata,
getLatestSRSeries,
- multipartEncode,
- toArray
-}
\ No newline at end of file
+}
diff --git a/Packages/ohif-measurement-table/package.js b/Packages/ohif-measurement-table/package.js
index 6e5c0ccda..a6293d55c 100644
--- a/Packages/ohif-measurement-table/package.js
+++ b/Packages/ohif-measurement-table/package.js
@@ -4,8 +4,13 @@ Package.describe({
version: '0.0.1'
});
+Npm.depends({
+ 'dicomweb-client': '0.3.2',
+ 'xhr2': '0.1.4'
+});
+
Package.onUse(function(api) {
- api.versionsFrom('1.6');
+ api.versionsFrom('1.7');
api.use('ecmascript');
diff --git a/Packages/ohif-measurements/client/lib/MeasurementHandlers/handleSingleMeasurementAdded.js b/Packages/ohif-measurements/client/lib/MeasurementHandlers/handleSingleMeasurementAdded.js
index 8a254d4c5..226ba89a7 100644
--- a/Packages/ohif-measurements/client/lib/MeasurementHandlers/handleSingleMeasurementAdded.js
+++ b/Packages/ohif-measurements/client/lib/MeasurementHandlers/handleSingleMeasurementAdded.js
@@ -21,7 +21,8 @@ export default function ({ instance, eventData, tool }) {
const imageAttributes = getImageAttributes(eventData.element);
const measurement = _.extend({}, measurementData, imageAttributes, {
measurementNumber: measurementData.measurementNumber,
- userId: OHIF.user.getUserId()
+ userId: OHIF.user.getUserId(),
+ toolType
});
// Get the related timepoint by the measurement number and use its location if defined
diff --git a/Packages/ohif-measurements/client/lib/MeasurementHandlers/handleSingleMeasurementRemoved.js b/Packages/ohif-measurements/client/lib/MeasurementHandlers/handleSingleMeasurementRemoved.js
index 1208e44fe..5310fc28e 100644
--- a/Packages/ohif-measurements/client/lib/MeasurementHandlers/handleSingleMeasurementRemoved.js
+++ b/Packages/ohif-measurements/client/lib/MeasurementHandlers/handleSingleMeasurementRemoved.js
@@ -30,7 +30,7 @@ export default function({ instance, eventData, tool, toolGroupId, toolGroup }) {
measurementApi.sortMeasurements(baseline.timepointId);
// Repaint the images on all viewports without the removed measurements
- _.each($('.imageViewerViewport'), element => cornerstone.updateImage(element));
+ _.each($('.imageViewerViewport:not(.empty)'), element => cornerstone.updateImage(element));
// Notify that viewer suffered changes
if (tool.toolGroup !== 'temp') {
diff --git a/Packages/ohif-measurements/client/lib/index.js b/Packages/ohif-measurements/client/lib/index.js
index 088d3eeef..6768b3b80 100644
--- a/Packages/ohif-measurements/client/lib/index.js
+++ b/Packages/ohif-measurements/client/lib/index.js
@@ -14,6 +14,7 @@ import './getTimepointName';
import './getToolConfiguration';
import './hangingProtocolCustomizations';
import './isNewLesionsMeasurement';
+import './isSaveDisabled';
import './MeasurementHandlers';
import './MeasurementManager';
import './navigateOverLesions';
diff --git a/Packages/ohif-measurements/client/lib/isSaveDisabled.js b/Packages/ohif-measurements/client/lib/isSaveDisabled.js
new file mode 100644
index 000000000..687425074
--- /dev/null
+++ b/Packages/ohif-measurements/client/lib/isSaveDisabled.js
@@ -0,0 +1,24 @@
+import { OHIF } from 'meteor/ohif:core';
+
+OHIF.measurements.isSaveDisabled = timepointId => {
+ const basePath = `viewer.studyViewer.measurements.${timepointId}`;
+
+ // Get the timepoint object
+ const timepoint = OHIF.viewer.timepointApi.timepoints.findOne({ timepointId });
+
+ // Check if the timepoint is locked
+ let isLocked = (timepoint && timepoint.isLocked);
+ if (typeof isLocked === 'undefined') {
+ isLocked = true;
+ }
+
+ // Check if the given timepoint suffered changes
+ const hasChanges = OHIF.ui.unsavedChanges.probe(basePath) !== 0;
+
+ // Check if the given timepoint has nonconformities
+ const nonconformities = OHIF.viewer.conformanceCriteria.nonconformities.get();
+ const hasNonconformities = nonconformities && !!nonconformities.length;
+
+ // Prevent saving if timepoint is locked, has no changes or has nonconformities
+ return isLocked || !hasChanges || hasNonconformities;
+};
diff --git a/Packages/ohif-measurements/client/lib/jumpToRowItem.js b/Packages/ohif-measurements/client/lib/jumpToRowItem.js
index e33d144fc..1782d3624 100644
--- a/Packages/ohif-measurements/client/lib/jumpToRowItem.js
+++ b/Packages/ohif-measurements/client/lib/jumpToRowItem.js
@@ -3,6 +3,9 @@ import { _ } from 'meteor/underscore';
import { OHIF } from 'meteor/ohif:core';
import { cornerstone } from 'meteor/ohif:cornerstone';
+// Flag that can be changed to disable automatic stack scroll linking when jumping over lesions
+OHIF.measurements.automaticStackScrollLinkingEnabled = true;
+
function renderIntoViewport(measurementData, enabledElement, viewportIndex) {
const { activateMeasurements, findAndRenderDisplaySet } = OHIF.measurements;
const { element } = enabledElement;
@@ -54,6 +57,11 @@ function renderIntoViewport(measurementData, enabledElement, viewportIndex) {
}
function syncViewports(viewportsIndexes) {
+ // Prevent stack scrolling from being linked if it's disabled
+ if (!OHIF.measurements.automaticStackScrollLinkingEnabled) {
+ return;
+ }
+
const synchronizer = OHIF.viewer.stackImagePositionOffsetSynchronizer;
if(!synchronizer) { return; }
diff --git a/Packages/ohif-measurements/client/lib/saveMeasurements.js b/Packages/ohif-measurements/client/lib/saveMeasurements.js
index dae43de6e..996da8a60 100644
--- a/Packages/ohif-measurements/client/lib/saveMeasurements.js
+++ b/Packages/ohif-measurements/client/lib/saveMeasurements.js
@@ -4,12 +4,10 @@ OHIF.measurements.saveMeasurements = (measurementApi, timepointId) => {
const { unsavedChanges, notifications, showDialog } = OHIF.ui;
const basePath = `viewer.studyViewer.measurements.${timepointId}`;
- // Stop here if there are nonconformities in the timepoints
- const nonconformities = OHIF.viewer.conformanceCriteria.nonconformities.get();
- if (nonconformities.length) return;
-
- // Stop here if there were no changes to the timepoint
- if (unsavedChanges.probe(basePath) === 0) return;
+ // Prevent saving if it's disabled
+ if (OHIF.measurements.isSaveDisabled(timepointId)) {
+ return;
+ }
// Clear unsaved changes state and display success message
const successHandler = () => {
diff --git a/Packages/ohif-measurements/package.js b/Packages/ohif-measurements/package.js
index cade7ef26..220b754ed 100644
--- a/Packages/ohif-measurements/package.js
+++ b/Packages/ohif-measurements/package.js
@@ -11,7 +11,7 @@ Package.describe({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
api.use('ecmascript');
api.use('standard-app-packages');
@@ -21,8 +21,6 @@ Package.onUse(function(api) {
api.use('momentjs:moment');
- api.use('validatejs');
-
// Schema for Data Models
api.use('aldeed:simple-schema');
api.use('aldeed:collection2');
diff --git a/Packages/ohif-metadata/package.js b/Packages/ohif-metadata/package.js
index 1e69589cd..13a0e2ac7 100644
--- a/Packages/ohif-metadata/package.js
+++ b/Packages/ohif-metadata/package.js
@@ -5,7 +5,7 @@ Package.describe({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
api.use('ecmascript');
diff --git a/Packages/ohif-polyfill/package.js b/Packages/ohif-polyfill/package.js
index ab843b5e9..c249242b3 100644
--- a/Packages/ohif-polyfill/package.js
+++ b/Packages/ohif-polyfill/package.js
@@ -5,7 +5,7 @@ Package.describe({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
// Meteor packages
api.use('ecmascript');
diff --git a/Packages/ohif-select-tree/package.js b/Packages/ohif-select-tree/package.js
index 353c20118..e9706b277 100644
--- a/Packages/ohif-select-tree/package.js
+++ b/Packages/ohif-select-tree/package.js
@@ -5,7 +5,7 @@ Package.describe({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
// Meteor packages
api.use([
diff --git a/Packages/ohif-servers/both/schema/servers.js b/Packages/ohif-servers/both/schema/servers.js
index 71988598d..d12820095 100644
--- a/Packages/ohif-servers/both/schema/servers.js
+++ b/Packages/ohif-servers/both/schema/servers.js
@@ -64,15 +64,15 @@ export const DICOMWebServer = new SimpleSchema({
imageRendering: {
type: String,
label: 'Image rendering',
- allowedValues: ['wadouri', 'wadors', 'orthanc'],
- valuesLabels: ['WADO URI', 'WADO RS', 'ORTHANC'],
+ allowedValues: ['wadouri', 'wadors'],
+ valuesLabels: ['WADO URI', 'WADO RS'],
defaultValue: 'wadouri'
},
thumbnailRendering: {
type: String,
label: 'Thumbnail rendering',
- allowedValues: ['wadouri', 'wadors', 'orthanc'],
- valuesLabels: ['WADO URI', 'WADO RS', 'ORTHANC'],
+ allowedValues: ['wadouri', 'wadors'],
+ valuesLabels: ['WADO URI', 'WADO RS'],
defaultValue: 'wadouri'
},
qidoRoot: {
diff --git a/Packages/ohif-servers/client/startup.js b/Packages/ohif-servers/client/startup.js
index de120dcc1..d8c3d2f47 100644
--- a/Packages/ohif-servers/client/startup.js
+++ b/Packages/ohif-servers/client/startup.js
@@ -14,7 +14,6 @@ if (Meteor.settings &&
const endpoints = servers[serverType];
endpoints.forEach((endpoint) => {
const server = Object.assign({}, endpoint);
- server.origin = 'json';
server.type = serverType;
Servers.insert(server);
@@ -26,7 +25,5 @@ if (Meteor.settings &&
CurrentServer.insert({
serverId: newServer._id
});
-
- console.log('test');
}
diff --git a/Packages/ohif-servers/package.js b/Packages/ohif-servers/package.js
index 574de1674..465d7ef52 100644
--- a/Packages/ohif-servers/package.js
+++ b/Packages/ohif-servers/package.js
@@ -5,14 +5,14 @@ Package.describe({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
api.use('ecmascript');
- api.use('templating');
- api.use('jquery');
- api.use('stylus');
- api.use('aldeed:simple-schema');
- api.use('aldeed:collection2');
+ api.use('templating', 'client');
+ api.use('jquery', 'client');
+ api.use('stylus', 'client');
+ api.use('aldeed:simple-schema@1.5.4');
+ api.use('aldeed:collection2@2.10.0');
// Our custom packages
api.use('ohif:core');
diff --git a/Packages/ohif-servers/server/startup.js b/Packages/ohif-servers/server/startup.js
index e34a2cca4..efcfec539 100644
--- a/Packages/ohif-servers/server/startup.js
+++ b/Packages/ohif-servers/server/startup.js
@@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor';
import { _ } from 'meteor/underscore';
import { OHIF } from 'meteor/ohif:core';
import { Servers } from 'meteor/ohif:servers/both/collections';
-import { ServerConfiguration } from 'meteor/ohif:servers/both/schema/servers.js';
// Check the servers on meteor startup
if (Meteor.settings &&
diff --git a/Packages/ohif-studies/imports/both/lib/encodeQueryData.js b/Packages/ohif-studies/imports/both/lib/encodeQueryData.js
deleted file mode 100644
index f466b3a20..000000000
--- a/Packages/ohif-studies/imports/both/lib/encodeQueryData.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * 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/ohif-studies/imports/both/lib/index.js b/Packages/ohif-studies/imports/both/lib/index.js
index 8271ccc98..f53464cd4 100644
--- a/Packages/ohif-studies/imports/both/lib/index.js
+++ b/Packages/ohif-studies/imports/both/lib/index.js
@@ -1,2 +1 @@
-import './encodeQueryData.js';
import './parseFloatArray.js';
diff --git a/Packages/ohif-studies/imports/both/services/qido/instances.js b/Packages/ohif-studies/imports/both/services/qido/instances.js
index e13ae54ea..aadf5db91 100644
--- a/Packages/ohif-studies/imports/both/services/qido/instances.js
+++ b/Packages/ohif-studies/imports/both/services/qido/instances.js
@@ -1,15 +1,7 @@
import { OHIF } from 'meteor/ohif:core';
-import { DICOMWeb } from 'meteor/ohif:dicomweb-client';
+import DICOMwebClient from 'dicomweb-client';
-/**
- * Creates a QIDO URL given the server settings and a study instance UID
- * @param server
- * @param studyInstanceUid
- * @returns {string} URL to be used for QIDO calls
- */
-function buildUrl(server, studyInstanceUid) {
- return server.qidoRoot + '/studies/' + studyInstanceUid + '/instances';
-}
+const { DICOMWeb } = OHIF;
/**
* Parses data returned from a QIDO search and transforms it into
@@ -76,20 +68,23 @@ function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
* @returns {{wadoUriRoot: String, studyInstanceUid: String, seriesList: Array}}
*/
OHIF.studies.services.QIDO.Instances = function(server, studyInstanceUid) {
- var url = buildUrl(server, studyInstanceUid);
+ // TODO: Are we using this function anywhere?? Can we remove it?
- try {
- var result = DICOMWeb.getJSON(url, server.requestOptions);
+ const config = {
+ url: server.qidoRoot,
+ headers: OHIF.DICOMWeb.getAuthorizationHeader()
+ };
+ const dicomWeb = new DICOMwebClient.api.DICOMwebClient(config);
+ const queryParams = getQIDOQueryParams(filter, server.qidoSupportsIncludeField);
+ const options = {
+ studyInstanceUID: studyInstanceUid
+ };
+ return dicomWeb.searchForInstances(options).then(result => {
return {
wadoUriRoot: server.wadoUriRoot,
studyInstanceUid: studyInstanceUid,
seriesList: resultDataToStudyMetadata(server, studyInstanceUid, result.data)
};
- } catch (error) {
- OHIF.log.trace();
-
- throw error;
- }
-
+ });
};
diff --git a/Packages/ohif-studies/imports/both/services/qido/studies.js b/Packages/ohif-studies/imports/both/services/qido/studies.js
index b7ff4f97b..830bd9302 100644
--- a/Packages/ohif-studies/imports/both/services/qido/studies.js
+++ b/Packages/ohif-studies/imports/both/services/qido/studies.js
@@ -1,5 +1,14 @@
import { OHIF } from 'meteor/ohif:core';
-import { DICOMWeb } from 'meteor/ohif:dicomweb-client';
+import DICOMwebClient from 'dicomweb-client';
+
+const { DICOMWeb } = OHIF;
+
+// TODO: Is there an easier way to do this?
+if (Meteor.isServer) {
+ var XMLHttpRequest = require('xhr2');
+
+ global.XMLHttpRequest = XMLHttpRequest;
+}
/**
* Creates a QIDO date string for a date range query
@@ -23,11 +32,11 @@ function dateToString(date) {
* Produces a QIDO URL given server details and a set of specified search filter
* items
*
- * @param server
* @param filter
+ * @param serverSupportsQIDOIncludeField
* @returns {string} The URL with encoded filter query data
*/
-function filterToQIDOURL(server, filter) {
+function getQIDOQueryParams(filter, serverSupportsQIDOIncludeField) {
const commaSeparatedFields = [
'00081030', // Study Description
'00080060' //Modality
@@ -41,7 +50,8 @@ function filterToQIDOURL(server, filter) {
StudyDescription: filter.studyDescription,
ModalitiesInStudy: filter.modalitiesInStudy,
limit: filter.limit,
- includefield: server.qidoSupportsIncludeField ? 'all' : commaSeparatedFields
+ offset: filter.offset,
+ includefield: serverSupportsQIDOIncludeField ? commaSeparatedFields : 'all'
};
// build the StudyDate range parameter
@@ -59,7 +69,16 @@ function filterToQIDOURL(server, filter) {
parameters.StudyInstanceUID = studyUids;
}
- return server.qidoRoot + '/studies?' + encodeQueryData(parameters);
+ // Clean query params of undefined values.
+ const params = {};
+ Object.keys(parameters).forEach(key => {
+ if (parameters[key] !== undefined &&
+ parameters[key] !== "") {
+ params[key] = parameters[key];
+ }
+ });
+
+ return params;
}
/**
@@ -98,13 +117,16 @@ function resultDataToStudies(resultData) {
}
OHIF.studies.services.QIDO.Studies = (server, filter) => {
- const url = filterToQIDOURL(server, filter);
+ const config = {
+ url: server.qidoRoot,
+ headers: OHIF.DICOMWeb.getAuthorizationHeader()
+ };
- return new Promise((resolve, reject) => {
- DICOMWeb.getJSON(url, server.requestOptions).then(result => {
- const studies = resultDataToStudies(result);
+ const dicomWeb = new DICOMwebClient.api.DICOMwebClient(config);
+ const queryParams = getQIDOQueryParams(filter, server.qidoSupportsIncludeField);
+ const options = {
+ queryParams
+ };
- resolve(studies);
- }, reject);
- });
+ return dicomWeb.searchForStudies(options).then(resultDataToStudies);
};
diff --git a/Packages/ohif-studies/imports/both/services/wado/retrieveMetadata.js b/Packages/ohif-studies/imports/both/services/wado/retrieveMetadata.js
index 05d75657f..a4c9f8904 100644
--- a/Packages/ohif-studies/imports/both/services/wado/retrieveMetadata.js
+++ b/Packages/ohif-studies/imports/both/services/wado/retrieveMetadata.js
@@ -1,7 +1,10 @@
import { OHIF } from 'meteor/ohif:core';
-import { DICOMWeb } from 'meteor/ohif:dicomweb-client';
+import DICOMwebClient from 'dicomweb-client';
+
import { parseFloatArray } from '../../lib/parseFloatArray';
+const { DICOMWeb } = OHIF;
+
/**
* Simple cache schema for retrieved color palettes.
*/
@@ -39,17 +42,6 @@ const paletteColorCache = {
}
};
-/**
- * Creates a URL for a WADO search
- *
- * @param server
- * @param studyInstanceUid
- * @returns {string}
- */
-function buildUrl(server, studyInstanceUid) {
- return server.wadoRoot + '/studies/' + studyInstanceUid + '/metadata';
-}
-
/** Returns a WADO url for an instance
*
* @param studyInstanceUid
@@ -58,6 +50,7 @@ function buildUrl(server, studyInstanceUid) {
* @returns {string}
*/
function buildInstanceWadoUrl(server, studyInstanceUid, seriesInstanceUid, sopInstanceUid) {
+ // TODO: This can be removed, since DICOMWebClient has the same function. Not urgent, though
const params = [];
params.push('requestType=WADO');
@@ -102,23 +95,47 @@ function getSourceImageInstanceUid(instance) {
}
function getPaletteColor(server, instance, tag, lutDescriptor) {
- const lut = [];
const numLutEntries = lutDescriptor[0];
const bits = lutDescriptor[2];
- const uri = WADOProxy.convertURL(instance[tag].BulkDataURI, server)
- const bulkDataPromise = DICOMWeb.getBulkData(uri);
- return bulkDataPromise.then(data => {
- for (var i = 0; i < numLutEntries; i++) {
- if(bits === 16) {
- lut[i] = data[i * 65536] + data[i + 1];
+ let uri = WADOProxy.convertURL(instance[tag].BulkDataURI, server)
+
+ // TODO: Workaround for dcm4chee behind SSL-terminating proxy returning
+ // incorrect bulk data URIs
+ if (server.wadoRoot.indexOf('https') === 0 &&
+ !uri.includes('https')) {
+ uri = uri.replace('http', 'https');
+ }
+
+ const config = {
+ url: server.wadoRoot, //BulkDataURI is absolute, so this isn't used
+ headers: OHIF.DICOMWeb.getAuthorizationHeader()
+ };
+ const dicomWeb = new DICOMwebClient.api.DICOMwebClient(config);
+ const options = {
+ BulkDataURI: uri
+ };
+
+ const readUInt16 = (byteArray, position) => {
+ return byteArray[position] + (byteArray[position + 1] * 256);
+ }
+
+ const arrayBufferToPaletteColorLUT = (arraybuffer) =>{
+ const byteArray = new Uint8Array(arraybuffer);
+ const lut = [];
+
+ for (let i = 0; i < numLutEntries; i++) {
+ if (bits === 16) {
+ lut[i] = readUInt16(byteArray, i * 2);
} else {
- lut[i] = data[i];
+ lut[i] = byteArray[i];
}
}
return lut;
- })
+ }
+
+ return dicomWeb.retrieveBulkData(options).then(arrayBufferToPaletteColorLUT)
}
/**
@@ -129,13 +146,15 @@ function getPaletteColor(server, instance, tag, lutDescriptor) {
* @returns {String} The ReferenceSOPInstanceUID
*/
async function getPaletteColors(server, instance, lutDescriptor) {
- let entry = null;
let paletteUID = DICOMWeb.getString(instance['00281199']);
return new Promise((resolve, reject) => {
if (paletteColorCache.isValidUID(paletteUID)) {
- entry = paletteColorCache.get(paletteUID);
- return resolve(entry);
+ const entry = paletteColorCache.get(paletteUID);
+
+ if (entry) {
+ return resolve(entry);
+ }
}
// no entry in cache... Fetch remote data.
@@ -146,7 +165,11 @@ async function getPaletteColors(server, instance, lutDescriptor) {
const promises = [r, g, b];
Promise.all(promises).then((args) => {
- entry = { red: r, green: g, blue: b };
+ entry = {
+ red: args[0],
+ green: args[1],
+ blue: args[2]
+ };
// when paletteUID is present, the entry can be cached...
entry.uid = paletteUID;
@@ -202,9 +225,6 @@ function getRadiopharmaceuticalInfo(instance) {
* @returns {{seriesList: Array, patientName: *, patientId: *, accessionNumber: *, studyDate: *, modalities: *, studyDescription: *, imageCount: *, studyInstanceUid: *}}
*/
async function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
- const seriesMap = {};
- const seriesList = [];
-
if (!resultData.length) {
return;
}
@@ -215,7 +235,9 @@ async function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
}
const studyData = {
- seriesList,
+ seriesList: [],
+ studyInstanceUid,
+ wadoUriRoot: server.wadoUriRoot,
patientName: DICOMWeb.getName(anInstance['00100010']),
patientId: DICOMWeb.getString(anInstance['00100020']),
patientAge: DICOMWeb.getNumber(anInstance['00101010']),
@@ -230,9 +252,12 @@ async function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
institutionName: DICOMWeb.getString(anInstance['00080080'])
};
+ const seriesMap = {};
+
await Promise.all(resultData.map(async function(instance) {
- var seriesInstanceUid = DICOMWeb.getString(instance['0020000E']);
- var series = seriesMap[seriesInstanceUid];
+ const seriesInstanceUid = DICOMWeb.getString(instance['0020000E']);
+ let series = seriesMap[seriesInstanceUid];
+
if (!series) {
series = {
seriesDescription: DICOMWeb.getString(instance['0008103E']),
@@ -244,7 +269,7 @@ async function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
instances: []
};
seriesMap[seriesInstanceUid] = series;
- seriesList.push(series);
+ studyData.seriesList.push(series);
}
const sopInstanceUid = DICOMWeb.getString(instance['00080018']);
@@ -331,22 +356,23 @@ async function resultDataToStudyMetadata(server, studyInstanceUid, resultData) {
}
/**
- * Retrieved Study MetaData from a DICOM server using a WADO call
+ * Retrieve Study MetaData from a DICOM server using a WADO call
+ *
* @param server
* @param studyInstanceUid
* @returns {Promise}
*/
OHIF.studies.services.WADO.RetrieveMetadata = async function(server, studyInstanceUid) {
- const url = buildUrl(server, studyInstanceUid);
+ const config = {
+ url: server.wadoRoot,
+ headers: OHIF.DICOMWeb.getAuthorizationHeader()
+ };
+ const dicomWeb = new DICOMwebClient.api.DICOMwebClient(config);
+ const options = {
+ studyInstanceUID: studyInstanceUid
+ };
- return new Promise((resolve, reject) => {
- DICOMWeb.getJSON(url, server.requestOptions).then(result => {
- resultDataToStudyMetadata(server, studyInstanceUid, result).then((study) => {
- study.wadoUriRoot = server.wadoUriRoot;
- study.studyInstanceUid = studyInstanceUid;
-
- resolve(study);
- }, reject);
- }, reject);
+ return dicomWeb.retrieveStudyMetadata(options).then(result => {
+ return resultDataToStudyMetadata(server, studyInstanceUid, result);
});
};
diff --git a/Packages/ohif-studies/imports/server/services/dimse/instances.js b/Packages/ohif-studies/imports/server/services/dimse/instances.js
index 6672c069d..ff09559f8 100644
--- a/Packages/ohif-studies/imports/server/services/dimse/instances.js
+++ b/Packages/ohif-studies/imports/server/services/dimse/instances.js
@@ -1,4 +1,5 @@
import { OHIF } from 'meteor/ohif:core';
+import DIMSE from 'dimse';
/**
* Parses data returned from a study search and transforms it into
diff --git a/Packages/ohif-studies/imports/server/services/dimse/retrieveMetadata.js b/Packages/ohif-studies/imports/server/services/dimse/retrieveMetadata.js
index 255b496f6..fb47de74c 100644
--- a/Packages/ohif-studies/imports/server/services/dimse/retrieveMetadata.js
+++ b/Packages/ohif-studies/imports/server/services/dimse/retrieveMetadata.js
@@ -1,5 +1,6 @@
import { OHIF } from 'meteor/ohif:core';
import { parseFloatArray } from 'meteor/ohif:studies/imports/both/lib/parseFloatArray';
+import DIMSE from 'dimse';
/**
* Returns the value of the element (e.g. '00280009')
diff --git a/Packages/ohif-studies/imports/server/services/dimse/setup.js b/Packages/ohif-studies/imports/server/services/dimse/setup.js
index 919251fe2..7e3c71ed7 100644
--- a/Packages/ohif-studies/imports/server/services/dimse/setup.js
+++ b/Packages/ohif-studies/imports/server/services/dimse/setup.js
@@ -1,6 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { OHIF } from 'meteor/ohif:core';
import { CurrentServer } from 'meteor/ohif:servers/both/collections';
+import DIMSE from 'dimse';
const setupDIMSE = () => {
// Terminate existing DIMSE servers and sockets and clean up the connection object
diff --git a/Packages/ohif-studies/imports/server/services/dimse/studies.js b/Packages/ohif-studies/imports/server/services/dimse/studies.js
index c4bb16bb8..e3169432f 100644
--- a/Packages/ohif-studies/imports/server/services/dimse/studies.js
+++ b/Packages/ohif-studies/imports/server/services/dimse/studies.js
@@ -1,5 +1,6 @@
import { moment } from 'meteor/momentjs:moment';
import { OHIF } from 'meteor/ohif:core';
+import DIMSE from 'dimse';
/**
* Parses resulting data from a QIDO call into a set of Study MetaData
diff --git a/Packages/ohif-studies/package.js b/Packages/ohif-studies/package.js
index 30993e323..69bae79c1 100644
--- a/Packages/ohif-studies/package.js
+++ b/Packages/ohif-studies/package.js
@@ -4,8 +4,14 @@ Package.describe({
version: '0.0.1'
});
+Npm.depends({
+ dimse: '0.0.2',
+ 'dicomweb-client': '0.3.2',
+ 'xhr2': '0.1.4'
+});
+
Package.onUse(function(api) {
- api.versionsFrom('1.6');
+ api.versionsFrom('1.7');
api.use([
'ecmascript',
@@ -20,8 +26,6 @@ Package.onUse(function(api) {
'ohif:core',
'ohif:log',
'ohif:servers',
- 'ohif:dicom-services',
- 'ohif:dicomweb-client',
'ohif:viewerbase',
'ohif:wadoproxy'
]);
diff --git a/Packages/ohif-study-list/client/components/studylist/index.js b/Packages/ohif-study-list/client/components/studylist/index.js
index 6cd09ef93..2249e8b6d 100644
--- a/Packages/ohif-study-list/client/components/studylist/index.js
+++ b/Packages/ohif-study-list/client/components/studylist/index.js
@@ -1,4 +1,5 @@
import './studylist.html';
+import './studylist.js';
import './studylist.styl';
import './studylistStudy/studylistStudy.html';
diff --git a/Packages/ohif-study-list/client/components/studylist/studylist.js b/Packages/ohif-study-list/client/components/studylist/studylist.js
new file mode 100644
index 000000000..91c8579ae
--- /dev/null
+++ b/Packages/ohif-study-list/client/components/studylist/studylist.js
@@ -0,0 +1,12 @@
+import { Template } from 'meteor/templating';
+import { OHIF } from 'meteor/ohif:core';
+
+Template.studylist.onCreated(() => {
+ // Set the current context
+ OHIF.context.set('studylist');
+});
+
+Template.studylist.onDestroyed(() => {
+ // Reset the current context
+ OHIF.context.set(null);
+});
diff --git a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js
index 43b15a52e..d6f545048 100644
--- a/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js
+++ b/Packages/ohif-study-list/client/components/studylist/studylistResult/studylistResult.js
@@ -15,7 +15,6 @@ Template.studylistResult.helpers({
*/
studies() {
const instance = Template.instance();
- let studies;
let sortOption = {
patientName: 1,
studyDate: 1
@@ -26,13 +25,7 @@ Template.studylistResult.helpers({
sortOption = Session.get('sortOption');
}
- // Pagination parameters
- const rowsPerPage = instance.paginationData.rowsPerPage.get();
- const currentPage = instance.paginationData.currentPage.get();
- const offset = rowsPerPage * currentPage;
- const limit = offset + rowsPerPage;
-
- studies = OHIF.studylist.collections.Studies.find({}, {
+ const studies = OHIF.studylist.collections.Studies.find({}, {
sort: sortOption
}).fetch();
@@ -43,8 +36,7 @@ Template.studylistResult.helpers({
// Update record count
instance.paginationData.recordCount.set(studies.length);
- // Limit studies
- return studies.slice(offset, limit);
+ return studies;
},
numberOfStudies() {
@@ -90,17 +82,6 @@ function getFilter(filter) {
return filter;
}
-/**
- * Search for a value in a string
- */
-function isIndexOf(mainVal, searchVal) {
- if (mainVal === undefined || mainVal === '' || mainVal.indexOf(searchVal) > -1){
- return true;
- }
-
- return false;
-}
-
/**
* Replace object if undefined
*/
@@ -112,22 +93,11 @@ function replaceUndefinedColumnValue(text) {
}
}
-/**
- * Convert string to study date
- */
-function convertStringToStudyDate(dateStr) {
- const y = dateStr.substring(0, 4);
- const m = dateStr.substring(4, 6);
- const d = dateStr.substring(6, 8);
- const newDateStr = m + '/' + d + '/' + y;
- return new Date(newDateStr);
-}
-
/**
* Runs a search for studies matching the studylist query parameters
* Inserts the identified studies into the Studies Collection
*/
-function search() {
+function search(instance) {
OHIF.log.info('search()');
// Show loading message
@@ -136,8 +106,14 @@ function search() {
// Hiding error message
Session.set('serverError', false);
+ // Pagination parameters
+ const rowsPerPage = instance.paginationData.rowsPerPage.get();
+ const currentPage = instance.paginationData.currentPage.get();
+
// Create the filters to be used for the StudyList Search
filter = {
+ offset: rowsPerPage * currentPage,
+ limit: rowsPerPage,
patientName: getFilter($('input#patientName').val()),
patientId: getFilter($('input#patientId').val()),
accessionNumber: getFilter($('input#accessionNumber').val()),
@@ -153,28 +129,37 @@ function search() {
OHIF.studies.searchStudies(filter).then((studies) => {
OHIF.log.info('StudyListSearch');
- // Hide loading text
+ // Hide loading text
Session.set('showLoadingText', false);
+ // Clear all current studies
+ OHIF.studylist.collections.Studies.remove({});
+
if (!studies) {
OHIF.log.warn('No studies found');
return;
}
- // Clear all current studies
- OHIF.studylist.collections.Studies.remove({});
-
// Loop through all identified studies
studies.forEach(study => {
- // Search the rest of the parameters that aren't done via the server call
- if (isIndexOf(study.modalities, modality) &&
- (new Date(studyDateFrom).setHours(0, 0, 0, 0) <= convertStringToStudyDate(study.studyDate) || !studyDateFrom || studyDateFrom === '') &&
- (convertStringToStudyDate(study.studyDate) <= new Date(studyDateTo).setHours(0, 0, 0, 0) || !studyDateTo || studyDateTo === '')) {
+ // TODO: Why is this Modality filter different from QIDO?
+ if (!modality && !study.modalities.includes(modality)) {
+ return;
+ }
+ // Sometimes DICOM studies have incorrect Date entries with
+ // periods such as '1990.10.04'
+ let studyDate = study.studyDate;
+ if (studyDate && studyDate.includes('.')) {
+ studyDate = studyDate.replace('.', '');
+ }
+
+ // Search the rest of the parameters that aren't done via the server call
+ if ((moment(studyDateFrom, "MM/DD/YYYY").isBefore(moment(studyDate, "YYYYMMDD")) || !studyDateFrom ) &&
+ (moment(studyDate, "YYYYMMDD").isBefore(moment(studyDateTo, "MM/DD/YYYY")) || !studyDateTo || studyDateTo === '')) {
// Convert numberOfStudyRelatedInstance string into integer
study.numberOfStudyRelatedInstances = !isNaN(study.numberOfStudyRelatedInstances) ? parseInt(study.numberOfStudyRelatedInstances) : undefined;
-
// Insert any matching studies into the Studies Collection
OHIF.studylist.collections.Studies.insert(study);
}
@@ -273,7 +258,20 @@ Template.studylistResult.onRendered(() => {
}
}).data('daterangepicker');
- search();
+ search(instance);
+
+ // Search when rowsPerPage or currentPage is changed
+ instance.autorun(computation => {
+ instance.paginationData.rowsPerPage.dep.depend();
+ instance.paginationData.currentPage.dep.depend();
+
+ // Stop here if it is the first run
+ if (computation.firstRun) {
+ return;
+ }
+
+ search(instance);
+ });
});
Template.studylistResult.onDestroyed(() => {
@@ -292,17 +290,17 @@ function resetSortingColumns(instance, sortingColumn) {
}
Template.studylistResult.events({
- 'keydown input'(event) {
+ 'keydown input'(event, instance) {
if (event.which === 13) { // Enter
- search();
+ search(instance);
}
},
- 'onsearch input'() {
- search();
+ 'onsearch input'(event, instance) {
+ search(instance);
},
- 'change #studyDate'(event) {
+ 'change #studyDate'(event, instance) {
let dateRange = $(event.currentTarget).val();
// Remove all space chars
@@ -314,7 +312,7 @@ Template.studylistResult.events({
studyDateTo = dates[1];
if (dateRange !== '') {
- search();
+ search(instance);
}
},
diff --git a/Packages/ohif-study-list/package.js b/Packages/ohif-study-list/package.js
index 0c4ae5f67..cfdcbfdd5 100644
--- a/Packages/ohif-study-list/package.js
+++ b/Packages/ohif-study-list/package.js
@@ -10,7 +10,7 @@ Package.describe({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
api.use('ecmascript');
api.use('standard-app-packages');
@@ -30,7 +30,6 @@ Package.onUse(function(api) {
api.use('ohif:core');
api.use('ohif:log');
api.use('ohif:servers');
- api.use('ohif:dicom-services');
api.use('ohif:viewerbase');
api.use('ohif:wadoproxy');
api.use('ohif:studies');
diff --git a/Packages/ohif-themes-common/package.js b/Packages/ohif-themes-common/package.js
index b8eb59f6e..2fb05c568 100644
--- a/Packages/ohif-themes-common/package.js
+++ b/Packages/ohif-themes-common/package.js
@@ -5,7 +5,7 @@ Package.describe({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4.2.3');
+ api.versionsFrom('1.7');
api.use('ecmascript');
api.use('templating');
diff --git a/Packages/ohif-themes/package.js b/Packages/ohif-themes/package.js
index 53b9805cc..be52f8bda 100644
--- a/Packages/ohif-themes/package.js
+++ b/Packages/ohif-themes/package.js
@@ -5,7 +5,7 @@ Package.describe({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4.2.3');
+ api.versionsFrom('1.7');
api.use('stylus');
diff --git a/Packages/ohif-user-management/package.js b/Packages/ohif-user-management/package.js
index bd7a6c296..901e0bc65 100644
--- a/Packages/ohif-user-management/package.js
+++ b/Packages/ohif-user-management/package.js
@@ -5,7 +5,7 @@ Package.describe({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
api.use('ecmascript');
api.use('standard-app-packages');
diff --git a/Packages/ohif-user-meteor-accounts/imports/client/index.js b/Packages/ohif-user-meteor-accounts/imports/client/index.js
index 267df83f9..0df9e0cfe 100644
--- a/Packages/ohif-user-meteor-accounts/imports/client/index.js
+++ b/Packages/ohif-user-meteor-accounts/imports/client/index.js
@@ -7,4 +7,4 @@ import './logout';
import './schema';
import './userLoggedIn';
-import './userLogin'
+import './userLogin/'
diff --git a/Packages/ohif-user-meteor-accounts/package.js b/Packages/ohif-user-meteor-accounts/package.js
index 982284f52..d077d96cf 100644
--- a/Packages/ohif-user-meteor-accounts/package.js
+++ b/Packages/ohif-user-meteor-accounts/package.js
@@ -5,9 +5,11 @@ Package.describe({
});
Package.onUse(function(api) {
- api.versionsFrom('1.6');
+ api.versionsFrom('1.7');
api.use('ecmascript');
+ api.use('templating');
+ api.use('stylus');
api.use('accounts-base');
api.use('accounts-password');
diff --git a/Packages/ohif-user-oidc/package.js b/Packages/ohif-user-oidc/package.js
index 099767354..c8d7d04d3 100644
--- a/Packages/ohif-user-oidc/package.js
+++ b/Packages/ohif-user-oidc/package.js
@@ -9,7 +9,7 @@ Npm.depends({
});
Package.onUse(function(api) {
- api.versionsFrom('1.6');
+ api.versionsFrom('1.7');
api.use('ecmascript', 'client');
diff --git a/Packages/ohif-viewerbase/client/components/viewer/downloadDialog/downloadDialog.js b/Packages/ohif-viewerbase/client/components/viewer/downloadDialog/downloadDialog.js
index 73ef9769f..cf3bcd056 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/downloadDialog/downloadDialog.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/downloadDialog/downloadDialog.js
@@ -11,6 +11,31 @@ OHIF.viewerbase.getImageDownloadDialogAnnotationTools = () => {
return ['length', 'probe', 'simpleAngle', 'arrowAnnotate', 'ellipticalRoi', 'rectangleRoi'];
};
+/**
+ * Converts a base64 data to a blob. This is needed to enabled JPEG images downloading on IE11.
+ * Source: https://stackoverflow.com/questions/16245767/creating-a-blob-from-a-base64-string-in-javascript/16245768
+ */
+const b64toBlob = (b64Data, contentType='', sliceSize=512) => {
+ const byteCharacters = atob(b64Data);
+ const byteArrays = [];
+
+ for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+ const slice = byteCharacters.slice(offset, offset + sliceSize);
+
+ const byteNumbers = new Array(slice.length);
+ for (let i = 0; i < slice.length; i++) {
+ byteNumbers[i] = slice.charCodeAt(i);
+ }
+
+ const byteArray = new Uint8Array(byteNumbers);
+
+ byteArrays.push(byteArray);
+ }
+
+ const blob = new Blob(byteArrays, { type: contentType });
+ return blob;
+};
+
Template.imageDownloadDialog.onCreated(() => {
const instance = Template.instance();
@@ -42,7 +67,7 @@ Template.imageDownloadDialog.onCreated(() => {
instance.lastImage = {};
instance.getConfirmCallback = () => () => {
- instance.downloadImage();
+ return instance.downloadImage();
};
});
@@ -105,7 +130,14 @@ Template.imageDownloadDialog.onRendered(() => {
const filename = `${formData.name}.${formData.type}`;
const mimetype = `image/${formData.type}`;
- cornerstoneTools.saveAs(instance.viewportElement, filename, mimetype);
+ // Handles JPEG images for IE11
+ if (instance.downloadCanvas.msToBlob && formData.type === 'jpeg') {
+ const image = instance.downloadCanvas.toDataURL(mimetype, 1);
+ const blob = b64toBlob(image.replace('data:image/jpeg;base64,', ''), mimetype);
+ return window.navigator.msSaveBlob(blob, filename);
+ }
+
+ return cornerstoneTools.saveAs(instance.viewportElement, filename, mimetype);
};
instance.autorun(() => {
@@ -147,9 +179,9 @@ Template.imageDownloadDialog.onRendered(() => {
});
Template.imageDownloadDialog.onDestroyed(() => {
- const instance = Template.instance();
+ const instance = Template.instance();
- cornerstone.disable(instance.viewportElement);
+ cornerstone.disable(instance.viewportElement);
});
Template.imageDownloadDialog.events({
diff --git a/Packages/ohif-viewerbase/client/components/viewer/downloadDialog/downloadDialog.styl b/Packages/ohif-viewerbase/client/components/viewer/downloadDialog/downloadDialog.styl
index d884f04bd..d2d48760f 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/downloadDialog/downloadDialog.styl
+++ b/Packages/ohif-viewerbase/client/components/viewer/downloadDialog/downloadDialog.styl
@@ -12,3 +12,6 @@
.viewport-preview
max-width: 512px
max-height: 512px
+
+ .wrapperLabel
+ display: block
diff --git a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
index 211555a72..be7fdd162 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
@@ -23,6 +23,9 @@ const allCornerstoneEvents = ['click', 'cornerstonetoolsmousedown', 'cornerstone
const PLUGIN_CORNERSTONE = 'cornerstone';
+// Create a way to add hooks to be executed every time a cornerstone element is enabled
+OHIF.viewer.cornerstoneElementHooks = [];
+
/**
* This function loads a study series into a viewport element.
*
@@ -99,6 +102,13 @@ const loadDisplaySetIntoViewport = (data, templateData) => {
};
cornerstone.enable(element, options);
+ // Call every defined hook
+ OHIF.viewer.cornerstoneElementHooks.forEach(hook => {
+ if (typeof hook === 'function') {
+ hook(element);
+ }
+ });
+
// Get the handler functions that will run when loading has finished or thrown
// an error. These are used to show/hide loading / error text boxes on each viewport.
const endLoadingHandler = cornerstoneTools.loadHandlerManager.getEndLoadHandler();
diff --git a/Packages/ohif-viewerbase/client/components/viewer/toolbarSectionTools/toolbarSectionTools.styl b/Packages/ohif-viewerbase/client/components/viewer/toolbarSectionTools/toolbarSectionTools.styl
index ec6134604..ebbd58f20 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/toolbarSectionTools/toolbarSectionTools.styl
+++ b/Packages/ohif-viewerbase/client/components/viewer/toolbarSectionTools/toolbarSectionTools.styl
@@ -29,7 +29,7 @@ $distance = 10px
transition(opacity 0.3s ease\, transform 0.3s ease\, left 0.3s ease)
transform(translateX(-50%) translateY( - ($toolbarDrawerHeight + $distance)) scale(0))
white-space: nowrap
- z-index: 1
+ z-index: 2
.toolbarSectionDrawer
theme('background', '$uiGrayDarkest', 0.95)
diff --git a/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js b/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
index 77b526867..fea90093e 100644
--- a/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
+++ b/Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
@@ -28,6 +28,9 @@ Template.viewerMain.onCreated(() => {
// Add beforeUnload event handler to check for unsaved changes
window.addEventListener('beforeunload', unloadHandlers.beforeUnload);
+
+ // Set the current context
+ OHIF.context.set('viewer');
});
Template.viewerMain.onRendered(() => {
@@ -82,4 +85,7 @@ Template.viewerMain.onDestroyed(() => {
// @TypeSafeStudies
// Clears OHIF.viewer.StudyMetadataList collection
OHIF.viewer.StudyMetadataList.removeAll();
+
+ // Reset the current context
+ OHIF.context.set(null);
});
diff --git a/Packages/ohif-viewerbase/client/lib/StackManager.js b/Packages/ohif-viewerbase/client/lib/StackManager.js
index c9e7a6fc6..21b0245cb 100644
--- a/Packages/ohif-viewerbase/client/lib/StackManager.js
+++ b/Packages/ohif-viewerbase/client/lib/StackManager.js
@@ -35,12 +35,13 @@ function createAndAddStack(stackMap, study, displaySet) {
if (numberOfFrames > 1) {
OHIF.log.info('Multiframe image detected');
for (let i = 0; i < numberOfFrames; i++) {
- metaData.frame = i;
+ metaData.frameNumber = i;
imageId = getImageId(image, i);
imageIds.push(imageId);
metadataProvider.addMetadata(imageId, metaData);
}
} else {
+ metaData.frameNumber = 1;
imageId = getImageId(image);
imageIds.push(imageId);
metadataProvider.addMetadata(imageId, metaData);
diff --git a/Packages/ohif-viewerbase/client/lib/WLPresets.js b/Packages/ohif-viewerbase/client/lib/WLPresets.js
index a0c51eb93..37ebc452f 100644
--- a/Packages/ohif-viewerbase/client/lib/WLPresets.js
+++ b/Packages/ohif-viewerbase/client/lib/WLPresets.js
@@ -153,7 +153,7 @@ class WindowLevelPresetsManager {
return new Promise((resolve, reject) => {
if (this.retrieveFunction) {
this.retrieveFunction.call(this).then(resolve).catch(reject);
- } else if (OHIF.user) {
+ } else if (OHIF.user.userLoggedIn()) {
try {
resolve(OHIF.user.getData(WL_STORAGE_KEY));
} catch(error) {
diff --git a/Packages/ohif-viewerbase/client/lib/classes/plugins/OHIFPlugin.js b/Packages/ohif-viewerbase/client/lib/classes/plugins/OHIFPlugin.js
index a81cac3f2..c31408edc 100644
--- a/Packages/ohif-viewerbase/client/lib/classes/plugins/OHIFPlugin.js
+++ b/Packages/ohif-viewerbase/client/lib/classes/plugins/OHIFPlugin.js
@@ -43,6 +43,12 @@ export class OHIFPlugin {
});
}
+ if (plugin.styleURLs && plugin.styleURLs.length) {
+ plugin.styleURLs.forEach(styleURLs => {
+ this.loadScript(styleURLs, "text/css");
+ });
+ }
+
let scriptURL = plugin.url;
if (plugin.allowCaching === false) {
diff --git a/Packages/ohif-viewerbase/client/lib/getWADORSImageId.js b/Packages/ohif-viewerbase/client/lib/getWADORSImageId.js
index a5fe44d6b..0f312631a 100644
--- a/Packages/ohif-viewerbase/client/lib/getWADORSImageId.js
+++ b/Packages/ohif-viewerbase/client/lib/getWADORSImageId.js
@@ -15,8 +15,5 @@ export function getWADORSImageId(instance, frame) {
return;
}
- const imageId = `wadors:${uri}`;
- OHIF.log.info('WADO-RS ImageID: ' + imageId);
-
- return imageId;
+ return `wadors:${uri}`;
};
diff --git a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
index 4aca22bdf..865963191 100644
--- a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
+++ b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
@@ -199,11 +199,11 @@ Meteor.startup(function() {
disabled: () => !canMoveDisplaySets(true)
},
nextPanel: {
- name: 'Next Panel',
+ name: 'Next Image Viewport',
action: () => panelNavigation.loadNextActivePanel()
},
previousPanel: {
- name: 'Previous Panel',
+ name: 'Previous Image Viewport',
action: () => panelNavigation.loadPreviousActivePanel()
}
}, true);
diff --git a/Packages/ohif-viewerbase/package.js b/Packages/ohif-viewerbase/package.js
index 0db14d0ab..82e4dbc5b 100644
--- a/Packages/ohif-viewerbase/package.js
+++ b/Packages/ohif-viewerbase/package.js
@@ -5,7 +5,7 @@ Package.describe({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
api.use(['ecmascript',
'standard-app-packages',
@@ -13,7 +13,6 @@ Package.onUse(function(api) {
'jquery',
'stylus',
'momentjs:moment',
- 'validatejs',
'cultofcoders:persistent-session'
]);
@@ -219,7 +218,7 @@ Package.onUse(function(api) {
});
Package.onTest(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
/*
* Really important dependencies to the project
@@ -230,7 +229,6 @@ Package.onTest(function(api) {
'jquery',
'mongo',
'momentjs:moment',
- 'validatejs',
'cultofcoders:persistent-session'
], 'client');
diff --git a/Packages/ohif-wadoproxy/package.js b/Packages/ohif-wadoproxy/package.js
index 4ec4c1f0b..26e9fa51a 100755
--- a/Packages/ohif-wadoproxy/package.js
+++ b/Packages/ohif-wadoproxy/package.js
@@ -10,7 +10,7 @@ Npm.depends({
});
Package.onUse(function(api) {
- api.versionsFrom('1.4');
+ api.versionsFrom('1.7');
api.use('ecmascript');
api.use('clinical:router@2.0.19');
@@ -22,7 +22,7 @@ Package.onUse(function(api) {
api.addFiles('both/convertURL.js', ['client', 'server']);
api.addFiles('both/initialize.js', ['client', 'server']);
api.addFiles('server/routes.js', 'server');
-
+
// Global exports
api.export('WADOProxy');
});
diff --git a/Packages/validatejs/lib/validate.js b/Packages/validatejs/lib/validate.js
deleted file mode 100755
index ec942ac7a..000000000
--- a/Packages/validatejs/lib/validate.js
+++ /dev/null
@@ -1,1086 +0,0 @@
-/*!
- * validate.js 0.9.0
- *
- * (c) 2013-2015 Nicklas Ansman, 2013 Wrapp
- * Validate.js may be freely distributed under the MIT license.
- * For all details and documentation:
- * http://validatejs.org/
- */
-
-(function(exports, module, define) {
- "use strict";
-
- // The main function that calls the validators specified by the constraints.
- // The options are the following:
- // - format (string) - An option that controls how the returned value is formatted
- // * flat - Returns a flat array of just the error messages
- // * grouped - Returns the messages grouped by attribute (default)
- // * detailed - Returns an array of the raw validation data
- // - fullMessages (boolean) - If `true` (default) the attribute name is prepended to the error.
- //
- // Please note that the options are also passed to each validator.
- var validate = function(attributes, constraints, options) {
- options = v.extend({}, v.options, options);
-
- var results = v.runValidations(attributes, constraints, options)
- , attr
- , validator;
-
- for (attr in results) {
- for (validator in results[attr]) {
- if (v.isPromise(results[attr][validator])) {
- throw new Error("Use validate.async if you want support for promises");
- }
- }
- }
- return validate.processValidationResults(results, options);
- };
-
- var v = validate;
-
- // Copies over attributes from one or more sources to a single destination.
- // Very much similar to underscore's extend.
- // The first argument is the target object and the remaining arguments will be
- // used as sources.
- v.extend = function(obj) {
- [].slice.call(arguments, 1).forEach(function(source) {
- for (var attr in source) {
- obj[attr] = source[attr];
- }
- });
- return obj;
- };
-
- v.extend(validate, {
- // This is the version of the library as a semver.
- // The toString function will allow it to be coerced into a string
- version: {
- major: 0,
- minor: 9,
- patch: 0,
- metadata: "development",
- toString: function() {
- var version = v.format("%{major}.%{minor}.%{patch}", v.version);
- if (!v.isEmpty(v.version.metadata)) {
- version += "+" + v.version.metadata;
- }
- return version;
- }
- },
-
- // Below is the dependencies that are used in validate.js
-
- // The constructor of the Promise implementation.
- // If you are using Q.js, RSVP or any other A+ compatible implementation
- // override this attribute to be the constructor of that promise.
- // Since jQuery promises aren't A+ compatible they won't work.
- Promise: typeof Promise !== "undefined" ? Promise : /* istanbul ignore next */ null,
-
- EMPTY_STRING_REGEXP: /^\s*$/,
-
- // Runs the validators specified by the constraints object.
- // Will return an array of the format:
- // [{attribute: "", error: ""}, ...]
- runValidations: function(attributes, constraints, options) {
- var results = []
- , attr
- , validatorName
- , value
- , validators
- , validator
- , validatorOptions
- , error;
-
- if (v.isDomElement(attributes) || v.isJqueryElement(attributes)) {
- attributes = v.collectFormValues(attributes);
- }
-
- // Loops through each constraints, finds the correct validator and run it.
- for (attr in constraints) {
- value = v.getDeepObjectValue(attributes, attr);
- // This allows the constraints for an attribute to be a function.
- // The function will be called with the value, attribute name, the complete dict of
- // attributes as well as the options and constraints passed in.
- // This is useful when you want to have different
- // validations depending on the attribute value.
- validators = v.result(constraints[attr], value, attributes, attr, options, constraints);
-
- for (validatorName in validators) {
- validator = v.validators[validatorName];
-
- if (!validator) {
- error = v.format("Unknown validator %{name}", {name: validatorName});
- throw new Error(error);
- }
-
- validatorOptions = validators[validatorName];
- // This allows the options to be a function. The function will be
- // called with the value, attribute name, the complete dict of
- // attributes as well as the options and constraints passed in.
- // This is useful when you want to have different
- // validations depending on the attribute value.
- validatorOptions = v.result(validatorOptions, value, attributes, attr, options, constraints);
- if (!validatorOptions) {
- continue;
- }
- results.push({
- attribute: attr,
- value: value,
- validator: validatorName,
- globalOptions: options,
- attributes: attributes,
- options: validatorOptions,
- error: validator.call(validator,
- value,
- validatorOptions,
- attr,
- attributes,
- options)
- });
- }
- }
-
- return results;
- },
-
- // Takes the output from runValidations and converts it to the correct
- // output format.
- processValidationResults: function(errors, options) {
- var attr;
-
- errors = v.pruneEmptyErrors(errors, options);
- errors = v.expandMultipleErrors(errors, options);
- errors = v.convertErrorMessages(errors, options);
-
- switch (options.format || "grouped") {
- case "detailed":
- // Do nothing more to the errors
- break;
-
- case "flat":
- errors = v.flattenErrorsToArray(errors);
- break;
-
- case "grouped":
- errors = v.groupErrorsByAttribute(errors);
- for (attr in errors) {
- errors[attr] = v.flattenErrorsToArray(errors[attr]);
- }
- break;
-
- default:
- throw new Error(v.format("Unknown format %{format}", options));
- }
-
- return v.isEmpty(errors) ? undefined : errors;
- },
-
- // Runs the validations with support for promises.
- // This function will return a promise that is settled when all the
- // validation promises have been completed.
- // It can be called even if no validations returned a promise.
- async: function(attributes, constraints, options) {
- options = v.extend({}, v.async.options, options);
-
- var WrapErrors = options.wrapErrors || function(errors) {
- return errors;
- };
-
- // Removes unknown attributes
- if (options.cleanAttributes !== false) {
- attributes = v.cleanAttributes(attributes, constraints);
- }
-
- var results = v.runValidations(attributes, constraints, options);
-
- return new v.Promise(function(resolve, reject) {
- v.waitForResults(results).then(function() {
- var errors = v.processValidationResults(results, options);
- if (errors) {
- reject(new WrapErrors(errors, options, attributes, constraints));
- } else {
- resolve(attributes);
- }
- }, function(err) {
- reject(err);
- });
- });
- },
-
- single: function(value, constraints, options) {
- options = v.extend({}, v.single.options, options, {
- format: "flat",
- fullMessages: false
- });
- return v({single: value}, {single: constraints}, options);
- },
-
- // Returns a promise that is resolved when all promises in the results array
- // are settled. The promise returned from this function is always resolved,
- // never rejected.
- // This function modifies the input argument, it replaces the promises
- // with the value returned from the promise.
- waitForResults: function(results) {
- // Create a sequence of all the results starting with a resolved promise.
- return results.reduce(function(memo, result) {
- // If this result isn't a promise skip it in the sequence.
- if (!v.isPromise(result.error)) {
- return memo;
- }
-
- return memo.then(function() {
- return result.error.then(
- function(error) {
- result.error = error || null;
- },
- function(error) {
- if (error instanceof Error) {
- throw error;
- }
- v.error("Rejecting promises with the result is deprecated. Please use the resolve callback instead.");
- result.error = error;
- }
- );
- });
- }, new v.Promise(function(r) { r(); })); // A resolved promise
- },
-
- // If the given argument is a call: function the and: function return the value
- // otherwise just return the value. Additional arguments will be passed as
- // arguments to the function.
- // Example:
- // ```
- // result('foo') // 'foo'
- // result(Math.max, 1, 2) // 2
- // ```
- result: function(value) {
- var args = [].slice.call(arguments, 1);
- if (typeof value === 'function') {
- value = value.apply(null, args);
- }
- return value;
- },
-
- // Checks if the value is a number. This function does not consider NaN a
- // number like many other `isNumber` functions do.
- isNumber: function(value) {
- return typeof value === 'number' && !isNaN(value);
- },
-
- // Returns false if the object is not a function
- isFunction: function(value) {
- return typeof value === 'function';
- },
-
- // A simple check to verify that the value is an integer. Uses `isNumber`
- // and a simple modulo check.
- isInteger: function(value) {
- return v.isNumber(value) && value % 1 === 0;
- },
-
- // Uses the `Object` function to check if the given argument is an object.
- isObject: function(obj) {
- return obj === Object(obj);
- },
-
- // Simply checks if the object is an instance of a date
- isDate: function(obj) {
- return obj instanceof Date;
- },
-
- // Returns false if the object is `null` of `undefined`
- isDefined: function(obj) {
- return obj !== null && obj !== undefined;
- },
-
- // Checks if the given argument is a promise. Anything with a `then`
- // function is considered a promise.
- isPromise: function(p) {
- return !!p && v.isFunction(p.then);
- },
-
- isJqueryElement: function(o) {
- return o && v.isString(o.jquery);
- },
-
- isDomElement: function(o) {
- if (!o) {
- return false;
- }
-
- if (!v.isFunction(o.querySelectorAll) || !v.isFunction(o.querySelector)) {
- return false;
- }
-
- if (v.isObject(document) && o === document) {
- return true;
- }
-
- // http://stackoverflow.com/a/384380/699304
- /* istanbul ignore else */
- if (typeof HTMLElement === "object") {
- return o instanceof HTMLElement;
- } else {
- return o &&
- typeof o === "object" &&
- o !== null &&
- o.nodeType === 1 &&
- typeof o.nodeName === "string";
- }
- },
-
- isEmpty: function(value) {
- var attr;
-
- // Null and undefined are empty
- if (!v.isDefined(value)) {
- return true;
- }
-
- // functions are non empty
- if (v.isFunction(value)) {
- return false;
- }
-
- // Whitespace only strings are empty
- if (v.isString(value)) {
- return v.EMPTY_STRING_REGEXP.test(value);
- }
-
- // For arrays we use the length property
- if (v.isArray(value)) {
- return value.length === 0;
- }
-
- // Dates have no attributes but aren't empty
- if (v.isDate(value)) {
- return false;
- }
-
- // If we find at least one property we consider it non empty
- if (v.isObject(value)) {
- for (attr in value) {
- return false;
- }
- return true;
- }
-
- return false;
- },
-
- // Formats the specified strings with the given values like so:
- // ```
- // format("Foo: %{foo}", {foo: "bar"}) // "Foo bar"
- // ```
- // If you want to write %{...} without having it replaced simply
- // prefix it with % like this `Foo: %%{foo}` and it will be returned
- // as `"Foo: %{foo}"`
- format: v.extend(function(str, vals) {
- if (!v.isString(str)) {
- return str;
- }
- return str.replace(v.format.FORMAT_REGEXP, function(m0, m1, m2) {
- if (m1 === '%') {
- return "%{" + m2 + "}";
- } else {
- return String(vals[m2]);
- }
- });
- }, {
- // Finds %{key} style patterns in the given string
- FORMAT_REGEXP: /(%?)%\{([^\}]+)\}/g
- }),
-
- // "Prettifies" the given string.
- // Prettifying means replacing [.\_-] with spaces as well as splitting
- // camel case words.
- prettify: function(str) {
- if (v.isNumber(str)) {
- // If there are more than 2 decimals round it to two
- if ((str * 100) % 1 === 0) {
- return "" + str;
- } else {
- return parseFloat(Math.round(str * 100) / 100).toFixed(2);
- }
- }
-
- if (v.isArray(str)) {
- return str.map(function(s) { return v.prettify(s); }).join(", ");
- }
-
- if (v.isObject(str)) {
- return str.toString();
- }
-
- // Ensure the string is actually a string
- str = "" + str;
-
- return str
- // Splits keys separated by periods
- .replace(/([^\s])\.([^\s])/g, '$1 $2')
- // Removes backslashes
- .replace(/\\+/g, '')
- // Replaces - and - with space
- .replace(/[_-]/g, ' ')
- // Splits camel cased words
- .replace(/([a-z])([A-Z])/g, function(m0, m1, m2) {
- return "" + m1 + " " + m2.toLowerCase();
- })
- .toLowerCase();
- },
-
- stringifyValue: function(value) {
- return v.prettify(value);
- },
-
- isString: function(value) {
- return typeof value === 'string';
- },
-
- isArray: function(value) {
- return {}.toString.call(value) === '[object Array]';
- },
-
- contains: function(obj, value) {
- if (!v.isDefined(obj)) {
- return false;
- }
- if (v.isArray(obj)) {
- return obj.indexOf(value) !== -1;
- }
- return value in obj;
- },
-
- forEachKeyInKeypath: function(object, keypath, callback) {
- if (!v.isString(keypath)) {
- return undefined;
- }
-
- var key = ""
- , i
- , escape = false;
-
- for (i = 0; i < keypath.length; ++i) {
- switch (keypath[i]) {
- case '.':
- if (escape) {
- escape = false;
- key += '.';
- } else {
- object = callback(object, key, false);
- key = "";
- }
- break;
-
- case '\\':
- if (escape) {
- escape = false;
- key += '\\';
- } else {
- escape = true;
- }
- break;
-
- default:
- escape = false;
- key += keypath[i];
- break;
- }
- }
-
- return callback(object, key, true);
- },
-
- getDeepObjectValue: function(obj, keypath) {
- if (!v.isObject(obj)) {
- return undefined;
- }
-
- return v.forEachKeyInKeypath(obj, keypath, function(obj, key) {
- if (v.isObject(obj)) {
- return obj[key];
- }
- });
- },
-
- // This returns an object with all the values of the form.
- // It uses the input name as key and the value as value
- // So for example this:
- //
- // would return:
- // {email: "foo@bar.com"}
- collectFormValues: function(form, options) {
- var values = {}
- , i
- , input
- , inputs
- , value;
-
- if (v.isJqueryElement(form)) {
- form = form[0];
- }
-
- if (!form) {
- return values;
- }
-
- options = options || {};
-
- inputs = form.querySelectorAll("input[name], textarea[name]");
- for (i = 0; i < inputs.length; ++i) {
- input = inputs.item(i);
-
- if (v.isDefined(input.getAttribute("data-ignored"))) {
- continue;
- }
-
- value = v.sanitizeFormValue(input.value, options);
- if (input.type === "number") {
- value = value ? +value : null;
- } else if (input.type === "checkbox") {
- if (input.attributes.value) {
- if (!input.checked) {
- value = values[input.name] || null;
- }
- } else {
- value = input.checked;
- }
- } else if (input.type === "radio") {
- if (!input.checked) {
- value = values[input.name] || null;
- }
- }
- values[input.name] = value;
- }
-
- inputs = form.querySelectorAll("select[name]");
- for (i = 0; i < inputs.length; ++i) {
- input = inputs.item(i);
- value = v.sanitizeFormValue(input.options[input.selectedIndex].value, options);
- values[input.name] = value;
- }
-
- return values;
- },
-
- sanitizeFormValue: function(value, options) {
- if (options.trim && v.isString(value)) {
- value = value.trim();
- }
-
- if (options.nullify !== false && value === "") {
- return null;
- }
- return value;
- },
-
- capitalize: function(str) {
- if (!v.isString(str)) {
- return str;
- }
- return str[0].toUpperCase() + str.slice(1);
- },
-
- // Remove all errors who's error attribute is empty (null or undefined)
- pruneEmptyErrors: function(errors) {
- return errors.filter(function(error) {
- return !v.isEmpty(error.error);
- });
- },
-
- // In
- // [{error: ["err1", "err2"], ...}]
- // Out
- // [{error: "err1", ...}, {error: "err2", ...}]
- //
- // All attributes in an error with multiple messages are duplicated
- // when expanding the errors.
- expandMultipleErrors: function(errors) {
- var ret = [];
- errors.forEach(function(error) {
- // Removes errors without a message
- if (v.isArray(error.error)) {
- error.error.forEach(function(msg) {
- ret.push(v.extend({}, error, {error: msg}));
- });
- } else {
- ret.push(error);
- }
- });
- return ret;
- },
-
- // Converts the error mesages by prepending the attribute name unless the
- // message is prefixed by ^
- convertErrorMessages: function(errors, options) {
- options = options || {};
-
- var ret = [];
- errors.forEach(function(errorInfo) {
- var error = v.result(errorInfo.error,
- errorInfo.value,
- errorInfo.attribute,
- errorInfo.options,
- errorInfo.attributes,
- errorInfo.globalOptions);
-
- if (!v.isString(error)) {
- ret.push(errorInfo);
- return;
- }
-
- if (error[0] === '^') {
- error = error.slice(1);
- } else if (options.fullMessages !== false) {
- error = v.capitalize(v.prettify(errorInfo.attribute)) + " " + error;
- }
- error = error.replace(/\\\^/g, "^");
- error = v.format(error, {value: v.stringifyValue(errorInfo.value)});
- ret.push(v.extend({}, errorInfo, {error: error}));
- });
- return ret;
- },
-
- // In:
- // [{attribute: "", ...}]
- // Out:
- // {"": [{attribute: "", ...}]}
- groupErrorsByAttribute: function(errors) {
- var ret = {};
- errors.forEach(function(error) {
- var list = ret[error.attribute];
- if (list) {
- list.push(error);
- } else {
- ret[error.attribute] = [error];
- }
- });
- return ret;
- },
-
- // In:
- // [{error: "", ...}, {error: "", ...}]
- // Out:
- // ["", ""]
- flattenErrorsToArray: function(errors) {
- return errors.map(function(error) { return error.error; });
- },
-
- cleanAttributes: function(attributes, whitelist) {
- function whitelistCreator(obj, key, last) {
- if (v.isObject(obj[key])) {
- return obj[key];
- }
- return (obj[key] = last ? true : {});
- }
-
- function buildObjectWhitelist(whitelist) {
- var ow = {}
- , lastObject
- , attr;
- for (attr in whitelist) {
- if (!whitelist[attr]) {
- continue;
- }
- v.forEachKeyInKeypath(ow, attr, whitelistCreator);
- }
- return ow;
- }
-
- function cleanRecursive(attributes, whitelist) {
- if (!v.isObject(attributes)) {
- return attributes;
- }
-
- var ret = v.extend({}, attributes)
- , w
- , attribute;
-
- for (attribute in attributes) {
- w = whitelist[attribute];
-
- if (v.isObject(w)) {
- ret[attribute] = cleanRecursive(ret[attribute], w);
- } else if (!w) {
- delete ret[attribute];
- }
- }
- return ret;
- }
-
- if (!v.isObject(whitelist) || !v.isObject(attributes)) {
- return {};
- }
-
- whitelist = buildObjectWhitelist(whitelist);
- return cleanRecursive(attributes, whitelist);
- },
-
- exposeModule: function(validate, root, exports, module, define) {
- if (exports) {
- if (module && module.exports) {
- exports = module.exports = validate;
- }
- exports.validate = validate;
- } else {
- root.validate = validate;
- if (validate.isFunction(define) && define.amd) {
- define([], function () { return validate; });
- }
- }
- },
-
- warn: function(msg) {
- if (typeof console !== "undefined" && console.warn) {
- console.warn("[validate.js] " + msg);
- }
- },
-
- error: function(msg) {
- if (typeof console !== "undefined" && console.error) {
- console.error("[validate.js] " + msg);
- }
- }
- });
-
- validate.validators = {
- // Presence validates that the value isn't empty
- presence: function(value, options) {
- options = v.extend({}, this.options, options);
- if (v.isEmpty(value)) {
- return options.message || this.message || "can't be blank";
- }
- },
- length: function(value, options, attribute) {
- // Empty values are allowed
- if (v.isEmpty(value)) {
- return;
- }
-
- options = v.extend({}, this.options, options);
-
- var is = options.is
- , maximum = options.maximum
- , minimum = options.minimum
- , tokenizer = options.tokenizer || function(val) { return val; }
- , err
- , errors = [];
-
- value = tokenizer(value);
- var length = value.length;
- if(!v.isNumber(length)) {
- v.error(v.format("Attribute %{attr} has a non numeric value for `length`", {attr: attribute}));
- return options.message || this.notValid || "has an incorrect length";
- }
-
- // Is checks
- if (v.isNumber(is) && length !== is) {
- err = options.wrongLength ||
- this.wrongLength ||
- "is the wrong length (should be %{count} characters)";
- errors.push(v.format(err, {count: is}));
- }
-
- if (v.isNumber(minimum) && length < minimum) {
- err = options.tooShort ||
- this.tooShort ||
- "is too short (minimum is %{count} characters)";
- errors.push(v.format(err, {count: minimum}));
- }
-
- if (v.isNumber(maximum) && length > maximum) {
- err = options.tooLong ||
- this.tooLong ||
- "is too long (maximum is %{count} characters)";
- errors.push(v.format(err, {count: maximum}));
- }
-
- if (errors.length > 0) {
- return options.message || errors;
- }
- },
- numericality: function(value, options) {
- // Empty values are fine
- if (v.isEmpty(value)) {
- return;
- }
-
- options = v.extend({}, this.options, options);
-
- var errors = []
- , name
- , count
- , checks = {
- greaterThan: function(v, c) { return v > c; },
- greaterThanOrEqualTo: function(v, c) { return v >= c; },
- equalTo: function(v, c) { return v === c; },
- lessThan: function(v, c) { return v < c; },
- lessThanOrEqualTo: function(v, c) { return v <= c; }
- };
-
- // Coerce the value to a number unless we're being strict.
- if (options.noStrings !== true && v.isString(value)) {
- value = +value;
- }
-
- // If it's not a number we shouldn't continue since it will compare it.
- if (!v.isNumber(value)) {
- return options.message || options.notValid || this.notValid || "is not a number";
- }
-
- // Same logic as above, sort of. Don't bother with comparisons if this
- // doesn't pass.
- if (options.onlyInteger && !v.isInteger(value)) {
- return options.message || options.notInteger || this.notInteger || "must be an integer";
- }
-
- for (name in checks) {
- count = options[name];
- if (v.isNumber(count) && !checks[name](value, count)) {
- // This picks the default message if specified
- // For example the greaterThan check uses the message from
- // this.notGreaterThan so we capitalize the name and prepend "not"
- var key = "not" + v.capitalize(name);
- var msg = options[key] || this[key] || "must be %{type} %{count}";
-
- errors.push(v.format(msg, {
- count: count,
- type: v.prettify(name)
- }));
- }
- }
-
- if (options.odd && value % 2 !== 1) {
- errors.push(options.notOdd || this.notOdd || "must be odd");
- }
- if (options.even && value % 2 !== 0) {
- errors.push(options.notEven || this.notEven || "must be even");
- }
-
- if (errors.length) {
- return options.message || errors;
- }
- },
- datetime: v.extend(function(value, options) {
- if (!v.isFunction(this.parse) || !v.isFunction(this.format)) {
- throw new Error("Both the parse and format functions needs to be set to use the datetime/date validator");
- }
-
- // Empty values are fine
- if (v.isEmpty(value)) {
- return;
- }
-
- options = v.extend({}, this.options, options);
-
- var err
- , errors = []
- , earliest = options.earliest ? this.parse(options.earliest, options) : NaN
- , latest = options.latest ? this.parse(options.latest, options) : NaN;
-
- value = this.parse(value, options);
-
- // 86400000 is the number of seconds in a day, this is used to remove
- // the time from the date
- if (isNaN(value) || options.dateOnly && value % 86400000 !== 0) {
- return options.message || this.notValid || "must be a valid date";
- }
-
- if (!isNaN(earliest) && value < earliest) {
- err = this.tooEarly || "must be no earlier than %{date}";
- err = v.format(err, {date: this.format(earliest, options)});
- errors.push(err);
- }
-
- if (!isNaN(latest) && value > latest) {
- err = this.tooLate || "must be no later than %{date}";
- err = v.format(err, {date: this.format(latest, options)});
- errors.push(err);
- }
-
- if (errors.length) {
- return options.message || errors;
- }
- }, {
- parse: null,
- format: null
- }),
- date: function(value, options) {
- options = v.extend({}, options, {dateOnly: true});
- return v.validators.datetime.call(v.validators.datetime, value, options);
- },
- format: function(value, options) {
- if (v.isString(options) || (options instanceof RegExp)) {
- options = {pattern: options};
- }
-
- options = v.extend({}, this.options, options);
-
- var message = options.message || this.message || "is invalid"
- , pattern = options.pattern
- , match;
-
- // Empty values are allowed
- if (v.isEmpty(value)) {
- return;
- }
- if (!v.isString(value)) {
- return message;
- }
-
- if (v.isString(pattern)) {
- pattern = new RegExp(options.pattern, options.flags);
- }
- match = pattern.exec(value);
- if (!match || match[0].length != value.length) {
- return message;
- }
- },
- inclusion: function(value, options) {
- // Empty values are fine
- if (v.isEmpty(value)) {
- return;
- }
- if (v.isArray(options)) {
- options = {within: options};
- }
- options = v.extend({}, this.options, options);
- if (v.contains(options.within, value)) {
- return;
- }
- var message = options.message ||
- this.message ||
- "^%{value} is not included in the list";
- return v.format(message, {value: value});
- },
- exclusion: function(value, options) {
- // Empty values are fine
- if (v.isEmpty(value)) {
- return;
- }
- if (v.isArray(options)) {
- options = {within: options};
- }
- options = v.extend({}, this.options, options);
- if (!v.contains(options.within, value)) {
- return;
- }
- var message = options.message || this.message || "^%{value} is restricted";
- return v.format(message, {value: value});
- },
- email: v.extend(function(value, options) {
- options = v.extend({}, this.options, options);
- var message = options.message || this.message || "is not a valid email";
- // Empty values are fine
- if (v.isEmpty(value)) {
- return;
- }
- if (!v.isString(value)) {
- return message;
- }
- if (!this.PATTERN.exec(value)) {
- return message;
- }
- }, {
- PATTERN: /^[a-z0-9\u007F-\uffff!#$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9\u007F-\uffff!#$%&'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z]{2,}$/i
- }),
- equality: function(value, options, attribute, attributes) {
- if (v.isEmpty(value)) {
- return;
- }
-
- if (v.isString(options)) {
- options = {attribute: options};
- }
- options = v.extend({}, this.options, options);
- var message = options.message ||
- this.message ||
- "is not equal to %{attribute}";
-
- if (v.isEmpty(options.attribute) || !v.isString(options.attribute)) {
- throw new Error("The attribute must be a non empty string");
- }
-
- var otherValue = v.getDeepObjectValue(attributes, options.attribute)
- , comparator = options.comparator || function(v1, v2) {
- return v1 === v2;
- };
-
- if (!comparator(value, otherValue, options, attribute, attributes)) {
- return v.format(message, {attribute: v.prettify(options.attribute)});
- }
- },
-
- // A URL validator that is used to validate URLs with the ability to
- // restrict schemes and some domains.
- url: function(value, options) {
- if (v.isEmpty(value)) {
- return;
- }
-
- options = v.extend({}, this.options, options);
-
- var message = options.message || this.message || "is not a valid url"
- , schemes = options.schemes || this.schemes || ['http', 'https']
- , allowLocal = options.allowLocal || this.allowLocal || false;
-
- if (!v.isString(value)) {
- return message;
- }
-
- // https://gist.github.com/dperini/729294
- var regex =
- "^" +
- // schemes
- "(?:(?:" + schemes.join("|") + "):\\/\\/)" +
- // credentials
- "(?:\\S+(?::\\S*)?@)?";
-
- regex += "(?:";
-
- var hostname =
- "(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)" +
- "(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*" +
- "(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))";
-
- // This ia a special case for the localhost hostname
- if (allowLocal) {
- hostname = "(?:localhost|" + hostname + ")";
- } else {
- // private & local addresses
- regex +=
- "(?!10(?:\\.\\d{1,3}){3})" +
- "(?!127(?:\\.\\d{1,3}){3})" +
- "(?!169\\.254(?:\\.\\d{1,3}){2})" +
- "(?!192\\.168(?:\\.\\d{1,3}){2})" +
- "(?!172" +
- "\\.(?:1[6-9]|2\\d|3[0-1])" +
- "(?:\\.\\d{1,3})" +
- "{2})";
- }
-
- // reserved addresses
- regex +=
- "(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])" +
- "(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}" +
- "(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))" +
- "|" +
- hostname +
- // port number
- "(?::\\d{2,5})?" +
- // path
- "(?:\\/[^\\s]*)?" +
- "$";
-
- var PATTERN = new RegExp(regex, 'i');
- if (!PATTERN.exec(value)) {
- return message;
- }
- }
- };
-
- validate.exposeModule(validate, this, exports, module, define);
-}).call(this,
- typeof exports !== 'undefined' ? /* istanbul ignore next */ exports : null,
- typeof module !== 'undefined' ? /* istanbul ignore next */ module : null,
- typeof define !== 'undefined' ? /* istanbul ignore next */ define : null);
diff --git a/Packages/validatejs/package.js b/Packages/validatejs/package.js
deleted file mode 100755
index 0aad995e5..000000000
--- a/Packages/validatejs/package.js
+++ /dev/null
@@ -1,16 +0,0 @@
-Package.describe({
- name: 'validatejs',
- summary: 'OHIF Validatejs temporary',
- version: '0.0.1'
-});
-
-Package.onUse(function(api) {
- api.versionsFrom('1.3.5.1');
-
- api.use('ecmascript');
-
- api.addFiles('lib/validate.js', 'client');
- api.addFiles('load.js', 'client');
-
- api.export('validate', 'client');
-});
\ No newline at end of file
diff --git a/StandaloneViewer/StandaloneViewer/.meteor/packages b/StandaloneViewer/StandaloneViewer/.meteor/packages
index 7109146e9..8aee66efb 100644
--- a/StandaloneViewer/StandaloneViewer/.meteor/packages
+++ b/StandaloneViewer/StandaloneViewer/.meteor/packages
@@ -27,7 +27,6 @@ ohif:cornerstone-settings
ohif:viewerbase
ohif:metadata
ohif:study-list
-ohif:dicomweb-client
ohif:measurement-table
aldeed:template-extension
diff --git a/StandaloneViewer/StandaloneViewer/.meteor/versions b/StandaloneViewer/StandaloneViewer/.meteor/versions
index cd7abe323..f5b9647da 100644
--- a/StandaloneViewer/StandaloneViewer/.meteor/versions
+++ b/StandaloneViewer/StandaloneViewer/.meteor/versions
@@ -78,8 +78,6 @@ ohif:core@0.0.1
ohif:cornerstone@0.0.1
ohif:cornerstone-settings@0.0.1
ohif:design@0.0.1
-ohif:dicom-services@0.0.1
-ohif:dicomweb-client@0.0.1
ohif:hanging-protocols@0.0.1
ohif:header@0.0.1
ohif:hotkeys@0.0.1
@@ -123,6 +121,5 @@ tracker@1.2.0
ui@1.0.13
underscore@1.0.10
url@1.2.0
-validatejs@0.0.1
webapp@1.6.2
webapp-hashing@1.0.9
diff --git a/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js
index ab8f311a9..4e0970fb5 100644
--- a/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js
+++ b/StandaloneViewer/StandaloneViewer/client/components/standaloneViewerMain/standaloneViewerMain.js
@@ -18,6 +18,9 @@ Template.standaloneViewerMain.onCreated(() => {
// Metadata configuration
const metadataProvider = OHIF.viewer.metadataProvider;
cornerstone.metaData.addProvider(metadataProvider.provider.bind(metadataProvider));
+
+ // Set the current context
+ OHIF.context.set('viewer');
});
Template.standaloneViewerMain.onRendered(() => {
@@ -58,4 +61,7 @@ Template.standaloneViewerMain.onDestroyed(() => {
// Clear references to all stacks in the StackManager
OHIF.viewerbase.stackManager.clearStacks();
+
+ // Reset the current context
+ OHIF.context.set(null);
});
diff --git a/config/orthancDICOMWeb.json b/config/orthancDICOMWeb.json
index 42ecf2060..5b899835d 100644
--- a/config/orthancDICOMWeb.json
+++ b/config/orthancDICOMWeb.json
@@ -6,7 +6,7 @@
"wadoUriRoot": "http://localhost:8042/wado",
"qidoRoot": "http://localhost:8042/dicom-web",
"wadoRoot": "http://localhost:8042/dicom-web",
- "qidoSupportsIncludeField": false,
+ "qidoSupportsIncludeField": true,
"imageRendering": "wadouri",
"thumbnailRendering": "wadouri",
"requestOptions": {