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

OHIF-159 Fix wado-proxy issues

Browse Source
This commit is contained in:
Evren Ozkan 2017-03-09 14:19:05 -05:00
parent 8d4a71fd73
commit d86cac112b
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Packages/ohif-viewerbase/client/lib/getImageId.js
View File

@ -1,4 +1,3 @@
import { OHIF } from 'meteor/ohif:core';
import { getWADORSImageId } from './getWADORSImageId'; import { getWADORSImageId } from './getWADORSImageId';
/** /**
@ -18,7 +17,7 @@ export function getImageId(instance, frame) {
} }
if (instance.wadouri) { if (instance.wadouri) {
var imageId = 'dicomweb:' + OHIF.utils.absoluteUrl(instance.wadouri); var imageId = 'dicomweb:' + instance.wadouri;
if (frame !== undefined) { if (frame !== undefined) {
imageId += '&frame=' + frame; imageId += '&frame=' + frame;
} }

2
Packages/ohif-viewerbase/client/lib/getWADORSImageId.js
View File

@ -27,7 +27,7 @@ export function getWADORSImageId(instanceMetada) {
} }
const image = { const image = {
uri: OHIF.utils.absoluteUrl(instance.wadorsuri), uri: instance.wadorsuri,
//imageId : '', //imageId : '',
//minPixelValue : 0, //minPixelValue : 0,
//maxPixelValue : 255, //maxPixelValue : 255,

2
Packages/ohif-wadoproxy/package.js
View File

@ -11,6 +11,8 @@ Package.onUse(function(api) {
api.use('standard-app-packages'); api.use('standard-app-packages');
api.use('iron:router@1.0.13'); api.use('iron:router@1.0.13');
api.use('ohif:core');
api.addFiles('server/namespace.js'); api.addFiles('server/namespace.js');
// Server-only // Server-only

8
Packages/ohif-wadoproxy/server/initialize.js
View File

@ -1,7 +1,9 @@
Settings = Object.assign((Meteor.settings && Meteor.settings.proxy) ? Meteor.settings.proxy : {}, { import { OHIF } from 'meteor/ohif:core';
uri : "/__wado_proxy",
Settings = Object.assign({
uri : OHIF.utils.absoluteUrl("/__wado_proxy"),
enabled: true enabled: true
}) }, (Meteor.settings && Meteor.settings.proxy) ? Meteor.settings.proxy : {});
http = require("http"); http = require("http");
url = require("url"); url = require("url");

4
Packages/ohif-wadoproxy/server/routes.js
View File

@ -1,6 +1,8 @@
import { OHIF } from 'meteor/ohif:core';
// Setup a Route using Iron Router to avoid Cross-origin resource sharing // Setup a Route using Iron Router to avoid Cross-origin resource sharing
// (CORS) errors. We only handle this route on the Server. // (CORS) errors. We only handle this route on the Server.
Router.route(Settings.uri, function() { Router.route(Settings.uri.replace(OHIF.utils.absoluteUrl(), ''), function() {
const request = this.request; const request = this.request;
const response = this.response; const response = this.response;
const params = this.params; const params = this.params;