Fix StudyPrefetcher import of getImageId. Update StandaloneViewer
This commit is contained in:
Erik Ziegler
parent
97b34090a3
commit
fc29b48b59
@ -5,6 +5,7 @@ import { _ } from 'meteor/underscore';
|
|||||||
import { OHIF } from 'meteor/ohif:core';
|
import { OHIF } from 'meteor/ohif:core';
|
||||||
import { OHIFError } from './OHIFError';
|
import { OHIFError } from './OHIFError';
|
||||||
import { StackManager } from '../StackManager.js';
|
import { StackManager } from '../StackManager.js';
|
||||||
|
import { getImageId } from '../getImageId.js';
|
||||||
|
|
||||||
export class StudyPrefetcher {
|
export class StudyPrefetcher {
|
||||||
|
|
||||||
|
|||||||
@ -16,10 +16,10 @@ function updateQueryStringParameter(uri, key, value) {
|
|||||||
*
|
*
|
||||||
* @param instance
|
* @param instance
|
||||||
* @param frame
|
* @param frame
|
||||||
* #param thumbnail
|
* @param thumbnail
|
||||||
* @returns {string} The imageId to be used by Cornerstone
|
* @returns {string} The imageId to be used by Cornerstone
|
||||||
*/
|
*/
|
||||||
export function getImageId(instance, frame, thumbnail) {
|
export function getImageId(instance, frame, thumbnail=false) {
|
||||||
if (!instance) {
|
if (!instance) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,10 +1,35 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
<link rel="stylesheet" type="text/css" class="__meteor-css__" href="/ab80e40a77dfac1a0e3e901365f886f7ede58bd2.css?meteor_css_resource=true">
|
<link rel="stylesheet" type="text/css" class="__meteor-css__" href="/e4bae103351559e4cc4f1610f25c9bcfa9ae9646.css?meteor_css_resource=true">
|
||||||
<link rel="stylesheet" type="text/css" class="__meteor-css__" href="/2d671223147fa0641468cb391231419082fc6389.css?meteor_css_resource=true">
|
<link rel="stylesheet" type="text/css" class="__meteor-css__" href="/d03b794e52cffaf1a76ed5395e54e18b09f20f15.css?meteor_css_resource=true">
|
||||||
<script type="text/javascript">__meteor_runtime_config__ = JSON.parse(decodeURIComponent("%7B%22meteorRelease%22%3A%22METEOR%401.5%22%2C%22ROOT_URL_PATH_PREFIX%22%3A%22%22%2C%22meteorEnv%22%3A%7B%22NODE_ENV%22%3A%22production%22%7D%2C%22ROOT_URL%22%3A%22localhost%3A3000%22%7D"));</script>
|
<script type="text/javascript">
|
||||||
<script type="text/javascript" src="/0ff7948d96edccbfd32476ed00422e30ffcc5f0a.js"></script>
|
__meteor_runtime_config__ = {
|
||||||
|
"meteorRelease": "METEOR@1.5.2.2",
|
||||||
|
"ROOT_URL_PATH_PREFIX": "",
|
||||||
|
"meteorEnv": {
|
||||||
|
"NODE_ENV": "production"
|
||||||
|
},
|
||||||
|
"ROOT_URL": "http://localhost:3000",
|
||||||
|
"PUBLIC_SETTINGS": {
|
||||||
|
"verifyEmail": false,
|
||||||
|
"ui": {
|
||||||
|
"studyListFunctionsEnabled": true,
|
||||||
|
"leftSidebarOpen": false,
|
||||||
|
"displaySetNavigationLoopOverSeries": false,
|
||||||
|
"displaySetNavigationMultipleViewports": true,
|
||||||
|
"autoPositionMeasurementsTextCallOuts": "TRLB"
|
||||||
|
},
|
||||||
|
"prefetch": {
|
||||||
|
"order": "topdown",
|
||||||
|
"displaySetCount": 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
console.log('Using Meteor Settings:');
|
||||||
|
console.log(__meteor_runtime_config__);
|
||||||
|
</script>
|
||||||
|
<script type="text/javascript" src="/00a3252f025c3b436cda09bf88f5ead9f975d4be.js"></script>
|
||||||
|
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<title>OHIF DICOM Viewer</title>
|
<title>OHIF DICOM Viewer</title>
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
StandaloneViewer/SampleClientOnlyBuild/packages/ohif_polyfill/public/js/svg4everybody.min.js
vendored
Normal file
1
StandaloneViewer/SampleClientOnlyBuild/packages/ohif_polyfill/public/js/svg4everybody.min.js
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
!function(a,b){"function"==typeof define&&define.amd?define([],function(){return a.svg4everybody=b()}):"object"==typeof module&&module.exports?module.exports=b():a.svg4everybody=b()}(this,function(){function a(a,b,c){if(c){var d=document.createDocumentFragment(),e=!b.hasAttribute("viewBox")&&c.getAttribute("viewBox");e&&b.setAttribute("viewBox",e);for(var f=c.cloneNode(!0);f.childNodes.length;)d.appendChild(f.firstChild);a.appendChild(d)}}function b(b){b.onreadystatechange=function(){if(4===b.readyState){var c=b._cachedDocument;c||(c=b._cachedDocument=document.implementation.createHTMLDocument(""),c.body.innerHTML=b.responseText,b._cachedTarget={}),b._embeds.splice(0).map(function(d){var e=b._cachedTarget[d.id];e||(e=b._cachedTarget[d.id]=c.getElementById(d.id)),a(d.parent,d.svg,e)})}},b.onreadystatechange()}function c(c){function e(){for(var c=0;c<o.length;){var h=o[c],i=h.parentNode,j=d(i),k=h.getAttribute("xlink:href")||h.getAttribute("href");if(!k&&g.attributeName&&(k=h.getAttribute(g.attributeName)),j&&k){if(f)if(!g.validate||g.validate(k,j,h)){i.removeChild(h);var l=k.split("#"),q=l.shift(),r=l.join("#");if(q.length){var s=m[q];s||(s=m[q]=new XMLHttpRequest,s.open("GET",q),s.send(),s._embeds=[]),s._embeds.push({parent:i,svg:j,id:r}),b(s)}else a(i,j,document.getElementById(r))}else++c,++p}else++c}(!o.length||o.length-p>0)&&n(e,67)}var f,g=Object(c),h=/\bTrident\/[567]\b|\bMSIE (?:9|10)\.0\b/,i=/\bAppleWebKit\/(\d+)\b/,j=/\bEdge\/12\.(\d+)\b/,k=/\bEdge\/.(\d+)\b/,l=window.top!==window.self;f="polyfill"in g?g.polyfill:h.test(navigator.userAgent)||(navigator.userAgent.match(j)||[])[1]<10547||(navigator.userAgent.match(i)||[])[1]<537||k.test(navigator.userAgent)&&l;var m={},n=window.requestAnimationFrame||setTimeout,o=document.getElementsByTagName("use"),p=0;f&&e()}function d(a){for(var b=a;"svg"!==b.nodeName.toLowerCase()&&(b=b.parentNode););return b}return c});
|
||||||
@ -1,12 +0,0 @@
|
|||||||
/*!
|
|
||||||
* @copyright Copyright (c) 2017 IcoMoon.io
|
|
||||||
* @license Licensed under MIT license
|
|
||||||
* See https://github.com/Keyamoon/svgxuse
|
|
||||||
* @version 1.2.4
|
|
||||||
*/
|
|
||||||
(function(){if("undefined"!==typeof window&&window.addEventListener){var e=Object.create(null),n,t,d=function(){clearTimeout(t);t=setTimeout(n,100)},q=function(){},u=function(){var f;window.addEventListener("resize",d,!1);window.addEventListener("orientationchange",d,!1);window.MutationObserver?(f=new MutationObserver(d),f.observe(document.documentElement,{childList:!0,subtree:!0,attributes:!0}),q=function(){try{f.disconnect(),window.removeEventListener("resize",d,!1),window.removeEventListener("orientationchange",
|
|
||||||
d,!1)}catch(w){}}):(document.documentElement.addEventListener("DOMSubtreeModified",d,!1),q=function(){document.documentElement.removeEventListener("DOMSubtreeModified",d,!1);window.removeEventListener("resize",d,!1);window.removeEventListener("orientationchange",d,!1)})},v=function(f){function e(a){var c;void 0!==a.protocol?c=a:(c=document.createElement("a"),c.href=a);return c.protocol.replace(/:/g,"")+c.host}var d,p;window.XMLHttpRequest&&(d=new XMLHttpRequest,p=e(location),f=e(f),d=void 0===d.withCredentials&&
|
|
||||||
""!==f&&f!==p?XDomainRequest||void 0:XMLHttpRequest);return d};n=function(){function d(){--r;0===r&&(q(),u())}function l(a){return function(){!0!==e[a.base]&&(a.isXlink?a.useEl.setAttributeNS("http://www.w3.org/1999/xlink","xlink:href","#"+a.hash):a.useEl.setAttribute("href","#"+a.hash))}}function n(a){return function(){var c=document.body,b=document.createElement("x");a.onload=null;b.innerHTML=a.responseText;if(b=b.getElementsByTagName("svg")[0])b.setAttribute("aria-hidden","true"),b.style.position=
|
|
||||||
"absolute",b.style.width=0,b.style.height=0,b.style.overflow="hidden",c.insertBefore(b,c.firstChild);d()}}function p(a){return function(){a.onerror=null;a.ontimeout=null;d()}}var a,c,m,g,r=0,b,k=!1,h;q();h=document.getElementsByTagName("use");for(g=0;g<h.length;g+=1){try{c=h[g].getBoundingClientRect()}catch(x){c=!1}(a=h[g].getAttribute("href"))?k=!1:(a=h[g].getAttributeNS("http://www.w3.org/1999/xlink","href"),k=!0);m=a&&a.split?a.split("#"):["",""];a=m[0];m=m[1];b=c&&0===c.left&&0===c.right&&0===
|
|
||||||
c.top&&0===c.bottom;c&&0===c.width&&0===c.height&&!b?a.length&&(b=e[a],!0!==b&&setTimeout(l({useEl:h[g],base:a,hash:m,isXlink:k}),0),void 0===b&&(k=v(a),void 0!==k&&(b=new k,e[a]=b,b.onload=n(b),b.onerror=p(b),b.ontimeout=p(b),b.open("GET",a),b.send(),r+=1))):b?a.length&&e[a]&&setTimeout(l({useEl:h[g],base:a,hash:m,isXlink:k}),0):void 0===e[a]?e[a]=!0:e[a].onload&&(e[a].abort(),delete e[a].onload,e[a]=!0)}h="";r+=1;d()};var l;l=function(){window.removeEventListener("load",l,!1);t=setTimeout(n,0)};
|
|
||||||
"complete"!==document.readyState?window.addEventListener("load",l,!1):l()}})();
|
|
||||||
@ -87,6 +87,7 @@ ohif:log@0.0.1
|
|||||||
ohif:metadata@0.0.1
|
ohif:metadata@0.0.1
|
||||||
ohif:polyfill@0.0.1
|
ohif:polyfill@0.0.1
|
||||||
ohif:servers@0.0.1
|
ohif:servers@0.0.1
|
||||||
|
ohif:studies@0.0.1
|
||||||
ohif:study-list@0.0.1
|
ohif:study-list@0.0.1
|
||||||
ohif:themes@0.0.1
|
ohif:themes@0.0.1
|
||||||
ohif:themes-common@0.0.1
|
ohif:themes-common@0.0.1
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user