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

Applied JSCS and added JSCS/jsHint config files

Browse Source
This commit is contained in:
Erik Ziegler 2016-01-11 11:32:20 +01:00
parent a9266608d2
commit 90a16a8059
68 changed files with 24956 additions and 6399 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
.jscsrc Normal file
View File

@ -0,0 +1,38 @@
{
"requireCurlyBraces": [ "if", "else", "for", "while", "do" ],
"requireSpaceAfterKeywords": [ "if", "else", "for", "while", "do", "switch", "return" ],
"requireSpacesInFunctionExpression": {
"beforeOpeningCurlyBrace": true
},
"disallowSpacesInFunctionExpression": {
"beforeOpeningRoundBrace": true
},
"disallowKeywordsOnNewLine": ["else"],
"disallowNewlineBeforeBlockStatements": true,
"requirePaddingNewLinesAfterUseStrict": true,
"requirePaddingNewLinesInObjects": true,
"requirePaddingNewLinesAfterBlocks": {
"allExcept": ["inCallExpressions", "inArrayExpressions", "inProperties"]
},
"requireObjectKeysOnNewLine": true,
"requireSemicolons": true,
"requireSpaceAfterBinaryOperators": true,
"requireSpaceBeforeObjectValues": true,
"requireSpacesInsideObjectBrackets": "all",
"requireSpacesInsideArrayBrackets": "all",
"requireLineBreakAfterVariableAssignment": true,
"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="],
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-"],
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
"disallowKeywords": [ "with" ],
"disallowMultipleLineBreaks": true,
"disallowKeywordsOnNewLine": [ "else" ],
"requireLineFeedAtFileEnd": true,
"disallowSpaceAfterObjectKeys": true,
"disallowQuotedKeysInObjects": true,
"disallowMultipleSpaces": true,
"validateLineBreaks": "LF",
"validateIndentation": 4,
"validateQuoteMarks": { "mark": "'", "escape": true },
"validateParameterSeparator": ", "
}

114
.jshintrc Normal file
View File

@ -0,0 +1,114 @@
{
// JSHint Default Configuration File (as on JSHint website)
// See http://jshint.com/docs/ for more details
"maxerr" : 50, // {int} Maximum error before stopping
// Enforcing
"bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
"camelcase" : false, // true: Identifiers must be in camelCase
"curly" : true, // true: Require {} for every new block or scope
"eqeqeq" : true, // true: Require triple equals (===) for comparison
"forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
"freeze" : true, // true: prohibits overwriting prototypes of native objects such as Array, Date etc.
"immed" : false, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
"latedef" : false, // true: Require variables/functions to be defined before being used
"newcap" : false, // true: Require capitalization of all constructor functions e.g. `new F()`
"noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
"noempty" : true, // true: Prohibit use of empty blocks
"nonbsp" : true, // true: Prohibit "non-breaking whitespace" characters.
"nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
"plusplus" : false, // true: Prohibit use of `++` and `--`
"quotmark" : false, // Quotation mark consistency:
// false : do nothing (default)
// true : ensure whatever is used is consistent
// "single" : require single quotes
// "double" : require double quotes
"undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
"unused" : true, // Unused variables:
// true : all variables, last function parameter
// "vars" : all variables only
// "strict" : all variables, all function parameters
"strict" : true, // true: Requires all functions run in ES5 Strict Mode
"maxparams" : false, // {int} Max number of formal params allowed per function
"maxdepth" : false, // {int} Max depth of nested blocks (within functions)
"maxstatements" : false, // {int} Max number statements per function
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function
"maxlen" : false, // {int} Max number of characters per line
"varstmt" : false, // true: Disallow any var statements. Only `let` and `const` are allowed.
// Relaxing
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
"boss" : false, // true: Tolerate assignments where comparisons would be expected
"debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
"eqnull" : false, // true: Tolerate use of `== null`
"es5" : true, // true: Allow ES5 syntax (ex: getters and setters)
"esnext" : false, // true: Allow ES.next (ES6) syntax (ex: `const`)
"moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
// (ex: `for each`, multiple try/catch, function expression…)
"evil" : false, // true: Tolerate use of `eval` and `new Function()`
"expr" : false, // true: Tolerate `ExpressionStatement` as Programs
"funcscope" : false, // true: Tolerate defining variables inside control statements
"globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
"iterator" : false, // true: Tolerate using the `__iterator__` property
"lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
"laxbreak" : false, // true: Tolerate possibly unsafe line breakings
"laxcomma" : false, // true: Tolerate comma-first style coding
"loopfunc" : false, // true: Tolerate functions being defined in loops
"multistr" : false, // true: Tolerate multi-line strings
"noyield" : false, // true: Tolerate generator functions with no yield statement in them.
"notypeof" : false, // true: Tolerate invalid typeof operator values
"proto" : false, // true: Tolerate using the `__proto__` property
"scripturl" : false, // true: Tolerate script-targeted URLs
"shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
"validthis" : false, // true: Tolerate using this in a non-constructor function
// Environments
"browser" : true, // Web Browser (window, document, etc)
"browserify" : false, // Browserify (node.js code in the browser)
"couch" : false, // CouchDB
"devel" : true, // Development/debugging (alert, confirm, etc)
"dojo" : false, // Dojo Toolkit
"jasmine" : false, // Jasmine
"jquery" : true, // jQuery
"mocha" : true, // Mocha
"mootools" : false, // MooTools
"node" : false, // Node.js
"nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
"phantom" : false, // PhantomJS
"prototypejs" : false, // Prototype and Scriptaculous
"qunit" : false, // QUnit
"rhino" : false, // Rhino
"shelljs" : false, // ShellJS
"typed" : false, // Globals for typed array constructions
"worker" : false, // Web Workers
"wsh" : false, // Windows Scripting Host
"yui" : false, // Yahoo User Interface
// Custom Globals
// additional predefined global variables
"globals" : {
console: true,
prompt: true,
$: true,
Hammer: true,
cornerstone: true,
cornerstoneMath: true,
cornerstoneTools: true,
cornerstoneTools: true,
// Meteor-specific Globals
Meteor: true,
Template: true,
UI: true,
// loglevel package
log: true,
// OHIF-package specific Globals
Timepoints: true,
Measurements: true
}
}

2
LesionTracker/client/components/init.js
View File

@ -28,4 +28,4 @@ Meteor.startup(function() {
states.enable.push('scaleOverlayTool');
toolManager.setToolDefaultStates(states);
});
});

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

@ -6,7 +6,7 @@ Template.viewer.onCreated(function() {
var firstMeasurementsActivated = false;
log.info("viewer onCreated");
log.info('viewer onCreated');
OHIF = OHIF || {
viewer: {}
@ -18,7 +18,6 @@ Template.viewer.onCreated(function() {
OHIF.viewer.isPlaying = {};
var contentId = this.data.contentId;
OHIF.viewer.functionList = {
invert: function(element) {
var viewport = cornerstone.getViewport(element);
@ -36,24 +35,25 @@ Template.viewer.onCreated(function() {
} else {
cornerstoneTools.playClip(element);
}
OHIF.viewer.isPlaying[viewportIndex] = !OHIF.viewer.isPlaying[viewportIndex];
Session.set('UpdateCINE', Random.id());
},
toggleLesionTrackerTools: toggleLesionTrackerTools,
clearTools: clearTools,
lesion: function() {
toolManager.setActiveTool("lesion");
toolManager.setActiveTool('lesion');
},
nonTarget: function() {
toolManager.setActiveTool("nonTarget");
toolManager.setActiveTool('nonTarget');
}
};
// The hotkey can also be an array (e.g. ["NUMPAD0", "0"])
OHIF.viewer.defaultHotkeys.toggleLesionTrackerTools = "O";
OHIF.viewer.defaultHotkeys.lesion = "T"; // Target
OHIF.viewer.defaultHotkeys.nonTarget = "N"; // Non-target
OHIF.viewer.defaultHotkeys.toggleLesionTrackerTools = 'O';
OHIF.viewer.defaultHotkeys.lesion = 'T'; // Target
OHIF.viewer.defaultHotkeys.nonTarget = 'N'; // Non-target
if (isTouchDevice()) {
OHIF.viewer.tooltipConfig = {
@ -65,7 +65,6 @@ Template.viewer.onCreated(function() {
};
}
if (ViewerData[contentId].loadedSeriesData) {
log.info('Reloading previous loadedSeriesData');
OHIF.viewer.loadedSeriesData = ViewerData[contentId].loadedSeriesData;
@ -114,7 +113,7 @@ Template.viewer.onCreated(function() {
// If we do, stop here
if (timepoint) {
log.warn("A timepoint with that study date already exists!");
log.warn('A timepoint with that study date already exists!');
return;
}
@ -124,7 +123,7 @@ Template.viewer.onCreated(function() {
// If it relates to another subject, we need to stop here as well
// because the tab may be changing.
if (testTimepoint && testTimepoint.patientId !== study.patientId) {
log.warn("Timepoints collection related to the wrong subject");
log.warn('Timepoints collection related to the wrong subject');
return;
}
@ -149,7 +148,7 @@ Template.viewer.onCreated(function() {
// Activate first measurements in image box as default if exists
if (!firstMeasurementsActivated) {
var templateData = {
contentId: Session.get("activeContentId")
contentId: Session.get('activeContentId')
};
// Activate measurement
@ -184,7 +183,7 @@ Template.viewer.onCreated(function() {
// that were created after the current lesion by 1
Meteor.call('decrementLesionNumbers', data, function(error, response) {
if (error) {
log.warn(error)
log.warn(error);
}
// Sync database data with toolData for all the measurements
@ -214,7 +213,7 @@ Template.viewer.onCreated(function() {
}
});
OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer("CornerstoneNewImage", cornerstoneTools.updateImageSynchronizer);
OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('CornerstoneNewImage', cornerstoneTools.updateImageSynchronizer);
});
function updateRelatedElements(imageId) {
@ -311,7 +310,7 @@ Template.viewer.onRendered(function() {
});
Template.viewer.onDestroyed(function() {
log.info("onDestroyed");
log.info('onDestroyed');
// Remove the Window resize listener
$(window).off('resize', handleResize);
@ -358,4 +357,4 @@ function handleMeasurementRemoved(e, eventData) {
clearMeasurementTimepointData(measurement._id, measurementData.timepointID);
break;
}
}
}

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

@ -1,5 +1,5 @@
Template.viewerMain.helpers({
'toolbarOptions': function() {
toolbarOptions: function() {
var toolbarOptions = {};
var buttonData = [];
@ -80,4 +80,4 @@ Template.viewerMain.helpers({
toolbarOptions.includeHangingProtocolButtons = false;
return toolbarOptions;
}
});
});

6
LesionTracker/client/routeHooks.js
View File

@ -1,5 +1,5 @@
Router.onBeforeAction(function () {
Router.onBeforeAction(function() {
// User is logged in, go ahead and route them
this.next();
// User is logged in, go ahead and route them
this.next();
});

9
LesionTracker/client/routes.js
View File

@ -18,11 +18,10 @@ Router.configure({
Router.onBeforeAction('loading');
Router.route('/', function () {
Router.route('/', function() {
this.render('worklist');
});
Router.route('/viewer/:_id', {
layoutTemplate: 'layoutLesionTracker',
name: 'viewer',
@ -33,7 +32,9 @@ Router.route('/viewer/:_id', {
// Check if this study is already loaded in a tab
// If it is, stop here so we don't keep adding tabs on hot-code reloads
var tab = WorklistTabs.find({'studyInstanceUid' : studyInstanceUid}).fetch();
var tab = WorklistTabs.find({
studyInstanceUid: studyInstanceUid
}).fetch();
if (tab) {
return;
}
@ -41,4 +42,4 @@ Router.route('/viewer/:_id', {
this.render('worklist');
openNewTab(studyInstanceUid);
}
});
});

9
OHIFViewer/client/components/viewer/viewer.js
View File

@ -2,7 +2,7 @@ Template.viewer.onCreated(function() {
// Attach the Window resize listener
$(window).on('resize', handleResize);
log.info("viewer onCreated");
log.info('viewer onCreated');
OHIF = window.OHIF || {
viewer: {}
@ -35,7 +35,6 @@ Template.viewer.onCreated(function() {
}
};
if (isTouchDevice()) {
OHIF.viewer.tooltipConfig = {
trigger: 'manual'
@ -75,10 +74,10 @@ Template.viewer.onCreated(function() {
ViewerStudies.insert(study);
});
OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer("CornerstoneNewImage", cornerstoneTools.updateImageSynchronizer);
OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('CornerstoneNewImage', cornerstoneTools.updateImageSynchronizer);
});
Template.viewer.onDestroyed(function() {
log.info("onDestroyed");
log.info('onDestroyed');
OHIF.viewer.updateImageSynchronizer.destroy();
});
});

6
OHIFViewer/client/routeHooks.js
View File

@ -1,5 +1,5 @@
Router.onBeforeAction(function () {
Router.onBeforeAction(function() {
// User is logged in, go ahead and route them
this.next();
// User is logged in, go ahead and route them
this.next();
});

9
OHIFViewer/client/routes.js
View File

@ -18,11 +18,10 @@ Router.configure({
Router.onBeforeAction('loading');
Router.route('/', function () {
Router.route('/', function() {
this.render('worklist');
});
Router.route('/viewer/:_id', {
layoutTemplate: 'layout',
name: 'viewer',
@ -31,7 +30,9 @@ Router.route('/viewer/:_id', {
// Check if this study is already loaded in a tab
// If it is, stop here so we don't keep adding tabs on hot-code reloads
var tab = WorklistTabs.find({studyInstanceUid: studyInstanceUid}).fetch();
var tab = WorklistTabs.find({
studyInstanceUid: studyInstanceUid
}).fetch();
if (tab) {
return;
}
@ -39,4 +40,4 @@ Router.route('/viewer/:_id', {
this.render('worklist');
openNewTab(studyInstanceUid);
}
});
});

29
Packages/dicomweb/lib/findIndexOfString.js
View File

@ -4,46 +4,49 @@
* @returns {Uint8Array} Uint8 Array of character codes
*/
function stringToUint8Array(str) {
var uint=new Uint8Array(str.length);
for(var i=0,j=str.length;i<j;i++){
uint[i]=str.charCodeAt(i);
var uint = new Uint8Array(str.length);
for (var i = 0,j = str.length;i< j;i++){
uint[i] = str.charCodeAt(i);
}
return uint;
}
function checkToken(token, data, dataOffset) {
if(dataOffset + token.length > data.length) {
if (dataOffset + token.length > data.length) {
//console.log('dataOffset >> ', dataOffset);
return false;
}
for(var i = 0; i < token.length; i++) {
if(token[i] !== data[endIndex++]) {
if(endIndex > 520000) {
for (var i = 0; i < token.length; i++) {
if (token[i] !== data[endIndex++]) {
if (endIndex > 520000) {
console.log('token=',uint8ArrayToString(token));
console.log('data=', uint8ArrayToString(data, dataOffset, endIndex-dataOffset));
console.log('data=', uint8ArrayToString(data, dataOffset, endIndex - dataOffset));
console.log('miss at %d %s dataOffset=%d', i, String.fromCharCode(data[endIndex]), endIndex);
console.log('miss at %d %s dataOffset=%d', i, String.fromCharCode(token[endIndex]), endIndex);
}
return false;
}
}
return true;
}
findIndexOfString = function(data, str, offset) {
offset = offset || 0;
var token = stringToUint8Array(str);
for(var i=offset; i < data.length; i++) {
if(data[i] === token[0]) {
for (var i = offset; i < data.length; i++) {
if (data[i] === token[0]) {
//console.log('match @', i);
if(checkToken(token, data, i)) {
if (checkToken(token, data, i)) {
return i;
}
}
}
return -1;
};
};

5
Packages/dicomweb/lib/uint8ArrayToString.js
View File

@ -8,10 +8,11 @@
uint8ArrayToString = function(data, offset, length) {
offset = offset || 0;
length = length || data.length - offset;
var str = "";
var str = '';
for(var i=offset; i < offset + length; i++) {
for (var i = offset; i < offset + length; i++) {
str += String.fromCharCode(data[i]);
}
return str;
};

10
Packages/dicomweb/package.js
View File

@ -1,10 +1,10 @@
Package.describe({
name: "dicomweb",
summary: "DICOM Web Helper Functions",
version: '0.0.1'
name: 'dicomweb',
summary: 'DICOM Web Helper Functions',
version: '0.0.1'
});
Package.onUse(function (api) {
Package.onUse(function(api) {
api.use('http');
// DICOMWeb API functions
@ -19,6 +19,6 @@ Package.onUse(function (api) {
api.addFiles('lib/findIndexOfString.js', 'server');
api.addFiles('lib/uint8ArrayToString.js', 'server');
api.export("DICOMWeb", 'server');
api.export('DICOMWeb', 'server');
});

122
Packages/dicomweb/server/getImageFrame.js
View File

@ -1,70 +1,74 @@
function findBoundary(header) {
for(var i=0; i < header.length; i++) {
if(header[i].substr(0,2) === '--') {
return header[i];
for (var i = 0; i < header.length; i++) {
if (header[i].substr(0,2) === '--') {
return header[i];
}
}
}
return undefined;
return undefined;
}
function findContentType(header) {
for(var i=0; i < header.length; i++) {
if(header[i].substr(0,13) === 'Content-Type:') {
return header[i].substr(13).trim();
for (var i = 0; i < header.length; i++) {
if (header[i].substr(0,13) === 'Content-Type:') {
return header[i].substr(13).trim();
}
}
}
return undefined;
return undefined;
}
DICOMWeb.getImageFrame = function(uri, mediaType) {
mediaType = mediaType || 'application/octet-stream';
mediaType = mediaType || 'application/octet-stream';
return new Promise(function(resolve, reject) {
var xhr = new XMLHttpRequest();
xhr.responseType = "arraybuffer";
xhr.open("get", uri, true);
xhr.setRequestHeader('Accept', 'multipart/related;type=' + mediaType);
xhr.onreadystatechange = function (oEvent) {
// TODO: consider sending out progress messages here as we receive the pixel data
if (xhr.readyState === 4) {
if (xhr.status === 200) {
// request succeeded, Parse the multi-part mime response
var imageFrameAsArrayBuffer = xhr.response;
var response = new Uint8Array(xhr.response);
// First look for the multipart mime header
var tokenIndex = findIndexOfString(response, '\n\r\n');
if(tokenIndex === -1) {
reject('invalid response - no multipart mime header');
}
var header = uint8ArrayToString(response, 0, tokenIndex);
// Now find the boundary marker
var split = header.split('\r\n');
var boundary = findBoundary(split);
if(!boundary) {
reject('invalid response - no boundary marker');
}
var offset = tokenIndex + 4; // skip over the \n\r\n
return new Promise(function(resolve, reject) {
var xhr = new XMLHttpRequest();
xhr.responseType = 'arraybuffer';
xhr.open('get', uri, true);
xhr.setRequestHeader('Accept', 'multipart/related;type=' + mediaType);
xhr.onreadystatechange = function(oEvent) {
// TODO: consider sending out progress messages here as we receive the pixel data
if (xhr.readyState === 4) {
if (xhr.status === 200) {
// request succeeded, Parse the multi-part mime response
var imageFrameAsArrayBuffer = xhr.response;
var response = new Uint8Array(xhr.response);
// First look for the multipart mime header
var tokenIndex = findIndexOfString(response, '\n\r\n');
if (tokenIndex === -1) {
reject('invalid response - no multipart mime header');
}
// find the terminal boundary marker
var endIndex = findIndexOfString(response, boundary, offset);
if(endIndex === -1) {
reject('invalid response - terminating boundary not found');
}
// return the info for this pixel data
var length = endIndex - offset - 1;
resolve({
contentType: findContentType(split),
arrayBuffer: imageFrameAsArrayBuffer,
offset: offset,
length: length
});
}
else {
// request failed, reject the deferred
reject(xhr.response);
}
}
};
xhr.send();
});
};
var header = uint8ArrayToString(response, 0, tokenIndex);
// Now find the boundary marker
var split = header.split('\r\n');
var boundary = findBoundary(split);
if (!boundary) {
reject('invalid response - no boundary marker');
}
var offset = tokenIndex + 4; // skip over the \n\r\n
// find the terminal boundary marker
var endIndex = findIndexOfString(response, boundary, offset);
if (endIndex === -1) {
reject('invalid response - terminating boundary not found');
}
// return the info for this pixel data
var length = endIndex - offset - 1;
resolve({
contentType: findContentType(split),
arrayBuffer: imageFrameAsArrayBuffer,
offset: offset,
length: length
});
} else {
// request failed, reject the deferred
reject(xhr.response);
}
}
};
xhr.send();
});
};

44
Packages/dicomweb/server/getJSON.js
View File

@ -1,31 +1,31 @@
DICOMWeb.getJSON = function(url, options) {
var getOptions = {
headers: {
'Accept' : 'application/json'
var getOptions = {
headers: {
Accept: 'application/json'
},
};
};
if (options.auth) {
getOptions.auth = options.auth;
}
if (options.auth) {
getOptions.auth = options.auth;
}
if (options.logRequests) {
console.log(url);
}
if (options.logRequests) {
console.log(url);
}
if (options.logTiming) {
console.time(url);
}
if (options.logTiming) {
console.time(url);
}
var result = HTTP.get(url, getOptions);
var result = HTTP.get(url, getOptions);
if (options.logTiming) {
console.timeEnd(url);
}
if (options.logTiming) {
console.timeEnd(url);
}
if (options.logResponses) {
console.log(result.data);
}
if (options.logResponses) {
console.log(result.data);
}
return result;
};
return result;
};

36
Packages/dicomweb/server/getName.js
View File

@ -6,21 +6,21 @@
* @returns {*}
*/
DICOMWeb.getName = function(element, defaultValue) {
if(!element) {
return defaultValue;
}
// Value is not present if the attribute has a zero length value
if(!element.Value) {
return defaultValue;
}
// Sanity check to make sure we have at least one entry in the array.
if(!element.Value.length) {
return defaultValue;
}
// Return the Alphabetic component group
if(element.Value[0].Alphabetic) {
return element.Value[0].Alphabetic;
}
// Orthanc does not return PN properly so this is a temporary workaround
return element.Value[0];
};
if (!element) {
return defaultValue;
}
// Value is not present if the attribute has a zero length value
if (!element.Value) {
return defaultValue;
}
// Sanity check to make sure we have at least one entry in the array.
if (!element.Value.length) {
return defaultValue;
}
// Return the Alphabetic component group
if (element.Value[0].Alphabetic) {
return element.Value[0].Alphabetic;
}
// Orthanc does not return PN properly so this is a temporary workaround
return element.Value[0];
};

27
Packages/dicomweb/server/getNumber.js
View File

@ -5,16 +5,17 @@
* @returns {*}
*/
DICOMWeb.getNumber = function(element, defaultValue) {
if(!element) {
return defaultValue;
}
// Value is not present if the attribute has a zero length value
if(!element.Value) {
return defaultValue;
}
// Sanity check to make sure we have at least one entry in the array.
if(!element.Value.length) {
return defaultValue;
}
return parseFloat(element.Value[0]);
};
if (!element) {
return defaultValue;
}
// Value is not present if the attribute has a zero length value
if (!element.Value) {
return defaultValue;
}
// Sanity check to make sure we have at least one entry in the array.
if (!element.Value.length) {
return defaultValue;
}
return parseFloat(element.Value[0]);
};

30
Packages/dicomweb/server/getString.js
View File

@ -6,18 +6,18 @@
* @returns {*}
*/
DICOMWeb.getString = function(element, defaultValue) {
if(!element) {
return defaultValue;
}
// Value is not present if the attribute has a zero length value
if(!element.Value) {
return defaultValue;
}
// Sanity check to make sure we have at least one entry in the array.
if(!element.Value.length) {
return defaultValue;
}
// Join the array together separated by backslash
// NOTE: Orthanc does not correctly split values into an array so the join is a no-op
return element.Value.join('\\');
};
if (!element) {
return defaultValue;
}
// Value is not present if the attribute has a zero length value
if (!element.Value) {
return defaultValue;
}
// Sanity check to make sure we have at least one entry in the array.
if (!element.Value.length) {
return defaultValue;
}
// Join the array together separated by backslash
// NOTE: Orthanc does not correctly split values into an array so the join is a no-op
return element.Value.join('\\');
};

32
Packages/dimse-service/package.js
View File

@ -1,22 +1,22 @@
Package.describe({
name: "dimseservice",
summary: "DICOM DIMSE C-Service",
version: '0.0.1'
name: 'dimseservice',
summary: 'DICOM DIMSE C-Service',
version: '0.0.1'
});
Package.onUse(function (api) {
//api.use("weiwei:dicomservices");
Package.onUse(function(api) {
//api.use("weiwei:dicomservices");
api.addFiles('server/require.js', 'server');
api.addFiles('server/constants.js', 'server');
api.addFiles('server/elements_data.js', 'server');
api.addFiles('server/Field.js', 'server');
api.addFiles('server/RWStream.js', 'server');
api.addFiles('server/Data.js', 'server');
api.addFiles('server/Message.js', 'server');
api.addFiles('server/PDU.js', 'server');
api.addFiles('server/Connection.js', 'server');
api.addFiles('server/DIMSE.js', 'server');
api.addFiles('server/require.js', 'server');
api.addFiles('server/constants.js', 'server');
api.addFiles('server/elements_data.js', 'server');
api.addFiles('server/Field.js', 'server');
api.addFiles('server/RWStream.js', 'server');
api.addFiles('server/Data.js', 'server');
api.addFiles('server/Message.js', 'server');
api.addFiles('server/PDU.js', 'server');
api.addFiles('server/Connection.js', 'server');
api.addFiles('server/DIMSE.js', 'server');
api.export("DIMSE", 'server');
api.export('DIMSE', 'server');
});

165
Packages/dimse-service/server/Connection.js
View File

@ -5,26 +5,27 @@ function time() {
}
var DEFAULT_MAX_PACKAGE_SIZE = 32768;
var DEFAULT_SOURCE_AE = "OHIFDCM";
var DEFAULT_SOURCE_AE = 'OHIFDCM';
var Envelope = function(conn, command, dataset) {
EventEmitter.call(this);
this.command = command;
this.dataset = dataset;
this.conn = conn;
}
};
util.inherits(Envelope, EventEmitter);
Envelope.prototype.send = function() {
return this;
}
};
Connection = function(socket, options) {
EventEmitter.call(this);
this.socket = socket;
this.options = Object.assign({
hostAE: "",
sourceAE: "OHIFDCM",
hostAE: '',
sourceAE: 'OHIFDCM',
maxPackageSize: 32768,
idle: 60,
reconnect: true,
@ -56,50 +57,53 @@ Connection = function(socket, options) {
//register hooks
var o = this;
this.socket.on("data", function(data) {
this.socket.on('data', function(data) {
o.received(data);
});
this.socket.on("close", function(he) {
this.socket.on('close', function(he) {
o.closed(he);
o.emit("close", he);
o.emit('close', he);
});
this.socket.on("error", function(he) {
this.socket.on('error', function(he) {
o.error(he);
});
this.socket.on("end", function() {
this.socket.on('end', function() {
if (o.intervalId) {
clearInterval(o.intervalId);
}
if (o.server) {
console.log("Closing server");
console.log('Closing server');
o.server.close();
}
console.log('ended');
})
this.on("released", function() {
});
this.on('released', function() {
this.released();
});
this.on('aborted', function() {
this.released();
})
});
this.on('message', function(pdvs) {
this.receivedMessage(pdvs);
});
this.on("init", this.ready);
this.on('init', this.ready);
//this.pause();
if (this.options.listenHost && this.options.listenPort) {
this.server = net.createServer();
this.server.listen(this.options.listenPort, this.options.listenHost);
this.server.on('listening', function() {
console.log("listening on %j", this.address());
console.log('listening on %j', this.address());
});
this.server.on('connection', function(socket) {
});
}
this.emit("init");
}
this.emit('init');
};
util.inherits(Connection, EventEmitter);
@ -129,7 +133,7 @@ Connection.prototype.getSoureceAE = function() {
};
Connection.prototype.ready = function() {
console.log("Connection established");
console.log('Connection established');
this.connected = true;
this.started = time();
@ -158,7 +162,7 @@ Connection.prototype.process = function(data) {
//console.log("Data received");
if (this.receiving === null) {
if (this.minRecv) {
data = Buffer.concat([this.minRecv, data], this.minRecv.length + data.length);
data = Buffer.concat([ this.minRecv, data ], this.minRecv.length + data.length);
this.minRecv = null;
}
@ -182,6 +186,7 @@ Connection.prototype.process = function(data) {
process = data.slice(0, len + 6);
remaining = data.slice(len + 6, cmp + 6);
}
this.resetReceive();
this.interpret(new ReadStream(process));
if (remaining) {
@ -189,7 +194,7 @@ Connection.prototype.process = function(data) {
}
}
} else {
var newData = Buffer.concat([this.receiving, data], this.receiving.length + data.length),
var newData = Buffer.concat([ this.receiving, data ], this.receiving.length + data.length),
pduLength = newData.length - 6;
if (pduLength < this.receiveLength) {
@ -200,6 +205,7 @@ Connection.prototype.process = function(data) {
remaining = newData.slice(this.receiveLength + 6, pduLength + 6);
newData = newData.slice(0, this.receiveLength + 6);
}
this.resetReceive();
this.interpret(new ReadStream(newData));
if (remaining) {
@ -207,6 +213,7 @@ Connection.prototype.process = function(data) {
}
}
}
return null;
};
@ -221,8 +228,9 @@ Connection.prototype.interpret = function(stream) {
pdu.presentationContextItems.forEach(function(ctx) {
var requested = o.getContext(ctx.presentationContextID);
if (!requested) {
throw "Accepted presentation context not found";
throw 'Accepted presentation context not found';
}
o.negotiatedContexts[ctx.presentationContextID] = {
id: ctx.presentationContextID,
transferSyntax: ctx.transferSyntaxesItems[0].transferSyntaxName,
@ -270,11 +278,13 @@ Connection.prototype.interpret = function(stream) {
break;
}
}
if (pdvs[i].isLast) {
this.emit('message', pdvs[i]);
} else {
this.pendingPDVs = [pdvs[i]];
this.pendingPDVs = [ pdvs[i] ];
}
i = j;
} else {
this.emit('message', pdvs[i++]);
@ -287,17 +297,17 @@ Connection.prototype.interpret = function(stream) {
Connection.prototype.newMessageId = function() {
return (++this.messageIdCounter) % 255;
}
};
Connection.prototype.closed = function(had_error) {
this.connected = false;
console.log("Connection closed", had_error);
console.log('Connection closed', had_error);
//this.destroy();
}
};
Connection.prototype.error = function(err) {
console.log("Error: ", err);
}
console.log('Error: ', err);
};
Connection.prototype.send = function(pdu, afterCbk) {
//console.log('SEND PDU-TYPE: ', pdu.type);
@ -306,13 +316,13 @@ Connection.prototype.send = function(pdu, afterCbk) {
this.socket.write(toSend, afterCbk ? afterCbk : function() {
//console.log('Data written');
});
}
};
Connection.prototype.getSyntax = function(contextId) {
if (!this.negotiatedContexts[contextId]) return null;
return this.negotiatedContexts[contextId].transferSyntax;
}
};
Connection.prototype.getContextByUID = function(uid) {
for (var k in this.negotiatedContexts) {
@ -321,22 +331,24 @@ Connection.prototype.getContextByUID = function(uid) {
return ctx;
}
}
return null;
}
};
Connection.prototype.getContextId = function(contextId) {
if (!this.negotiatedContexts[contextId]) return null;
return this.negotiatedContexts[contextId].id;
}
};
Connection.prototype.getContext = function(id) {
for (var k in this.presentationContexts) {
var ctx = this.presentationContexts[k];
if (id == ctx.id) return ctx;
}
return null;
}
};
Connection.prototype.setPresentationContexts = function(uids) {
var contexts = [],
@ -345,29 +357,29 @@ Connection.prototype.setPresentationContexts = function(uids) {
contexts.push({
id: ++id,
abstractSyntax: uid,
transferSyntaxes: [C.IMPLICIT_LITTLE_ENDIAN, C.EXPLICIT_LITTLE_ENDIAN, C.EXPLICIT_BIG_ENDIAN]
transferSyntaxes: [ C.IMPLICIT_LITTLE_ENDIAN, C.EXPLICIT_LITTLE_ENDIAN, C.EXPLICIT_BIG_ENDIAN ]
});
});
this.presentationContexts = contexts;
}
};
Connection.prototype.verify = function() {
this.setPresentationContexts([C.SOP_VERIFICATION]);
this.setPresentationContexts([ C.SOP_VERIFICATION ]);
this.startAssociationRequest(function() {
//associated, we can release now
this.release();
});
}
};
Connection.prototype.release = function() {
var releaseRQ = new ReleaseRQ();
this.send(releaseRQ);
}
};
Connection.prototype.addService = function(service) {
service.setConnection(this);
this.services.push(service);
}
};
Connection.prototype.receivedMessage = function(pdv) {
var syntax = this.getSyntax(pdv.contextId),
@ -380,9 +392,11 @@ Connection.prototype.receivedMessage = function(pdv) {
if (msg.is(C.COMMAND_C_GET_RSP) || msg.is(C.COMMAND_C_MOVE_RSP)) {
//console.log('remaining', msg.getNumOfRemainingSubOperations(), msg.getNumOfCompletedSubOperations());
}
if (msg.failure()) {
//console.log("message failed with status ", msg.getStatus().toString(16));
}
if (msg.isFinal()) {
var replyId = msg.respondedTo();
if (this.messages[replyId].listener) {
@ -408,7 +422,7 @@ Connection.prototype.receivedMessage = function(pdv) {
} else {
if (!this.lastCommand) {
throw "Only dataset?";
throw 'Only dataset?';
} else if (!this.lastCommand.haveData()) {
throw "Last command didn't indicate presence of data";
}
@ -418,7 +432,7 @@ Connection.prototype.receivedMessage = function(pdv) {
if (this.messages[replyId].listener) {
var flag = this.lastCommand.failure() ? true : false;
this.messages[replyId].listener.emit("result", msg, flag);
this.messages[replyId].listener.emit('result', msg, flag);
if (this.lastCommand.failure()) {
delete this.messages[replyId];
@ -434,14 +448,14 @@ Connection.prototype.receivedMessage = function(pdv) {
if (this.lastGets.length > 0) {
useId = this.lastGets[0];
} else {
throw "Where does this c-store came from?";
throw 'Where does this c-store came from?';
}
} else console.log('move ', moveMessageId);
//this.storeResponse(useId, msg);
}
}
}
}
};
Connection.prototype.storeResponse = function(messageId, msg) {
var rq = this.messages[messageId];
@ -456,10 +470,10 @@ Connection.prototype.storeResponse = function(messageId, msg) {
replyMessage.setReplyMessageId(this.lastCommand.messageId);
this.sendMessage(replyMessage, null, null, storeSr);
} else {
throw "Missing store status";
throw 'Missing store status';
}
}
}
};
Connection.prototype.sendMessage = function(context, command, dataset, listener) {
var nContext = this.getContextByUID(context),
@ -489,8 +503,9 @@ Connection.prototype.sendMessage = function(context, command, dataset, listener)
if (command.is(C.COMMAND_C_GET_RQ)) {
this.lastGets.push(messageId);
}
pdv.setMessage(command);
pdata.setPresentationDataValueItems([pdv]);
pdata.setPresentationDataValueItems([ pdv ]);
msgData.command = command;
this.messages[messageId] = msgData;
@ -507,9 +522,10 @@ Connection.prototype.sendMessage = function(context, command, dataset, listener)
dPdv = new PresentationDataValueItem(cid);
dPdv.setMessage(dataset);
dsData.setPresentationDataValueItems([dPdv]);
dsData.setPresentationDataValueItems([ dPdv ]);
this.send(dsData);
}
return msgData.listener;
};
@ -517,6 +533,7 @@ Connection.prototype.associate = function(options, callback) {
if (callback) {
this.once('associated', callback);
}
if (this.associated) {
this.emit('associated');
return;
@ -525,7 +542,7 @@ Connection.prototype.associate = function(options, callback) {
if (options.contexts) {
this.setPresentationContexts(options.contexts);
} else {
throw "No services attached";
throw 'No services attached';
}
var associateRQ = new AssociateRQ();
@ -534,7 +551,7 @@ Connection.prototype.associate = function(options, callback) {
associateRQ.setCallingAETitle(sourceAE);
associateRQ.setApplicationContextItem(new ApplicationContextItem());
var contextItems = []
var contextItems = [];
this.presentationContexts.forEach(function(context) {
var contextItem = new PresentationContextItem(),
syntaxes = [];
@ -563,12 +580,12 @@ Connection.prototype.associate = function(options, callback) {
maxLengthItem.setMaximumLengthReceived(packageSize);
var userInfo = new UserInformationItem();
userInfo.setUserDataItems([maxLengthItem, classUIDItem, versionItem]);
userInfo.setUserDataItems([ maxLengthItem, classUIDItem, versionItem ]);
associateRQ.setUserInformationItem(userInfo);
this.send(associateRQ);
}
};
Connection.prototype.wrapMessage = function(data) {
if (data) {
@ -576,60 +593,60 @@ Connection.prototype.wrapMessage = function(data) {
datasetMessage.setElements(data);
return datasetMessage;
} else return data;
}
};
Connection.prototype.setFindContext = function(ctx) {
this.findContext = ctx;
}
};
Connection.prototype.find = function(params, callback) {
return this.sendMessage(this.findContext, new CFindRQ(), this.wrapMessage(params), callback);
}
};
Connection.prototype.findPatients = function(params, callback) {
var sendParams = Object.assign({
0x00080052: C.QUERY_RETRIEVE_LEVEL_PATIENT,
0x00100010: "",
0x00100020: "",
0x00100030: "",
0x00100040: "",
0x00100010: '',
0x00100020: '',
0x00100030: '',
0x00100040: '',
}, params);
return this.find(sendParams, callback);
}
};
Connection.prototype.findStudies = function(params, callback) {
var sendParams = Object.assign({
0x00080052: C.QUERY_RETRIEVE_LEVEL_STUDY,
0x00080020: "",
0x00100010: "",
0x00080061: "",
0x0020000D: ""
0x00080020: '',
0x00100010: '',
0x00080061: '',
0x0020000D: ''
}, params);
return this.find(sendParams, callback);
}
};
Connection.prototype.findSeries = function(params, callback) {
var sendParams = Object.assign({
0x00080052: C.QUERY_RETRIEVE_LEVEL_SERIES,
0x00080020: "",
0x0020000E: "",
0x0008103E: "",
0x0020000D: ""
0x00080020: '',
0x0020000E: '',
0x0008103E: '',
0x0020000D: ''
}, params);
return this.find(sendParams, callback);
}
};
Connection.prototype.findInstances = function(params, callback) {
var sendParams = Object.assign({
0x00080052: C.QUERY_RETRIEVE_LEVEL_IMAGE,
0x00080020: "",
0x0020000E: "",
0x0008103E: "",
0x0020000D: ""
0x00080020: '',
0x0020000E: '',
0x0008103E: '',
0x0020000D: ''
}, params);
return this.find(sendParams, callback);
}
};

100
Packages/dimse-service/server/DIMSE.js
View File

@ -34,14 +34,14 @@ DIMSE.associate = function(contexts, callback) {
DIMSE.retrievePatients = function(params) {
//var start = new Date();
var future = new Future;
DIMSE.associate([C.SOP_PATIENT_ROOT_FIND], function(pdu) {
DIMSE.associate([ C.SOP_PATIENT_ROOT_FIND ], function(pdu) {
var defaultParams = {
0x00100010: "",
0x00100020: "",
0x00100030: "",
0x00100040: "",
0x00101010: "",
0x00101040: ""
0x00100010: '',
0x00100020: '',
0x00100030: '',
0x00100040: '',
0x00101010: '',
0x00101040: ''
};
this.setFindContext(C.SOP_PATIENT_ROOT_FIND);
@ -68,18 +68,18 @@ DIMSE.retrievePatients = function(params) {
DIMSE.retrieveStudies = function(params) {
//var start = new Date();
var future = new Future;
DIMSE.associate([C.SOP_STUDY_ROOT_FIND], function(pdu) {
DIMSE.associate([ C.SOP_STUDY_ROOT_FIND ], function(pdu) {
var defaultParams = {
0x0020000D: "",
0x00080060: "",
0x00080005: "",
0x00080020: "",
0x00080030: "",
0x00080090: "",
0x00100010: "",
0x00100020: "",
0x00200010: "",
0x00100030: ""
0x0020000D: '',
0x00080060: '',
0x00080005: '',
0x00080020: '',
0x00080030: '',
0x00080090: '',
0x00100010: '',
0x00100020: '',
0x00200010: '',
0x00100030: ''
};
this.setFindContext(C.SOP_STUDY_ROOT_FIND);
@ -105,19 +105,19 @@ DIMSE.retrieveStudies = function(params) {
DIMSE.retrieveSeries = function(studyInstanceUID, params) {
var future = new Future;
DIMSE.associate([C.SOP_STUDY_ROOT_FIND], function(pdu) {
DIMSE.associate([ C.SOP_STUDY_ROOT_FIND ], function(pdu) {
var defaultParams = {
0x0020000D: studyInstanceUID ? studyInstanceUID : "",
0x00080005: "",
0x00080020: "",
0x00080030: "",
0x00080090: "",
0x00100010: "",
0x00100020: "",
0x00200010: "",
0x0008103E: "",
0x0020000E: "",
0x00200011: ""
0x0020000D: studyInstanceUID ? studyInstanceUID : '',
0x00080005: '',
0x00080020: '',
0x00080030: '',
0x00080090: '',
0x00100010: '',
0x00100020: '',
0x00200010: '',
0x0008103E: '',
0x0020000E: '',
0x00200011: ''
};
this.setFindContext(C.SOP_STUDY_ROOT_FIND);
@ -142,26 +142,26 @@ DIMSE.retrieveSeries = function(studyInstanceUID, params) {
DIMSE.retrieveInstances = function(studyInstanceUID, seriesInstanceUID, params) {
var future = new Future;
DIMSE.associate([C.SOP_STUDY_ROOT_FIND], function(pdu) {
DIMSE.associate([ C.SOP_STUDY_ROOT_FIND ], function(pdu) {
var defaultParams = {
0x0020000D: studyInstanceUID ? studyInstanceUID : "",
0x0020000E: (studyInstanceUID && seriesInstanceUID) ? seriesInstanceUID : "",
0x00080005: "",
0x00080020: "",
0x00080030: "",
0x00080090: "",
0x00100010: "",
0x00100020: "",
0x00200010: "",
0x0008103E: "",
0x00200011: "",
0x00080016: "",
0x00080018: "",
0x00200013: "",
0x00280010: "",
0x00280011: "",
0x00280100: "",
0x00280103: ""
0x0020000D: studyInstanceUID ? studyInstanceUID : '',
0x0020000E: (studyInstanceUID && seriesInstanceUID) ? seriesInstanceUID : '',
0x00080005: '',
0x00080020: '',
0x00080030: '',
0x00080090: '',
0x00100010: '',
0x00100020: '',
0x00200010: '',
0x0008103E: '',
0x00200011: '',
0x00080016: '',
0x00080018: '',
0x00200013: '',
0x00280010: '',
0x00280011: '',
0x00280100: '',
0x00280103: ''
};
this.setFindContext(C.SOP_STUDY_ROOT_FIND);
@ -182,4 +182,4 @@ DIMSE.retrieveInstances = function(studyInstanceUID, seriesInstanceUID, params)
});
});
return future.wait();
};
};

1223
Packages/dimse-service/server/Data.js
View File

File diff suppressed because it is too large Load Diff

141
Packages/dimse-service/server/Field.js
View File

@ -1,128 +1,141 @@
Field = function(type, value) {
this.type = type;
this.value = value;
this.type = type;
this.value = value;
};
Field.prototype.length = function() {
return calcLength(this.type, this.value);
}
return calcLength(this.type, this.value);
};
Field.prototype.write = function(stream) {
stream.write(this.type, this.value);
}
stream.write(this.type, this.value);
};
Field.prototype.isNumeric = function() {
return false;
}
return false;
};
StringField = function(str) {
Field.call(this, C.TYPE_ASCII, typeof str == 'string' ? str : "");
}
Field.call(this, C.TYPE_ASCII, typeof str == 'string' ? str : '');
};
util.inherits(StringField, Field);
FilledField = function(value, length) {
Field.call(this, C.TYPE_COMPOSITE, value);
this.fillLength = length;
}
Field.call(this, C.TYPE_COMPOSITE, value);
this.fillLength = length;
};
util.inherits(FilledField, Field);
FilledField.prototype.length = function() {
return this.fillLength;
}
return this.fillLength;
};
FilledField.prototype.write = function(stream) {
var len = this.value.length;
if (len < this.fillLength && len >= 0) {
if (len > 0)
stream.write(C.TYPE_ASCII, this.value);
var zeroLength = this.fillLength - len;
stream.write(C.TYPE_HEX, "20".repeat(zeroLength));
} else if (len == this.fillLength) {
stream.write(C.TYPE_ASCII, this.value);
} else {
throw "Length mismatch";
}
}
var len = this.value.length;
if (len < this.fillLength && len >= 0) {
if (len > 0)
stream.write(C.TYPE_ASCII, this.value);
var zeroLength = this.fillLength - len;
stream.write(C.TYPE_HEX, '20'.repeat(zeroLength));
} else if (len == this.fillLength) {
stream.write(C.TYPE_ASCII, this.value);
} else {
throw 'Length mismatch';
}
};
HexField = function(hex) {
Field.call(this, C.TYPE_HEX, hex);
}
Field.call(this, C.TYPE_HEX, hex);
};
util.inherits(HexField, Field);
ReservedField = function(length) {
length = length || 1;
Field.call(this, C.TYPE_HEX, "00".repeat(length));
}
length = length || 1;
Field.call(this, C.TYPE_HEX, '00'.repeat(length));
};
util.inherits(ReservedField, Field);
UInt8Field = function(value) {
Field.call(this, C.TYPE_UINT8, value);
}
Field.call(this, C.TYPE_UINT8, value);
};
util.inherits(UInt8Field, Field);
UInt8Field.prototype.isNumeric = function() {
return true;
}
return true;
};
UInt16Field = function(value) {
Field.call(this, C.TYPE_UINT16, value);
}
Field.call(this, C.TYPE_UINT16, value);
};
util.inherits(UInt16Field, Field);
UInt16Field.prototype.isNumeric = function() {
return true;
}
return true;
};
UInt32Field = function(value) {
Field.call(this, C.TYPE_UINT32, value);
}
Field.call(this, C.TYPE_UINT32, value);
};
util.inherits(UInt32Field, Field);
UInt32Field.prototype.isNumeric = function() {
return true;
}
return true;
};
Int8Field = function(value) {
Field.call(this, C.TYPE_INT8, value);
}
Field.call(this, C.TYPE_INT8, value);
};
util.inherits(Int8Field, Field);
Int8Field.prototype.isNumeric = function() {
return true;
}
return true;
};
Int16Field = function(value) {
Field.call(this, C.TYPE_INT16, value);
}
Field.call(this, C.TYPE_INT16, value);
};
util.inherits(Int16Field, Field);
Int16Field.prototype.isNumeric = function() {
return true;
}
return true;
};
Int32Field = function(value) {
Field.call(this, C.TYPE_INT32, value);
}
Field.call(this, C.TYPE_INT32, value);
};
util.inherits(Int32Field, Field);
Int32Field.prototype.isNumeric = function() {
return true;
}
return true;
};
FloatField = function(value) {
Field.call(this, C.TYPE_FLOAT, value);
}
Field.call(this, C.TYPE_FLOAT, value);
};
util.inherits(FloatField, Field);
FloatField.prototype.isNumeric = function() {
return true;
}
return true;
};
DoubleField = function(value) {
Field.call(this, C.TYPE_DOUBLE, value);
}
Field.call(this, C.TYPE_DOUBLE, value);
};
util.inherits(DoubleField, Field);
DoubleField.prototype.isNumeric = function() {
return true;
}
return true;
};

567
Packages/dimse-service/server/Message.js
View File

@ -1,444 +1,463 @@
DicomMessage = function(syntax) {
this.syntax = syntax ? syntax : null;
this.type = C.DATA_TYPE_COMMAND;
this.messageId = C.DEFAULT_MESSAGE_ID;
this.elementPairs = {};
this.syntax = syntax ? syntax : null;
this.type = C.DATA_TYPE_COMMAND;
this.messageId = C.DEFAULT_MESSAGE_ID;
this.elementPairs = {};
};
DicomMessage.prototype.isCommand = function() {
return this.type == C.DATA_TYPE_COMMAND;
}
return this.type == C.DATA_TYPE_COMMAND;
};
DicomMessage.prototype.setSyntax = function(syntax) {
this.syntax = syntax;
this.syntax = syntax;
for (var tag in this.elementPairs) {
this.elementPairs[tag].setSyntax(this.syntax);
}
}
for (var tag in this.elementPairs) {
this.elementPairs[tag].setSyntax(this.syntax);
}
};
DicomMessage.prototype.setMessageId = function(id) {
this.messageId = id;
}
this.messageId = id;
};
DicomMessage.prototype.setReplyMessageId = function(id) {
this.replyMessageId = id;
}
this.replyMessageId = id;
};
DicomMessage.prototype.command = function(cmds) {
cmds.unshift(this.newElement(0x00000800, this.dataSetPresent ? C.DATA_SET_PRESENT : C.DATE_SET_ABSENCE));
cmds.unshift(this.newElement(0x00000700, this.priority));
cmds.unshift(this.newElement(0x00000110, this.messageId));
cmds.unshift(this.newElement(0x00000100, this.commandType));
cmds.unshift(this.newElement(0x00000002, this.contextUID));
cmds.unshift(this.newElement(0x00000800, this.dataSetPresent ? C.DATA_SET_PRESENT : C.DATE_SET_ABSENCE));
cmds.unshift(this.newElement(0x00000700, this.priority));
cmds.unshift(this.newElement(0x00000110, this.messageId));
cmds.unshift(this.newElement(0x00000100, this.commandType));
cmds.unshift(this.newElement(0x00000002, this.contextUID));
var length = 0;
cmds.forEach(function(cmd) {
length += cmd.length(cmd.getFields());
});
var length = 0;
cmds.forEach(function(cmd) {
length += cmd.length(cmd.getFields());
});
cmds.unshift(this.newElement(0x00000000, length));
return cmds;
}
cmds.unshift(this.newElement(0x00000000, length));
return cmds;
};
DicomMessage.prototype.response = function(cmds) {
cmds.unshift(this.newElement(0x00000800, this.dataSetPresent ? C.DATA_SET_PRESENT : C.DATE_SET_ABSENCE));
cmds.unshift(this.newElement(0x00000120, this.replyMessageId));
cmds.unshift(this.newElement(0x00000100, this.commandType));
cmds.unshift(this.newElement(0x00000002, this.contextUID));
cmds.unshift(this.newElement(0x00000800, this.dataSetPresent ? C.DATA_SET_PRESENT : C.DATE_SET_ABSENCE));
cmds.unshift(this.newElement(0x00000120, this.replyMessageId));
cmds.unshift(this.newElement(0x00000100, this.commandType));
cmds.unshift(this.newElement(0x00000002, this.contextUID));
var length = 0;
cmds.forEach(function(cmd) {
length += cmd.length(cmd.getFields());
});
var length = 0;
cmds.forEach(function(cmd) {
length += cmd.length(cmd.getFields());
});
cmds.unshift(this.newElement(0x00000000, length));
return cmds;
}
cmds.unshift(this.newElement(0x00000000, length));
return cmds;
};
DicomMessage.prototype.setElements = function(pairs) {
var p = {};
for (var tag in pairs) {
p[tag] = this.newElement(tag, pairs[tag]);
}
this.elementPairs = p;
}
var p = {};
for (var tag in pairs) {
p[tag] = this.newElement(tag, pairs[tag]);
}
this.elementPairs = p;
};
DicomMessage.prototype.newElement = function(tag, value) {
return elementByType(tag, value, this.syntax);
}
return elementByType(tag, value, this.syntax);
};
DicomMessage.prototype.setElement = function(key, value) {
this.elementPairs[key] = elementByType(key, value);
}
this.elementPairs[key] = elementByType(key, value);
};
DicomMessage.prototype.setElementPairs = function(pairs) {
this.elementPairs = pairs;
}
this.elementPairs = pairs;
};
DicomMessage.prototype.setContextId = function(context) {
this.contextUID = context;
}
this.contextUID = context;
};
DicomMessage.prototype.setPriority = function(pri) {
this.priority = pri;
}
this.priority = pri;
};
DicomMessage.prototype.setType = function(type) {
this.type = type;
}
this.type = type;
};
DicomMessage.prototype.setDataSetPresent = function(present) {
this.dataSetPresent = present == 0x0101 ? false : true;
}
this.dataSetPresent = present == 0x0101 ? false : true;
};
DicomMessage.prototype.haveData = function() {
return this.dataSetPresent;
}
return this.dataSetPresent;
};
DicomMessage.prototype.tags = function() {
return Object.keys(this.elementPairs);
}
return Object.keys(this.elementPairs);
};
DicomMessage.prototype.key = function(tag) {
return elementKeywordByTag(tag);
}
return elementKeywordByTag(tag);
};
DicomMessage.prototype.getValue = function(tag) {
return this.elementPairs[tag] ? this.elementPairs[tag].getValue() : null;
}
return this.elementPairs[tag] ? this.elementPairs[tag].getValue() : null;
};
DicomMessage.prototype.affectedSOPClassUID = function() {
return this.getValue(0x00000002);
}
return this.getValue(0x00000002);
};
DicomMessage.prototype.getMessageId = function() {
return this.getValue(0x00000110);
}
return this.getValue(0x00000110);
};
DicomMessage.prototype.getFields = function() {
var eles = [];
for (var tag in this.elementPairs) {
eles.push(this.elementPairs[tag]);
}
return eles;
}
var eles = [];
for (var tag in this.elementPairs) {
eles.push(this.elementPairs[tag]);
}
return eles;
};
DicomMessage.prototype.length = function(elems) {
var len = 0;
elems.forEach(function(elem){
len += elem.length(elem.getFields());
});
return len;
}
var len = 0;
elems.forEach(function(elem) {
len += elem.length(elem.getFields());
});
return len;
};
DicomMessage.prototype.isResponse = function() {
return false;
}
return false;
};
DicomMessage.prototype.is = function(type) {
return this.commandType == type;
}
return this.commandType == type;
};
DicomMessage.prototype.write = function(stream) {
var fields = this.getFields(), o = this;
fields.forEach(function(field){
field.setSyntax(o.syntax);
field.write(stream);
});
}
var fields = this.getFields(), o = this;
fields.forEach(function(field) {
field.setSyntax(o.syntax);
field.write(stream);
});
};
DicomMessage.prototype.printElements = function(pairs, indent) {
var typeName = "";
for (var tag in pairs) {
var value = pairs[tag].getValue();
typeName += (" ".repeat(indent)) + this.key(tag) + " : ";
if (value instanceof Array) {
var o = this;
value.forEach(function(p) {
if (typeof p == "object") {
typeName += "[\n" + o.printElements(p, indent + 2) + (" ".repeat(indent)) + "]";
var typeName = '';
for (var tag in pairs) {
var value = pairs[tag].getValue();
typeName += (' '.repeat(indent)) + this.key(tag) + ' : ';
if (value instanceof Array) {
var o = this;
value.forEach(function(p) {
if (typeof p == 'object') {
typeName += '[\n' + o.printElements(p, indent + 2) + (' '.repeat(indent)) + ']';
} else {
typeName += '[' + p + ']';
}
});
if (typeName[typeName.length - 1] != '\n') {
typeName += '\n';
}
} else {
typeName += "[" + p + "]";
typeName += value + '\n';
}
});
if (typeName[typeName.length-1] != "\n") {
typeName += "\n";
}
} else {
typeName += value + "\n";
}
}
return typeName;
}
return typeName;
};
DicomMessage.prototype.toString = function() {
var typeName = "";
if (!this.isCommand()) {
typeName = "DateSet Message";
} else {
switch (this.commandType) {
case C.COMMAND_C_GET_RSP : typeName = "C-GET-RSP"; break;
case C.COMMAND_C_MOVE_RSP : typeName = "C-MOVE-RSP"; break;
case C.COMMAND_C_GET_RQ : typeName = "C-GET-RQ"; break;
case C.COMMAND_C_STORE_RQ : typeName = "C-STORE-RQ"; break;
case C.COMMAND_C_FIND_RSP : typeName = "C-FIND-RSP"; break;
case C.COMMAND_C_MOVE_RQ : typeName = "C-MOVE-RQ"; break;
case C.COMMAND_C_FIND_RQ : typeName = "C-FIND-RQ"; break;
case C.COMMAND_C_STORE_RSP : typeName = "C-STORE-RSP"; break;
}
}
typeName += " [\n";
typeName += this.printElements(this.elementPairs, 0);
typeName += "]";
return typeName;
}
var typeName = '';
if (!this.isCommand()) {
typeName = 'DateSet Message';
} else {
switch (this.commandType) {
case C.COMMAND_C_GET_RSP : typeName = 'C-GET-RSP'; break;
case C.COMMAND_C_MOVE_RSP : typeName = 'C-MOVE-RSP'; break;
case C.COMMAND_C_GET_RQ : typeName = 'C-GET-RQ'; break;
case C.COMMAND_C_STORE_RQ : typeName = 'C-STORE-RQ'; break;
case C.COMMAND_C_FIND_RSP : typeName = 'C-FIND-RSP'; break;
case C.COMMAND_C_MOVE_RQ : typeName = 'C-MOVE-RQ'; break;
case C.COMMAND_C_FIND_RQ : typeName = 'C-FIND-RQ'; break;
case C.COMMAND_C_STORE_RSP : typeName = 'C-STORE-RSP'; break;
}
}
typeName += ' [\n';
typeName += this.printElements(this.elementPairs, 0);
typeName += ']';
return typeName;
};
DicomMessage.prototype.walkObject = function(pairs) {
var obj = {}, o = this;
for (var tag in pairs) {
var v = pairs[tag].getValue(), u = v;
if (v instanceof Array) {
u = [];
v.forEach(function(a) {
if (typeof a == 'object') {
u.push(o.walkObject(a));
} else u.push(a);
});
}
obj[tag] = u;
}
var obj = {}, o = this;
for (var tag in pairs) {
var v = pairs[tag].getValue(), u = v;
if (v instanceof Array) {
u = [];
v.forEach(function(a) {
if (typeof a == 'object') {
u.push(o.walkObject(a));
} else u.push(a);
});
}
return obj;
}
obj[tag] = u;
}
return obj;
};
DicomMessage.prototype.toObject = function() {
return this.walkObject(this.elementPairs);
}
return this.walkObject(this.elementPairs);
};
readMessage = function(stream, type, syntax, options) {
var elements = [], pairs = {}, useSyntax = type == C.DATA_TYPE_COMMAND ? C.IMPLICIT_LITTLE_ENDIAN : syntax;
stream.reset();
while (!stream.end()) {
var elem = new DataElement();
if (options) {
elem.setOptions(options);
}
elem.setSyntax(useSyntax);
elem.readBytes(stream);//return;
pairs[elem.tag.value] = elem;
}
var elements = [], pairs = {}, useSyntax = type == C.DATA_TYPE_COMMAND ? C.IMPLICIT_LITTLE_ENDIAN : syntax;
stream.reset();
while (!stream.end()) {
var elem = new DataElement();
if (options) {
elem.setOptions(options);
}
var message = null;
if (type == C.DATA_TYPE_COMMAND) {
var cmdType = pairs[0x00000100].value;
switch (cmdType) {
case 0x8020 : message = new CFindRSP(useSyntax); break;
case 0x8021 : message = new CMoveRSP(useSyntax); break;
case 0x8010 : message = new CGetRSP(useSyntax); break;
case 0x0001 : message = new CStoreRQ(useSyntax); break;
case 0x0020 : message = new CFindRQ(useSyntax); break;
default : throw "Unrecognized command type " + cmdType.toString(16); break;
elem.setSyntax(useSyntax);
elem.readBytes(stream);//return;
pairs[elem.tag.value] = elem;
}
message.setElementPairs(pairs);
message.setDataSetPresent(message.getValue(0x00000800));
message.setContextId(message.getValue(0x00000002));
if (!message.isResponse()) {
message.setMessageId(message.getValue(0x00000110));
var message = null;
if (type == C.DATA_TYPE_COMMAND) {
var cmdType = pairs[0x00000100].value;
switch (cmdType) {
case 0x8020 : message = new CFindRSP(useSyntax); break;
case 0x8021 : message = new CMoveRSP(useSyntax); break;
case 0x8010 : message = new CGetRSP(useSyntax); break;
case 0x0001 : message = new CStoreRQ(useSyntax); break;
case 0x0020 : message = new CFindRQ(useSyntax); break;
default : throw 'Unrecognized command type ' + cmdType.toString(16); break;
}
message.setElementPairs(pairs);
message.setDataSetPresent(message.getValue(0x00000800));
message.setContextId(message.getValue(0x00000002));
if (!message.isResponse()) {
message.setMessageId(message.getValue(0x00000110));
} else {
message.setReplyMessageId(message.getValue(0x00000120));
}
} else if (type == C.DATA_TYPE_DATA) {
message = new DataSetMessage(useSyntax);
message.setElementPairs(pairs);
} else {
message.setReplyMessageId(message.getValue(0x00000120));
throw 'Unrecognized message type';
}
} else if (type == C.DATA_TYPE_DATA) {
message = new DataSetMessage(useSyntax);
message.setElementPairs(pairs);
} else {
throw "Unrecognized message type";
}
return message;
}
DataSetMessage = function(syntax){
DicomMessage.call(this, syntax);
this.type = C.DATA_TYPE_DATA;
return message;
};
DataSetMessage = function(syntax) {
DicomMessage.call(this, syntax);
this.type = C.DATA_TYPE_DATA;
};
util.inherits(DataSetMessage, DicomMessage);
DataSetMessage.prototype.is = function(type) {
return false;
}
return false;
};
CommandMessage = function(syntax) {
DicomMessage.call(this, syntax);
this.type = C.DATA_TYPE_COMMAND;
this.priority = C.PRIORITY_MEDIUM;
this.dataSetPresent = true;
}
DicomMessage.call(this, syntax);
this.type = C.DATA_TYPE_COMMAND;
this.priority = C.PRIORITY_MEDIUM;
this.dataSetPresent = true;
};
util.inherits(CommandMessage, DicomMessage);
CommandMessage.prototype.getFields = function() {
return this.command(CommandMessage.super_.prototype.getFields.call(this));
}
return this.command(CommandMessage.super_.prototype.getFields.call(this));
};
CommandResponse = function(syntax) {
DicomMessage.call(this, syntax);
this.type = C.DATA_TYPE_COMMAND;
this.dataSetPresent = true;
DicomMessage.call(this, syntax);
this.type = C.DATA_TYPE_COMMAND;
this.dataSetPresent = true;
};
util.inherits(CommandResponse, DicomMessage);
CommandResponse.prototype.isResponse = function() {
return true;
}
return true;
};
CommandResponse.prototype.respondedTo = function() {
return this.getValue(0x00000120);
}
return this.getValue(0x00000120);
};
CommandResponse.prototype.isFinal = function() {
return this.success() || this.failure() || this.cancel();
}
return this.success() || this.failure() || this.cancel();
};
CommandResponse.prototype.warning = function() {
var status = this.getStatus();
return (status == 0x0001) || (status >> 12 == 0xb);
}
var status = this.getStatus();
return (status == 0x0001) || (status >> 12 == 0xb);
};
CommandResponse.prototype.success = function() {
return this.getStatus() == 0x0000;
}
return this.getStatus() == 0x0000;
};
CommandResponse.prototype.failure = function() {
var status = this.getStatus();
return (status >> 12 == 0xa) || (status >> 12 == 0xc) || (status >> 8 == 0x1)
}
var status = this.getStatus();
return (status >> 12 == 0xa) || (status >> 12 == 0xc) || (status >> 8 == 0x1);
};
CommandResponse.prototype.cancel = function() {
return this.getStatus() == C.STATUS_CANCEL;
}
return this.getStatus() == C.STATUS_CANCEL;
};
CommandResponse.prototype.pending = function() {
var status = this.getStatus();
return (status == 0xff00) || (status == 0xff01);
}
var status = this.getStatus();
return (status == 0xff00) || (status == 0xff01);
};
CommandResponse.prototype.getStatus = function() {
return this.getValue(0x00000900);
}
return this.getValue(0x00000900);
};
CommandResponse.prototype.setStatus = function(status) {
this.setElement(0x00000900, status);
}
this.setElement(0x00000900, status);
};
// following four methods only available to C-GET-RSP and C-MOVE-RSP
CommandResponse.prototype.getNumOfRemainingSubOperations = function() {
return this.getValue(0x00001020);
}
return this.getValue(0x00001020);
};
CommandResponse.prototype.getNumOfCompletedSubOperations = function() {
return this.getValue(0x00001021);
}
return this.getValue(0x00001021);
};
CommandResponse.prototype.getNumOfFailedSubOperations = function() {
return this.getValue(0x00001022);
}
return this.getValue(0x00001022);
};
CommandResponse.prototype.getNumOfWarningSubOperations = function() {
return this.getValue(0x00001023);
}
return this.getValue(0x00001023);
};
//end
CommandResponse.prototype.getFields = function() {
return this.response(CommandResponse.super_.prototype.getFields.call(this));
}
return this.response(CommandResponse.super_.prototype.getFields.call(this));
};
CFindRSP = function(syntax) {
CommandResponse.call(this, syntax);
this.commandType = 0x8020;
CommandResponse.call(this, syntax);
this.commandType = 0x8020;
};
util.inherits(CFindRSP, CommandResponse);
CGetRSP = function(syntax) {
CommandResponse.call(this, syntax);
this.commandType = 0x8010;
CommandResponse.call(this, syntax);
this.commandType = 0x8010;
};
util.inherits(CGetRSP, CommandResponse);
CMoveRSP = function(syntax) {
CommandResponse.call(this, syntax);
this.commandType = 0x8021;
CommandResponse.call(this, syntax);
this.commandType = 0x8021;
};
util.inherits(CMoveRSP, CommandResponse);
CFindRQ = function(syntax) {
CommandMessage.call(this, syntax);
this.commandType = 0x20;
this.contextUID = C.SOP_STUDY_ROOT_FIND;
CommandMessage.call(this, syntax);
this.commandType = 0x20;
this.contextUID = C.SOP_STUDY_ROOT_FIND;
};
util.inherits(CFindRQ, CommandMessage);
CMoveRQ = function(syntax, destination) {
CommandMessage.call(this, syntax);
this.commandType = 0x21;
this.contextUID = C.SOP_STUDY_ROOT_MOVE;
this.setDestination(destination || "");
CommandMessage.call(this, syntax);
this.commandType = 0x21;
this.contextUID = C.SOP_STUDY_ROOT_MOVE;
this.setDestination(destination || '');
};
util.inherits(CMoveRQ, CommandMessage);
CMoveRQ.prototype.setStore = function(cstr) {
this.store = cstr;
}
this.store = cstr;
};
CMoveRQ.prototype.setDestination = function(dest) {
this.setElements({
0x00000600 : dest
});
}
this.setElements({
0x00000600: dest
});
};
CGetRQ = function(syntax) {
CommandMessage.call(this, syntax);
this.commandType = 0x10;
this.contextUID = C.SOP_STUDY_ROOT_GET;
this.store = null;
CommandMessage.call(this, syntax);
this.commandType = 0x10;
this.contextUID = C.SOP_STUDY_ROOT_GET;
this.store = null;
};
util.inherits(CGetRQ, CommandMessage);
CGetRQ.prototype.setStore = function(cstr) {
this.store = cstr;
}
this.store = cstr;
};
CStoreRQ = function(syntax) {
CommandMessage.call(this, syntax);
this.commandType = 0x01;
this.contextUID = C.SOP_STUDY_ROOT_GET;
CommandMessage.call(this, syntax);
this.commandType = 0x01;
this.contextUID = C.SOP_STUDY_ROOT_GET;
};
util.inherits(CStoreRQ, CommandMessage);
CStoreRQ.prototype.getOriginAETitle = function() {
return this.getValue(0x00001030);
}
return this.getValue(0x00001030);
};
CStoreRQ.prototype.getMoveMessageId = function() {
return this.getValue(0x00001031);
}
return this.getValue(0x00001031);
};
CStoreRQ.prototype.getSOPInstanceUID = function() {
return this.getValue(0x00001000);
}
return this.getValue(0x00001000);
};
CStoreRSP = function(syntax) {
CommandResponse.call(this, syntax);
this.commandType = 0x8001;
this.contextUID = C.SOP_STUDY_ROOT_GET;
this.dataSetPresent = false;
CommandResponse.call(this, syntax);
this.commandType = 0x8001;
this.contextUID = C.SOP_STUDY_ROOT_GET;
this.dataSetPresent = false;
};
util.inherits(CStoreRSP, CommandResponse);
CStoreRSP.prototype.setAffectedSOPInstanceUID = function(uid) {
this.setElement(0x00001000, uid);
}
this.setElement(0x00001000, uid);
};
CStoreRSP.prototype.getAffectedSOPInstanceUID = function(uid) {
return this.getValue(0x00001000);
}
return this.getValue(0x00001000);
};

817
Packages/dimse-service/server/PDU.js
View File

File diff suppressed because it is too large Load Diff

302
Packages/dimse-service/server/RWStream.js
View File

@ -1,229 +1,229 @@
var isString = function(type) {
if (type == C.TYPE_ASCII || type == C.TYPE_HEX) {
return true;
} else return false;
if (type == C.TYPE_ASCII || type == C.TYPE_HEX) {
return true;
} else return false;
};
calcLength = function(type, value) {
var size = NaN;
switch (type) {
case C.TYPE_HEX : size = Buffer.byteLength(value, 'hex'); break;
case C.TYPE_ASCII : size = Buffer.byteLength(value, 'ascii'); break;
case C.TYPE_UINT8 : size = 1; break;
case C.TYPE_UINT16 : size = 2; break;
case C.TYPE_UINT32 : size = 4; break;
case C.TYPE_FLOAT : size = 4; break;
case C.TYPE_DOUBLE : size = 8; break;
case C.TYPE_INT8 : size = 1; break;
case C.TYPE_INT16 : size = 2; break;
case C.TYPE_INT32 : size = 4; break;
default :break;
}
return size;
}
var size = NaN;
switch (type) {
case C.TYPE_HEX : size = Buffer.byteLength(value, 'hex'); break;
case C.TYPE_ASCII : size = Buffer.byteLength(value, 'ascii'); break;
case C.TYPE_UINT8 : size = 1; break;
case C.TYPE_UINT16 : size = 2; break;
case C.TYPE_UINT32 : size = 4; break;
case C.TYPE_FLOAT : size = 4; break;
case C.TYPE_DOUBLE : size = 8; break;
case C.TYPE_INT8 : size = 1; break;
case C.TYPE_INT16 : size = 2; break;
case C.TYPE_INT32 : size = 4; break;
default :break;
}
return size;
};
var RWStream = function() {
this.endian = C.BIG_ENDIAN;
this.endian = C.BIG_ENDIAN;
};
RWStream.prototype.setEndian = function(endian) {
this.endian = endian;
}
this.endian = endian;
};
RWStream.prototype.getEncoding = function(type) {
return RWStream.encodings[type];
}
return RWStream.encodings[type];
};
RWStream.prototype.getWriteType = function(type) {
return RWStream.writes[this.endian][type];
}
return RWStream.writes[this.endian][type];
};
RWStream.prototype.getReadType = function(type) {
return RWStream.reads[this.endian][type];
}
return RWStream.reads[this.endian][type];
};
WriteStream = function() {
RWStream.call(this);
this.defaultBufferSize = 512; //512 bytes
this.rawBuffer = new Buffer(this.defaultBufferSize);
this.offset = 0;
this.contentSize = 0;
}
RWStream.call(this);
this.defaultBufferSize = 512; //512 bytes
this.rawBuffer = new Buffer(this.defaultBufferSize);
this.offset = 0;
this.contentSize = 0;
};
util.inherits(WriteStream, RWStream);
WriteStream.prototype.increment = function(add) {
this.offset += add;
if (this.offset > this.contentSize) {
this.contentSize = this.offset;
}
}
this.offset += add;
if (this.offset > this.contentSize) {
this.contentSize = this.offset;
}
};
WriteStream.prototype.size = function() {
return this.contentSize;
}
return this.contentSize;
};
WriteStream.prototype.skip = function(amount) {
this.increment(amount);
}
this.increment(amount);
};
WriteStream.prototype.checkSize = function(length) {
if (this.offset + length > this.rawBuffer.length) {
// we need more size, copying old one to new buffer
var oldLength = this.rawBuffer.length,
newBuffer = new Buffer(oldLength + length + (oldLength / 2));
this.rawBuffer.copy(newBuffer, 0, 0, this.contentSize);
this.rawBuffer = newBuffer;
}
}
if (this.offset + length > this.rawBuffer.length) {
// we need more size, copying old one to new buffer
var oldLength = this.rawBuffer.length,
newBuffer = new Buffer(oldLength + length + (oldLength / 2));
this.rawBuffer.copy(newBuffer, 0, 0, this.contentSize);
this.rawBuffer = newBuffer;
}
};
WriteStream.prototype.writeToBuffer = function(type, value, length) {
if (value === "" || value === null) return;
if (value === '' || value === null) return;
this.checkSize(length);
this.rawBuffer[this.getWriteType(type)](value, this.offset);
this.increment(length);
}
this.checkSize(length);
this.rawBuffer[this.getWriteType(type)](value, this.offset);
this.increment(length);
};
WriteStream.prototype.write = function(type, value) {
if (isString(type)) {
this.writeString(value, type);
} else {
this.writeToBuffer(type, value, calcLength(type));
}
}
if (isString(type)) {
this.writeString(value, type);
} else {
this.writeToBuffer(type, value, calcLength(type));
}
};
WriteStream.prototype.writeString = function(string, type) {
var encoding = this.getEncoding(type), length = Buffer.byteLength(string, encoding);
this.rawBuffer.write(string, this.offset, length, encoding);
this.increment(length);
}
var encoding = this.getEncoding(type), length = Buffer.byteLength(string, encoding);
this.rawBuffer.write(string, this.offset, length, encoding);
this.increment(length);
};
WriteStream.prototype.buffer = function() {
return this.rawBuffer.slice(0, this.contentSize);
}
return this.rawBuffer.slice(0, this.contentSize);
};
WriteStream.prototype.toReadBuffer = function() {
return new ReadStream(this.buffer());
}
return new ReadStream(this.buffer());
};
WriteStream.prototype.concat = function(newStream) {
var newSize = this.size() + newStream.size();
this.rawBuffer = Buffer.concat([this.buffer(), newStream.buffer()], newSize);
this.contentSize = newSize;
this.offset = newSize;
}
var newSize = this.size() + newStream.size();
this.rawBuffer = Buffer.concat([ this.buffer(), newStream.buffer() ], newSize);
this.contentSize = newSize;
this.offset = newSize;
};
ReadStream = function(buffer) {
RWStream.call(this);
this.rawBuffer = buffer;
this.offset = 0;
RWStream.call(this);
this.rawBuffer = buffer;
this.offset = 0;
};
util.inherits(ReadStream, RWStream);
ReadStream.prototype.size = function() {
return this.rawBuffer.length;
}
return this.rawBuffer.length;
};
ReadStream.prototype.increment = function(add) {
this.offset += add;
}
this.offset += add;
};
ReadStream.prototype.more = function(length) {
var newBuf = this.rawBuffer.slice(this.offset, this.offset + length);
this.increment(length);
return new ReadStream(newBuf);
}
var newBuf = this.rawBuffer.slice(this.offset, this.offset + length);
this.increment(length);
return new ReadStream(newBuf);
};
ReadStream.prototype.reset = function() {
this.offset = 0;
return this;
}
this.offset = 0;
return this;
};
ReadStream.prototype.end = function() {
return this.offset >= this.size();
}
return this.offset >= this.size();
};
ReadStream.prototype.readFromBuffer = function(type, length) {
//this.checkSize(length);
//if (this.offset + length > this.rawBuffer.length) throw ("out of bound " + this.offset + "," + length + "," + this.rawBuffer.length);
var value = this.rawBuffer[this.getReadType(type)](this.offset);
this.increment(length);
return value;
}
//this.checkSize(length);
//if (this.offset + length > this.rawBuffer.length) throw ("out of bound " + this.offset + "," + length + "," + this.rawBuffer.length);
var value = this.rawBuffer[this.getReadType(type)](this.offset);
this.increment(length);
return value;
};
ReadStream.prototype.read = function(type, length) {
var value = null;
if (isString(type)) {
value = this.readString(length, type);
} else {
value = this.readFromBuffer(type, calcLength(type));
}
var value = null;
if (isString(type)) {
value = this.readString(length, type);
} else {
value = this.readFromBuffer(type, calcLength(type));
}
return value;
}
return value;
};
ReadStream.prototype.readString = function(length, type) {
var encoding = this.getEncoding(type),
str = this.rawBuffer.toString(encoding, this.offset, this.offset + length);
this.increment(length);
return str;
}
var encoding = this.getEncoding(type),
str = this.rawBuffer.toString(encoding, this.offset, this.offset + length);
this.increment(length);
return str;
};
ReadStream.prototype.buffer = function() {
return this.rawBuffer;
}
return this.rawBuffer;
};
ReadStream.prototype.concat = function(newStream) {
var newSize = this.size() + newStream.size();
this.rawBuffer = Buffer.concat([this.buffer(), newStream.buffer()], newSize);
this.contentSize = newSize;
this.offset = newSize;
}
var newSize = this.size() + newStream.size();
this.rawBuffer = Buffer.concat([ this.buffer(), newStream.buffer() ], newSize);
this.contentSize = newSize;
this.offset = newSize;
};
RWStream.writes = {};
RWStream.writes[C.BIG_ENDIAN] = {};
RWStream.writes[C.BIG_ENDIAN][C.TYPE_UINT8] = "writeUInt8";
RWStream.writes[C.BIG_ENDIAN][C.TYPE_UINT16] = "writeUInt16BE";
RWStream.writes[C.BIG_ENDIAN][C.TYPE_UINT32] = "writeUInt32BE";
RWStream.writes[C.BIG_ENDIAN][C.TYPE_INT8] = "writeInt8";
RWStream.writes[C.BIG_ENDIAN][C.TYPE_INT16] = "writeInt16BE";
RWStream.writes[C.BIG_ENDIAN][C.TYPE_INT32] = "writeInt32BE";
RWStream.writes[C.BIG_ENDIAN][C.TYPE_FLOAT] = "writeFloatBE";
RWStream.writes[C.BIG_ENDIAN][C.TYPE_DOUBLE] = "writeDoubleBE";
RWStream.writes[C.BIG_ENDIAN][C.TYPE_UINT8] = 'writeUInt8';
RWStream.writes[C.BIG_ENDIAN][C.TYPE_UINT16] = 'writeUInt16BE';
RWStream.writes[C.BIG_ENDIAN][C.TYPE_UINT32] = 'writeUInt32BE';
RWStream.writes[C.BIG_ENDIAN][C.TYPE_INT8] = 'writeInt8';
RWStream.writes[C.BIG_ENDIAN][C.TYPE_INT16] = 'writeInt16BE';
RWStream.writes[C.BIG_ENDIAN][C.TYPE_INT32] = 'writeInt32BE';
RWStream.writes[C.BIG_ENDIAN][C.TYPE_FLOAT] = 'writeFloatBE';
RWStream.writes[C.BIG_ENDIAN][C.TYPE_DOUBLE] = 'writeDoubleBE';
RWStream.writes[C.LITTLE_ENDIAN] = {};
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_UINT8] = "writeUInt8";
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_UINT16] = "writeUInt16LE";
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_UINT32] = "writeUInt32LE";
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_INT8] = "writeInt8";
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_INT16] = "writeInt16LE";
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_INT32] = "writeInt32LE";
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_FLOAT] = "writeFloatLE";
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_DOUBLE] = "writeDoubleLE";
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_UINT8] = 'writeUInt8';
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_UINT16] = 'writeUInt16LE';
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_UINT32] = 'writeUInt32LE';
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_INT8] = 'writeInt8';
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_INT16] = 'writeInt16LE';
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_INT32] = 'writeInt32LE';
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_FLOAT] = 'writeFloatLE';
RWStream.writes[C.LITTLE_ENDIAN][C.TYPE_DOUBLE] = 'writeDoubleLE';
RWStream.reads = {};
RWStream.reads[C.BIG_ENDIAN] = {};
RWStream.reads[C.BIG_ENDIAN][C.TYPE_UINT8] = "readUInt8";
RWStream.reads[C.BIG_ENDIAN][C.TYPE_UINT16] = "readUInt16BE";
RWStream.reads[C.BIG_ENDIAN][C.TYPE_UINT32] = "readUInt32BE";
RWStream.reads[C.BIG_ENDIAN][C.TYPE_INT8] = "readInt8";
RWStream.reads[C.BIG_ENDIAN][C.TYPE_INT16] = "readInt16BE";
RWStream.reads[C.BIG_ENDIAN][C.TYPE_INT32] = "readInt32BE";
RWStream.reads[C.BIG_ENDIAN][C.TYPE_FLOAT] = "readFloatBE";
RWStream.reads[C.BIG_ENDIAN][C.TYPE_DOUBLE] = "readDoubleBE";
RWStream.reads[C.BIG_ENDIAN][C.TYPE_UINT8] = 'readUInt8';
RWStream.reads[C.BIG_ENDIAN][C.TYPE_UINT16] = 'readUInt16BE';
RWStream.reads[C.BIG_ENDIAN][C.TYPE_UINT32] = 'readUInt32BE';
RWStream.reads[C.BIG_ENDIAN][C.TYPE_INT8] = 'readInt8';
RWStream.reads[C.BIG_ENDIAN][C.TYPE_INT16] = 'readInt16BE';
RWStream.reads[C.BIG_ENDIAN][C.TYPE_INT32] = 'readInt32BE';
RWStream.reads[C.BIG_ENDIAN][C.TYPE_FLOAT] = 'readFloatBE';
RWStream.reads[C.BIG_ENDIAN][C.TYPE_DOUBLE] = 'readDoubleBE';
RWStream.reads[C.LITTLE_ENDIAN] = {};
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_UINT8] = "readUInt8";
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_UINT16] = "readUInt16LE";
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_UINT32] = "readUInt32LE";
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_INT8] = "readInt8";
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_INT16] = "readInt16LE";
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_INT32] = "readInt32LE";
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_FLOAT] = "readFloatLE";
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_DOUBLE] = "readDoubleLE";
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_UINT8] = 'readUInt8';
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_UINT16] = 'readUInt16LE';
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_UINT32] = 'readUInt32LE';
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_INT8] = 'readInt8';
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_INT16] = 'readInt16LE';
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_INT32] = 'readInt32LE';
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_FLOAT] = 'readFloatLE';
RWStream.reads[C.LITTLE_ENDIAN][C.TYPE_DOUBLE] = 'readDoubleLE';
RWStream.encodings = {};
RWStream.encodings[C.TYPE_HEX] = "hex";
RWStream.encodings[C.TYPE_ASCII] = "ascii";
RWStream.encodings[C.TYPE_HEX] = 'hex';
RWStream.encodings[C.TYPE_ASCII] = 'ascii';

194
Packages/dimse-service/server/constants.js
View File

@ -1,98 +1,98 @@
C = {
IMPLEM_UID : "1.2.840.0.1.3680045.8.641",
IMPLEM_VERSION : "OHIF-DCM-0.1",
APPLICATION_CONTEXT_NAME : "1.2.840.10008.3.1.1.1",
PROTOCOL_VERSION : "0001",
ITEM_TYPE_RESERVED : "00",
ITEM_TYPE_APPLICATION_CONTEXT : "10",
ITEM_TYPE_PDU_ASSOCIATE_RQ : "01",
ITEM_TYPE_PDU_ASSOCIATE_AC : "02",
ITEM_TYPE_PDU_PDATA : "04",
ITEM_TYPE_PDU_RELEASE_RQ : "05",
ITEM_TYPE_PDU_RELEASE_RP : "06",
ITEM_TYPE_PDU_AABORT : "07",
ITEM_TYPE_PRESENTATION_CONTEXT : "20",
ITEM_TYPE_PRESENTATION_CONTEXT_AC : "21",
ITEM_TYPE_ABSTRACT_CONTEXT : "30",
ITEM_TYPE_TRANSFER_CONTEXT : "40",
ITEM_TYPE_USER_INFORMATION : "50",
ITEM_TYPE_MAXIMUM_LENGTH : "51",
ITEM_TYPE_IMPLEMENTATION_UID : "52",
ITEM_TYPE_IMPLEMENTATION_VERSION : "55",
IMPLICIT_LITTLE_ENDIAN : "1.2.840.10008.1.2",
EXPLICIT_LITTLE_ENDIAN : "1.2.840.10008.1.2.1",
EXPLICIT_BIG_ENDIAN : "1.2.840.10008.1.2.2",
SOP_PATIENT_ROOT_FIND : "1.2.840.10008.5.1.4.1.2.1.1",
SOP_PATIENT_ROOT_MOVE : "1.2.840.10008.5.1.4.1.2.1.2",
SOP_PATIENT_ROOT_GET : "1.2.840.10008.5.1.4.1.2.1.3",
SOP_STUDY_ROOT_FIND : "1.2.840.10008.5.1.4.1.2.2.1",
SOP_STUDY_ROOT_MOVE : "1.2.840.10008.5.1.4.1.2.2.2",
SOP_STUDY_ROOT_GET : "1.2.840.10008.5.1.4.1.2.2.3",
SOP_VERIFICATION : "1.2.840.10008.1.1",
SOP_HANGING_PROTOCOL_FIND : "1.2.840.10008.5.1.4.38.2",
SOP_MR_IMAGE_STORAGE : "1.2.840.10008.5.1.4.1.1.4",
TYPE_ASCII : 1,
TYPE_HEX : 2,
TYPE_UINT8 : 3,
TYPE_UINT16 : 4,
TYPE_UINT32 : 5,
TYPE_COMPOSITE : 6,
TYPE_FLOAT : 7,
TYPE_DOUBLE : 8,
TYPE_INT8 : 9,
TYPE_INT16 : 10,
TYPE_INT32 : 11,
RESULT_REASON_ACCEPTANCE : 0,
RESULT_REASON_USER_REJECTION : 1,
RESULT_REASON_NO_REASON :2,
RESULT_REASON_ABSTRACT_NOT_SUPPORTED : 3,
RESULT_REASON_TRANSFER_NOT_SUPPORTED : 4,
DEFAULT_MESSAGE_ID : 1,
LITTLE_ENDIAN : 1,
BIG_ENDIAN : 2,
VM_SINGLE :1,
VM_TWO : 3,
VM_THREE : 4,
VM_FOUR : 5,
VM_1N : 6,
VM_2N :7,
VM_3N :8,
VM_6N :9,
VM_3_3N : 10,
VM_2_2N : 11,
VM_16 : 12,
VM_1_2 : 13,
VM_1_3 : 18,
VM_SIX : 14,
VM_NINE : 15,
VM_1_32 : 16,
VM_1_99 : 17,
PRIORITY_LOW : 0x2,
PRIORITY_MEDIUM : 0x0,
PRIORITY_HIGH : 0x1,
DATA_SET_PRESENT : 1,
DATE_SET_ABSENCE : 0x0101,
DATA_TYPE_COMMAND : 1,
DATA_TYPE_DATA : 0,
DATA_IS_LAST : 1,
DATA_NOT_LAST : 0,
SOURCE_SERVICE_USER : 0,
SOURCE_SERVICE_PROVIDER : 2,
QUERY_RETRIEVE_LEVEL_PATIENT : "PATIENT",
QUERY_RETRIEVE_LEVEL_STUDY : "STUDY",
QUERY_RETRIEVE_LEVEL_SERIES : "SERIES",
QUERY_RETRIEVE_LEVEL_IMAGE : "IMAGE",
VALUE_LENGTH_UNDEFINED : 0xffffffff,
STATUS_SUCCESS : 0x0000,
STATUS_CANCEL : 0xfe00,
STATUS_CFIND_CONT_OK : 0xff00,
STATUS_CFIND_CONT_WARN : 0xff01,
COMMAND_C_GET_RSP : 0x8010,
COMMAND_C_MOVE_RSP : 0x8021,
COMMAND_C_GET_RQ : 0x10,
COMMAND_C_STORE_RQ : 0x01,
COMMAND_C_FIND_RSP : 0x8020,
COMMAND_C_MOVE_RQ : 0x21,
COMMAND_C_FIND_RQ : 0x20,
COMMAND_C_STORE_RSP : 0x8001
};
IMPLEM_UID: '1.2.840.0.1.3680045.8.641',
IMPLEM_VERSION: 'OHIF-DCM-0.1',
APPLICATION_CONTEXT_NAME: '1.2.840.10008.3.1.1.1',
PROTOCOL_VERSION: '0001',
ITEM_TYPE_RESERVED: '00',
ITEM_TYPE_APPLICATION_CONTEXT: '10',
ITEM_TYPE_PDU_ASSOCIATE_RQ: '01',
ITEM_TYPE_PDU_ASSOCIATE_AC: '02',
ITEM_TYPE_PDU_PDATA: '04',
ITEM_TYPE_PDU_RELEASE_RQ: '05',
ITEM_TYPE_PDU_RELEASE_RP: '06',
ITEM_TYPE_PDU_AABORT: '07',
ITEM_TYPE_PRESENTATION_CONTEXT: '20',
ITEM_TYPE_PRESENTATION_CONTEXT_AC: '21',
ITEM_TYPE_ABSTRACT_CONTEXT: '30',
ITEM_TYPE_TRANSFER_CONTEXT: '40',
ITEM_TYPE_USER_INFORMATION: '50',
ITEM_TYPE_MAXIMUM_LENGTH: '51',
ITEM_TYPE_IMPLEMENTATION_UID: '52',
ITEM_TYPE_IMPLEMENTATION_VERSION: '55',
IMPLICIT_LITTLE_ENDIAN: '1.2.840.10008.1.2',
EXPLICIT_LITTLE_ENDIAN: '1.2.840.10008.1.2.1',
EXPLICIT_BIG_ENDIAN: '1.2.840.10008.1.2.2',
SOP_PATIENT_ROOT_FIND: '1.2.840.10008.5.1.4.1.2.1.1',
SOP_PATIENT_ROOT_MOVE: '1.2.840.10008.5.1.4.1.2.1.2',
SOP_PATIENT_ROOT_GET: '1.2.840.10008.5.1.4.1.2.1.3',
SOP_STUDY_ROOT_FIND: '1.2.840.10008.5.1.4.1.2.2.1',
SOP_STUDY_ROOT_MOVE: '1.2.840.10008.5.1.4.1.2.2.2',
SOP_STUDY_ROOT_GET: '1.2.840.10008.5.1.4.1.2.2.3',
SOP_VERIFICATION: '1.2.840.10008.1.1',
SOP_HANGING_PROTOCOL_FIND: '1.2.840.10008.5.1.4.38.2',
SOP_MR_IMAGE_STORAGE: '1.2.840.10008.5.1.4.1.1.4',
TYPE_ASCII: 1,
TYPE_HEX: 2,
TYPE_UINT8: 3,
TYPE_UINT16: 4,
TYPE_UINT32: 5,
TYPE_COMPOSITE: 6,
TYPE_FLOAT: 7,
TYPE_DOUBLE: 8,
TYPE_INT8: 9,
TYPE_INT16: 10,
TYPE_INT32: 11,
RESULT_REASON_ACCEPTANCE: 0,
RESULT_REASON_USER_REJECTION: 1,
RESULT_REASON_NO_REASON: 2,
RESULT_REASON_ABSTRACT_NOT_SUPPORTED: 3,
RESULT_REASON_TRANSFER_NOT_SUPPORTED: 4,
DEFAULT_MESSAGE_ID: 1,
LITTLE_ENDIAN: 1,
BIG_ENDIAN: 2,
VM_SINGLE: 1,
VM_TWO: 3,
VM_THREE: 4,
VM_FOUR: 5,
VM_1N: 6,
VM_2N: 7,
VM_3N: 8,
VM_6N: 9,
VM_3_3N: 10,
VM_2_2N: 11,
VM_16: 12,
VM_1_2: 13,
VM_1_3: 18,
VM_SIX: 14,
VM_NINE: 15,
VM_1_32: 16,
VM_1_99: 17,
PRIORITY_LOW: 0x2,
PRIORITY_MEDIUM: 0x0,
PRIORITY_HIGH: 0x1,
DATA_SET_PRESENT: 1,
DATE_SET_ABSENCE: 0x0101,
DATA_TYPE_COMMAND: 1,
DATA_TYPE_DATA: 0,
DATA_IS_LAST: 1,
DATA_NOT_LAST: 0,
SOURCE_SERVICE_USER: 0,
SOURCE_SERVICE_PROVIDER: 2,
QUERY_RETRIEVE_LEVEL_PATIENT: 'PATIENT',
QUERY_RETRIEVE_LEVEL_STUDY: 'STUDY',
QUERY_RETRIEVE_LEVEL_SERIES: 'SERIES',
QUERY_RETRIEVE_LEVEL_IMAGE: 'IMAGE',
VALUE_LENGTH_UNDEFINED: 0xffffffff,
STATUS_SUCCESS: 0x0000,
STATUS_CANCEL: 0xfe00,
STATUS_CFIND_CONT_OK: 0xff00,
STATUS_CFIND_CONT_WARN: 0xff01,
COMMAND_C_GET_RSP: 0x8010,
COMMAND_C_MOVE_RSP: 0x8021,
COMMAND_C_GET_RQ: 0x10,
COMMAND_C_STORE_RQ: 0x01,
COMMAND_C_FIND_RSP: 0x8020,
COMMAND_C_MOVE_RQ: 0x21,
COMMAND_C_FIND_RQ: 0x20,
COMMAND_C_STORE_RSP: 0x8001
};

2
Packages/dimse-service/server/methods.js
View File

@ -1,3 +1,3 @@
Meteor.methods({
});
});

2
Packages/dimse-service/server/require.js
View File

@ -1 +1 @@
util = Npm.require("util");
util = Npm.require('util');

10
Packages/hangingprotocols/package.js
View File

@ -1,10 +1,10 @@
Package.describe({
name: "hangingprotocols",
summary: "Support functions for using DICOM Hanging Protocols",
name: 'hangingprotocols',
summary: 'Support functions for using DICOM Hanging Protocols',
version: '0.0.1'
});
Package.onUse(function (api) {
Package.onUse(function(api) {
api.use('cornerstone');;
api.addFiles('server/namespace.js', 'server');
@ -13,5 +13,5 @@ Package.onUse(function (api) {
api.export('instanceDataToJsObject', 'server');
api.export('TAG_DICT', 'server');
api.export("DICOMHP", ['client', 'server']);
});
api.export('DICOMHP', [ 'client', 'server' ]);
});

25512
Packages/hangingprotocols/server/dataDictionary.js
View File

File diff suppressed because it is too large Load Diff

20
Packages/hangingprotocols/server/dataSetToJsWithDictionary.js
View File

@ -4,14 +4,14 @@
* @param dataSet
* @param options
*/
dataSetToJsWithDictionary = function (dataSet, dictionary, options) {
dataSetToJsWithDictionary = function(dataSet, dictionary, options) {
if (!dataSet) {
throw 'dataSetToJsWithDictionary: missing required parameter dataSet';
}
options = options || {
omitPrivateAttibutes: true, // true if private elements should be omitted
maxElementLength : 128 // maximum element length to try and convert to string format
maxElementLength: 128 // maximum element length to try and convert to string format
};
// For the purpose of inserting a comma into the tag in order
@ -20,7 +20,7 @@ dataSetToJsWithDictionary = function (dataSet, dictionary, options) {
var result = {};
for(var tag in dataSet.elements) {
for (var tag in dataSet.elements) {
var element = dataSet.elements[tag];
// Reformat the tag from x00020010 to "0002,0010" to suit the dictionary
@ -43,18 +43,18 @@ dataSetToJsWithDictionary = function (dataSet, dictionary, options) {
element.vr = tagDictionaryEntry.vr;
}
// skip this element if it a private element and our options specify that we should
if(options.omitPrivateAttibutes === true && dicomParser.isPrivateTag(tag)) {
if (options.omitPrivateAttibutes === true && dicomParser.isPrivateTag(tag)) {
continue;
}
if(element.items) {
if (element.items) {
// handle sequences
var sequenceItems = [];
for(var i=0; i < element.items.length; i++) {
for (var i = 0; i < element.items.length; i++) {
sequenceItems.push(dicomParser.dataSetToJsWithDictionary(element.items[i].dataSet, dictionary, options));
}
result[tagName] = sequenceItems;
} else {
var asString;
@ -63,16 +63,16 @@ dataSetToJsWithDictionary = function (dataSet, dictionary, options) {
asString = dicomParser.explicitElementToString(dataSet, element);
}
if(asString !== undefined) {
if (asString !== undefined) {
result[tagName] = asString;
} else {
result[tagName] = {
dataOffset: element.dataOffset,
length : element.length
length: element.length
};
}
}
}
return result;
};
};

12
Packages/hangingprotocols/server/imageset.js
View File

@ -1,20 +1,20 @@
DICOMHP.imageSet = function(setNumber, category) {
this.setNumber = setNumber;
this.category = category;
this.setNumber = setNumber;
this.category = category;
};
DICOMHP.imageSet.prototype.setRelativeTime = function(time) {
this.relativeTime = time;
this.relativeTime = time;
};
DICOMHP.imageSet.prototype.setTimeUnits = function(units) {
this.timeUnits = units;
this.timeUnits = units;
};
DICOMHP.imageSet.prototype.setPriorValue = function(priorValue) {
this.priorValue = priorValue;
this.priorValue = priorValue;
};
DICOMHP.imageSet.prototype.retrieve = function(studyInstanceId) {
};
};

4
Packages/hangingprotocols/server/instanceDataToJsObject.js
View File

@ -11,7 +11,7 @@ var valueRepresentationTypes = {
* @param instance
* @param options
*/
instanceDataToJsObject = function (instance, dictionary) {
instanceDataToJsObject = function(instance, dictionary) {
if (!instance) {
throw 'instanceDataToJsObject: missing required parameter dataSet';
}
@ -70,4 +70,4 @@ instanceDataToJsObject = function (instance, dictionary) {
});
console.log(result);
return result;
};
};

2
Packages/hangingprotocols/server/match.js
View File

@ -84,4 +84,4 @@ DICOMHP.match = function(studyInstanceUID) {
});
return matchedProtocols;*/
};
};

2
Packages/hangingprotocols/server/namespace.js
View File

@ -1 +1 @@
DICOMHP = {};
DICOMHP = {};

133
Packages/hangingprotocols/server/select.js
View File

@ -1,77 +1,78 @@
DICOMHP.select = function(hpInstance) {
var imageSetsSequence = hpInstance["00720020"].Value;
if (!imageSetsSequence) {
return [];
}
var matchedImageSets = [];
imageSetsSequence.forEach(function(imageSet) {
var selectorSequence = imageSet["00720022"].Value;
selectorSequence.forEach(function(selector){
var usageFlag = selector["00720024"].Value[0],
selectorAttribute = selector["00720026"].Value[0],
selectorAttributeVR = selector["00720050"].Value[0],
selectorAttributeValue = null;
var imageSetsSequence = hpInstance['00720020'].Value;
if (!imageSetsSequence) {
return [];
}
if (selectorAttributeVR == 'SQ') {
return;
} else if (selectorAttributeVR == 'AT') {
selectorAttributeValue = selector["00720060"].Value[0];
} else if (selectorAttributeVR == 'CS') {
selectorAttributeValue = selector["00720062"].Value[0];
} else if (selectorAttributeVR == 'IS') {
selectorAttributeValue = selector["00720064"].Value[0];
} else if (selectorAttributeVR == 'LO') {
selectorAttributeValue = selector["00720066"].Value[0];
} else if (selectorAttributeVR == 'LT') {
selectorAttributeValue = selector["00720068"].Value[0];
} else if (selectorAttributeVR == 'PN') {
selectorAttributeValue = selector["0072006A"].Value[0];
} else if (selectorAttributeVR == 'SH') {
selectorAttributeValue = selector["0072006C"].Value[0];
} else if (selectorAttributeVR == 'ST') {
selectorAttributeValue = selector["0072006E"].Value[0];
} else if (selectorAttributeVR == 'UT') {
selectorAttributeValue = selector["00720070"].Value[0];
} else if (selectorAttributeVR == 'DS') {
selectorAttributeValue = selector["00720072"].Value[0];
} else if (selectorAttributeVR == 'FD') {
selectorAttributeValue = selector["00720074"].Value[0];
} else if (selectorAttributeVR == 'FL') {
selectorAttributeValue = selector["00720076"].Value[0];
} else if (selectorAttributeVR == 'UL') {
selectorAttributeValue = selector["00720078"].Value[0];
} else if (selectorAttributeVR == 'US') {
selectorAttributeValue = selector["0072007A"].Value[0];
} else if (selectorAttributeVR == 'SL') {
selectorAttributeValue = selector["0072007C"].Value[0];
} else if (selectorAttributeVR == 'SS') {
selectorAttributeValue = selector["0072007E"].Value[0];
}
var matchedImageSets = [];
imageSetsSequence.forEach(function(imageSet) {
var selectorSequence = imageSet['00720022'].Value;
selectorSequence.forEach(function(selector) {
var usageFlag = selector['00720024'].Value[0],
selectorAttribute = selector['00720026'].Value[0],
selectorAttributeVR = selector['00720050'].Value[0],
selectorAttributeValue = null;
if (selectorAttributeValue !== null) {
if (selectorAttributeVR == 'SQ') {
return;
} else if (selectorAttributeVR == 'AT') {
selectorAttributeValue = selector['00720060'].Value[0];
} else if (selectorAttributeVR == 'CS') {
selectorAttributeValue = selector['00720062'].Value[0];
} else if (selectorAttributeVR == 'IS') {
selectorAttributeValue = selector['00720064'].Value[0];
} else if (selectorAttributeVR == 'LO') {
selectorAttributeValue = selector['00720066'].Value[0];
} else if (selectorAttributeVR == 'LT') {
selectorAttributeValue = selector['00720068'].Value[0];
} else if (selectorAttributeVR == 'PN') {
selectorAttributeValue = selector['0072006A'].Value[0];
} else if (selectorAttributeVR == 'SH') {
selectorAttributeValue = selector['0072006C'].Value[0];
} else if (selectorAttributeVR == 'ST') {
selectorAttributeValue = selector['0072006E'].Value[0];
} else if (selectorAttributeVR == 'UT') {
selectorAttributeValue = selector['00720070'].Value[0];
} else if (selectorAttributeVR == 'DS') {
selectorAttributeValue = selector['00720072'].Value[0];
} else if (selectorAttributeVR == 'FD') {
selectorAttributeValue = selector['00720074'].Value[0];
} else if (selectorAttributeVR == 'FL') {
selectorAttributeValue = selector['00720076'].Value[0];
} else if (selectorAttributeVR == 'UL') {
selectorAttributeValue = selector['00720078'].Value[0];
} else if (selectorAttributeVR == 'US') {
selectorAttributeValue = selector['0072007A'].Value[0];
} else if (selectorAttributeVR == 'SL') {
selectorAttributeValue = selector['0072007C'].Value[0];
} else if (selectorAttributeVR == 'SS') {
selectorAttributeValue = selector['0072007E'].Value[0];
}
}
});
if (selectorAttributeValue !== null) {
var timeBasedImageSetsSequence = imageSet["00720030"].Value;
timeBasedImageSetsSequence.forEach(function(timeImageSet){
var setNumber = timeImageSet["00720032"].Value[0], selectorCategory = timeImageSet["00720034"].Value[0];
}
});
var mImageSet = new DICOMHP.imageSet(setNumber, selectorCategory);
if (selectorCategory == 'RELATIVE_TIME') {
var relativeTime = timeImageSet["00720038"].Value[0], timeUnits = timeImageSet["0072003A"].Value[0];
var timeBasedImageSetsSequence = imageSet['00720030'].Value;
timeBasedImageSetsSequence.forEach(function(timeImageSet) {
var setNumber = timeImageSet['00720032'].Value[0], selectorCategory = timeImageSet['00720034'].Value[0];
var mImageSet = new DICOMHP.imageSet(setNumber, selectorCategory);
if (selectorCategory == 'RELATIVE_TIME') {
var relativeTime = timeImageSet['00720038'].Value[0], timeUnits = timeImageSet['0072003A'].Value[0];
mImageSet.setRelativeTime(relativeTime);
mImageSet.setTimeUnits(timeUnits);
} else if (selectorCategory == 'ABSTRACT_PRIOR') {
var priorValue = timeImageSet["0072003C"].Value[0];
mImageSet.setRelativeTime(relativeTime);
mImageSet.setTimeUnits(timeUnits);
} else if (selectorCategory == 'ABSTRACT_PRIOR') {
var priorValue = timeImageSet['0072003C'].Value[0];
mImageSet.setPriorValue(priorValue);
}
mImageSet.setPriorValue(priorValue);
}
matchedImageSets.push(mImageSet);
matchedImageSets.push(mImageSet);
});
});
});
return matchedImageSets;
};
return matchedImageSets;
};

2
Packages/lesiontracker/both/collections.js
View File

@ -1,2 +1,2 @@
Timepoints = new Meteor.Collection('timepoints');
Measurements = new Meteor.Collection('measurements');
Measurements = new Meteor.Collection('measurements');

50
Packages/lesiontracker/client/collections/LesionLocations.js
View File

@ -3,106 +3,106 @@ LesionLocations = new Meteor.Collection(null);
LesionLocations.insert({
id: 'liverLeft',
group: 'liver',
location: "Liver Left",
location: 'Liver Left',
hasDescription: false,
description: "",
description: '',
selected: false
});
LesionLocations.insert({
id: 'liverRight',
group: 'liver',
location: "Liver Right",
location: 'Liver Right',
hasDescription: false,
description: "",
description: '',
selected: false
});
LesionLocations.insert({
id: 'liverCaudate',
group: 'liver',
location: "Liver Caudate",
location: 'Liver Caudate',
hasDescription: false,
description: "",
description: '',
selected: false
});
LesionLocations.insert({
id: 'lungLLL',
group: 'lung',
location: "Lung LLL",
location: 'Lung LLL',
hasDescription: false,
description: "",
description: '',
selected: false
});
LesionLocations.insert({
id: 'lungLUL',
group: 'lung',
location: "Lung LUL",
location: 'Lung LUL',
hasDescription: false,
description: "",
description: '',
selected: false
});
LesionLocations.insert({
id: 'lungRLL',
group: 'lung',
location: "Lung RLL",
location: 'Lung RLL',
hasDescription: false,
description: "",
description: '',
selected: false
});
LesionLocations.insert({
id: 'lungRML',
group: 'lung',
location: "Lung RML",
location: 'Lung RML',
hasDescription: false,
description: "",
description: '',
selected: false
});
LesionLocations.insert({
id: 'lungRUL',
group: 'lung',
location: "Lung RUL",
location: 'Lung RUL',
hasDescription: false,
description: "",
description: '',
selected: false
});
LesionLocations.insert({
id: 'pleuraLeft',
group: 'pleura',
location: "Pleura Left",
location: 'Pleura Left',
hasDescription: false,
description: "",
description: '',
selected: false
});
LesionLocations.insert({
id: 'pleuraRight',
group: 'pleura',
location: "Pleura Right",
location: 'Pleura Right',
hasDescription: false,
description: "",
description: '',
selected: false
});
LesionLocations.insert({
id: 'kidneyLeft',
group: 'kidney',
location: "Kidney Left",
location: 'Kidney Left',
hasDescription: false,
description: "",
description: '',
selected: false
});
LesionLocations.insert({
id: 'kidneyRight',
group: 'kidney',
location: "Kidney Right",
location: 'Kidney Right',
hasDescription: false,
description: ""
});
description: ''
});

42
Packages/lesiontracker/client/collections/LocationResponses.js
View File

@ -1,43 +1,43 @@
LocationResponses = new Meteor.Collection(null);
LocationResponses.insert({
text: "Complete response",
code: "CR",
description: ""
text: 'Complete response',
code: 'CR',
description: ''
});
LocationResponses.insert({
text: "Progressive disease",
code: "PD",
description: ""
text: 'Progressive disease',
code: 'PD',
description: ''
});
LocationResponses.insert({
text: "Stable disease",
code: "SD",
description: ""
text: 'Stable disease',
code: 'SD',
description: ''
});
LocationResponses.insert({
text: "Present",
text: 'Present',
code: false,
description: ""
description: ''
});
LocationResponses.insert({
text: "Not Evaluable",
code: "NE",
description: ""
text: 'Not Evaluable',
code: 'NE',
description: ''
});
LocationResponses.insert({
text: "Non-CR/Non-PD",
code: "NN",
description: ""
text: 'Non-CR/Non-PD',
code: 'NN',
description: ''
});
LocationResponses.insert({
text: "Excluded from Assessment",
code: "EX",
description: ""
});
text: 'Excluded from Assessment',
code: 'EX',
description: ''
});

10
Packages/lesiontracker/client/compatibility/LesionManager.js
View File

@ -29,7 +29,9 @@ var LesionManager = (function() {
function updateLesionData(lesionData) {
// Find the related Timepoint from the Timepoints Collection
var timepointID = lesionData.timepointID;
var timepoint = Timepoints.findOne({timepointID: timepointID});
var timepoint = Timepoints.findOne({
timepointID: timepointID
});
if (!timepoint) {
log.warn('Timepoint in an image is not present in the Timepoints Collection?');
return;
@ -126,7 +128,9 @@ var LesionManager = (function() {
var measurements = Measurements.find({
isTarget: isTarget
}, {
sort: {lesionNumber: 1}
sort: {
lesionNumber: 1
}
}).fetch();
// If measurements exist, find the last lesion number
@ -176,4 +180,4 @@ var LesionManager = (function() {
lesionNumberExists: lesionNumberExists,
getLocationName: getLocationName
};
})();
})();

6
Packages/lesiontracker/client/compatibility/deleteLesionKeyboardTool.js
View File

@ -31,7 +31,7 @@
nearbyToolIndex,
nearbyToolType;
toolTypes.forEach(function(toolType){
toolTypes.forEach(function(toolType) {
var toolData = cornerstoneTools.getToolState(element, toolType);
if (!toolData) {
return;
@ -75,7 +75,7 @@
if (keyCode === keys.DELETE ||
(keyCode === keys.D && eventData.event.ctrlKey === true)) {
var toolTypes = ["lesion", "nonTarget"];
var toolTypes = [ 'lesion', 'nonTarget' ];
var nearbyToolData = getNearbyToolData(eventData.element, eventData.currentPoints.canvas, toolTypes);
if (!nearbyToolData) {
@ -95,4 +95,4 @@
// module/private exports
cornerstoneTools.deleteLesionKeyboardTool = cornerstoneTools.keyboardTool(keyDownCallback);
})(cornerstoneTools);
})(cornerstoneTools);

16
Packages/lesiontracker/client/compatibility/lesionTool.js
View File

@ -1,8 +1,8 @@
(function($, cornerstone, cornerstoneMath, cornerstoneTools) {
"use strict";
'use strict';
var toolType = "lesion";
var toolType = 'lesion';
var configuration = {
setLesionNumberCallback: setLesionNumberCallback,
@ -221,6 +221,7 @@
if (!handle.boundingBox) {
return;
}
return cornerstoneMath.point.insideRect(coords, handle.boundingBox);
}
@ -514,7 +515,7 @@
// Sets drawnIndependently property of control points(handles)
function setControlPoints(handles, value) {
Object.keys(handles).forEach(function(name) {
if (name !== "textBox") {
if (name !== 'textBox') {
var handle = handles[name];
handle.drawnIndependently = value;
}
@ -730,7 +731,6 @@
}
function findDottedLinePosition(data) {
var distancesArr = [];
@ -775,6 +775,7 @@
minDistance = distanceToPerpendicularEnd;
}
}
for (var i = 0; i < distancesArr.length; i++) {
var obj = distancesArr[i];
if (obj.distance === minDistance) {
@ -840,7 +841,7 @@
context.beginPath();
context.strokeStyle = color;
context.lineWidth = lineWidth;
context.setLineDash([2, 3]);
context.setLineDash([ 2, 3 ]);
// Set position of text
var perpendicularStartCanvas = cornerstone.pixelToCanvas(element, findDottedLinePosition(data));
@ -858,7 +859,6 @@
var wy = (data.handles.perpendicularStart.y - data.handles.perpendicularEnd.y) * (eventData.image.rowPixelSpacing || 1);
var width = Math.sqrt(wx * wx + wy * wy);
var suffix = ' mm';
if (!eventData.image.rowPixelSpacing || !eventData.image.columnPixelSpacing) {
suffix = ' pixels';
@ -866,7 +866,7 @@
var lengthText = ' L ' + length.toFixed(1) + suffix;
var widthText = ' W ' + width.toFixed(1) + suffix;
var textLines = ['Target ' + data.lesionNumber, lengthText, widthText];
var textLines = [ 'Target ' + data.lesionNumber, lengthText, widthText ];
var boundingBox = cornerstoneTools.drawTextBox(context,
textLines,
@ -948,4 +948,4 @@
cornerstoneTools.lesion.setConfiguration(configuration);
})($, cornerstone, cornerstoneMath, cornerstoneTools);
})($, cornerstone, cornerstoneMath, cornerstoneTools);

9
Packages/lesiontracker/client/compatibility/nonTargetTool.js
View File

@ -68,7 +68,7 @@
if (cornerstoneTools.anyHandlesOutsideImage(mouseEventData, measurementData.handles)) {
// delete the measurement
cornerstoneTools.removeToolState(mouseEventData.element, toolType, measurementData);
}else{
}else {
config.getLesionLocationCallback(measurementData, mouseEventData, doneCallback);
}
@ -150,6 +150,7 @@
if (!handle.boundingBox) {
return;
}
return cornerstoneMath.point.insideRect(coords, handle.boundingBox);
}
@ -217,7 +218,7 @@
context.beginPath();
context.strokeStyle = color;
context.lineWidth = lineWidth;
context.setLineDash([2, 3]);
context.setLineDash([ 2, 3 ]);
context.moveTo(mid.x, mid.y);
context.lineTo(canvasTextLocation.x + 20, canvasTextLocation.y + 20);
@ -254,6 +255,7 @@
if (measurementData.lesionName === undefined) {
config.setLesionNumberCallback(measurementData, touchEventData, doneCallback);
}
cornerstone.updateImage(element);
cornerstoneTools.moveNewHandleTouch(touchEventData, toolType, measurementData, measurementData.handles.end, function() {
@ -266,14 +268,12 @@
config.getLesionLocationCallback(measurementData, touchEventData, doneCallback);
$(element).on('CornerstoneToolsTouchDrag', cornerstoneTools.nonTargetTouch.touchMoveHandle);
$(element).on('CornerstoneToolsDragStartActive', cornerstoneTools.nonTargetTouch.touchDownActivateCallback);
$(element).on('CornerstoneToolsTap', cornerstoneTools.nonTargetTouch.tapCallback);
});
}
function doubleClickCallback(e, eventData) {
var element = eventData.element;
var data;
@ -339,5 +339,4 @@
// pressCallback: doubleClickCallback
});
})($, cornerstone, cornerstoneMath, cornerstoneTools);

571
Packages/lesiontracker/client/compatibility/scaleOverlayTool.js
View File

@ -1,331 +1,348 @@
(function($, cornerstone, cornerstoneTools) {
'use strict';
'use strict';
// Draw Intervals
function drawIntervals (context, config) {
// Draw Intervals
function drawIntervals (context, config) {
var i = 0;
var i = 0;
while (config.verticalLine.start.y + i * config.verticalMinorTick <= config.vscaleBounds.bottom) {
while (config.verticalLine.start.y + i * config.verticalMinorTick <= config.vscaleBounds.bottom) {
var startPoint = {
x: config.verticalLine.start.x,
y: config.verticalLine.start.y + i*config.verticalMinorTick
};
var startPoint = {
x: config.verticalLine.start.x,
y: config.verticalLine.start.y + i * config.verticalMinorTick
};
var endPoint = {x: 0, y: config.verticalLine.start.y + i*config.verticalMinorTick};
if (i%5 === 0) {
var endPoint = {
x: 0,
y: config.verticalLine.start.y + i * config.verticalMinorTick
};
if (i% 5 === 0) {
endPoint.x = config.verticalLine.start.x - config.majorTickLength;
} else{
endPoint.x = config.verticalLine.start.x - config.majorTickLength;
} else {
endPoint.x = config.verticalLine.start.x - config.minorTickLength;
}
endPoint.x = config.verticalLine.start.x - config.minorTickLength;
}
context.beginPath();
context.strokeStyle = config.color;
context.lineWidth = config.lineWidth;
context.moveTo(startPoint.x, startPoint.y);
context.lineTo(endPoint.x, endPoint.y);
context.stroke();
context.beginPath();
context.strokeStyle = config.color;
context.lineWidth = config.lineWidth;
context.moveTo(startPoint.x, startPoint.y);
context.lineTo(endPoint.x, endPoint.y);
context.stroke();
i++;
}
i++;
}
i = 0;
i = 0;
while (config.horizontalLine.start.x + i * config.horizontalMinorTick <= config.hscaleBounds.right) {
while (config.horizontalLine.start.x + i * config.horizontalMinorTick <= config.hscaleBounds.right) {
startPoint = {
x: config.horizontalLine.start.x + i * config.horizontalMinorTick,
y: config.horizontalLine.start.y
};
startPoint = {
x: config.horizontalLine.start.x + i * config.horizontalMinorTick,
y: config.horizontalLine.start.y
};
endPoint = {
x: config.horizontalLine.start.x + i * config.horizontalMinorTick,
y: 0
};
if (i% 5 === 0) {
endPoint = {x: config.horizontalLine.start.x + i * config.horizontalMinorTick, y: 0};
if (i%5 === 0) {
endPoint.y = config.horizontalLine.start.y - config.majorTickLength;
} else {
endPoint.y = config.horizontalLine.start.y - config.majorTickLength;
} else{
endPoint.y = config.horizontalLine.start.y - config.minorTickLength;
}
endPoint.y = config.horizontalLine.start.y - config.minorTickLength;
}
context.beginPath();
context.strokeStyle = config.color;
context.lineWidth = config.lineWidth;
context.moveTo(startPoint.x, startPoint.y);
context.lineTo(endPoint.x, endPoint.y);
context.stroke();
context.beginPath();
context.strokeStyle = config.color;
context.lineWidth = config.lineWidth;
context.moveTo(startPoint.x, startPoint.y);
context.lineTo(endPoint.x, endPoint.y);
context.stroke();
i++;
i++;
}
}
}
// Draws long horizontal and vertical lines
function drawFrameLines(context, config){
// Draws long horizontal and vertical lines
function drawFrameLines(context, config){
// Vertical Line
var startPoint = {
x: config.verticalLine.start.x,
y: config.verticalLine.start.y
};
var endPoint = {
x: config.verticalLine.end.x,
y: config.verticalLine.end.y
};
// Vertical Line
var startPoint = {x: config.verticalLine.start.x, y: config.verticalLine.start.y};
var endPoint = {x: config.verticalLine.end.x, y: config.verticalLine.end.y};
context.beginPath();
context.strokeStyle = config.color;
context.lineWidth = config.lineWidth;
context.moveTo(startPoint.x, startPoint.y);
context.lineTo(endPoint.x, endPoint.y);
context.stroke();
context.beginPath();
context.strokeStyle = config.color;
context.lineWidth = config.lineWidth;
context.moveTo(startPoint.x, startPoint.y);
context.lineTo(endPoint.x, endPoint.y);
context.stroke();
// Horizontal line
startPoint = {
x: config.horizontalLine.start.x ,
y: config.horizontalLine.start.y
};
endPoint = {
x: config.horizontalLine.end.x,
y: config.horizontalLine.end.y
};
context.beginPath();
context.strokeStyle = config.color;
context.lineWidth = config.lineWidth;
context.moveTo(startPoint.x, startPoint.y);
context.lineTo(endPoint.x, endPoint.y);
context.stroke();
// Horizontal line
startPoint = {x: config.horizontalLine.start.x , y: config.horizontalLine.start.y};
endPoint = {x: config.horizontalLine.end.x, y: config.horizontalLine.end.y};
context.beginPath();
context.strokeStyle = config.color;
context.lineWidth = config.lineWidth;
context.moveTo(startPoint.x, startPoint.y);
context.lineTo(endPoint.x, endPoint.y);
context.stroke();
// Draw intervals
drawIntervals(context, config);
}
function doesIntersect(canvasBounds, imageBounds) {
var intersectLeftRight;
var intersectTopBottom;
if (canvasBounds.width >= 0)
{
if (imageBounds.width >= 0)
intersectLeftRight = !((canvasBounds.right <= imageBounds.left) || (imageBounds.right <= canvasBounds.left));
else
intersectLeftRight = !((canvasBounds.right <= imageBounds.right) || (imageBounds.left <= canvasBounds.left));
}
else
{
if (imageBounds.width >= 0)
intersectLeftRight = !((canvasBounds.left <= imageBounds.left) || (imageBounds.right <= canvasBounds.right));
else
intersectLeftRight = !((canvasBounds.left <= imageBounds.right) || (imageBounds.left <= canvasBounds.right));
}
if (canvasBounds.height >= 0)
{
if (imageBounds.height >= 0)
intersectTopBottom = !((canvasBounds.bottom <= imageBounds.top) || (imageBounds.bottom <= canvasBounds.top));
else
intersectTopBottom = !((canvasBounds.bottom <= imageBounds.bottom) || (imageBounds.top <= canvasBounds.top));
}
else
{
if (imageBounds.height >= 0)
intersectTopBottom = !((canvasBounds.top <= imageBounds.top) || (imageBounds.bottom <= canvasBounds.bottom));
else
intersectTopBottom = !((canvasBounds.top <= imageBounds.bottom) || (imageBounds.top <= canvasBounds.bottom));
}
return intersectLeftRight && intersectTopBottom;
}
function getIntersectionRectangle(canvasBounds, imageBounds) {
var intersectPoints = {
left: 0,
top: 0,
right: 0,
bottom: 0
};
if(!doesIntersect(canvasBounds, imageBounds)) {
return intersectPoints;
// Draw intervals
drawIntervals(context, config);
}
if (canvasBounds.width >= 0)
{
if (imageBounds.width >= 0)
{
intersectPoints.left = Math.max(canvasBounds.left, imageBounds.left);
intersectPoints.right = Math.min(canvasBounds.right, imageBounds.right);
}
else
{
intersectPoints.left = Math.max(canvasBounds.left, imageBounds.right);
intersectPoints.right = Math.min(canvasBounds.right, imageBounds.left);
}
}
else
{
if (imageBounds.width >= 0)
{
intersectPoints.left = Math.min(canvasBounds.left, imageBounds.right);
intersectPoints.right = Math.max(canvasBounds.right, imageBounds.left);
}
else
{
intersectPoints.left = Math.min(canvasBounds.left, imageBounds.left);
intersectPoints.right = Math.max(canvasBounds.right, imageBounds.right);
}
function doesIntersect(canvasBounds, imageBounds) {
var intersectLeftRight;
var intersectTopBottom;
if (canvasBounds.width >= 0) {
if (imageBounds.width >= 0)
intersectLeftRight = !((canvasBounds.right <= imageBounds.left) || (imageBounds.right <= canvasBounds.left));
else
intersectLeftRight = !((canvasBounds.right <= imageBounds.right) || (imageBounds.left <= canvasBounds.left));
} else {
if (imageBounds.width >= 0)
intersectLeftRight = !((canvasBounds.left <= imageBounds.left) || (imageBounds.right <= canvasBounds.right));
else
intersectLeftRight = !((canvasBounds.left <= imageBounds.right) || (imageBounds.left <= canvasBounds.right));
}
if (canvasBounds.height >= 0) {
if (imageBounds.height >= 0)
intersectTopBottom = !((canvasBounds.bottom <= imageBounds.top) || (imageBounds.bottom <= canvasBounds.top));
else
intersectTopBottom = !((canvasBounds.bottom <= imageBounds.bottom) || (imageBounds.top <= canvasBounds.top));
} else {
if (imageBounds.height >= 0)
intersectTopBottom = !((canvasBounds.top <= imageBounds.top) || (imageBounds.bottom <= canvasBounds.bottom));
else
intersectTopBottom = !((canvasBounds.top <= imageBounds.bottom) || (imageBounds.top <= canvasBounds.bottom));
}
return intersectLeftRight && intersectTopBottom;
}
if (canvasBounds.height >= 0)
{
if (imageBounds.height >= 0)
{
intersectPoints.top = Math.max(canvasBounds.top, imageBounds.top);
intersectPoints.bottom = Math.min(canvasBounds.bottom, imageBounds.bottom);
}
else
{
intersectPoints.top = Math.max(canvasBounds.top, imageBounds.bottom);
intersectPoints.bottom = Math.min(canvasBounds.bottom, imageBounds.top);
}
}
else
{
if (imageBounds.height >= 0)
{
intersectPoints.top = Math.min(canvasBounds.top, imageBounds.bottom);
intersectPoints.bottom = Math.max(canvasBounds.bottom, imageBounds.top);
}
else
{
intersectPoints.top = Math.min(canvasBounds.top, imageBounds.top);
intersectPoints.bottom = Math.max(canvasBounds.bottom, imageBounds.bottom);
}
function getIntersectionRectangle(canvasBounds, imageBounds) {
var intersectPoints = {
left: 0,
top: 0,
right: 0,
bottom: 0
};
if (!doesIntersect(canvasBounds, imageBounds)) {
return intersectPoints;
}
if (canvasBounds.width >= 0) {
if (imageBounds.width >= 0) {
intersectPoints.left = Math.max(canvasBounds.left, imageBounds.left);
intersectPoints.right = Math.min(canvasBounds.right, imageBounds.right);
} else {
intersectPoints.left = Math.max(canvasBounds.left, imageBounds.right);
intersectPoints.right = Math.min(canvasBounds.right, imageBounds.left);
}
} else {
if (imageBounds.width >= 0) {
intersectPoints.left = Math.min(canvasBounds.left, imageBounds.right);
intersectPoints.right = Math.max(canvasBounds.right, imageBounds.left);
} else {
intersectPoints.left = Math.min(canvasBounds.left, imageBounds.left);
intersectPoints.right = Math.max(canvasBounds.right, imageBounds.right);
}
}
if (canvasBounds.height >= 0) {
if (imageBounds.height >= 0) {
intersectPoints.top = Math.max(canvasBounds.top, imageBounds.top);
intersectPoints.bottom = Math.min(canvasBounds.bottom, imageBounds.bottom);
} else {
intersectPoints.top = Math.max(canvasBounds.top, imageBounds.bottom);
intersectPoints.bottom = Math.min(canvasBounds.bottom, imageBounds.top);
}
} else {
if (imageBounds.height >= 0) {
intersectPoints.top = Math.min(canvasBounds.top, imageBounds.bottom);
intersectPoints.bottom = Math.max(canvasBounds.bottom, imageBounds.top);
} else {
intersectPoints.top = Math.min(canvasBounds.top, imageBounds.top);
intersectPoints.bottom = Math.max(canvasBounds.bottom, imageBounds.bottom);
}
}
return intersectPoints;
}
return intersectPoints;
// Computes the max bound for scales on the image
function computeScaleBounds(eventData, canvasSize, imageSize, horizontalReduction, verticalReduction) {
}
var canvasBounds = {
left: 0,
top: 0,
right: canvasSize.width,
bottom: canvasSize.height,
width: canvasSize.width,
height: canvasSize.height
};
// Computes the max bound for scales on the image
function computeScaleBounds(eventData, canvasSize, imageSize, horizontalReduction, verticalReduction) {
var hReduction = horizontalReduction * Math.min(1000, canvasSize.width);
var vReduction = verticalReduction * Math.min(1000, canvasSize.height);
canvasBounds = {
left: canvasBounds.left + hReduction,
top: canvasBounds.top + vReduction,
right: (canvasBounds.left + hReduction) + (canvasBounds.width - 2 * hReduction),
bottom: (canvasBounds.top + vReduction) + (canvasBounds.height - 2 * vReduction),
width: canvasBounds.width - 2 * hReduction,
height: canvasBounds.height - 2 * vReduction
};
var canvasBounds = {
left: 0,
top: 0,
right: canvasSize.width,
bottom: canvasSize.height,
width: canvasSize.width,
height: canvasSize.height
};
var startPoint = {
x: 0,
y: 0
};
var startPointImageBounds = {
x: startPoint.x,
y: startPoint.y
};
var endPointImageBounds = {
x: startPoint.x + imageSize.width,
y: startPoint.y + imageSize.height
};
var hReduction = horizontalReduction * Math.min(1000, canvasSize.width);
var vReduction = verticalReduction * Math.min(1000, canvasSize.height);
canvasBounds = {
left: canvasBounds.left + hReduction,
top: canvasBounds.top + vReduction,
right: (canvasBounds.left + hReduction) + (canvasBounds.width - 2 * hReduction),
bottom: (canvasBounds.top + vReduction) + (canvasBounds.height - 2 * vReduction),
width: canvasBounds.width - 2 * hReduction,
height: canvasBounds.height - 2 * vReduction
};
var startPointCanvasImageBounds = cornerstone.pixelToCanvas(eventData.element, startPointImageBounds);
var endPointCanvasImageBounds = cornerstone.pixelToCanvas(eventData.element, endPointImageBounds);
var startPoint = {x: 0, y: 0};
var startPointImageBounds = {x: startPoint.x, y: startPoint.y};
var endPointImageBounds = {x: startPoint.x + imageSize.width, y: startPoint.y + imageSize.height};
var imageBoundsWidth = Math.abs(startPointCanvasImageBounds.x - endPointCanvasImageBounds.x);
var imageBoundsHeight = Math.abs(startPointCanvasImageBounds.y - endPointCanvasImageBounds.y);
var startPointCanvasImageBounds = cornerstone.pixelToCanvas(eventData.element, startPointImageBounds);
var endPointCanvasImageBounds = cornerstone.pixelToCanvas(eventData.element, endPointImageBounds);
hReduction = horizontalReduction * imageBoundsWidth;
vReduction = verticalReduction * imageBoundsHeight;
var imageBoundsWidth = Math.abs(startPointCanvasImageBounds.x - endPointCanvasImageBounds.x);
var imageBoundsHeight = Math.abs(startPointCanvasImageBounds.y - endPointCanvasImageBounds.y);
var imageBounds = {
left: startPointCanvasImageBounds.x + hReduction,
top: startPointCanvasImageBounds.y + vReduction,
right: (startPointCanvasImageBounds.x + hReduction) + (imageBoundsWidth - 2 * hReduction),
bottom: (startPointCanvasImageBounds.y + vReduction) + (imageBoundsHeight - 2 * vReduction),
width: imageBoundsWidth - 2 * hReduction,
height: imageBoundsHeight - 2 * vReduction
};
hReduction = horizontalReduction * imageBoundsWidth;
vReduction = verticalReduction * imageBoundsHeight;
return getIntersectionRectangle(canvasBounds, imageBounds);
var imageBounds = {
left: startPointCanvasImageBounds.x + hReduction,
top: startPointCanvasImageBounds.y + vReduction,
right: (startPointCanvasImageBounds.x + hReduction) + (imageBoundsWidth - 2 * hReduction),
bottom: (startPointCanvasImageBounds.y + vReduction) + (imageBoundsHeight - 2 * vReduction),
width: imageBoundsWidth - 2 * hReduction,
height: imageBoundsHeight - 2 * vReduction
};
return getIntersectionRectangle(canvasBounds, imageBounds);
}
function onImageRendered(e, eventData) {
// Check whether pixel spacing is defined
if (!eventData.image.rowPixelSpacing || !eventData.image.columnPixelSpacing) {
return;
}
var viewport = cornerstone.getViewport(eventData.enabledElement.element);
if (!viewport) {
return;
function onImageRendered(e, eventData) {
// Check whether pixel spacing is defined
if (!eventData.image.rowPixelSpacing || !eventData.image.columnPixelSpacing) {
return;
}
var viewport = cornerstone.getViewport(eventData.enabledElement.element);
if (!viewport) {
return;
}
var canvasSize = {
width: eventData.enabledElement.canvas.width,
height: eventData.enabledElement.canvas.height
};
var imageSize = {
width: eventData.enabledElement.image.width ,
height: eventData.enabledElement.image.height
};
// Distance between intervals is 10mm
var verticalIntervalScale = (10.0 / eventData.enabledElement.image.rowPixelSpacing) * eventData.viewport.scale;
var horizontalIntervalScale = (10.0 / eventData.enabledElement.image.rowPixelSpacing) * eventData.viewport.scale;
if (!canvasSize.width || !canvasSize.height || !imageSize.width || !imageSize.height ) {
return false;
}
// 0.1 and 0.05 gives margin to horizontal and vertical lines
var hscaleBounds = computeScaleBounds(eventData, canvasSize, imageSize, 0.1, 0.05);
var vscaleBounds = computeScaleBounds(eventData, canvasSize, imageSize, 0.05, 0.1);
var config = {
width: imageSize.width,
height: imageSize.height,
hscaleBounds: hscaleBounds,
vscaleBounds: vscaleBounds,
verticalMinorTick: verticalIntervalScale,
horizontalMinorTick: horizontalIntervalScale,
minorTickLength: 12.5,
majorTickLength: 25,
verticalLine: {
start: {
x: vscaleBounds.right ,
y: vscaleBounds.top
},
end: {
x: vscaleBounds.right,
y: vscaleBounds.bottom
}
},
horizontalLine: {
start: {
x: hscaleBounds.left,
y: hscaleBounds.bottom
},
end: {
x: hscaleBounds.right,
y: hscaleBounds.bottom
}
},
color: cornerstoneTools.toolColors.getToolColor(),
lineWidth: cornerstoneTools.toolStyle.getToolWidth()
};
var context = eventData.enabledElement.canvas.getContext('2d');
context.setTransform(1, 0, 0, 1, 0, 0);
context.save();
// Draw frame lines
drawFrameLines(context, config);
context.restore();
}
var canvasSize = { width: eventData.enabledElement.canvas.width, height: eventData.enabledElement.canvas.height};
var imageSize = {width: eventData.enabledElement.image.width , height: eventData.enabledElement.image.height};
///////// END IMAGE RENDERING ///////
// Distance between intervals is 10mm
var verticalIntervalScale = (10.0 / eventData.enabledElement.image.rowPixelSpacing) * eventData.viewport.scale;
var horizontalIntervalScale = (10.0 / eventData.enabledElement.image.rowPixelSpacing) * eventData.viewport.scale;
if (!canvasSize.width || !canvasSize.height || !imageSize.width || !imageSize.height ) {
return false;
function disable(element) {
// TODO: displayTool does not have cornerstone.updateImage(element) method to hide tool
$(element).off('CornerstoneImageRendered', onImageRendered);
cornerstone.updateImage(element);
}
// 0.1 and 0.05 gives margin to horizontal and vertical lines
var hscaleBounds = computeScaleBounds(eventData, canvasSize, imageSize, 0.1, 0.05);
var vscaleBounds = computeScaleBounds(eventData, canvasSize, imageSize, 0.05, 0.1);
// module exports
cornerstoneTools.scaleOverlayTool = cornerstoneTools.displayTool(onImageRendered);
cornerstoneTools.scaleOverlayTool.disable = disable;
var config = {
width: imageSize.width,
height: imageSize.height,
hscaleBounds: hscaleBounds,
vscaleBounds: vscaleBounds,
verticalMinorTick: verticalIntervalScale,
horizontalMinorTick: horizontalIntervalScale,
minorTickLength: 12.5,
majorTickLength: 25,
verticalLine: {
start: {x: vscaleBounds.right , y: vscaleBounds.top},
end: {x: vscaleBounds.right, y: vscaleBounds.bottom}
},
horizontalLine: {
start: {x: hscaleBounds.left, y: hscaleBounds.bottom},
end: {x: hscaleBounds.right, y: hscaleBounds.bottom}
},
color: cornerstoneTools.toolColors.getToolColor(),
lineWidth: cornerstoneTools.toolStyle.getToolWidth()
};
var context = eventData.enabledElement.canvas.getContext('2d');
context.setTransform(1, 0, 0, 1, 0, 0);
context.save();
// Draw frame lines
drawFrameLines(context, config);
context.restore();
}
///////// END IMAGE RENDERING ///////
function disable(element) {
// TODO: displayTool does not have cornerstone.updateImage(element) method to hide tool
$(element).off('CornerstoneImageRendered', onImageRendered);
cornerstone.updateImage(element);
}
// module exports
cornerstoneTools.scaleOverlayTool = cornerstoneTools.displayTool(onImageRendered);
cornerstoneTools.scaleOverlayTool.disable = disable;
})($, cornerstone, cornerstoneTools);
})($, cornerstone, cornerstoneTools);

12
Packages/lesiontracker/client/components/confirmDeleteDialog/confirmDeleteDialog.js
View File

@ -1,9 +1,9 @@
function closeHandler() {
// Hide the lesion dialog
$("#confirmDeleteDialog").css('display', 'none');
$('#confirmDeleteDialog').css('display', 'none');
// Remove the backdrop
$(".removableBackdrop").remove();
$('.removableBackdrop').remove();
// Remove the callback from the template data
delete Template.confirmDeleteDialog.doneCallback;
@ -17,18 +17,18 @@ showConfirmDialog = function(doneCallback, options) {
options = options || {};
UI.renderWithData(Template.removableBackdrop, options, document.body);
var confirmDeleteDialog = $("#confirmDeleteDialog");
var confirmDeleteDialog = $('#confirmDeleteDialog');
confirmDeleteDialog.remove();
var viewer = document.getElementById('viewer');
UI.renderWithData(Template.confirmDeleteDialog, options, viewer);
// Make sure the context menu is closed when the user clicks away
$(".removableBackdrop").one('mousedown touchstart', function() {
$('.removableBackdrop').one('mousedown touchstart', function() {
closeHandler();
});
confirmDeleteDialog = $("#confirmDeleteDialog");
confirmDeleteDialog = $('#confirmDeleteDialog');
confirmDeleteDialog.css('display', 'block');
confirmDeleteDialog.focus();
@ -76,4 +76,4 @@ Template.confirmDeleteDialog.events({
closeHandler();
}
}
});
});

48
Packages/lesiontracker/client/components/lesionLocationDialog/lesionLocationDialog.js
View File

@ -3,7 +3,7 @@ function closeHandler(dialog) {
$(dialog).css('display', 'none');
// Remove the backdrop
$(".removableBackdrop").remove();
$('.removableBackdrop').remove();
// Restore the focus to the active viewport
setFocusToActiveViewport();
@ -17,7 +17,9 @@ function setLesionNumberCallback(measurementData, eventData, doneCallback) {
var imageId = enabledElement.image.imageId;
var study = cornerstoneTools.metaData.get('study', imageId);
var timepoint = Timepoints.findOne({timepointName: study.studyDate});
var timepoint = Timepoints.findOne({
timepointName: study.studyDate
});
if (!timepoint) {
return;
}
@ -26,7 +28,7 @@ function setLesionNumberCallback(measurementData, eventData, doneCallback) {
// Get a lesion number for this lesion, depending on whether or not the same lesion previously
// exists at a different timepoint
var lesionNumber = LesionManager.getNewLesionNumber(measurementData.timepointID, isTarget=true);
var lesionNumber = LesionManager.getNewLesionNumber(measurementData.timepointID, isTarget = true);
measurementData.lesionNumber = lesionNumber;
// Set lesion number
@ -43,20 +45,20 @@ function getLesionLocationCallback(measurementData, eventData) {
Template.lesionLocationDialog.doneCallback = undefined;
// Get the lesion location dialog
var dialog = $("#lesionLocationDialog");
var dialog = $('#lesionLocationDialog');
Template.lesionLocationDialog.dialog = dialog;
// Show the backdrop
UI.render(Template.removableBackdrop, document.body);
// Make sure the context menu is closed when the user clicks away
$(".removableBackdrop").one('mousedown touchstart', function() {
$('.removableBackdrop').one('mousedown touchstart', function() {
closeHandler(dialog);
});
// Select the first option for now
var selector = dialog.find("select.selectLesionLocation");
selector.find("option:first").prop("selected", true);
var selector = dialog.find('select.selectLesionLocation');
selector.find('option:first').prop('selected', true);
// Find out if this lesion number is already added in the lesion manager for another timepoint
// If it is, stop here because we don't need the dialog.
@ -73,7 +75,7 @@ function getLesionLocationCallback(measurementData, eventData) {
// If it isn't, continue to open the dialog and have the user choose a lesion location
// Show the lesion location dialog above
var dialogProperty = {
var dialogProperty = {
top: eventData.currentPoints.page.y - dialog.outerHeight() - 40,
left: eventData.currentPoints.page.x - dialog.outerWidth() / 2,
display: 'block'
@ -91,7 +93,7 @@ function getLesionLocationCallback(measurementData, eventData) {
// If device is touch device, set position center of screen vertically and horizontally
if (isTouchDevice()) {
// add dialogMobile class to provide a black,transparent background
dialog.addClass("dialogMobile");
dialog.addClass('dialogMobile');
dialogProperty.top = 0;
dialogProperty.left = 0;
dialogProperty.right = 0;
@ -107,14 +109,14 @@ changeLesionLocationCallback = function(measurementData, eventData, doneCallback
Template.lesionLocationDialog.doneCallback = doneCallback;
// Get the lesion location dialog
var dialog = $("#lesionLocationRelabelDialog");
var dialog = $('#lesionLocationRelabelDialog');
Template.lesionLocationDialog.dialog = dialog;
// Show the backdrop
UI.render(Template.removableBackdrop, document.body);
// Make sure the context menu is closed when the user clicks away
$(".removableBackdrop").one('mousedown touchstart', function() {
$('.removableBackdrop').one('mousedown touchstart', function() {
closeHandler(dialog);
});
@ -127,7 +129,7 @@ changeLesionLocationCallback = function(measurementData, eventData, doneCallback
// If device is touch device, set position center of screen vertically and horizontally
if (!eventData || isTouchDevice()) {
// add dialogMobile class to provide a black,transparent background
dialog.addClass("dialogMobile");
dialog.addClass('dialogMobile');
dialogProperty.top = 0;
dialogProperty.left = 0;
dialogProperty.right = 0;
@ -146,8 +148,14 @@ changeLesionLocationCallback = function(measurementData, eventData, doneCallback
}
LesionLocations.update({},
{$set: {selected: false}},
{ multi: true });
{
$set: {
selected: false
}
},
{
multi: true
});
var currentLocation = LesionLocations.findOne({
id: measurement.locationId
@ -188,10 +196,14 @@ Template.lesionLocationDialog.events({
}
// Get selected location data
var locationObj = LesionLocations.findOne({_id: selectedOptionId});
var locationObj = LesionLocations.findOne({
_id: selectedOptionId
});
var id;
var existingLocation = PatientLocations.findOne({location: locationObj.location});
var existingLocation = PatientLocations.findOne({
location: locationObj.location
});
if (existingLocation) {
id = existingLocation._id;
} else {
@ -269,7 +281,7 @@ Template.lesionLocationDialog.events({
});
Template.lesionLocationDialog.helpers({
'lesionLocations': function() {
lesionLocations: function() {
return LesionLocations.find();
}
});
});

18
Packages/lesiontracker/client/components/lesionTable/lesionTable.js
View File

@ -1,5 +1,5 @@
Template.lesionTable.helpers({
'measurement': function() {
measurement: function() {
// All Targets shall be listed first followed by Non-Targets
return Measurements.find({}, {
sort: {
@ -8,7 +8,7 @@ Template.lesionTable.helpers({
}
});
},
'timepoints': function() {
timepoints: function() {
return Timepoints.find({}, {
sort: {
timepointName: 1
@ -49,10 +49,10 @@ Template.lesionTable.events({
height: newHeight
});
var viewportAndLesionTableHeight = $("#viewportAndLesionTable").height();
var viewportAndLesionTableHeight = $('#viewportAndLesionTable').height();
var newPercentageHeightofLesionTable = (startHeight - topPosition) / viewportAndLesionTableHeight * 100;
var newPercentageHeightofViewermain = 100 - newPercentageHeightofLesionTable;
$(".viewerMain").height(newPercentageHeightofViewermain + "%");
$('.viewerMain').height(newPercentageHeightofViewermain + '%');
// Resize viewport
resizeViewportElements();
@ -71,19 +71,19 @@ Template.lesionTable.onRendered(function() {
// Put a visual indicator (<) in timepoint header in lesion table for active timepoints
// timepointLoaded property is used to put indicator for loaded timepoints in viewport
self.autorun(function() {
var ViewerData = Session.get("ViewerData");
var contentId = Session.get("activeContentId");
var ViewerData = Session.get('ViewerData');
var contentId = Session.get('activeContentId');
if (contentId) {
var viewerData = ViewerData[contentId];
if (viewerData) {
if (viewerData.loadedSeriesData) {
// Get study dates of imageViewerViewport elements
var loadedStudyDates = {
patientId: "",
patientId: '',
dates: []
};
$(".imageViewerViewport").each(function(viewportIndex, element) {
$('.imageViewerViewport').each(function(viewportIndex, element) {
var enabledElement = cornerstone.getEnabledElement(element);
if (!enabledElement || !enabledElement.image) {
return;
@ -125,4 +125,4 @@ Template.lesionTable.onRendered(function() {
}
});
});
});

12
Packages/lesiontracker/client/components/lesionTableRow/lesionTableRow.js
View File

@ -1,6 +1,10 @@
Template.lesionTableRow.helpers({
'timepoints': function() {
return Timepoints.find({}, {sort: {timepointName: 1}});
timepoints: function() {
return Timepoints.find({}, {
sort: {
timepointName: 1
}
});
}
});
@ -9,7 +13,7 @@ function doneCallback(measurementData, deleteTool) {
// opened by the Lesion Table, we should clear the data for
// the specified Timepoint Cell
if (deleteTool === true) {
Meteor.call("removeMeasurement", measurementData.id, function(error, response) {
Meteor.call('removeMeasurement', measurementData.id, function(error, response) {
if (error) {
log.warn(error);
}
@ -47,7 +51,7 @@ Template.lesionTableRow.events({
};
showConfirmDialog(function() {
Meteor.call("removeMeasurement", currentMeasurement._id, function(error, response) {
Meteor.call('removeMeasurement', currentMeasurement._id, function(error, response) {
if (error) {
log.warn(error);
}

10
Packages/lesiontracker/client/components/lesionTableTimepointCell/lesionTableTimepointCell.js
View File

@ -1,5 +1,5 @@
Template.lesionTableTimepointCell.helpers({
'hasDataAtThisTimepoint': function() {
hasDataAtThisTimepoint: function() {
// This simple function just checks whether or not timepoint data
// exists for this Measurement at this Timepoint
var lesionData = Template.parentData(1);
@ -7,7 +7,7 @@ Template.lesionTableTimepointCell.helpers({
lesionData.timepoints &&
lesionData.timepoints[this.timepointID]);
},
'displayData': function() {
displayData: function() {
// Search Measurements by lesion and timepoint
var lesionData = Template.parentData(1);
if (!lesionData ||
@ -20,7 +20,7 @@ Template.lesionTableTimepointCell.helpers({
if (lesionData.isTarget === true) {
if (data.shortestDiameter) {
return data.longestDiameter + " x " + data.shortestDiameter;
return data.longestDiameter + ' x ' + data.shortestDiameter;
}
return data.longestDiameter;
@ -28,7 +28,7 @@ Template.lesionTableTimepointCell.helpers({
return data.response;
}
},
'isTarget': function() {
isTarget: function() {
var lesionData = Template.parentData(1);
return lesionData.isTarget;
}
@ -90,4 +90,4 @@ Template.lesionTableTimepointCell.events({
});
}
}
});
});

63
Packages/lesiontracker/client/components/lesionTableTimepointHeader/lesionTableTimepointHeader.js
View File

@ -1,23 +1,26 @@
Template.lesionTableTimepointHeader.events({
'click th': function(e, template){
'click th.lesionTableTimepointCell': function(e, template) {
var parentPosition = getPosition(e.currentTarget);
var cellText = e.currentTarget.innerText;
// Remove spaces in string
cellText = cellText.replace(/\s/g, ''); // Remove spaces
cellText = cellText.replace('<', ''); // Remove <
var splitCellText = cellText.split('/');
var dateStr = splitCellText[2].replace(/\D/g,'') + "" + splitCellText[0].replace(/\D/g,'') + ""+splitCellText[1].replace(/\D/g,''); // Remove non-digit chars
var dateStr = splitCellText[2].replace(/\D/g,'') + '' + splitCellText[0].replace(/\D/g,'') + '' + splitCellText[1].replace(/\D/g,''); // Remove non-digit chars
// Check patient has a timepointText as Baseline
var patientId = template.data.patientId;
// Open popup
var timepointTextDialog = $("#timepointTextDialog");
var dialogDisplay = timepointTextDialog.css("display");
if(dialogDisplay === "none") {
var isBaselineInCollection = Timepoints.findOne({patientId: patientId, timepointName: dateStr, timepointText: "Baseline"});
var timepointTextDialog = $('#timepointTextDialog');
var dialogDisplay = timepointTextDialog.css('display');
if (dialogDisplay === 'none') {
var isBaselineInCollection = Timepoints.findOne({
patientId: patientId,
timepointName: dateStr,
timepointText: 'Baseline'
});
// If isBaselineInCollection is true, "Baseline" is found in collection for patient and set checkbox as checked
if (isBaselineInCollection) {
@ -29,30 +32,31 @@ Template.lesionTableTimepointHeader.events({
}
// Open dialog
var dialogProperty = {
var dialogProperty = {
top: parentPosition.y - 30,
left: parentPosition.x,
display: 'block'
};
timepointTextDialog.css(dialogProperty);
} else if(dialogDisplay === "block") {
} else {
// Get timepoints of patient
// Set timepointText as Baseline for selected timepoint
var timepoints = Timepoints.find({patientId: patientId}).fetch();
var timepoints = Timepoints.find({
patientId: patientId
}).fetch();
// Check checkbox is selected
var checkboxBaselineChecked = $("#checkBoxBaseline").is(":checked");
var checkboxBaselineChecked = $('#checkBoxBaseline').is(':checked');
timepoints.forEach(function(timepoint) {
// timepointText defines a custom text for timepoint such as Baseline, Nadir, Current
if (timepoint.timepointName === dateStr) {
// If checkbox is selected, set timepointText as Baseline
// Else set timepointText as ""
var timepointText = "Baseline";
if(!checkboxBaselineChecked) {
timepointText = "";
var timepointText = 'Baseline';
if (!checkboxBaselineChecked) {
timepointText = '';
}
Timepoints.update(timepoint._id,{
@ -60,36 +64,29 @@ Template.lesionTableTimepointHeader.events({
timepointText: timepointText
}
});
} else{
} else {
// Set timepointText as empty
Timepoints.update(timepoint._id,{
$set: {
timepointText: ""
timepointText: ''
}
});
}
});
// Close dialog
timepointTextDialog.css("display", "none");
timepointTextDialog.css('display', 'none');
}
}
});
Template.lesionTableTimepointHeader.helpers({
'timepointTextFound': function(){
timepointTextFound: function() {
var timepointText = this.timepointText;
if(timepointText && timepointText === 'Baseline') {
return true;
}
return false;
return (timepointText && timepointText === 'Baseline');
}
});
// Gets parent's position of element which mouse pointer is clicked in
function getPosition(element) {
var xPosition = 0;
@ -100,5 +97,9 @@ function getPosition(element) {
yPosition += (element.offsetTop - element.scrollTop + element.clientTop);
element = element.offsetParent;
}
return { x: xPosition, y: yPosition };
}
return {
x: xPosition,
y: yPosition
};
}

95
Packages/lesiontracker/client/components/nonTargetLesionDialog/nonTargetLesionDialog.js
View File

@ -3,7 +3,7 @@ function closeHandler(dialog) {
$(dialog).css('display', 'none');
// Remove the backdrop
$(".removableBackdrop").remove();
$('.removableBackdrop').remove();
// Restore the focus to the active viewport
setFocusToActiveViewport();
@ -17,7 +17,9 @@ function setLesionNumberCallback(measurementData, eventData, doneCallback) {
var imageId = enabledElement.image.imageId;
var study = cornerstoneTools.metaData.get('study', imageId);
var timepoint = Timepoints.findOne({timepointName: study.studyDate});
var timepoint = Timepoints.findOne({
timepointName: study.studyDate
});
if (!timepoint) {
return;
}
@ -29,7 +31,7 @@ function setLesionNumberCallback(measurementData, eventData, doneCallback) {
// Get a lesion number for this lesion, depending on whether or not the same lesion previously
// exists at a different timepoint
var lesionNumber = LesionManager.getNewLesionNumber(measurementData.timepointID, isTarget=false);
var lesionNumber = LesionManager.getNewLesionNumber(measurementData.timepointID, isTarget = false);
measurementData.lesionNumber = lesionNumber;
// Set lesion number
@ -43,26 +45,26 @@ function getLesionLocationCallback(measurementData, eventData) {
Template.nonTargetLesionDialog.measurementData = measurementData;
// Get the non-target lesion location dialog
var dialog = $("#nonTargetLesionLocationDialog");
var dialog = $('#nonTargetLesionLocationDialog');
Template.nonTargetLesionDialog.dialog = dialog;
// Show the backdrop
UI.render(Template.removableBackdrop, document.body);
// Make sure the context menu is closed when the user clicks away
$(".removableBackdrop").one('mousedown touchstart', function() {
$('.removableBackdrop').one('mousedown touchstart', function() {
closeHandler(dialog);
});
// Find the select option box
var selectorLocation = dialog.find("select#selectNonTargetLesionLocation");
var selectorResponse = dialog.find("select#selectNonTargetLesionLocationResponse");
var selectorLocation = dialog.find('select#selectNonTargetLesionLocation');
var selectorResponse = dialog.find('select#selectNonTargetLesionLocationResponse');
selectorLocation.find("option:first").prop("selected", "selected");
selectorResponse.find("option:first").prop("selected", "selected");
selectorLocation.find('option:first').prop('selected', 'selected');
selectorResponse.find('option:first').prop('selected', 'selected');
// Allow location selection
selectorLocation.removeAttr("disabled");
selectorLocation.removeAttr('disabled');
// Find out if this lesion number is already added in the lesion manager for another timepoint
// If it is, disable selector location
@ -83,15 +85,15 @@ function getLesionLocationCallback(measurementData, eventData) {
selectorLocation.find('option').each(function() {
if ($(this).text() === locationName) {
// Select location in locations dropdown list
selectorLocation.find('option').eq($(this).index()).prop("selected", true);
selectorLocation.find('option').eq($(this).index()).prop('selected', true);
}
});
selectorLocation.prop("disabled", true);
selectorLocation.prop('disabled', true);
}
// Show the nonTargetLesion dialog above
var dialogProperty = {
var dialogProperty = {
top: eventData.currentPoints.page.y - dialog.outerHeight() - 40,
left: eventData.currentPoints.page.x - dialog.outerWidth() / 2,
display: 'block'
@ -109,7 +111,7 @@ function getLesionLocationCallback(measurementData, eventData) {
// If device is touch device, set position center of screen vertically and horizontally
if (isTouchDevice()) {
// add dialogMobile class to provide a black,transparent background
dialog.addClass("dialogMobile");
dialog.addClass('dialogMobile');
dialogProperty.top = 0;
dialogProperty.left = 0;
dialogProperty.right = 0;
@ -125,14 +127,14 @@ changeNonTargetLocationCallback = function(measurementData, eventData, doneCallb
Template.nonTargetLesionDialog.doneCallback = doneCallback;
// Get the non-target lesion location dialog
var dialog = $("#nonTargetLesionRelabelDialog");
var dialog = $('#nonTargetLesionRelabelDialog');
Template.nonTargetLesionDialog.dialog = dialog;
// Show the backdrop
UI.render(Template.removableBackdrop, document.body);
// Make sure the context menu is closed when the user clicks away
$(".removableBackdrop").one('mousedown touchstart', function() {
$('.removableBackdrop').one('mousedown touchstart', function() {
closeHandler(dialog);
if (doneCallback && typeof doneCallback === 'function') {
@ -142,17 +144,17 @@ changeNonTargetLocationCallback = function(measurementData, eventData, doneCallb
});
// Find the select option box
var selectorLocation = dialog.find("select#selectNonTargetLesionLocation");
var selectorResponse = dialog.find("select#selectNonTargetLesionLocationResponse");
var selectorLocation = dialog.find('select#selectNonTargetLesionLocation');
var selectorResponse = dialog.find('select#selectNonTargetLesionLocationResponse');
selectorLocation.find("option:first").prop("selected", "selected");
selectorResponse.find("option:first").prop("selected", "selected");
selectorLocation.find('option:first').prop('selected', 'selected');
selectorResponse.find('option:first').prop('selected', 'selected');
// Allow location selection
selectorLocation.removeAttr("disabled");
selectorLocation.removeAttr('disabled');
// Show the nonTargetLesion dialog above
var dialogProperty = {
var dialogProperty = {
display: 'block'
};
@ -160,7 +162,7 @@ changeNonTargetLocationCallback = function(measurementData, eventData, doneCallb
// If device is touch device, set position center of screen vertically and horizontally
if (!eventData || isTouchDevice()) {
// add dialogMobile class to provide a black,transparent background
dialog.addClass("dialogMobile");
dialog.addClass('dialogMobile');
dialogProperty.top = 0;
dialogProperty.left = 0;
dialogProperty.right = 0;
@ -179,8 +181,14 @@ changeNonTargetLocationCallback = function(measurementData, eventData, doneCallb
}
LesionLocations.update({},
{$set: {selected: false}},
{ multi: true });
{
$set: {
selected: false
}
},
{
multi: true
});
var currentLocation = LesionLocations.findOne({
id: measurement.locationId
@ -197,8 +205,14 @@ changeNonTargetLocationCallback = function(measurementData, eventData, doneCallb
});
LocationResponses.update({},
{$set: {selected: false}},
{ multi: true });
{
$set: {
selected: false
}
},
{
multi: true
});
var response = measurement.timepoints[measurementData.timepointID].response;
@ -233,12 +247,12 @@ Template.nonTargetLesionDialog.events({
var measurementData = Template.nonTargetLesionDialog.measurementData;
// Find the select option box
var selectorLocation = dialog.find("select#selectNonTargetLesionLocation");
var selectorResponse = dialog.find("select#selectNonTargetLesionLocationResponse");
var selectorLocation = dialog.find('select#selectNonTargetLesionLocation');
var selectorResponse = dialog.find('select#selectNonTargetLesionLocationResponse');
// Get the current value of the selector
var selectedOptionId = selectorLocation.find("option:selected").val();
var responseOptionId = selectorResponse.find("option:selected").val();
var selectedOptionId = selectorLocation.find('option:selected').val();
var responseOptionId = selectorResponse.find('option:selected').val();
// If the selected option is still the default (-1)
// then stop here
@ -253,15 +267,21 @@ Template.nonTargetLesionDialog.events({
}
// Get selected location data
var locationObj = LesionLocations.findOne({_id: selectedOptionId});
var locationObj = LesionLocations.findOne({
_id: selectedOptionId
});
var id;
var existingLocation = PatientLocations.findOne({location: locationObj.location});
var existingLocation = PatientLocations.findOne({
location: locationObj.location
});
if (existingLocation) {
id = existingLocation._id;
} else {
// Adds location data to PatientLocation and retrieve the location ID
id = PatientLocations.insert({location: locationObj.location});
id = PatientLocations.insert({
location: locationObj.location
});
}
if (measurementData.id) {
@ -323,12 +343,11 @@ Template.nonTargetLesionDialog.events({
}
});
Template.nonTargetLesionDialog.helpers({
'lesionLocations': function() {
lesionLocations: function() {
return LesionLocations.find();
},
'locationResponses': function() {
locationResponses: function() {
return LocationResponses.find();
}
});
});

19
Packages/lesiontracker/client/components/nonTargetResponseDialog/nonTargetResponseDialog.js
View File

@ -3,7 +3,7 @@ function closeHandler(dialog) {
$(dialog).css('display', 'none');
// Remove the backdrop
$(".removableBackdrop").remove();
$('.removableBackdrop').remove();
// Restore the focus to the active viewport
setFocusToActiveViewport();
@ -14,14 +14,14 @@ changeNonTargetResponse = function(measurementData, eventData, doneCallback) {
Template.nonTargetResponseDialog.doneCallback = doneCallback;
// Get the non-target lesion location dialog
var dialog = $("#nonTargetResponseDialog");
var dialog = $('#nonTargetResponseDialog');
Template.nonTargetResponseDialog.dialog = dialog;
// Show the backdrop
UI.render(Template.removableBackdrop, document.body);
// Make sure the context menu is closed when the user clicks away
$(".removableBackdrop").one('mousedown touchstart', function() {
$('.removableBackdrop').one('mousedown touchstart', function() {
closeHandler(dialog);
if (doneCallback && typeof doneCallback === 'function') {
@ -31,7 +31,7 @@ changeNonTargetResponse = function(measurementData, eventData, doneCallback) {
});
// Show the nonTargetLesion dialog above
var dialogProperty = {
var dialogProperty = {
display: 'block'
};
@ -39,7 +39,7 @@ changeNonTargetResponse = function(measurementData, eventData, doneCallback) {
// If device is touch device, set position center of screen vertically and horizontally
if (!eventData || isTouchDevice()) {
// add dialogMobile class to provide a black,transparent background
dialog.addClass("dialogMobile");
dialog.addClass('dialogMobile');
dialogProperty.top = 0;
dialogProperty.left = 0;
dialogProperty.right = 0;
@ -90,10 +90,10 @@ Template.nonTargetResponseDialog.events({
var measurementData = Template.nonTargetResponseDialog.measurementData;
// Find the select option box
var selectorResponse = dialog.find("select#selectNonTargetLesionLocationResponse");
var selectorResponse = dialog.find('select#selectNonTargetLesionLocationResponse');
// Get the current value of the selector
var responseOptionId = selectorResponse.find("option:selected").val();
var responseOptionId = selectorResponse.find('option:selected').val();
// If the selected response option is still the default (-1)
// then stop here
@ -148,9 +148,8 @@ Template.nonTargetResponseDialog.events({
}
});
Template.nonTargetResponseDialog.helpers({
'locationResponses': function() {
locationResponses: function() {
return LocationResponses.find();
}
});
});

35
Packages/lesiontracker/client/components/studyDateList/studyDateList.js
View File

@ -12,10 +12,14 @@ Template.studyDateList.helpers({
// since the WorklistStudies Collection only contains the studies on-screen
// Check which study is currently loaded into the study browser
var currentStudyInBrowser = ViewerStudies.findOne({selected: true});
var currentStudyInBrowser = ViewerStudies.findOne({
selected: true
});
// Find studies which have the same patientId as the currently selected study
var relatedStudies = WorklistStudies.find({patientId: currentStudyInBrowser.patientId}).fetch();
var relatedStudies = WorklistStudies.find({
patientId: currentStudyInBrowser.patientId
}).fetch();
// Modify the array of related studies so the default option is the currently selected study
relatedStudies.forEach(function(study) {
@ -31,7 +35,6 @@ Template.studyDateList.helpers({
}
});
Template.studyDateList.events({
/**
* When the study date selector combo box is changed, we will
@ -65,16 +68,26 @@ Template.studyDateList.events({
// Set "Selected" to false for the entire collection
ViewerStudies.update({},
{$set: {selected: false}},
{ multi: true });
{
$set: {
selected: false
}
},
{
multi: true
});
// Check if this study already exists in the ViewerStudies collection
// of loaded studies. If it does, set it's 'selected' value to true.
var existingStudy = ViewerStudies.findOne({studyInstanceUid: studyInstanceUid});
var existingStudy = ViewerStudies.findOne({
studyInstanceUid: studyInstanceUid
});
if (existingStudy) {
// Set the current finding in the collection to true
ViewerStudies.update(existingStudy._id, {
$set: {selected: true}
$set: {
selected: true
}
});
return;
}
@ -86,15 +99,17 @@ Template.studyDateList.events({
var timepointID = uuid.v4();
var timepoint = Timepoints.findOne({timepointName: study.studyDate});
var timepoint = Timepoints.findOne({
timepointName: study.studyDate
});
if (timepoint) {
log.warn("A timepoint with that study date already exists!");
log.warn('A timepoint with that study date already exists!');
return;
}
var testTimepoint = Timepoints.findOne({});
if (testTimepoint && testTimepoint.patientId !== study.patientId) {
log.warn("Timepoints collection related to the wrong subject");
log.warn('Timepoints collection related to the wrong subject');
return;
}

12
Packages/lesiontracker/lib/activateLesion.js
View File

@ -6,7 +6,7 @@
activateLesion = function(measurementId, templateData) {
// Set background color of selected row
$("tr[data-measurementid=" + measurementId + "]").addClass("selectedRow").siblings().removeClass("selectedRow");
$('tr[data-measurementid=' + measurementId + ']').addClass('selectedRow').siblings().removeClass('selectedRow');
var measurementData = Measurements.findOne(measurementId);
@ -26,9 +26,9 @@ activateLesion = function(measurementId, templateData) {
Object.keys(timepoints).forEach(function(key) {
var timepoint = timepoints[key];
if (timepoint.imageId === "" ||
timepoint.studyInstanceUid === "" ||
timepoint.seriesInstanceUid === "") {
if (timepoint.imageId === '' ||
timepoint.studyInstanceUid === '' ||
timepoint.seriesInstanceUid === '') {
return;
}
@ -41,7 +41,7 @@ activateLesion = function(measurementId, templateData) {
}
// Loop through the viewports and display each timepoint
$(".imageViewerViewport").not('.empty').each(function(viewportIndex, element) {
$('.imageViewerViewport').not('.empty').each(function(viewportIndex, element) {
// Stop if we run out of timepoints before viewports
if (viewportIndex >= timepointsWithEntries.length) {
// Update the element anyway, to remove any other highlights that are present
@ -93,4 +93,4 @@ activateLesion = function(measurementId, templateData) {
activateMeasurements(element, measurementId, templateData, viewportIndex);
});
});
};
};

2
Packages/lesiontracker/lib/activateMeasurements.js
View File

@ -80,4 +80,4 @@ function activateTool(element, measurementData, timepointID) {
}
cornerstone.updateImage(element);
}
}

2
Packages/lesiontracker/lib/clearMeasurementTimepointData.js
View File

@ -20,7 +20,7 @@ clearMeasurementTimepointData = function(measurementId, timepointId) {
delete data.timepoints[timepointId];
if (Object.keys(data.timepoints).length === 0) {
Meteor.call("removeMeasurement", measurementId, function(error, response) {
Meteor.call('removeMeasurement', measurementId, function(error, response) {
console.log('Removed!');
});
} else {

16
Packages/lesiontracker/lib/clearTools.js
View File

@ -1,15 +1,15 @@
clearTools = function() {
var patientId = Session.get("patientId");
var toolTypes = ["lesion", "nonTarget"];
var patientId = Session.get('patientId');
var toolTypes = [ 'lesion', 'nonTarget' ];
var toolState = cornerstoneTools.globalImageIdSpecificToolStateManager.toolState;
var toolStateKeys = Object.keys(toolState).slice(0);
// Set null array for toolState data found by imageId and toolType
toolStateKeys.forEach(function (imageId) {
toolTypes.forEach(function (toolType) {
toolStateKeys.forEach(function(imageId) {
toolTypes.forEach(function(toolType) {
var toolTypeData = toolState[imageId][toolType];
if(toolTypeData && toolTypeData.data.length > 0) {
if(toolTypeData.data[0].patientId === patientId) {
if (toolTypeData && toolTypeData.data.length > 0) {
if (toolTypeData.data[0].patientId === patientId) {
toolState[imageId][toolType] = {
data: []
};
@ -19,11 +19,11 @@ clearTools = function() {
});
// Update imageViewerViewport elements to remove lesions on current image
var viewportElements = $(".imageViewerViewport").not('.empty');
var viewportElements = $('.imageViewerViewport').not('.empty');
viewportElements.each(function(index, element) {
cornerstone.updateImage(element);
});
// Remove patient's measurements
Meteor.call('removeMeasurementsByPatientId', patientId);
};
};

2
Packages/lesiontracker/lib/deactivateAllToolData.js
View File

@ -15,4 +15,4 @@ deactivateAllToolData = function(element, toolType) {
var data = toolData.data[i];
data.active = false;
}
};
};

7
Packages/lesiontracker/lib/getTimepointObject.js
View File

@ -9,5 +9,8 @@ getTimepointObject = function(imageId) {
if (!study) {
return;
}
return Timepoints.findOne({timepointName: study.studyDate});
};
return Timepoints.findOne({
timepointName: study.studyDate
});
};

31
Packages/lesiontracker/lib/mathUtils.js
View File

@ -4,14 +4,13 @@ sign = function(x) {
return typeof x === 'number' ? x ? x < 0 ? -1 : 1 : x === x ? 0 : NaN : NaN;
};
// Returns intersection points of lines and whether lines are intersected
getLineIntersection = function (point1, point2, point3, point4) {
getLineIntersection = function(point1, point2, point3, point4) {
var intersectionPoint = {};
var x1 = point1.x, y1 = point1.y, x2 = point2.x, y2 = point2.y,
x3 = point3.x, y3 = point3.y, x4 = point4.x, y4 = point4.y;
var x1 = point1.x, y1 = point1.y, x2 = point2.x, y2 = point2.y,
x3 = point3.x, y3 = point3.y, x4 = point4.x, y4 = point4.y;
var a1, a2, b1, b2, c1, c2; // Coefficients of line equations
var r1, r2, r3, r4; // Sign values
@ -33,8 +32,7 @@ getLineIntersection = function (point1, point2, point3, point4) {
if (r3 != 0 &&
r4 != 0 &&
sign(r3) == sign(r4))
{
sign(r3) == sign(r4)) {
intersectionPoint.x = 0;
intersectionPoint.y = 0;
intersectionPoint.intersected = false;
@ -59,8 +57,7 @@ getLineIntersection = function (point1, point2, point3, point4) {
if (r1 != 0 &&
r2 != 0 &&
sign(r1) == sign(r2))
{
sign(r1) == sign(r2)) {
intersectionPoint.x = 0;
intersectionPoint.y = 0;
intersectionPoint.intersected = false;
@ -98,7 +95,7 @@ getDistance = function(point1, point2) {
};
// Returns distance from point to a line
getDistanceFromPointToLine = function (ptTest, pt1, pt2) {
getDistanceFromPointToLine = function(ptTest, pt1, pt2) {
var ptNearest = {};
// Point on line segment nearest to pt0
@ -106,29 +103,23 @@ getDistanceFromPointToLine = function (ptTest, pt1, pt2) {
var dy = pt2.y - pt1.y;
// It's a point, not a line
if (dx == 0 && dy == 0)
{
if (dx == 0 && dy == 0) {
ptNearest.x = pt1.x;
ptNearest.y = pt1.y;
}
else
{
} else {
// Parameter
var t = ((ptTest.x - pt1.x) * dx + (ptTest.y - pt1.y) * dy) / (dx * dx + dy * dy);
// Nearest point is pt1
if (t < 0)
{
if (t < 0) {
ptNearest = pt1;
}
// Nearest point is pt2
else if (t > 1)
{
else if (t > 1) {
ptNearest = pt2;
}
// Nearest point is on the line segment
else
{
else {
// Parametric equation
ptNearest.x = (pt1.x + t * dx);
ptNearest.y = (pt1.y + t * dy);

2
Packages/lesiontracker/lib/removeToolDataWithMeasurementId.js
View File

@ -25,4 +25,4 @@ removeToolDataWithMeasurementId = function(imageId, toolType, measurementId) {
toRemove.forEach(function(index) {
toolData.splice(index, 1);
});
};
};

6
Packages/lesiontracker/lib/toggleLesionTrackerTools.js
View File

@ -15,10 +15,10 @@ toggleLesionTrackerTools = function() {
// Hide the tools (set them all to disabled)
var toolDefaultStates = {
activate: ['deleteLesionKeyboardTool'],
activate: [ 'deleteLesionKeyboardTool' ],
deactivate: [],
enable: [],
disable: ['lesion', 'nonTarget', 'scaleOverlayTool', 'length']
disable: [ 'lesion', 'nonTarget', 'scaleOverlayTool', 'length' ]
};
toolManager.setToolDefaultStates(toolDefaultStates);
@ -38,4 +38,4 @@ toggleLesionTrackerTools = function() {
toolsShown = true;
}
};
};

430
Packages/lesiontracker/lib/uuid.js
View File

@ -4,247 +4,247 @@
// MIT License - http://opensource.org/licenses/mit-license.php
(function() {
var _global = this;
var _global = this;
// Unique ID creation requires a high quality random # generator. We feature
// detect to determine the best RNG source, normalizing to a function that
// returns 128-bits of randomness, since that's what's usually required
var _rng;
// Unique ID creation requires a high quality random # generator. We feature
// detect to determine the best RNG source, normalizing to a function that
// returns 128-bits of randomness, since that's what's usually required
var _rng;
// Allow for MSIE11 msCrypto
var _crypto = _global.crypto || _global.msCrypto;
// Allow for MSIE11 msCrypto
var _crypto = _global.crypto || _global.msCrypto;
// Node.js crypto-based RNG - http://nodejs.org/docs/v0.6.2/api/crypto.html
//
// Moderately fast, high quality
if (typeof(_global.require) == 'function') {
try {
var _rb = _global.require('crypto').randomBytes;
_rng = _rb && function() {return _rb(16);};
} catch(e) {}
}
if (!_rng && _crypto && _crypto.getRandomValues) {
// WHATWG crypto-based RNG - http://wiki.whatwg.org/wiki/Crypto
// Node.js crypto-based RNG - http://nodejs.org/docs/v0.6.2/api/crypto.html
//
// Moderately fast, high quality
var _rnds8 = new Uint8Array(16);
_rng = function whatwgRNG() {
_crypto.getRandomValues(_rnds8);
return _rnds8;
};
}
if (typeof(_global.require) == 'function') {
try {
var _rb = _global.require('crypto').randomBytes;
_rng = _rb && function() {return _rb(16);};
} catch(e) {}
}
if (!_rng) {
// Math.random()-based (RNG)
if (!_rng && _crypto && _crypto.getRandomValues) {
// WHATWG crypto-based RNG - http://wiki.whatwg.org/wiki/Crypto
//
// Moderately fast, high quality
var _rnds8 = new Uint8Array(16);
_rng = function whatwgRNG() {
_crypto.getRandomValues(_rnds8);
return _rnds8;
};
}
if (!_rng) {
// Math.random()-based (RNG)
//
// If all else fails, use Math.random(). It's fast, but is of unspecified
// quality.
var _rnds = new Array(16);
_rng = function() {
for (var i = 0, r; i < 16; i++) {
if ((i & 0x03) === 0) r = Math.random() * 0x100000000;
_rnds[i] = r >>> ((i & 0x03) << 3) & 0xff;
}
return _rnds;
};
}
// Buffer class to use
var BufferClass = typeof(_global.Buffer) == 'function' ? _global.Buffer : Array;
// Maps for number <-> hex string conversion
var _byteToHex = [];
var _hexToByte = {};
for (var i = 0; i < 256; i++) {
_byteToHex[i] = (i + 0x100).toString(16).substr(1);
_hexToByte[_byteToHex[i]] = i;
}
// **`parse()` - Parse a UUID into it's component bytes**
function parse(s, buf, offset) {
var i = (buf && offset) || 0, ii = 0;
buf = buf || [];
s.toLowerCase().replace(/[0-9a-f]{2}/g, function(oct) {
if (ii < 16) { // Don't overflow!
buf[i + ii++] = _hexToByte[oct];
}
});
// Zero out remaining bytes if string was short
while (ii < 16) {
buf[i + ii++] = 0;
}
return buf;
}
// **`unparse()` - Convert UUID byte array (ala parse()) into a string**
function unparse(buf, offset) {
var i = offset || 0, bth = _byteToHex;
return bth[buf[i++]] + bth[buf[i++]] +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] +
bth[buf[i++]] + bth[buf[i++]] +
bth[buf[i++]] + bth[buf[i++]];
}
// **`v1()` - Generate time-based UUID**
//
// If all else fails, use Math.random(). It's fast, but is of unspecified
// quality.
var _rnds = new Array(16);
_rng = function() {
for (var i = 0, r; i < 16; i++) {
if ((i & 0x03) === 0) r = Math.random() * 0x100000000;
_rnds[i] = r >>> ((i & 0x03) << 3) & 0xff;
}
// Inspired by https://github.com/LiosK/UUID.js
// and http://docs.python.org/library/uuid.html
return _rnds;
};
}
// random #'s we need to init node and clockseq
var _seedBytes = _rng();
// Buffer class to use
var BufferClass = typeof(_global.Buffer) == 'function' ? _global.Buffer : Array;
// Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
var _nodeId = [
_seedBytes[0] | 0x01,
_seedBytes[1], _seedBytes[2], _seedBytes[3], _seedBytes[4], _seedBytes[5]
];
// Maps for number <-> hex string conversion
var _byteToHex = [];
var _hexToByte = {};
for (var i = 0; i < 256; i++) {
_byteToHex[i] = (i + 0x100).toString(16).substr(1);
_hexToByte[_byteToHex[i]] = i;
}
// Per 4.2.2, randomize (14 bit) clockseq
var _clockseq = (_seedBytes[6] << 8 | _seedBytes[7]) & 0x3fff;
// **`parse()` - Parse a UUID into it's component bytes**
function parse(s, buf, offset) {
var i = (buf && offset) || 0, ii = 0;
// Previous uuid creation time
var _lastMSecs = 0, _lastNSecs = 0;
buf = buf || [];
s.toLowerCase().replace(/[0-9a-f]{2}/g, function(oct) {
if (ii < 16) { // Don't overflow!
buf[i + ii++] = _hexToByte[oct];
}
});
// See https://github.com/broofa/node-uuid for API details
function v1(options, buf, offset) {
var i = buf && offset || 0;
var b = buf || [];
// Zero out remaining bytes if string was short
while (ii < 16) {
buf[i + ii++] = 0;
options = options || {};
var clockseq = options.clockseq != null ? options.clockseq : _clockseq;
// UUID timestamps are 100 nano-second units since the Gregorian epoch,
// (1582-10-15 00:00). JSNumbers aren't precise enough for this, so
// time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
// (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00.
var msecs = options.msecs != null ? options.msecs : new Date().getTime();
// Per 4.2.1.2, use count of uuid's generated during the current clock
// cycle to simulate higher resolution clock
var nsecs = options.nsecs != null ? options.nsecs : _lastNSecs + 1;
// Time since last uuid creation (in msecs)
var dt = (msecs - _lastMSecs) + (nsecs - _lastNSecs) / 10000;
// Per 4.2.1.2, Bump clockseq on clock regression
if (dt < 0 && options.clockseq == null) {
clockseq = clockseq + 1 & 0x3fff;
}
// Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
// time interval
if ((dt < 0 || msecs > _lastMSecs) && options.nsecs == null) {
nsecs = 0;
}
// Per 4.2.1.2 Throw error if too many uuids are requested
if (nsecs >= 10000) {
throw new Error('uuid.v1(): Can\'t create more than 10M uuids/sec');
}
_lastMSecs = msecs;
_lastNSecs = nsecs;
_clockseq = clockseq;
// Per 4.1.4 - Convert from unix epoch to Gregorian epoch
msecs += 12219292800000;
// `time_low`
var tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
b[i++] = tl >>> 24 & 0xff;
b[i++] = tl >>> 16 & 0xff;
b[i++] = tl >>> 8 & 0xff;
b[i++] = tl & 0xff;
// `time_mid`
var tmh = (msecs / 0x100000000 * 10000) & 0xfffffff;
b[i++] = tmh >>> 8 & 0xff;
b[i++] = tmh & 0xff;
// `time_high_and_version`
b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
b[i++] = tmh >>> 16 & 0xff;
// `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
b[i++] = clockseq >>> 8 | 0x80;
// `clock_seq_low`
b[i++] = clockseq & 0xff;
// `node`
var node = options.node || _nodeId;
for (var n = 0; n < 6; n++) {
b[i + n] = node[n];
}
return buf ? buf : unparse(b);
}
return buf;
}
// **`v4()` - Generate random UUID**
// **`unparse()` - Convert UUID byte array (ala parse()) into a string**
function unparse(buf, offset) {
var i = offset || 0, bth = _byteToHex;
return bth[buf[i++]] + bth[buf[i++]] +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] +
bth[buf[i++]] + bth[buf[i++]] +
bth[buf[i++]] + bth[buf[i++]];
}
// See https://github.com/broofa/node-uuid for API details
function v4(options, buf, offset) {
// Deprecated - 'format' argument, as supported in v1.2
var i = buf && offset || 0;
// **`v1()` - Generate time-based UUID**
//
// Inspired by https://github.com/LiosK/UUID.js
// and http://docs.python.org/library/uuid.html
if (typeof(options) == 'string') {
buf = options == 'binary' ? new BufferClass(16) : null;
options = null;
}
// random #'s we need to init node and clockseq
var _seedBytes = _rng();
options = options || {};
// Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
var _nodeId = [
_seedBytes[0] | 0x01,
_seedBytes[1], _seedBytes[2], _seedBytes[3], _seedBytes[4], _seedBytes[5]
];
var rnds = options.random || (options.rng || _rng)();
// Per 4.2.2, randomize (14 bit) clockseq
var _clockseq = (_seedBytes[6] << 8 | _seedBytes[7]) & 0x3fff;
// Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
rnds[6] = (rnds[6] & 0x0f) | 0x40;
rnds[8] = (rnds[8] & 0x3f) | 0x80;
// Previous uuid creation time
var _lastMSecs = 0, _lastNSecs = 0;
// Copy bytes to buffer, if provided
if (buf) {
for (var ii = 0; ii < 16; ii++) {
buf[i + ii] = rnds[ii];
}
}
// See https://github.com/broofa/node-uuid for API details
function v1(options, buf, offset) {
var i = buf && offset || 0;
var b = buf || [];
options = options || {};
var clockseq = options.clockseq != null ? options.clockseq : _clockseq;
// UUID timestamps are 100 nano-second units since the Gregorian epoch,
// (1582-10-15 00:00). JSNumbers aren't precise enough for this, so
// time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
// (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00.
var msecs = options.msecs != null ? options.msecs : new Date().getTime();
// Per 4.2.1.2, use count of uuid's generated during the current clock
// cycle to simulate higher resolution clock
var nsecs = options.nsecs != null ? options.nsecs : _lastNSecs + 1;
// Time since last uuid creation (in msecs)
var dt = (msecs - _lastMSecs) + (nsecs - _lastNSecs)/10000;
// Per 4.2.1.2, Bump clockseq on clock regression
if (dt < 0 && options.clockseq == null) {
clockseq = clockseq + 1 & 0x3fff;
return buf || unparse(rnds);
}
// Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
// time interval
if ((dt < 0 || msecs > _lastMSecs) && options.nsecs == null) {
nsecs = 0;
}
// Export public API
var uuid = v4;
uuid.v1 = v1;
uuid.v4 = v4;
uuid.parse = parse;
uuid.unparse = unparse;
uuid.BufferClass = BufferClass;
// Per 4.2.1.2 Throw error if too many uuids are requested
if (nsecs >= 10000) {
throw new Error('uuid.v1(): Can\'t create more than 10M uuids/sec');
}
_lastMSecs = msecs;
_lastNSecs = nsecs;
_clockseq = clockseq;
// Per 4.1.4 - Convert from unix epoch to Gregorian epoch
msecs += 12219292800000;
// `time_low`
var tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
b[i++] = tl >>> 24 & 0xff;
b[i++] = tl >>> 16 & 0xff;
b[i++] = tl >>> 8 & 0xff;
b[i++] = tl & 0xff;
// `time_mid`
var tmh = (msecs / 0x100000000 * 10000) & 0xfffffff;
b[i++] = tmh >>> 8 & 0xff;
b[i++] = tmh & 0xff;
// `time_high_and_version`
b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
b[i++] = tmh >>> 16 & 0xff;
// `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
b[i++] = clockseq >>> 8 | 0x80;
// `clock_seq_low`
b[i++] = clockseq & 0xff;
// `node`
var node = options.node || _nodeId;
for (var n = 0; n < 6; n++) {
b[i + n] = node[n];
}
return buf ? buf : unparse(b);
}
// **`v4()` - Generate random UUID**
// See https://github.com/broofa/node-uuid for API details
function v4(options, buf, offset) {
// Deprecated - 'format' argument, as supported in v1.2
var i = buf && offset || 0;
if (typeof(options) == 'string') {
buf = options == 'binary' ? new BufferClass(16) : null;
options = null;
}
options = options || {};
var rnds = options.random || (options.rng || _rng)();
// Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
rnds[6] = (rnds[6] & 0x0f) | 0x40;
rnds[8] = (rnds[8] & 0x3f) | 0x80;
// Copy bytes to buffer, if provided
if (buf) {
for (var ii = 0; ii < 16; ii++) {
buf[i + ii] = rnds[ii];
}
}
return buf || unparse(rnds);
}
// Export public API
var uuid = v4;
uuid.v1 = v1;
uuid.v4 = v4;
uuid.parse = parse;
uuid.unparse = unparse;
uuid.BufferClass = BufferClass;
if (typeof(module) != 'undefined' && module.exports) {
// Publish as node.js module
module.exports = uuid;
} else if (typeof define === 'function' && define.amd) {
// Publish as AMD module
define(function() {return uuid;});
if (typeof(module) != 'undefined' && module.exports) {
// Publish as node.js module
module.exports = uuid;
} else if (typeof define === 'function' && define.amd) {
// Publish as AMD module
define(function() {return uuid;});
} else {
// Publish as global (in browsers)
var _previousRoot = _global.uuid;
} else {
// Publish as global (in browsers)
var _previousRoot = _global.uuid;
// **`noConflict()` - (browser only) to reset global 'uuid' var**
uuid.noConflict = function() {
_global.uuid = _previousRoot;
return uuid;
};
// **`noConflict()` - (browser only) to reset global 'uuid' var**
uuid.noConflict = function() {
_global.uuid = _previousRoot;
return uuid;
};
_global.uuid = uuid;
}
_global.uuid = uuid;
}
}).call(this);

2
Packages/lesiontracker/log.js
View File

@ -1,3 +1,3 @@
// Create package logger using loglevel
// https://atmospherejs.com/spacejamio/loglevel
log = loglevel.createPackageLogger('lesiontracker', defaultLevel = 'info');
log = loglevel.createPackageLogger('lesiontracker', defaultLevel = 'info');

41
Packages/lesiontracker/package.js
View File

@ -1,10 +1,10 @@
Package.describe({
name: "lesiontracker",
summary: "OHIF Lesion Tracker Tools",
version: '0.0.1'
name: 'lesiontracker',
summary: 'OHIF Lesion Tracker Tools',
version: '0.0.1'
});
Package.onUse(function (api) {
Package.onUse(function(api) {
api.versionsFrom('1.2.0.2');
api.use('standard-app-packages');
@ -15,16 +15,26 @@ Package.onUse(function (api) {
// Our custom package
api.use('cornerstone');
api.addFiles('log.js', ['client', 'server']);
api.addFiles('log.js', [ 'client', 'server' ]);
api.addFiles('client/collections/LesionLocations.js', 'client');
api.addFiles('client/collections/LocationResponses.js', 'client');
api.addFiles('client/compatibility/lesionTool.js', 'client', {bare: true});
api.addFiles('client/compatibility/nonTargetTool.js', 'client', {bare: true});
api.addFiles('client/compatibility/scaleOverlayTool.js', 'client', {bare: true});
api.addFiles('client/compatibility/deleteLesionKeyboardTool.js', 'client', {bare: true});
api.addFiles('client/compatibility/LesionManager.js', 'client', {bare: true});
api.addFiles('client/compatibility/lesionTool.js', 'client', {
bare: true
});
api.addFiles('client/compatibility/nonTargetTool.js', 'client', {
bare: true
});
api.addFiles('client/compatibility/scaleOverlayTool.js', 'client', {
bare: true
});
api.addFiles('client/compatibility/deleteLesionKeyboardTool.js', 'client', {
bare: true
});
api.addFiles('client/compatibility/LesionManager.js', 'client', {
bare: true
});
api.addFiles('client/components/lesionLocationDialog/lesionLocationDialog.html', 'client');
api.addFiles('client/components/lesionLocationDialog/lesionLocationDialog.js', 'client');
@ -66,10 +76,10 @@ Package.onUse(function (api) {
// Server functions
api.addFiles('server/collections.js', 'server');
api.addFiles('server/removeCollections.js', ['server']);
api.addFiles('server/removeCollections.js', [ 'server' ]);
// Both client and server functions
api.addFiles('both/collections.js', ['client', 'server']);
api.addFiles('both/collections.js', [ 'client', 'server' ]);
// Library functions
api.addFiles('lib/uuid.js', 'client');
@ -83,7 +93,6 @@ Package.onUse(function (api) {
api.addFiles('lib/clearTools.js', 'client');
api.addFiles('lib/mathUtils.js', 'client');
// Export gloabal functions
api.export('activateLesion','client');
api.export('activateMeasurements','client');
@ -107,6 +116,6 @@ Package.onUse(function (api) {
api.export('PatientLocations', 'client');
// Export collections spanning both client and server
api.export('Measurements', ['client', 'server']);
api.export('Timepoints', ['client', 'server']);
});
api.export('Measurements', [ 'client', 'server' ]);
api.export('Timepoints', [ 'client', 'server' ]);
});

3
Packages/lesiontracker/server/collections.js
View File

@ -10,7 +10,6 @@ Meteor.publish('measurements', function(patientId) {
});
});
// Temporary fix to drop all Collections on server restart
// http://stackoverflow.com/questions/23891631/meteor-how-can-i-drop-all-mongo-collections-and-clear-all-data-on-startup
Meteor.startup(function() {
@ -21,4 +20,4 @@ Meteor.startup(function() {
object.remove({});
}
}
});
});

12
Packages/lesiontracker/server/removeCollections.js
View File

@ -1,11 +1,13 @@
Meteor.methods({
"removeMeasurement": function(id) {
removeMeasurement: function(id) {
Measurements.remove(id);
},
"removeMeasurementsByPatientId": function(patientId) {
Measurements.remove({patientId: patientId});
removeMeasurementsByPatientId: function(patientId) {
Measurements.remove({
patientId: patientId
});
},
"decrementLesionNumbers": function(lesionData) {
decrementLesionNumbers: function(lesionData) {
// Update all Measurements to decrement the lesion numbers for those
// that were created after the current lesion by 1
@ -41,4 +43,4 @@ Meteor.methods({
multi: true
});
}
});
});