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
}
}

27
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);

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

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

5
LesionTracker/client/routes.js
View File

@ -22,7 +22,6 @@ 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;
}

7
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();
});

5
OHIFViewer/client/routes.js
View File

@ -22,7 +22,6 @@ 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;
}

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

@ -8,6 +8,7 @@ function stringToUint8Array(str) {
for (var i = 0,j = str.length;i< j;i++){
uint[i] = str.charCodeAt(i);
}
return uint;
}
@ -25,13 +26,14 @@ function checkToken(token, data, 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;
@ -45,5 +47,6 @@ findIndexOfString = function(data, str, offset) {
}
}
}
return -1;
};

3
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++) {
str += String.fromCharCode(data[i]);
}
return str;
};

6
Packages/dicomweb/package.js
View File

@ -1,6 +1,6 @@
Package.describe({
name: "dicomweb",
summary: "DICOM Web Helper Functions",
name: 'dicomweb',
summary: 'DICOM Web Helper Functions',
version: '0.0.1'
});
@ -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');
});

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

@ -4,6 +4,7 @@ function findBoundary(header) {
return header[i];
}
}
return undefined;
}
@ -13,6 +14,7 @@ function findContentType(header) {
return header[i].substr(13).trim();
}
}
return undefined;
}
@ -21,8 +23,8 @@ DICOMWeb.getImageFrame = function(uri, mediaType) {
return new Promise(function(resolve, reject) {
var xhr = new XMLHttpRequest();
xhr.responseType = "arraybuffer";
xhr.open("get", uri, true);
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
@ -36,6 +38,7 @@ DICOMWeb.getImageFrame = function(uri, mediaType) {
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');
@ -43,6 +46,7 @@ DICOMWeb.getImageFrame = function(uri, mediaType) {
if (!boundary) {
reject('invalid response - no boundary marker');
}
var offset = tokenIndex + 4; // skip over the \n\r\n
// find the terminal boundary marker
@ -58,13 +62,13 @@ DICOMWeb.getImageFrame = function(uri, mediaType) {
offset: offset,
length: length
});
}
else {
} else {
// request failed, reject the deferred
reject(xhr.response);
}
}
};
xhr.send();
});
};

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

@ -1,7 +1,7 @@
DICOMWeb.getJSON = function(url, options) {
var getOptions = {
headers: {
'Accept' : 'application/json'
Accept: 'application/json'
},
};

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

@ -16,5 +16,6 @@ DICOMWeb.getNumber = function(element, defaultValue) {
if (!element.Value.length) {
return defaultValue;
}
return parseFloat(element.Value[0]);
};

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

@ -1,6 +1,6 @@
Package.describe({
name: "dimseservice",
summary: "DICOM DIMSE C-Service",
name: 'dimseservice',
summary: 'DICOM DIMSE C-Service',
version: '0.0.1'
});
@ -18,5 +18,5 @@ Package.onUse(function (api) {
api.addFiles('server/Connection.js', 'server');
api.addFiles('server/DIMSE.js', 'server');
api.export("DIMSE", 'server');
api.export('DIMSE', 'server');
});

149
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();
@ -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) {
@ -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] ];
}
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 = [],
@ -349,7 +361,7 @@ Connection.prototype.setPresentationContexts = function(uids) {
});
});
this.presentationContexts = contexts;
}
};
Connection.prototype.verify = function() {
this.setPresentationContexts([ C.SOP_VERIFICATION ]);
@ -357,17 +369,17 @@ Connection.prototype.verify = 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,6 +503,7 @@ 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 ]);
@ -510,6 +525,7 @@ Connection.prototype.sendMessage = function(context, command, dataset, listener)
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 = [];
@ -568,7 +585,7 @@ Connection.prototype.associate = function(options, callback) {
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);
}
};

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

@ -36,12 +36,12 @@ DIMSE.retrievePatients = function(params) {
var future = new Future;
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);
@ -70,16 +70,16 @@ DIMSE.retrieveStudies = function(params) {
var future = new Future;
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);
@ -107,17 +107,17 @@ DIMSE.retrieveSeries = function(studyInstanceUID, params) {
var future = new Future;
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);
@ -144,24 +144,24 @@ DIMSE.retrieveInstances = function(studyInstanceUID, seriesInstanceUID, params)
var future = new Future;
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);

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

@ -23,25 +23,25 @@ Tag = function(value) {
};
Tag.prototype.toString = function() {
return "(" + paddingLeft("0000", this.group().toString(16)) + "," +
paddingLeft("0000", this.element().toString(16)) + ")";
}
return '(' + paddingLeft('0000', this.group().toString(16)) + ',' +
paddingLeft('0000', this.element().toString(16)) + ')';
};
Tag.prototype.is = function(t) {
return this.value == t;
}
};
Tag.prototype.group = function() {
return this.value >>> 16;
}
};
Tag.prototype.element = function() {
return this.value & 0xffff;
}
};
tagFromNumbers = function(group, element) {
return new Tag(((group << 16) | element) >>> 0);
}
};
function readTag(stream) {
var group = stream.read(C.TYPE_UINT16),
@ -60,38 +60,41 @@ parseElements = function (stream, syntax) {
elem.readBytes(stream);
pairs[elem.tag.value] = elem;
}
return pairs;
}
};
ValueRepresentation = function(type) {
this.type = type;
this.multi = false;
}
};
ValueRepresentation.prototype.read = function(stream, length, syntax) {
if (this.fixed && this.maxLength) {
if (!length)
return this.defaultValue;
if (this.maxLength != length)
throw "Invalid length for fixed length tag, vr " + this.type + ", length " + this.maxLength + " != " + length;
throw 'Invalid length for fixed length tag, vr ' + this.type + ', length ' + this.maxLength + ' != ' + length;
}
return this.readBytes(stream, length, syntax);
}
};
ValueRepresentation.prototype.readBytes = function(stream, length) {
return stream.read(C.TYPE_ASCII, length);
}
};
ValueRepresentation.prototype.readNullPaddedString = function(stream, length) {
if (!length) return "";
if (!length) return '';
var str = stream.read(C.TYPE_ASCII, length - 1);
if (stream.read(C.TYPE_UINT8) != 0) {
stream.increment(-1);
str += stream.read(C.TYPE_ASCII, 1);
}
return str;
}
};
ValueRepresentation.prototype.getFields = function(fields) {
var valid = true;
@ -108,8 +111,9 @@ ValueRepresentation.prototype.getFields = function(fields) {
var check = this.maxLength, length = fieldsLength(fields);
valid = length <= check;
}
if (!valid)
throw "Value exceeds max length";
throw 'Value exceeds max length';
//check for odd
var length = fieldsLength(fields);
@ -118,97 +122,102 @@ ValueRepresentation.prototype.getFields = function(fields) {
}
for (var i = 0;i < fields.length;i++) {
if (fields[i].isNumeric() && (fields[i].value === "" || fields[i].value === null)) {
fields[i] = new StringField("");
if (fields[i].isNumeric() && (fields[i].value === '' || fields[i].value === null)) {
fields[i] = new StringField('');
}
}
return fields;
}
};
ApplicationEntity = function() {
ValueRepresentation.call(this, "AE");
ValueRepresentation.call(this, 'AE');
this.maxLength = 16;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(ApplicationEntity, ValueRepresentation);
ApplicationEntity.prototype.readBytes = function(stream, length) {
return stream.read(C.TYPE_ASCII, length).trim();
}
};
ApplicationEntity.prototype.getFields = function(value) {
return ApplicationEntity.super_.prototype.getFields.call(this, [ new FilledField(value, 16) ]);
}
};
CodeString = function() {
ValueRepresentation.call(this, "CS");
ValueRepresentation.call(this, 'CS');
this.maxLength = 16;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(CodeString, ValueRepresentation);
CodeString.prototype.readBytes = function(stream, length) {
var str = this.readNullPaddedString(stream, length);
return str.trim();
}
};
CodeString.prototype.getFields = function(value) {
return CodeString.super_.prototype.getFields.call(this, [ new StringField(value) ]);
}
};
AgeString = function() {
ValueRepresentation.call(this, "AS");
ValueRepresentation.call(this, 'AS');
this.maxLength = 4;
this.padByte = "20";
this.padByte = '20';
this.fixed = true;
this.defaultValue = "";
this.defaultValue = '';
};
util.inherits(AgeString, ValueRepresentation);
AgeString.prototype.getFields = function(value) {
var str = "";
var str = '';
if (value) {
if (value.days) {
str = paddingLeft("000" + value.days) + "D";
str = paddingLeft('000' + value.days) + 'D';
} else if (value.weeks) {
str = paddingLeft("000" + value.weeks) + "W";
str = paddingLeft('000' + value.weeks) + 'W';
} else if (value.months) {
str = paddingLeft("000" + value.months) + "M";
str = paddingLeft('000' + value.months) + 'M';
} else if (value.years) {
str = paddingLeft("000" + value.years) + "Y";
str = paddingLeft('000' + value.years) + 'Y';
} else {
throw "Invalid age string";
throw 'Invalid age string';
}
}
return AgeString.super_.prototype.getFields.call(this, [ new StringField(str) ]);
}
};
AttributeTag = function() {
ValueRepresentation.call(this, "AT");
ValueRepresentation.call(this, 'AT');
this.maxLength = 4;
this.padByte = "00";
this.padByte = '00';
this.fixed = true;
};
util.inherits(AttributeTag, ValueRepresentation);
AttributeTag.prototype.readBytes = function(stream, length) {
var group = stream.read(C.TYPE_UINT16), element = stream.read(C.TYPE_UINT16);
return tagFromNumbers(group, element);
}
};
AttributeTag.prototype.getFields = function(value) {
return AttributeTag.super_.prototype.getFields.call(this, [ new UInt16Field(value.group()), new UInt16Field(value.element()) ]);
}
};
DateValue = function() {
ValueRepresentation.call(this, "DA");
ValueRepresentation.call(this, 'DA');
this.maxLength = 8;
this.padByte = "20";
this.padByte = '20';
this.fixed = true;
this.defaultValue = "";
this.defaultValue = '';
};
util.inherits(DateValue, ValueRepresentation);
DateValue.prototype.readBytes = function(stream, length) {
@ -218,144 +227,152 @@ DateValue.prototype.readBytes = function(stream, length) {
month = parseInt(datestr.substring(4,6)),
day = parseInt(datestr.substring(6,8));
return datestr;//new Date(year, month, day);
}
};
DateValue.prototype.getFields = function(date) {
var str = null;
if (typeof date == 'object') {
var year = date.getFullYear(), month = paddingLeft("00", date.getMonth()), day = paddingLeft("00", date.getDate());
var year = date.getFullYear(), month = paddingLeft('00', date.getMonth()), day = paddingLeft('00', date.getDate());
str = year + month + day;
} else if (date && date.length > 0) {
this.maxLength = 18;
this.fixed = false;
str = date;
} else {
str = "";
str = '';
}
return DateValue.super_.prototype.getFields.call(this, [ new StringField(str) ]);
}
};
DecimalString = function() {
ValueRepresentation.call(this, "DS");
ValueRepresentation.call(this, 'DS');
this.maxLength = 16;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(DecimalString, ValueRepresentation);
DecimalString.prototype.readBytes = function(stream, length) {
var str = this.readNullPaddedString(stream, length);
return str.trim();
}
};
DecimalString.prototype.getFields = function(value) {
var f = parseFloat(value);
return DecimalString.super_.prototype.getFields.call(this, [ new StringField(isNaN(f) ? '' : f.toExponential()) ]);
}
};
DateTime = function() {
ValueRepresentation.call(this, "DT");
ValueRepresentation.call(this, 'DT');
this.maxLength = 26;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(DateTime, ValueRepresentation);
DateTime.prototype.getFields = function(value) {
var year = date.getUTCFullYear(), month = paddingLeft("00", date.getUTCMonth()),
day = paddingLeft("00", date.getUTCDate()), hour = paddingLeft("00", date.getUTCHours()),
minute = paddingLeft("00", date.getUTCMinutes()), second = paddingLeft("00", date.getUTCSeconds()),
millisecond = paddingLeft("000", date.getUTCMilliseconds());
var year = date.getUTCFullYear(), month = paddingLeft('00', date.getUTCMonth()),
day = paddingLeft('00', date.getUTCDate()), hour = paddingLeft('00', date.getUTCHours()),
minute = paddingLeft('00', date.getUTCMinutes()), second = paddingLeft('00', date.getUTCSeconds()),
millisecond = paddingLeft('000', date.getUTCMilliseconds());
return DateTime.super_.prototype.getFields.call(this, [new StringField(year + month + day + hour + minute + second + "." + millisecond + "+0000")]);
}
return DateTime.super_.prototype.getFields.call(this, [ new StringField(year + month + day + hour + minute + second + '.' + millisecond + '+0000') ]);
};
FloatingPointSingle = function() {
ValueRepresentation.call(this, "FL");
ValueRepresentation.call(this, 'FL');
this.maxLength = 4;
this.padByte = "00";
this.padByte = '00';
this.fixed = true;
this.defaultValue = 0.0;
};
util.inherits(FloatingPointSingle, ValueRepresentation);
FloatingPointSingle.prototype.readBytes = function(stream, length) {
return stream.read(C.TYPE_FLOAT);
}
};
FloatingPointSingle.prototype.getFields = function(value) {
return FloatingPointSingle.super_.prototype.getFields.call(this, [ new FloatField(value) ]);
}
};
FloatingPointDouble = function() {
ValueRepresentation.call(this, "FD");
ValueRepresentation.call(this, 'FD');
this.maxLength = 8;
this.padByte = "00";
this.padByte = '00';
this.fixed = true;
this.defaultValue = 0.0;
};
util.inherits(FloatingPointDouble, ValueRepresentation);
FloatingPointDouble.prototype.readBytes = function(stream, length) {
return stream.read(C.TYPE_DOUBLE);
}
};
FloatingPointDouble.prototype.getFields = function(value) {
return FloatingPointDouble.super_.prototype.getFields.call(this, [ new DoubleField(value) ]);
}
};
IntegerString = function() {
ValueRepresentation.call(this, "IS");
ValueRepresentation.call(this, 'IS');
this.maxLength = 12;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(IntegerString, ValueRepresentation);
IntegerString.prototype.readBytes = function(stream, length) {
var str = this.readNullPaddedString(stream, length);
return str.trim();
}
};
IntegerString.prototype.getFields = function(value) {
return IntegerString.super_.prototype.getFields.call(this, [ new StringField(value.toString()) ]);
}
};
LongString = function() {
ValueRepresentation.call(this, "LO");
ValueRepresentation.call(this, 'LO');
this.maxCharLength = 64;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(LongString, ValueRepresentation);
LongString.prototype.readBytes = function(stream, length) {
var str = this.readNullPaddedString(stream, length);
return str.trim();
}
};
LongString.prototype.getFields = function(value) {
return LongString.super_.prototype.getFields.call(this, [new StringField(value ? value : "")]);
}
return LongString.super_.prototype.getFields.call(this, [ new StringField(value ? value : '') ]);
};
LongText = function() {
ValueRepresentation.call(this, "LT");
ValueRepresentation.call(this, 'LT');
this.maxCharLength = 10240;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(LongText, ValueRepresentation);
LongText.prototype.readBytes = function(stream, length) {
var str = this.readNullPaddedString(stream, length);
return rtrim(str);
}
};
LongText.prototype.getFields = function(value) {
return LongText.super_.prototype.getFields.call(this, [ new StringField(value) ]);
}
};
PersonName = function() {
ValueRepresentation.call(this, "PN");
ValueRepresentation.call(this, 'PN');
this.maxLength = null;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(PersonName, ValueRepresentation);
PersonName.prototype.checkLength = function(field) {
@ -364,66 +381,70 @@ PersonName.prototype.checkLength = function(field) {
var cmp = cmps[i];
if (cmp.length > 64) return false;
}
return true;
}
};
PersonName.prototype.readBytes = function(stream, length) {
var str = this.readNullPaddedString(stream, length);
return rtrim(str);
}
};
PersonName.prototype.getFields = function(value) {
var str = null;
if (typeof value == 'string') {
str = value;
} else if (value) {
var fName = value.family || "", gName = value.given || "",
middle = value.middle || "", prefix = value.prefix || "", suffix = value.suffix || "";
var fName = value.family || '', gName = value.given || '',
middle = value.middle || '', prefix = value.prefix || '', suffix = value.suffix || '';
str = [fName, gName, middle, prefix, suffix].join("^");
str = [ fName, gName, middle, prefix, suffix ].join('^');
} else str = '';
return PersonName.super_.prototype.getFields.call(this, [ new StringField(str) ]);
}
};
ShortString = function() {
ValueRepresentation.call(this, "SH");
ValueRepresentation.call(this, 'SH');
this.maxCharLength = 16;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(ShortString, ValueRepresentation);
ShortString.prototype.readBytes = function(stream, length) {
var str = this.readNullPaddedString(stream, length);
return str.trim();
}
};
ShortString.prototype.getFields = function(value) {
return ShortString.super_.prototype.getFields.call(this, [ new StringField(value) ]);
}
};
SignedLong = function() {
ValueRepresentation.call(this, "SL");
ValueRepresentation.call(this, 'SL');
this.maxLength = 4;
this.padByte = "00";
this.padByte = '00';
this.fixed = true;
this.defaultValue = 0;
};
util.inherits(SignedLong, ValueRepresentation);
SignedLong.prototype.readBytes = function(stream, length) {
return stream.read(C.TYPE_INT32);
}
};
SignedLong.prototype.getFields = function(value) {
return SignedLong.super_.prototype.getFields.call(this, [ new Int32Field(value) ]);
}
};
SequenceOfItems = function() {
ValueRepresentation.call(this, "SQ");
ValueRepresentation.call(this, 'SQ');
this.maxLength = null;
this.padByte = "00";
this.padByte = '00';
};
util.inherits(SequenceOfItems, ValueRepresentation);
SequenceOfItems.prototype.readBytes = function(stream, sqlength, syntax) {
@ -437,7 +458,7 @@ SequenceOfItems.prototype.readBytes = function(stream, sqlength, syntax) {
read += 4;
if (tag.is(0xfffee0dd)) {
stream.read(C.TYPE_UINT32)
stream.read(C.TYPE_UINT32);
break;
} else if (!undefLength && (read == sqlength)) {
break;
@ -485,14 +506,16 @@ SequenceOfItems.prototype.readBytes = function(stream, sqlength, syntax) {
elements.push(parseElements(itemStream, syntax));
}
if (!undefLength && (read == sqlength)) {
break;
}
}
}
return elements;
}
}
};
SequenceOfItems.prototype.getFields = function(value, syntax) {
var fields = [];
@ -518,189 +541,199 @@ SequenceOfItems.prototype.getFields = function(value, syntax) {
fields.push(new UInt32Field(0x00000000));
return SequenceOfItems.super_.prototype.getFields.call(this, fields);
}
};
SignedShort = function() {
ValueRepresentation.call(this, "SS");
ValueRepresentation.call(this, 'SS');
this.maxLength = 2;
this.padByte = "00";
this.padByte = '00';
this.fixed = true;
this.defaultValue = 0;
};
util.inherits(SignedShort, ValueRepresentation);
SignedShort.prototype.readBytes = function(stream, length) {
return stream.read(C.TYPE_INT16);
}
};
SignedShort.prototype.getFields = function(value) {
return SignedShort.super_.prototype.getFields.call(this, [ new Int16Field(value) ]);
}
};
ShortText = function() {
ValueRepresentation.call(this, "ST");
ValueRepresentation.call(this, 'ST');
this.maxCharLength = 1024;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(ShortText, ValueRepresentation);
ShortText.prototype.readBytes = function(stream, length) {
var str = this.readNullPaddedString(stream, length);
return rtrim(str);
}
};
ShortText.prototype.getFields = function(value) {
return ShortText.super_.prototype.getFields.call(this, [ new StringField(value) ]);
}
};
TimeValue = function() {
ValueRepresentation.call(this, "TM");
ValueRepresentation.call(this, 'TM');
this.maxLength = 14;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(TimeValue, ValueRepresentation);
TimeValue.prototype.readBytes = function(stream, length) {
return rtrim(stream.read(C.TYPE_ASCII, length));
}
};
TimeValue.prototype.getFields = function(date) {
var dateStr = '';
if (date) {
var hour = paddingLeft("00", date.getHours()),
minute = paddingLeft("00", date.getMinutes()), second = paddingLeft("00", date.getSeconds()),
millisecond = paddingLeft("000", date.getMilliseconds());
dateStr = hour + minute + second + "." + millisecond;
var hour = paddingLeft('00', date.getHours()),
minute = paddingLeft('00', date.getMinutes()), second = paddingLeft('00', date.getSeconds()),
millisecond = paddingLeft('000', date.getMilliseconds());
dateStr = hour + minute + second + '.' + millisecond;
}
return TimeValue.super_.prototype.getFields.call(this, [ new StringField(dateStr) ]);
}
};
UnlimitedCharacters = function() {
ValueRepresentation.call(this, "UC");
ValueRepresentation.call(this, 'UC');
this.maxLength = null;
this.multi = true;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(UnlimitedCharacters, ValueRepresentation);
UnlimitedCharacters.prototype.readBytes = function(stream, length) {
return rtrim(stream.read(C.TYPE_ASCII, length));
}
};
UnlimitedCharacters.prototype.getFields = function(value) {
return UnlimitedCharacters.super_.prototype.getFields.call(this, [ new StringField(value) ]);
}
};
UnlimitedText = function() {
ValueRepresentation.call(this, "UT");
ValueRepresentation.call(this, 'UT');
this.maxLength = null;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(UnlimitedText, ValueRepresentation);
UnlimitedText.prototype.readBytes = function(stream, length) {
return this.readNullPaddedString(stream, length);
}
};
UnlimitedText.prototype.getFields = function(value) {
return UnlimitedText.super_.prototype.getFields.call(this, [ new StringField(value) ]);
}
};
UnsignedShort = function() {
ValueRepresentation.call(this, "US");
ValueRepresentation.call(this, 'US');
this.maxLength = 2;
this.padByte = "00";
this.padByte = '00';
this.fixed = true;
this.defaultValue = 0;
};
util.inherits(UnsignedShort, ValueRepresentation);
UnsignedShort.prototype.readBytes = function(stream, length) {
return stream.read(C.TYPE_UINT16);
}
};
UnsignedShort.prototype.getFields = function(value) {
return UnsignedShort.super_.prototype.getFields.call(this, [ new UInt16Field(value) ]);
}
};
UnsignedLong = function() {
ValueRepresentation.call(this, "UL");
ValueRepresentation.call(this, 'UL');
this.maxLength = 4;
this.padByte = "00";
this.padByte = '00';
this.fixed = true;
this.defaultValue = 0;
};
util.inherits(UnsignedLong, ValueRepresentation);
UnsignedLong.prototype.readBytes = function(stream, length) {
return stream.read(C.TYPE_UINT32);
}
};
UnsignedLong.prototype.getFields = function(value) {
return UnsignedLong.super_.prototype.getFields.call(this, [ new UInt32Field(value) ]);
}
};
UniqueIdentifier = function() {
ValueRepresentation.call(this, "UI");
ValueRepresentation.call(this, 'UI');
this.maxLength = 64;
this.padByte = "00";
this.padByte = '00';
};
util.inherits(UniqueIdentifier, ValueRepresentation);
UniqueIdentifier.prototype.readBytes = function(stream, length) {
return this.readNullPaddedString(stream, length);
}
};
UniqueIdentifier.prototype.getFields = function(value) {
return UniqueIdentifier.super_.prototype.getFields.call(this, [ new StringField(value) ]);
}
};
UniversalResource = function() {
ValueRepresentation.call(this, "UR");
ValueRepresentation.call(this, 'UR');
this.maxLength = null;
this.padByte = "20";
this.padByte = '20';
};
util.inherits(UniversalResource, ValueRepresentation);
UniversalResource.prototype.readBytes = function(stream, length) {
return rtrim(stream.read(C.TYPE_ASCII, length));
}
};
UniversalResource.prototype.getFields = function(value) {
return UniversalResource.super_.prototype.getFields.call(this, [ new StringField(value) ]);
}
};
UnknownValue = function() {
ValueRepresentation.call(this, "UN");
ValueRepresentation.call(this, 'UN');
this.maxLength = null;
this.padByte = "00";
this.padByte = '00';
};
util.inherits(UnknownValue, ValueRepresentation);
UnknownValue.prototype.readBytes = function(stream, length) {
return stream.read(C.TYPE_ASCII, length);
}
};
UnknownValue.prototype.getFields = function(value) {
return UnknownValue.super_.prototype.getFields.call(this, [ new StringField(value) ]);
}
};
OtherWordString = function() {
ValueRepresentation.call(this, "OW");
ValueRepresentation.call(this, 'OW');
this.maxLength = null;
this.padByte = "00";
this.padByte = '00';
};
util.inherits(OtherWordString, ValueRepresentation);
OtherWordString.prototype.readBytes = function(stream, length) {
return stream.read(C.TYPE_ASCII, length);
}
};
OtherWordString.prototype.getFields = function(value) {
return OtherWordString.super_.prototype.getFields.call(this, [ new StringField(value) ]);
}
};
elementByType = function(type, value, syntax) {
var elem = null, nk = DicomElements.dicomNDict[type];
@ -713,6 +746,7 @@ elementByType = function(type, value, syntax) {
for (var tag in el) {
values.push(elementByType(tag, el[tag], syntax));
}
sq.push(values);
});
elem = new DataElement(type, nk.vr, nk.vm, sq, false, syntax);
@ -720,60 +754,62 @@ elementByType = function(type, value, syntax) {
elem = new DataElement(type, nk.vr, nk.vm, value, false, syntax);
}
} else {
throw "Unrecognized element type";
throw 'Unrecognized element type';
}
return elem;
}
};
elementDataByTag = function(tag) {
var nk = DicomElements.dicomNDict[tag];
if (nk) {
return nk;
}
throw ("Unrecognized tag " + (tag >>> 0).toString(16));
}
throw ('Unrecognized tag ' + (tag >>> 0).toString(16));
};
elementKeywordByTag = function(tag) {
var nk = elementDataByTag(tag);
return nk.keyword;
}
};
vrByType = function(type) {
var vr = null;
if (type == "AE") vr = new ApplicationEntity();
else if (type == "AS") vr = new AgeString();
else if (type == "AT") vr = new AttributeTag();
else if (type == "CS") vr = new CodeString();
else if (type == "DA") vr = new DateValue();
else if (type == "DS") vr = new DecimalString();
else if (type == "DT") vr = new DateTime();
else if (type == "FL") vr = new FloatingPointSingle();
else if (type == "FD") vr = new FloatingPointDouble();
else if (type == "IS") vr = new IntegerString();
else if (type == "LO") vr = new LongString();
else if (type == "LT") vr = new LongText();
else if (type == "OB") vr = new OtherByteString();
else if (type == "OD") vr = new OtherDoubleString();
else if (type == "OF") vr = new OtherFloatString();
else if (type == "OW") vr = new OtherWordString();
else if (type == "PN") vr = new PersonName();
else if (type == "SH") vr = new ShortString();
else if (type == "SL") vr = new SignedLong();
else if (type == "SQ") vr = new SequenceOfItems();
else if (type == "SS") vr = new SignedShort();
else if (type == "ST") vr = new ShortText();
else if (type == "TM") vr = new TimeValue();
else if (type == "UC") vr = new UnlimitedCharacters();
else if (type == "UI") vr = new UniqueIdentifier();
else if (type == "UL") vr = new UnsignedLong();
else if (type == "UN") vr = new UnknownValue();
else if (type == "UR") vr = new UniversalResource();
else if (type == "US") vr = new UnsignedShort();
else if (type == "UT") vr = new UnlimitedText();
else throw "Invalid vr type " + type;
if (type == 'AE') vr = new ApplicationEntity();
else if (type == 'AS') vr = new AgeString();
else if (type == 'AT') vr = new AttributeTag();
else if (type == 'CS') vr = new CodeString();
else if (type == 'DA') vr = new DateValue();
else if (type == 'DS') vr = new DecimalString();
else if (type == 'DT') vr = new DateTime();
else if (type == 'FL') vr = new FloatingPointSingle();
else if (type == 'FD') vr = new FloatingPointDouble();
else if (type == 'IS') vr = new IntegerString();
else if (type == 'LO') vr = new LongString();
else if (type == 'LT') vr = new LongText();
else if (type == 'OB') vr = new OtherByteString();
else if (type == 'OD') vr = new OtherDoubleString();
else if (type == 'OF') vr = new OtherFloatString();
else if (type == 'OW') vr = new OtherWordString();
else if (type == 'PN') vr = new PersonName();
else if (type == 'SH') vr = new ShortString();
else if (type == 'SL') vr = new SignedLong();
else if (type == 'SQ') vr = new SequenceOfItems();
else if (type == 'SS') vr = new SignedShort();
else if (type == 'ST') vr = new ShortText();
else if (type == 'TM') vr = new TimeValue();
else if (type == 'UC') vr = new UnlimitedCharacters();
else if (type == 'UI') vr = new UniqueIdentifier();
else if (type == 'UL') vr = new UnsignedLong();
else if (type == 'UN') vr = new UnknownValue();
else if (type == 'UR') vr = new UniversalResource();
else if (type == 'US') vr = new UnsignedShort();
else if (type == 'UT') vr = new UnlimitedText();
else throw 'Invalid vr type ' + type;
return vr;
}
};
readElements = function(stream, syntax) {
if (stream.end()) return false;
@ -787,10 +823,10 @@ readElements = function(stream, syntax) {
length = stream.read(C.TYPE_UINT32);
stream.setEndian(oldEndian);
}
};
var explicitVRList = ["OB", "OW", "OF", "SQ", "UC", "UR", "UT", "UN"],
binaryVRs = ["FL", "FD", "SL", "SS", "UL", "US"];
var explicitVRList = [ 'OB', 'OW', 'OF', 'SQ', 'UC', 'UR', 'UT', 'UN' ],
binaryVRs = [ 'FL', 'FD', 'SL', 'SS', 'UL', 'US' ];
DataElement = function(tag, vr, vm, value, vvr, syntax, options) {
this.vr = vr ? vrByType(vr) : null;
@ -803,14 +839,16 @@ DataElement = function(tag, vr, vm, value, vvr, syntax, options) {
};
DataElement.prototype.setOptions = function(options) {
this.options = Object.assign({split : true}, options);
}
this.options = Object.assign({
split: true
}, options);
};
DataElement.prototype.setSyntax = function(syn) {
this.syntax = syn;
this.implicit = this.syntax == C.IMPLICIT_LITTLE_ENDIAN ? true : false;
this.endian = (this.syntax == C.IMPLICIT_LITTLE_ENDIAN || this.syntax == C.EXPLICIT_LITTLE_ENDIAN) ? C.LITTLE_ENDIAN : C.BIG_ENDIAN;
}
};
DataElement.prototype.getValue = function() {
if (!this.singleValue() && !this.isBinaryNumber()) {
@ -818,11 +856,11 @@ DataElement.prototype.getValue = function() {
} else {
return this.value;
}
}
};
DataElement.prototype.singleValue = function() {
return this.vm == C.VM_SINGLE ? true : false;
}
};
DataElement.prototype.getVMNum = function() {
var num = 1;
@ -835,16 +873,16 @@ DataElement.prototype.getVMNum = function() {
default : break;
}
return num;
}
};
DataElement.prototype.isBinaryNumber = function() {
return binaryVRs.indexOf(this.vr.type) != -1;
}
};
DataElement.prototype.length = function(fields) {
//let fields = this.vr.getFields(this.value);
return fieldsLength(fields);
}
};
DataElement.prototype.readBytes = function(stream) {
var oldEndian = stream.endian;
@ -888,7 +926,7 @@ DataElement.prototype.readBytes = function(stream) {
//} catch (e) { console.log('error', vr, length); }
stream.setEndian(oldEndian);
}
};
DataElement.prototype.write = function(stream) {
var oldEndian = stream.endian;
@ -900,13 +938,13 @@ DataElement.prototype.write = function(stream) {
});
stream.setEndian(oldEndian);
}
};
DataElement.prototype.getFields = function() {
var fields = [ new UInt16Field(this.tag.group()), new UInt16Field(this.tag.element()) ],
valueFields = this.vr.getFields(this.value, this.syntax), valueLength = fieldsLength(valueFields), vrType = this.vr.type;
if (vrType == "SQ") {
if (vrType == 'SQ') {
valueLength = 0xffffffff;
}
@ -922,6 +960,5 @@ DataElement.prototype.getFields = function() {
fields = fields.concat(valueFields);
return fields;
}
};

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

@ -5,30 +5,32 @@ Field = function(type, value) {
Field.prototype.length = function() {
return calcLength(this.type, this.value);
}
};
Field.prototype.write = function(stream) {
stream.write(this.type, this.value);
}
};
Field.prototype.isNumeric = function() {
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;
}
};
util.inherits(FilledField, Field);
FilledField.prototype.length = function() {
return this.fillLength;
}
};
FilledField.prototype.write = function(stream) {
var len = this.value.length;
@ -36,93 +38,104 @@ FilledField.prototype.write = function(stream) {
if (len > 0)
stream.write(C.TYPE_ASCII, this.value);
var zeroLength = this.fillLength - len;
stream.write(C.TYPE_HEX, "20".repeat(zeroLength));
stream.write(C.TYPE_HEX, '20'.repeat(zeroLength));
} else if (len == this.fillLength) {
stream.write(C.TYPE_ASCII, this.value);
} else {
throw "Length mismatch";
}
throw 'Length mismatch';
}
};
HexField = function(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));
}
Field.call(this, C.TYPE_HEX, '00'.repeat(length));
};
util.inherits(ReservedField, Field);
UInt8Field = function(value) {
Field.call(this, C.TYPE_UINT8, value);
}
};
util.inherits(UInt8Field, Field);
UInt8Field.prototype.isNumeric = function() {
return true;
}
};
UInt16Field = function(value) {
Field.call(this, C.TYPE_UINT16, value);
}
};
util.inherits(UInt16Field, Field);
UInt16Field.prototype.isNumeric = function() {
return true;
}
};
UInt32Field = function(value) {
Field.call(this, C.TYPE_UINT32, value);
}
};
util.inherits(UInt32Field, Field);
UInt32Field.prototype.isNumeric = function() {
return true;
}
};
Int8Field = function(value) {
Field.call(this, C.TYPE_INT8, value);
}
};
util.inherits(Int8Field, Field);
Int8Field.prototype.isNumeric = function() {
return true;
}
};
Int16Field = function(value) {
Field.call(this, C.TYPE_INT16, value);
}
};
util.inherits(Int16Field, Field);
Int16Field.prototype.isNumeric = function() {
return true;
}
};
Int32Field = function(value) {
Field.call(this, C.TYPE_INT32, value);
}
};
util.inherits(Int32Field, Field);
Int32Field.prototype.isNumeric = function() {
return true;
}
};
FloatField = function(value) {
Field.call(this, C.TYPE_FLOAT, value);
}
};
util.inherits(FloatField, Field);
FloatField.prototype.isNumeric = function() {
return true;
}
};
DoubleField = function(value) {
Field.call(this, C.TYPE_DOUBLE, value);
}
};
util.inherits(DoubleField, Field);
DoubleField.prototype.isNumeric = function() {
return true;
}
};

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

@ -7,7 +7,7 @@ DicomMessage = function(syntax) {
DicomMessage.prototype.isCommand = function() {
return this.type == C.DATA_TYPE_COMMAND;
}
};
DicomMessage.prototype.setSyntax = function(syntax) {
this.syntax = syntax;
@ -15,15 +15,15 @@ DicomMessage.prototype.setSyntax = function(syntax) {
for (var tag in this.elementPairs) {
this.elementPairs[tag].setSyntax(this.syntax);
}
}
};
DicomMessage.prototype.setMessageId = function(id) {
this.messageId = id;
}
};
DicomMessage.prototype.setReplyMessageId = function(id) {
this.replyMessageId = id;
}
};
DicomMessage.prototype.command = function(cmds) {
cmds.unshift(this.newElement(0x00000800, this.dataSetPresent ? C.DATA_SET_PRESENT : C.DATE_SET_ABSENCE));
@ -39,7 +39,7 @@ DicomMessage.prototype.command = function(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));
@ -54,75 +54,77 @@ DicomMessage.prototype.response = function(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;
}
};
DicomMessage.prototype.newElement = function(tag, value) {
return elementByType(tag, value, this.syntax);
}
};
DicomMessage.prototype.setElement = function(key, value) {
this.elementPairs[key] = elementByType(key, value);
}
};
DicomMessage.prototype.setElementPairs = function(pairs) {
this.elementPairs = pairs;
}
};
DicomMessage.prototype.setContextId = function(context) {
this.contextUID = context;
}
};
DicomMessage.prototype.setPriority = function(pri) {
this.priority = pri;
}
};
DicomMessage.prototype.setType = function(type) {
this.type = type;
}
};
DicomMessage.prototype.setDataSetPresent = function(present) {
this.dataSetPresent = present == 0x0101 ? false : true;
}
};
DicomMessage.prototype.haveData = function() {
return this.dataSetPresent;
}
};
DicomMessage.prototype.tags = function() {
return Object.keys(this.elementPairs);
}
};
DicomMessage.prototype.key = function(tag) {
return elementKeywordByTag(tag);
}
};
DicomMessage.prototype.getValue = function(tag) {
return this.elementPairs[tag] ? this.elementPairs[tag].getValue() : null;
}
};
DicomMessage.prototype.affectedSOPClassUID = function() {
return this.getValue(0x00000002);
}
};
DicomMessage.prototype.getMessageId = function() {
return this.getValue(0x00000110);
}
};
DicomMessage.prototype.getFields = function() {
var eles = [];
for (var tag in this.elementPairs) {
eles.push(this.elementPairs[tag]);
}
return eles;
}
};
DicomMessage.prototype.length = function(elems) {
var len = 0;
@ -130,15 +132,15 @@ DicomMessage.prototype.length = function(elems) {
len += elem.length(elem.getFields());
});
return len;
}
};
DicomMessage.prototype.isResponse = function() {
return false;
}
};
DicomMessage.prototype.is = function(type) {
return this.commandType == type;
}
};
DicomMessage.prototype.write = function(stream) {
var fields = this.getFields(), o = this;
@ -146,53 +148,55 @@ DicomMessage.prototype.write = function(stream) {
field.setSyntax(o.syntax);
field.write(stream);
});
}
};
DicomMessage.prototype.printElements = function(pairs, indent) {
var typeName = "";
var typeName = '';
for (var tag in pairs) {
var value = pairs[tag].getValue();
typeName += (" ".repeat(indent)) + this.key(tag) + " : ";
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)) + "]";
if (typeof p == 'object') {
typeName += '[\n' + o.printElements(p, indent + 2) + (' '.repeat(indent)) + ']';
} else {
typeName += "[" + p + "]";
typeName += '[' + p + ']';
}
});
if (typeName[typeName.length-1] != "\n") {
typeName += "\n";
if (typeName[typeName.length - 1] != '\n') {
typeName += '\n';
}
} else {
typeName += value + "\n";
typeName += value + '\n';
}
}
return typeName;
}
return typeName;
};
DicomMessage.prototype.toString = function() {
var typeName = "";
var typeName = '';
if (!this.isCommand()) {
typeName = "DateSet Message";
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;
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 += ' [\n';
typeName += this.printElements(this.elementPairs, 0);
typeName += "]";
typeName += ']';
return typeName;
}
};
DicomMessage.prototype.walkObject = function(pairs) {
var obj = {}, o = this;
@ -206,15 +210,16 @@ DicomMessage.prototype.walkObject = function(pairs) {
} else u.push(a);
});
}
obj[tag] = u;
}
return obj;
}
};
DicomMessage.prototype.toObject = function() {
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;
@ -224,6 +229,7 @@ readMessage = function(stream, type, syntax, options) {
if (options) {
elem.setOptions(options);
}
elem.setSyntax(useSyntax);
elem.readBytes(stream);//return;
pairs[elem.tag.value] = elem;
@ -239,7 +245,7 @@ readMessage = function(stream, type, syntax, options) {
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;
default : throw 'Unrecognized command type ' + cmdType.toString(16); break;
}
message.setElementPairs(pairs);
@ -254,121 +260,128 @@ readMessage = function(stream, type, syntax, options) {
message = new DataSetMessage(useSyntax);
message.setElementPairs(pairs);
} else {
throw "Unrecognized message type";
throw 'Unrecognized message type';
}
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;
}
};
CommandMessage = function(syntax) {
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));
}
};
CommandResponse = function(syntax) {
DicomMessage.call(this, syntax);
this.type = C.DATA_TYPE_COMMAND;
this.dataSetPresent = true;
};
util.inherits(CommandResponse, DicomMessage);
CommandResponse.prototype.isResponse = function() {
return true;
}
};
CommandResponse.prototype.respondedTo = function() {
return this.getValue(0x00000120);
}
};
CommandResponse.prototype.isFinal = function() {
return this.success() || this.failure() || this.cancel();
}
};
CommandResponse.prototype.warning = function() {
var status = this.getStatus();
return (status == 0x0001) || (status >> 12 == 0xb);
}
};
CommandResponse.prototype.success = function() {
return this.getStatus() == 0x0000;
}
};
CommandResponse.prototype.failure = function() {
var status = this.getStatus();
return (status >> 12 == 0xa) || (status >> 12 == 0xc) || (status >> 8 == 0x1)
}
return (status >> 12 == 0xa) || (status >> 12 == 0xc) || (status >> 8 == 0x1);
};
CommandResponse.prototype.cancel = function() {
return this.getStatus() == C.STATUS_CANCEL;
}
};
CommandResponse.prototype.pending = function() {
var status = this.getStatus();
return (status == 0xff00) || (status == 0xff01);
}
};
CommandResponse.prototype.getStatus = function() {
return this.getValue(0x00000900);
}
};
CommandResponse.prototype.setStatus = function(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);
}
};
CommandResponse.prototype.getNumOfCompletedSubOperations = function() {
return this.getValue(0x00001021);
}
};
CommandResponse.prototype.getNumOfFailedSubOperations = function() {
return this.getValue(0x00001022);
}
};
CommandResponse.prototype.getNumOfWarningSubOperations = function() {
return this.getValue(0x00001023);
}
};
//end
CommandResponse.prototype.getFields = function() {
return this.response(CommandResponse.super_.prototype.getFields.call(this));
}
};
CFindRSP = function(syntax) {
CommandResponse.call(this, syntax);
this.commandType = 0x8020;
};
util.inherits(CFindRSP, CommandResponse);
CGetRSP = function(syntax) {
CommandResponse.call(this, syntax);
this.commandType = 0x8010;
};
util.inherits(CGetRSP, CommandResponse);
CMoveRSP = function(syntax) {
CommandResponse.call(this, syntax);
this.commandType = 0x8021;
};
util.inherits(CMoveRSP, CommandResponse);
CFindRQ = function(syntax) {
@ -376,25 +389,27 @@ CFindRQ = function(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 || "");
this.setDestination(destination || '');
};
util.inherits(CMoveRQ, CommandMessage);
CMoveRQ.prototype.setStore = function(cstr) {
this.store = cstr;
}
};
CMoveRQ.prototype.setDestination = function(dest) {
this.setElements({
0x00000600: dest
});
}
};
CGetRQ = function(syntax) {
CommandMessage.call(this, syntax);
@ -402,30 +417,32 @@ CGetRQ = function(syntax) {
this.contextUID = C.SOP_STUDY_ROOT_GET;
this.store = null;
};
util.inherits(CGetRQ, CommandMessage);
CGetRQ.prototype.setStore = function(cstr) {
this.store = cstr;
}
};
CStoreRQ = function(syntax) {
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);
}
};
CStoreRQ.prototype.getMoveMessageId = function() {
return this.getValue(0x00001031);
}
};
CStoreRQ.prototype.getSOPInstanceUID = function() {
return this.getValue(0x00001000);
}
};
CStoreRSP = function(syntax) {
CommandResponse.call(this, syntax);
@ -433,12 +450,14 @@ CStoreRSP = function(syntax) {
this.contextUID = C.SOP_STUDY_ROOT_GET;
this.dataSetPresent = false;
};
util.inherits(CStoreRSP, CommandResponse);
CStoreRSP.prototype.setAffectedSOPInstanceUID = function(uid) {
this.setElement(0x00001000, uid);
}
};
CStoreRSP.prototype.getAffectedSOPInstanceUID = function(uid) {
return this.getValue(0x00001000);
}
};

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

@ -1,7 +1,7 @@
PDU = function() {
this.fields = [];
this.lengthBytes = 4;
}
};
PDU.prototype.length = function(fields) {
var len = 0;
@ -9,11 +9,11 @@ PDU.prototype.length = function(fields) {
len += !f.getFields ? f.length() : f.length(f.getFields());
});
return len;
}
};
PDU.prototype.is = function(type) {
return this.type == type;
}
};
PDU.prototype.getFields = function(fields) {
var len = this.lengthField(fields);
@ -24,7 +24,7 @@ PDU.prototype.getFields = function(fields) {
}
return fields;
}
};
PDU.prototype.lengthField = function(fields) {
if (this.lengthBytes == 4) {
@ -32,19 +32,19 @@ PDU.prototype.lengthField = function(fields) {
} else if (this.lengthBytes == 2) {
return new UInt16Field(this.length(fields));
} else {
throw "Invalid length bytes";
}
throw 'Invalid length bytes';
}
};
PDU.prototype.read = function(stream) {
stream.read(C.TYPE_HEX, 1);
var length = stream.read(C.TYPE_UINT32);
this.readBytes(stream, length);
}
};
PDU.prototype.load = function(stream) {
return pduByStream(stream);
}
};
PDU.prototype.loadPDV = function(stream, length) {
if (stream.end()) return false;
@ -59,12 +59,12 @@ PDU.prototype.loadPDV = function(stream, length) {
}
return pdvs;
}
};
PDU.prototype.loadDicomMessage = function(stream, isCommand, isLast) {
var message = readMessage(stream, isCommand, isLast);
return message;
}
};
PDU.prototype.stream = function() {
var stream = new WriteStream(),
@ -76,15 +76,15 @@ PDU.prototype.stream = function() {
});
return stream;
}
};
PDU.prototype.buffer = function() {
return this.stream().buffer();
}
};
var interpretCommand = function(stream, isLast) {
parseDicomMessage(stream);
}
};
mergePDVs = function(pdvs) {
var merges = [], count = pdvs.length, i = 0;
@ -94,14 +94,16 @@ mergePDVs = function(pdvs) {
while (!pdvs[j++].isLast && j < count) {
pdvs[i].messageStream.concat(pdvs[j].messageStream);
}
merges.push(pdvs[i]);
i = j;
} else {
merges.push(pdvs[i++]);
}
}
return merges;
}
};
pduByStream = function(stream) {
if (stream.end()) return null;
@ -123,13 +125,13 @@ pduByStream = function(stream) {
case 0x51 : pdu = new MaximumLengthItem(); break;
case 0x52 : pdu = new ImplementationClassUIDItem(); break;
case 0x55 : pdu = new ImplementationVersionNameItem(); break;
default : throw "Unrecoginized pdu type " + pduType; break;
default : throw 'Unrecoginized pdu type ' + pduType; break;
}
if (pdu)
pdu.read(stream);
return pdu;
}
};
var nextItemIs = function(stream, pduType) {
if (stream.end()) return false;
@ -137,47 +139,48 @@ var nextItemIs = function(stream, pduType) {
var nextType = stream.read(C.TYPE_HEX, 1);
stream.increment(-1);
return pduType == nextType;
}
};
AssociateRQ = function() {
PDU.call(this);
this.type = C.ITEM_TYPE_PDU_ASSOCIATE_RQ;
this.protocolVersion = 1;
}
};
util.inherits(AssociateRQ, PDU);
AssociateRQ.prototype.setProtocolVersion = function(version) {
this.protocolVersion = version;
}
};
AssociateRQ.prototype.setCalledAETitle = function(title) {
this.calledAETitle = title;
}
};
AssociateRQ.prototype.setCallingAETitle = function(title) {
this.callingAETitle = title;
}
};
AssociateRQ.prototype.setApplicationContextItem = function(item) {
this.applicationContextItem = item;
}
};
AssociateRQ.prototype.setPresentationContextItems = function(items) {
this.presentationContextItems = items;
}
};
AssociateRQ.prototype.setUserInformationItem = function(item) {
this.userInformationItem = item;
}
};
AssociateRQ.prototype.allAccepted = function() {
for (var i in this.presentationContextItems) {
var item = this.presentationContextItems[i];
if (!item.accepted()) return false;
}
return true;
}
};
AssociateRQ.prototype.getFields = function() {
var f = [
@ -190,7 +193,7 @@ AssociateRQ.prototype.getFields = function() {
});
f.push(this.userInformationItem);
return AssociateRQ.super_.prototype.getFields.call(this, f);
}
};
AssociateRQ.prototype.readBytes = function(stream, length) {
this.type = C.ITEM_TYPE_PDU_ASSOCIATE_RQ;
@ -214,11 +217,11 @@ AssociateRQ.prototype.readBytes = function(stream, length) {
var userItem = this.load(stream);
this.setUserInformationItem(userItem);
}
};
AssociateRQ.prototype.buffer = function() {
return AssociateRQ.super_.prototype.buffer.call(this);
}
};
AssociateAC = function() {
AssociateRQ.call(this);
@ -243,24 +246,24 @@ AssociateAC.prototype.readBytes = function(stream, length) {
var userItem = this.load(stream);
this.setUserInformationItem(userItem);
}
};
AssociateAbort = function() {
this.type = C.ITEM_TYPE_PDU_AABORT;
this.source = 1;
this.reason = 0;
PDU.call(this);
}
};
util.inherits(AssociateAbort, PDU);
AssociateAbort.prototype.setSource = function(src) {
this.source = src;
}
};
AssociateAbort.prototype.setReason = function(reason) {
this.reason = reason;
}
};
AssociateAbort.prototype.readBytes = function(stream, length) {
stream.increment(2);
@ -270,14 +273,14 @@ AssociateAbort.prototype.readBytes = function(stream, length) {
var reason = stream.read(C.TYPE_UINT8);
this.setReason(reason);
}
};
AssociateAbort.prototype.getFields = function() {
return AssociateAbort.super_.prototype.getFields.call(this, [
new ReservedField(), new ReservedField(),
new UInt8Field(this.source), new UInt8Field(this.reason)
]);
}
};
ReleaseRQ = function() {
this.type = C.ITEM_TYPE_PDU_RELEASE_RQ;
@ -293,7 +296,7 @@ ReleaseRQ.prototype.getFields = function() {
ReleaseRP = function() {
this.type = C.ITEM_TYPE_PDU_RELEASE_RP;
PDU.call(this);
}
};
util.inherits(ReleaseRP, PDU);
@ -303,51 +306,53 @@ ReleaseRP.prototype.readBytes = function(stream, length) {
ReleaseRP.prototype.getFields = function() {
return ReleaseRP.super_.prototype.getFields.call(this, [ new ReservedField(4) ]);
}
};
PDataTF = function() {
this.type = C.ITEM_TYPE_PDU_PDATA;
this.presentationDataValueItems = [];
PDU.call(this);
}
};
util.inherits(PDataTF, PDU);
PDataTF.prototype.setPresentationDataValueItems = function(items) {
this.presentationDataValueItems = items ? items : [];
}
};
PDataTF.prototype.getFields = function() {
var fields = this.presentationDataValueItems;
return PDataTF.super_.prototype.getFields.call(this, fields);
}
};
PDataTF.prototype.readBytes = function(stream, length) {
var pdvs = this.loadPDV(stream, length);
//let merges = mergePDVs(pdvs);
this.setPresentationDataValueItems(pdvs);
}
};
Item = function() {
PDU.call(this);
this.lengthBytes = 2;
};
util.inherits(Item, PDU);
Item.prototype.read = function(stream) {
stream.read(C.TYPE_HEX, 1);
var length = stream.read(C.TYPE_UINT16);
this.readBytes(stream, length);
}
};
Item.prototype.write = function(stream) {
stream.concat(this.stream());
}
};
Item.prototype.getFields = function(fields) {
return Item.super_.prototype.getFields.call(this, fields);
}
};
PresentationDataValueItem = function(context) {
this.type = null;
@ -359,27 +364,28 @@ PresentationDataValueItem = function(context) {
this.lengthBytes = 4;
};
util.inherits(PresentationDataValueItem, Item);
PresentationDataValueItem.prototype.setContextId = function(id) {
this.contextId = id;
}
};
PresentationDataValueItem.prototype.setFlag = function(flag) {
this.flag = flag;
}
};
PresentationDataValueItem.prototype.setPresentationDataValue = function(pdv) {
this.pdv = pdv;
}
};
PresentationDataValueItem.prototype.setMessage = function(msg) {
this.dataFragment = msg;
}
};
PresentationDataValueItem.prototype.getMessage = function() {
return this.dataFragment;
}
};
PresentationDataValueItem.prototype.readBytes = function(stream, length) {
this.contextId = stream.read(C.TYPE_UINT8);
@ -389,7 +395,7 @@ PresentationDataValueItem.prototype.readBytes = function(stream, length) {
//load dicom messages
this.messageStream = stream.more(length - 2);
}
};
PresentationDataValueItem.prototype.getFields = function() {
var fields = [ new UInt8Field(this.contextId) ];
@ -409,57 +415,59 @@ rst.setEndian(C.LITTLE_ENDIAN);
console.log(tag.toString(), rst.read(C.TYPE_UINT32));*/
return PresentationDataValueItem.super_.prototype.getFields.call(this, fields);
}
};
ApplicationContextItem = function() {
this.type = C.ITEM_TYPE_APPLICATION_CONTEXT;
this.applicationContextName = C.APPLICATION_CONTEXT_NAME;
Item.call(this);
}
};
util.inherits(ApplicationContextItem, Item);
ApplicationContextItem.prototype.setApplicationContextName = function(name) {
this.applicationContextName = name;
}
};
ApplicationContextItem.prototype.getFields = function() {
return ApplicationContextItem.super_.prototype.getFields.call(this, [ new StringField(this.applicationContextName) ]);
}
};
ApplicationContextItem.prototype.readBytes = function(stream, length) {
var appContext = stream.read(C.TYPE_ASCII, length);
this.setApplicationContextName(appContext);
}
};
ApplicationContextItem.prototype.buffer = function() {
return ApplicationContextItem.super_.prototype.buffer.call(this);
}
};
PresentationContextItem = function() {
this.type = C.ITEM_TYPE_PRESENTATION_CONTEXT;
Item.call(this);
};
util.inherits(PresentationContextItem, Item);
PresentationContextItem.prototype.setPresentationContextID = function(id) {
this.presentationContextID = id;
}
};
PresentationContextItem.prototype.setAbstractSyntaxItem = function(item) {
this.abstractSyntaxItem = item;
}
};
PresentationContextItem.prototype.setTransferSyntaxesItems = function(items) {
this.transferSyntaxesItems = items;
}
};
PresentationContextItem.prototype.setResultReason = function(reason) {
this.resultReason = reason;
}
};
PresentationContextItem.prototype.accepted = function() {
return this.resultReason == 0;
}
};
PresentationContextItem.prototype.readBytes = function(stream, length) {
var contextId = stream.read(C.TYPE_UINT8);
@ -476,7 +484,7 @@ PresentationContextItem.prototype.readBytes = function(stream, length) {
transContexts.push(this.load(stream));
} while (nextItemIs(stream, C.ITEM_TYPE_TRANSFER_CONTEXT));
this.setTransferSyntaxesItems(transContexts);
}
};
PresentationContextItem.prototype.getFields = function() {
var f = [
@ -487,16 +495,17 @@ PresentationContextItem.prototype.getFields = function() {
f.push(syntaxItem);
});
return PresentationContextItem.super_.prototype.getFields.call(this, f);
}
};
PresentationContextItem.prototype.buffer = function() {
return PresentationContextItem.super_.prototype.buffer.call(this);
}
};
PresentationContextItemAC = function() {
this.type = C.ITEM_TYPE_PRESENTATION_CONTEXT_AC;
Item.call(this);
};
util.inherits(PresentationContextItemAC, PresentationContextItem);
PresentationContextItemAC.prototype.readBytes = function(stream, length) {
@ -509,63 +518,66 @@ PresentationContextItemAC.prototype.readBytes = function(stream, length) {
var transItem = this.load(stream);
this.setTransferSyntaxesItems([ transItem ]);
}
};
AbstractSyntaxItem = function() {
this.type = C.ITEM_TYPE_ABSTRACT_CONTEXT;
Item.call(this);
}
};
util.inherits(AbstractSyntaxItem, Item);
AbstractSyntaxItem.prototype.setAbstractSyntaxName = function(name) {
this.abstractSyntaxName = name;
}
};
AbstractSyntaxItem.prototype.getFields = function() {
return AbstractSyntaxItem.super_.prototype.getFields.call(this, [ new StringField(this.abstractSyntaxName) ]);
}
};
AbstractSyntaxItem.prototype.buffer = function() {
return AbstractSyntaxItem.super_.prototype.buffer.call(this);
}
};
AbstractSyntaxItem.prototype.readBytes = function(stream, length) {
var name = stream.read(C.TYPE_ASCII, length);
this.setAbstractSyntaxName(name);
}
};
TransferSyntaxItem = function() {
this.type = C.ITEM_TYPE_TRANSFER_CONTEXT;
Item.call(this);
};
util.inherits(TransferSyntaxItem, Item);
TransferSyntaxItem.prototype.setTransferSyntaxName = function(name) {
this.transferSyntaxName = name;
}
};
TransferSyntaxItem.prototype.readBytes = function(stream, length) {
var transfer = stream.read(C.TYPE_ASCII, length);
this.setTransferSyntaxName(transfer);
}
};
TransferSyntaxItem.prototype.getFields = function() {
return TransferSyntaxItem.super_.prototype.getFields.call(this, [ new StringField(this.transferSyntaxName) ]);
}
};
TransferSyntaxItem.prototype.buffer = function() {
return TransferSyntaxItem.super_.prototype.buffer.call(this);
}
};
UserInformationItem = function() {
this.type = C.ITEM_TYPE_USER_INFORMATION;
Item.call(this);
};
util.inherits(UserInformationItem, Item);
UserInformationItem.prototype.setUserDataItems = function(items) {
this.userDataItems = items;
}
};
UserInformationItem.prototype.readBytes = function(stream, length) {
var items = [], pdu = this.load(stream);
@ -574,7 +586,7 @@ UserInformationItem.prototype.readBytes = function(stream, length) {
items.push(pdu);
} while (pdu = this.load(stream));
this.setUserDataItems(items);
}
};
UserInformationItem.prototype.getFields = function() {
var f = [];
@ -582,79 +594,82 @@ UserInformationItem.prototype.getFields = function() {
f.push(userData);
});
return UserInformationItem.super_.prototype.getFields.call(this, f);
}
};
UserInformationItem.prototype.buffer = function() {
return UserInformationItem.super_.prototype.buffer.call(this);
}
};
ImplementationClassUIDItem = function() {
this.type = C.ITEM_TYPE_IMPLEMENTATION_UID;
Item.call(this);
}
};
util.inherits(ImplementationClassUIDItem, Item);
ImplementationClassUIDItem.prototype.setImplementationClassUID = function(id) {
this.implementationClassUID = id;
}
};
ImplementationClassUIDItem.prototype.readBytes = function(stream, length) {
var uid = stream.read(C.TYPE_ASCII, length);
this.setImplementationClassUID(uid);
}
};
ImplementationClassUIDItem.prototype.getFields = function() {
return ImplementationClassUIDItem.super_.prototype.getFields.call(this, [ new StringField(this.implementationClassUID) ]);
}
};
ImplementationClassUIDItem.prototype.buffer = function() {
return ImplementationClassUIDItem.super_.prototype.buffer.call(this);
}
};
ImplementationVersionNameItem = function() {
this.type = C.ITEM_TYPE_IMPLEMENTATION_VERSION;
Item.call(this);
}
};
util.inherits(ImplementationVersionNameItem, Item);
ImplementationVersionNameItem.prototype.setImplementationVersionName = function(name) {
this.implementationVersionName = name;
}
};
ImplementationVersionNameItem.prototype.readBytes = function(stream, length) {
var name = stream.read(C.TYPE_ASCII, length);
this.setImplementationVersionName(name);
}
};
ImplementationVersionNameItem.prototype.getFields = function() {
return ImplementationVersionNameItem.super_.prototype.getFields.call(this, [ new StringField(this.implementationVersionName) ]);
}
};
ImplementationVersionNameItem.prototype.buffer = function() {
return ImplementationVersionNameItem.super_.prototype.buffer.call(this);
}
};
MaximumLengthItem = function() {
this.type = C.ITEM_TYPE_MAXIMUM_LENGTH;
this.maximumLengthReceived = 32768;
Item.call(this);
}
};
util.inherits(MaximumLengthItem, Item);
MaximumLengthItem.prototype.setMaximumLengthReceived = function(length) {
this.maximumLengthReceived = length;
}
};
MaximumLengthItem.prototype.readBytes = function(stream, length) {
var l = stream.read(C.TYPE_UINT32);
this.setMaximumLengthReceived(l);
}
};
MaximumLengthItem.prototype.getFields = function() {
return MaximumLengthItem.super_.prototype.getFields.call(this, [ new UInt32Field(this.maximumLengthReceived) ]);
}
};
MaximumLengthItem.prototype.buffer = function() {
return MaximumLengthItem.super_.prototype.buffer.call(this);
}
};

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

@ -20,7 +20,7 @@ calcLength = function(type, value) {
default :break;
}
return size;
}
};
var RWStream = function() {
this.endian = C.BIG_ENDIAN;
@ -28,19 +28,19 @@ var RWStream = function() {
RWStream.prototype.setEndian = function(endian) {
this.endian = endian;
}
};
RWStream.prototype.getEncoding = function(type) {
return RWStream.encodings[type];
}
};
RWStream.prototype.getWriteType = function(type) {
return RWStream.writes[this.endian][type];
}
};
RWStream.prototype.getReadType = function(type) {
return RWStream.reads[this.endian][type];
}
};
WriteStream = function() {
RWStream.call(this);
@ -48,7 +48,7 @@ WriteStream = function() {
this.rawBuffer = new Buffer(this.defaultBufferSize);
this.offset = 0;
this.contentSize = 0;
}
};
util.inherits(WriteStream, RWStream);
@ -57,15 +57,15 @@ WriteStream.prototype.increment = function(add) {
if (this.offset > this.contentSize) {
this.contentSize = this.offset;
}
}
};
WriteStream.prototype.size = function() {
return this.contentSize;
}
};
WriteStream.prototype.skip = function(amount) {
this.increment(amount);
}
};
WriteStream.prototype.checkSize = function(length) {
if (this.offset + length > this.rawBuffer.length) {
@ -75,15 +75,15 @@ WriteStream.prototype.checkSize = function(length) {
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);
}
};
WriteStream.prototype.write = function(type, value) {
if (isString(type)) {
@ -91,28 +91,28 @@ WriteStream.prototype.write = function(type, value) {
} 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);
}
};
WriteStream.prototype.buffer = function() {
return this.rawBuffer.slice(0, this.contentSize);
}
};
WriteStream.prototype.toReadBuffer = function() {
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;
}
};
ReadStream = function(buffer) {
RWStream.call(this);
@ -124,26 +124,26 @@ util.inherits(ReadStream, RWStream);
ReadStream.prototype.size = function() {
return this.rawBuffer.length;
}
};
ReadStream.prototype.increment = function(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);
}
};
ReadStream.prototype.reset = function() {
this.offset = 0;
return this;
}
};
ReadStream.prototype.end = function() {
return this.offset >= this.size();
}
};
ReadStream.prototype.readFromBuffer = function(type, length) {
//this.checkSize(length);
@ -151,7 +151,7 @@ ReadStream.prototype.readFromBuffer = function(type, length) {
var value = this.rawBuffer[this.getReadType(type)](this.offset);
this.increment(length);
return value;
}
};
ReadStream.prototype.read = function(type, length) {
var value = null;
@ -162,68 +162,68 @@ ReadStream.prototype.read = function(type, length) {
}
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;
}
};
ReadStream.prototype.buffer = function() {
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;
}
};
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';

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

@ -1,36 +1,36 @@
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",
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,
@ -78,10 +78,10 @@ C = {
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",
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,

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

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

6
Packages/hangingprotocols/package.js
View File

@ -1,6 +1,6 @@
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'
});
@ -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' ]);
});

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

File diff suppressed because it is too large Load Diff

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

@ -43,7 +43,6 @@ 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)) {
continue;
@ -55,6 +54,7 @@ dataSetToJsWithDictionary = function (dataSet, dictionary, options) {
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;

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

@ -1,51 +1,52 @@
DICOMHP.select = function(hpInstance) {
var imageSetsSequence = hpInstance["00720020"].Value;
var imageSetsSequence = hpInstance['00720020'].Value;
if (!imageSetsSequence) {
return [];
}
var matchedImageSets = [];
imageSetsSequence.forEach(function(imageSet) {
var selectorSequence = imageSet["00720022"].Value;
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],
var usageFlag = selector['00720024'].Value[0],
selectorAttribute = selector['00720026'].Value[0],
selectorAttributeVR = selector['00720050'].Value[0],
selectorAttributeValue = null;
if (selectorAttributeVR == 'SQ') {
return;
} else if (selectorAttributeVR == 'AT') {
selectorAttributeValue = selector["00720060"].Value[0];
selectorAttributeValue = selector['00720060'].Value[0];
} else if (selectorAttributeVR == 'CS') {
selectorAttributeValue = selector["00720062"].Value[0];
selectorAttributeValue = selector['00720062'].Value[0];
} else if (selectorAttributeVR == 'IS') {
selectorAttributeValue = selector["00720064"].Value[0];
selectorAttributeValue = selector['00720064'].Value[0];
} else if (selectorAttributeVR == 'LO') {
selectorAttributeValue = selector["00720066"].Value[0];
selectorAttributeValue = selector['00720066'].Value[0];
} else if (selectorAttributeVR == 'LT') {
selectorAttributeValue = selector["00720068"].Value[0];
selectorAttributeValue = selector['00720068'].Value[0];
} else if (selectorAttributeVR == 'PN') {
selectorAttributeValue = selector["0072006A"].Value[0];
selectorAttributeValue = selector['0072006A'].Value[0];
} else if (selectorAttributeVR == 'SH') {
selectorAttributeValue = selector["0072006C"].Value[0];
selectorAttributeValue = selector['0072006C'].Value[0];
} else if (selectorAttributeVR == 'ST') {
selectorAttributeValue = selector["0072006E"].Value[0];
selectorAttributeValue = selector['0072006E'].Value[0];
} else if (selectorAttributeVR == 'UT') {
selectorAttributeValue = selector["00720070"].Value[0];
selectorAttributeValue = selector['00720070'].Value[0];
} else if (selectorAttributeVR == 'DS') {
selectorAttributeValue = selector["00720072"].Value[0];
selectorAttributeValue = selector['00720072'].Value[0];
} else if (selectorAttributeVR == 'FD') {
selectorAttributeValue = selector["00720074"].Value[0];
selectorAttributeValue = selector['00720074'].Value[0];
} else if (selectorAttributeVR == 'FL') {
selectorAttributeValue = selector["00720076"].Value[0];
selectorAttributeValue = selector['00720076'].Value[0];
} else if (selectorAttributeVR == 'UL') {
selectorAttributeValue = selector["00720078"].Value[0];
selectorAttributeValue = selector['00720078'].Value[0];
} else if (selectorAttributeVR == 'US') {
selectorAttributeValue = selector["0072007A"].Value[0];
selectorAttributeValue = selector['0072007A'].Value[0];
} else if (selectorAttributeVR == 'SL') {
selectorAttributeValue = selector["0072007C"].Value[0];
selectorAttributeValue = selector['0072007C'].Value[0];
} else if (selectorAttributeVR == 'SS') {
selectorAttributeValue = selector["0072007E"].Value[0];
selectorAttributeValue = selector['0072007E'].Value[0];
}
if (selectorAttributeValue !== null) {
@ -53,18 +54,18 @@ DICOMHP.select = function(hpInstance) {
}
});
var timeBasedImageSetsSequence = imageSet["00720030"].Value;
var timeBasedImageSetsSequence = imageSet['00720030'].Value;
timeBasedImageSetsSequence.forEach(function(timeImageSet) {
var setNumber = timeImageSet["00720032"].Value[0], selectorCategory = timeImageSet["00720034"].Value[0];
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 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];
var priorValue = timeImageSet['0072003C'].Value[0];
mImageSet.setPriorValue(priorValue);
}

48
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: ''
});

40
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: ''
});

8
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

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

@ -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) {

10
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) {
@ -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';

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

@ -150,6 +150,7 @@
if (!handle.boundingBox) {
return;
}
return cornerstoneMath.point.insideRect(coords, handle.boundingBox);
}
@ -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);

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

@ -15,7 +15,10 @@
y: config.verticalLine.start.y + i * config.verticalMinorTick
};
var endPoint = {x: 0, y: config.verticalLine.start.y + i*config.verticalMinorTick};
var endPoint = {
x: 0,
y: config.verticalLine.start.y + i * config.verticalMinorTick
};
if (i% 5 === 0) {
endPoint.x = config.verticalLine.start.x - config.majorTickLength;
@ -38,13 +41,15 @@
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
};
endPoint = {x: config.horizontalLine.start.x + i * config.horizontalMinorTick, y: 0};
endPoint = {
x: config.horizontalLine.start.x + i * config.horizontalMinorTick,
y: 0
};
if (i% 5 === 0) {
endPoint.y = config.horizontalLine.start.y - config.majorTickLength;
@ -70,8 +75,14 @@
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};
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;
@ -80,10 +91,15 @@
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};
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;
@ -101,30 +117,24 @@
var intersectLeftRight;
var intersectTopBottom;
if (canvasBounds.width >= 0)
{
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
{
} 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 (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
{
} else {
if (imageBounds.height >= 0)
intersectTopBottom = !((canvasBounds.top <= imageBounds.top) || (imageBounds.bottom <= canvasBounds.bottom));
else
@ -147,55 +157,37 @@
}
if (canvasBounds.width >= 0)
{
if (imageBounds.width >= 0)
{
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
{
} else {
intersectPoints.left = Math.max(canvasBounds.left, imageBounds.right);
intersectPoints.right = Math.min(canvasBounds.right, imageBounds.left);
}
}
else
{
if (imageBounds.width >= 0)
{
} else {
if (imageBounds.width >= 0) {
intersectPoints.left = Math.min(canvasBounds.left, imageBounds.right);
intersectPoints.right = Math.max(canvasBounds.right, imageBounds.left);
}
else
{
} 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)
{
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
{
} else {
intersectPoints.top = Math.max(canvasBounds.top, imageBounds.bottom);
intersectPoints.bottom = Math.min(canvasBounds.bottom, imageBounds.top);
}
}
else
{
if (imageBounds.height >= 0)
{
} else {
if (imageBounds.height >= 0) {
intersectPoints.top = Math.min(canvasBounds.top, imageBounds.bottom);
intersectPoints.bottom = Math.max(canvasBounds.bottom, imageBounds.top);
}
else
{
} else {
intersectPoints.top = Math.min(canvasBounds.top, imageBounds.top);
intersectPoints.bottom = Math.max(canvasBounds.bottom, imageBounds.bottom);
}
@ -228,9 +220,18 @@
height: canvasBounds.height - 2 * vReduction
};
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 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 startPointCanvasImageBounds = cornerstone.pixelToCanvas(eventData.element, startPointImageBounds);
var endPointCanvasImageBounds = cornerstone.pixelToCanvas(eventData.element, endPointImageBounds);
@ -238,7 +239,6 @@
var imageBoundsWidth = Math.abs(startPointCanvasImageBounds.x - endPointCanvasImageBounds.x);
var imageBoundsHeight = Math.abs(startPointCanvasImageBounds.y - endPointCanvasImageBounds.y);
hReduction = horizontalReduction * imageBoundsWidth;
vReduction = verticalReduction * imageBoundsHeight;
@ -268,14 +268,19 @@
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};
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;
}
@ -294,12 +299,24 @@
minorTickLength: 12.5,
majorTickLength: 25,
verticalLine: {
start: {x: vscaleBounds.right , y: vscaleBounds.top},
end: {x: vscaleBounds.right, y: vscaleBounds.bottom}
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}
start: {
x: hscaleBounds.left,
y: hscaleBounds.bottom
},
end: {
x: hscaleBounds.right,
y: hscaleBounds.bottom
}
},
color: cornerstoneTools.toolColors.getToolColor(),
lineWidth: cornerstoneTools.toolStyle.getToolWidth()

10
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();

42
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;
}
@ -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.
@ -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();
}
});

16
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;

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);
}

8
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;
}

55
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) {
@ -34,25 +37,26 @@ Template.lesionTableTimepointHeader.events({
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";
var timepointText = 'Baseline';
if (!checkboxBaselineChecked) {
timepointText = "";
timepointText = '';
}
Timepoints.update(timepoint._id,{
@ -64,32 +68,25 @@ Template.lesionTableTimepointHeader.events({
// 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
};
}

87
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;
}
@ -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,11 +85,11 @@ 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
@ -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,14 +144,14 @@ 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 = {
@ -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();
}
});

15
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') {
@ -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;
}

10
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

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 {

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

@ -1,6 +1,6 @@
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);
@ -19,7 +19,7 @@ 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);
});

5
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
});
};

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

@ -4,7 +4,6 @@ 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) {
@ -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;
@ -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/uuid.js
View File

@ -201,6 +201,7 @@
buf = options == 'binary' ? new BufferClass(16) : null;
options = null;
}
options = options || {};
var rnds = options.random || (options.rng || _rng)();
@ -234,7 +235,6 @@
// Publish as AMD module
define(function() {return uuid;});
} else {
// Publish as global (in browsers)
var _previousRoot = _global.uuid;

25
Packages/lesiontracker/package.js
View File

@ -1,6 +1,6 @@
Package.describe({
name: "lesiontracker",
summary: "OHIF Lesion Tracker Tools",
name: 'lesiontracker',
summary: 'OHIF Lesion Tracker Tools',
version: '0.0.1'
});
@ -20,11 +20,21 @@ Package.onUse(function (api) {
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');
@ -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');

1
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() {

10
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