Integration TrizRis OHIF: key images, annotations, layouts, access control and reconstruction
Build and Deploy Docs / build-and-deploy-docs (push) Canceled after 0s
Build and Deploy Docs / build-and-deploy-docs (push) Canceled after 0s
This commit is contained in:
1 parent
bbe37ff388
commit
f00379a672
28 files changed
+1898
-105
No files matched your search
@@ -209,6 +209,15 @@ module.exports = (env, argv) => {
|
||||
context: ['/dicomweb'],
|
||||
target: 'http://localhost:5000',
|
||||
},
|
||||
|
||||
{
|
||||
context: ['/orthanc'],
|
||||
target: 'http://localhost:8042',
|
||||
changeOrigin: true,
|
||||
pathRewrite: {
|
||||
'^/orthanc': '',
|
||||
},
|
||||
},
|
||||
],
|
||||
static: [
|
||||
{
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
module.exports = {
|
||||
TRIZRIS_BASE_URL: 'http://localhost:9090/TrizRis',
|
||||
ORTHANC_BASE_URL: 'http://localhost:8042',
|
||||
OHIF_BASE_URL: 'http://localhost:3000',
|
||||
};
|
||||
@@ -16,12 +16,18 @@
|
||||
// your own DICOMweb server. For a fully-featured setup with every data source
|
||||
// and customization loading enabled, see config/dev.js (local development) and
|
||||
// config/netlify.js (the public demo deploy).
|
||||
|
||||
window.config = {
|
||||
name: 'config/default.js',
|
||||
|
||||
routerBasename: null,
|
||||
|
||||
// whiteLabeling: {},
|
||||
|
||||
extensions: [],
|
||||
|
||||
modes: [],
|
||||
|
||||
customizationService: {},
|
||||
|
||||
// --- URL-driven customizations (?customization=) ----------------------------
|
||||
@@ -44,68 +50,112 @@ window.config = {
|
||||
// ("next") API instead of the legacy Stack/Volume viewport classes.
|
||||
genericViewports: {
|
||||
enabled: false,
|
||||
|
||||
// Render backend selection: 'cpu' | 'webgl' | 'auto' | a backend id
|
||||
// registered via cornerstone's registerRenderBackend (e.g. a webgpu
|
||||
// backend), or a map with per-viewport-type overrides, e.g.
|
||||
// { default: 'webgl', orthographic: 'cpu' }. The matching URL params take
|
||||
// precedence per-session: ?viewportRendering=cpu and
|
||||
// ?orthographic.viewportRendering=cpu.
|
||||
|
||||
// viewportRendering: 'auto',
|
||||
},
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
showStudyList: true,
|
||||
|
||||
// some windows systems have issues with more than 3 web workers
|
||||
maxNumberOfWebWorkers: 3,
|
||||
|
||||
// below flag is for performance reasons, but it might not work for all servers
|
||||
showWarningMessageForCrossOrigin: true,
|
||||
|
||||
showCPUFallbackMessage: true,
|
||||
|
||||
showLoadingIndicator: true,
|
||||
|
||||
experimentalStudyBrowserSort: false,
|
||||
|
||||
strictZSpacingForVolumeViewport: true,
|
||||
|
||||
groupEnabledModesFirst: true,
|
||||
|
||||
allowMultiSelectExport: false,
|
||||
|
||||
maxNumRequests: {
|
||||
interaction: 100,
|
||||
thumbnail: 5,
|
||||
|
||||
// Prefetch number is dependent on the http protocol. For http 2 or
|
||||
// above, the number of requests can be go a lot higher.
|
||||
prefetch: 25,
|
||||
},
|
||||
showErrorDetails: 'always', // 'always', 'dev', 'production'
|
||||
|
||||
showErrorDetails: 'always',
|
||||
|
||||
// `dangerouslyUseDynamicConfig` (load configuration from a `configUrl` query
|
||||
// parameter) is intentionally left OFF in the secure default build. See
|
||||
// config/dev.js for the documented shape.
|
||||
defaultDataSourceName: 'ohif',
|
||||
|
||||
// ✅ MODIFIÉ : on indique que la source par défaut est Orthanc
|
||||
defaultDataSourceName: 'orthanc',
|
||||
|
||||
dataSources: [
|
||||
{
|
||||
// Read-only public demo server. Replace with your own DICOMweb server.
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
|
||||
sourceName: 'ohif',
|
||||
|
||||
// ✅ MODIFIÉ : nom logique de la datasource
|
||||
sourceName: 'orthanc',
|
||||
|
||||
configuration: {
|
||||
friendlyName: 'AWS S3 Static wado server',
|
||||
name: 'aws',
|
||||
wadoUriRoot: 'https://d14fa38qiwhyfd.cloudfront.net/dicomweb',
|
||||
qidoRoot: 'https://d14fa38qiwhyfd.cloudfront.net/dicomweb',
|
||||
wadoRoot: 'https://d14fa38qiwhyfd.cloudfront.net/dicomweb',
|
||||
qidoSupportsIncludeField: false,
|
||||
// ✅ MODIFIÉ
|
||||
friendlyName: 'Orthanc local',
|
||||
|
||||
// ✅ MODIFIÉ
|
||||
name: 'Orthanc',
|
||||
|
||||
// ✅ Orthanc WADO-URI
|
||||
wadoUriRoot: '/orthanc/wado',
|
||||
|
||||
// ✅ Orthanc QIDO-RS
|
||||
qidoRoot: '/orthanc/dicom-web',
|
||||
|
||||
// ✅ Orthanc WADO-RS
|
||||
wadoRoot: '/orthanc/dicom-web',
|
||||
|
||||
qidoSupportsIncludeField: true,
|
||||
|
||||
imageRendering: 'wadors',
|
||||
thumbnailRendering: 'thumbnail',
|
||||
|
||||
thumbnailRendering: 'wadors',
|
||||
|
||||
thumbnailRequestStrategy: 'fetch',
|
||||
|
||||
enableStudyLazyLoad: true,
|
||||
supportsFuzzyMatching: true,
|
||||
|
||||
supportsFuzzyMatching: false,
|
||||
|
||||
supportsWildcard: true,
|
||||
staticWado: true,
|
||||
|
||||
// ✅ MODIFIÉ
|
||||
// Avant tu avais true car la config venait d'un serveur WADO statique.
|
||||
// Avec Orthanc DICOMweb, mets false.
|
||||
staticWado: false,
|
||||
|
||||
// Multiframe SEG loads fetch the whole instance as a single Part 10
|
||||
// object by default and wait for it: the per-frame endpoint is
|
||||
// efficient, but SEG frames are so small and numerous that one bulk
|
||||
// fetch beats hundreds of tiny requests. Per-frame loading is the
|
||||
// exception — set loadMultiframeAsPart10: false here to force it.
|
||||
// fetch beats hundreds of tiny requests.
|
||||
singlepart: 'bulkdata,video',
|
||||
|
||||
bulkDataURI: {
|
||||
enabled: true,
|
||||
relativeResolution: 'studies',
|
||||
|
||||
transform: url => url.replace('/pixeldata.mp4', '/rendered'),
|
||||
},
|
||||
|
||||
omitQuotationForMultipartRequest: true,
|
||||
},
|
||||
},
|
||||
@@ -114,15 +164,13 @@ window.config = {
|
||||
// default because they broaden the attack surface of a default deployment.
|
||||
// Enable them only in a deployment you control (see config/dev.js):
|
||||
// - dicomlocal: loads DICOM files from the user's machine.
|
||||
// - dicomjson: loads metadata from an arbitrary `?url=` (gate with
|
||||
// `dangerouslyAllowedOriginsForAuthenticatedEnvironments`).
|
||||
// - dicomjson: loads metadata from an arbitrary `?url=`.
|
||||
// - dicomwebproxy: delegating proxy driven by `?url=`.
|
||||
],
|
||||
|
||||
httpErrorHandler: error => {
|
||||
// This is 429 when rejected from the public idc sandbox too often.
|
||||
console.warn(error.status);
|
||||
|
||||
// Could use services manager here to bring up a dialog/modal if needed.
|
||||
console.warn('test, navigate to https://ohif.org/');
|
||||
},
|
||||
};
|
||||
@@ -10,52 +10,64 @@
|
||||
// customizations, can be exercised locally exactly as it runs on the demo.
|
||||
// The locked-down config/default.js is what a plain production build emits
|
||||
// instead.
|
||||
|
||||
window.config = {
|
||||
name: 'config/dev.js',
|
||||
|
||||
routerBasename: null,
|
||||
|
||||
// whiteLabeling: {},
|
||||
|
||||
extensions: [],
|
||||
|
||||
modes: [],
|
||||
|
||||
customizationService: ['@ohif/extension-default.customizationModule.theme'],
|
||||
|
||||
// URL-driven customizations (?customization=). The `default` prefix (no
|
||||
// slashes) is used for values without a leading slash; every other prefix
|
||||
// must start AND end with a slash and matches the leading `/segment/` of the
|
||||
// value. Files are fetched and parsed as JSONC data — never executed.
|
||||
// e.g. ?customization=tools/ctPresets -> ./customizations/tools/ctPresets.jsonc
|
||||
customizationUrlPrefixes: {
|
||||
default: './customizations/',
|
||||
},
|
||||
|
||||
showStudyList: true,
|
||||
// some windows systems have issues with more than 3 web workers
|
||||
|
||||
maxNumberOfWebWorkers: 3,
|
||||
// below flag is for performance reasons, but it might not work for all servers
|
||||
|
||||
showWarningMessageForCrossOrigin: true,
|
||||
|
||||
showCPUFallbackMessage: true,
|
||||
|
||||
showLoadingIndicator: true,
|
||||
|
||||
experimentalStudyBrowserSort: false,
|
||||
|
||||
strictZSpacingForVolumeViewport: true,
|
||||
|
||||
groupEnabledModesFirst: true,
|
||||
|
||||
allowMultiSelectExport: false,
|
||||
|
||||
maxNumRequests: {
|
||||
interaction: 100,
|
||||
thumbnail: 5,
|
||||
// Prefetch number is dependent on the http protocol. For http 2 or
|
||||
// above, the number of requests can be go a lot higher.
|
||||
prefetch: 25,
|
||||
},
|
||||
showErrorDetails: 'always', // 'always', 'dev', 'production'
|
||||
|
||||
showErrorDetails: 'always',
|
||||
|
||||
// filterQueryParam: false,
|
||||
// Defines multi-monitor layouts
|
||||
|
||||
multimonitor: [
|
||||
{
|
||||
id: 'split',
|
||||
|
||||
test: ({ multimonitor }) => multimonitor === 'split',
|
||||
|
||||
screens: [
|
||||
{
|
||||
id: 'ohif0',
|
||||
|
||||
screen: null,
|
||||
|
||||
location: {
|
||||
screen: 0,
|
||||
width: 0.5,
|
||||
@@ -63,17 +75,22 @@ window.config = {
|
||||
left: 0,
|
||||
top: 0,
|
||||
},
|
||||
|
||||
options: 'location=no,menubar=no,scrollbars=no,status=no,titlebar=no',
|
||||
},
|
||||
|
||||
{
|
||||
id: 'ohif1',
|
||||
|
||||
screen: null,
|
||||
|
||||
location: {
|
||||
width: 0.5,
|
||||
height: 1,
|
||||
left: 0.5,
|
||||
top: 0,
|
||||
},
|
||||
|
||||
options: 'location=no,menubar=no,scrollbars=no,status=no,titlebar=no',
|
||||
},
|
||||
],
|
||||
@@ -81,195 +98,362 @@ window.config = {
|
||||
|
||||
{
|
||||
id: '2',
|
||||
|
||||
test: ({ multimonitor }) => multimonitor === '2',
|
||||
|
||||
screens: [
|
||||
{
|
||||
id: 'ohif0',
|
||||
|
||||
screen: 0,
|
||||
|
||||
location: {
|
||||
width: 1,
|
||||
height: 1,
|
||||
left: 0,
|
||||
top: 0,
|
||||
},
|
||||
|
||||
options: 'fullscreen=yes,location=no,menubar=no,scrollbars=no,status=no,titlebar=no',
|
||||
},
|
||||
|
||||
{
|
||||
id: 'ohif1',
|
||||
|
||||
screen: 1,
|
||||
|
||||
location: {
|
||||
width: 1,
|
||||
height: 1,
|
||||
left: 0,
|
||||
top: 0,
|
||||
},
|
||||
|
||||
options: 'fullscreen=yes,location=no,menubar=no,scrollbars=no,status=no,titlebar=no',
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
defaultDataSourceName: 'ohif',
|
||||
/* Dynamic config allows user to pass "configUrl" query string this allows to load config without recompiling application. The regex will ensure valid configuration source */
|
||||
// dangerouslyUseDynamicConfig: {
|
||||
// enabled: true,
|
||||
// regex: /.*/,
|
||||
// },
|
||||
|
||||
// ✅ MODIFIÉ
|
||||
// Avant :
|
||||
// defaultDataSourceName: 'ohif',
|
||||
//
|
||||
// Maintenant OHIF utilise Orthanc par défaut.
|
||||
defaultDataSourceName: 'orthanc',
|
||||
|
||||
dataSources: [
|
||||
// =========================================================
|
||||
// AWS source 1
|
||||
// =========================================================
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
|
||||
|
||||
sourceName: 'ohif',
|
||||
|
||||
configuration: {
|
||||
friendlyName: 'AWS S3 Static wado server',
|
||||
|
||||
name: 'aws',
|
||||
|
||||
wadoUriRoot: 'https://d14fa38qiwhyfd.cloudfront.net/dicomweb',
|
||||
|
||||
qidoRoot: 'https://d14fa38qiwhyfd.cloudfront.net/dicomweb',
|
||||
|
||||
wadoRoot: 'https://d14fa38qiwhyfd.cloudfront.net/dicomweb',
|
||||
|
||||
qidoSupportsIncludeField: false,
|
||||
|
||||
imageRendering: 'wadors',
|
||||
|
||||
thumbnailRendering: 'thumbnail',
|
||||
|
||||
thumbnailRequestStrategy: 'fetch',
|
||||
|
||||
enableStudyLazyLoad: true,
|
||||
|
||||
supportsFuzzyMatching: true,
|
||||
|
||||
supportsWildcard: true,
|
||||
|
||||
staticWado: true,
|
||||
|
||||
singlepart: 'bulkdata,video',
|
||||
|
||||
bulkDataURI: {
|
||||
enabled: true,
|
||||
|
||||
relativeResolution: 'studies',
|
||||
|
||||
transform: url => url.replace('/pixeldata.mp4', '/rendered'),
|
||||
},
|
||||
|
||||
omitQuotationForMultipartRequest: true,
|
||||
},
|
||||
},
|
||||
|
||||
// =========================================================
|
||||
// AWS source 2
|
||||
// =========================================================
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
|
||||
|
||||
sourceName: 'ohif2',
|
||||
|
||||
configuration: {
|
||||
friendlyName: 'AWS S3 Static wado secondary server',
|
||||
|
||||
name: 'aws',
|
||||
|
||||
wadoUriRoot: 'https://dd14fa38qiwhyfd.cloudfront.net/dicomweb',
|
||||
|
||||
qidoRoot: 'https://dd14fa38qiwhyfd.cloudfront.net/dicomweb',
|
||||
|
||||
wadoRoot: 'https://dd14fa38qiwhyfd.cloudfront.net/dicomweb',
|
||||
|
||||
qidoSupportsIncludeField: false,
|
||||
|
||||
supportsReject: false,
|
||||
|
||||
imageRendering: 'wadors',
|
||||
|
||||
thumbnailRendering: 'wadors',
|
||||
|
||||
enableStudyLazyLoad: true,
|
||||
|
||||
supportsFuzzyMatching: false,
|
||||
|
||||
supportsWildcard: true,
|
||||
|
||||
staticWado: true,
|
||||
|
||||
singlepart: 'bulkdata,video',
|
||||
|
||||
bulkDataURI: {
|
||||
enabled: true,
|
||||
relativeResolution: 'studies',
|
||||
},
|
||||
omitQuotationForMultipartRequest: true,
|
||||
},
|
||||
},
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
|
||||
sourceName: 'ohif3',
|
||||
configuration: {
|
||||
friendlyName: 'AWS S3 Static wado secondary server',
|
||||
name: 'aws',
|
||||
wadoUriRoot: 'https://d3t6nz73ql33tx.cloudfront.net/dicomweb',
|
||||
qidoRoot: 'https://d3t6nz73ql33tx.cloudfront.net/dicomweb',
|
||||
wadoRoot: 'https://d3t6nz73ql33tx.cloudfront.net/dicomweb',
|
||||
qidoSupportsIncludeField: false,
|
||||
supportsReject: false,
|
||||
imageRendering: 'wadors',
|
||||
thumbnailRendering: 'wadors',
|
||||
enableStudyLazyLoad: true,
|
||||
supportsFuzzyMatching: false,
|
||||
supportsWildcard: true,
|
||||
staticWado: true,
|
||||
singlepart: 'bulkdata,video',
|
||||
bulkDataURI: {
|
||||
enabled: true,
|
||||
relativeResolution: 'studies',
|
||||
},
|
||||
|
||||
omitQuotationForMultipartRequest: true,
|
||||
},
|
||||
},
|
||||
|
||||
// =========================================================
|
||||
// AWS source 3
|
||||
// =========================================================
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
|
||||
|
||||
sourceName: 'ohif3',
|
||||
|
||||
configuration: {
|
||||
friendlyName: 'AWS S3 Static wado secondary server',
|
||||
|
||||
name: 'aws',
|
||||
|
||||
wadoUriRoot: 'https://d3t6nz73ql33tx.cloudfront.net/dicomweb',
|
||||
|
||||
qidoRoot: 'https://d3t6nz73ql33tx.cloudfront.net/dicomweb',
|
||||
|
||||
wadoRoot: 'https://d3t6nz73ql33tx.cloudfront.net/dicomweb',
|
||||
|
||||
qidoSupportsIncludeField: false,
|
||||
|
||||
supportsReject: false,
|
||||
|
||||
imageRendering: 'wadors',
|
||||
|
||||
thumbnailRendering: 'wadors',
|
||||
|
||||
enableStudyLazyLoad: true,
|
||||
|
||||
supportsFuzzyMatching: false,
|
||||
|
||||
supportsWildcard: true,
|
||||
|
||||
staticWado: true,
|
||||
|
||||
singlepart: 'bulkdata,video',
|
||||
|
||||
bulkDataURI: {
|
||||
enabled: true,
|
||||
relativeResolution: 'studies',
|
||||
},
|
||||
|
||||
omitQuotationForMultipartRequest: true,
|
||||
},
|
||||
},
|
||||
|
||||
// =========================================================
|
||||
// local5000
|
||||
// =========================================================
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
|
||||
|
||||
sourceName: 'local5000',
|
||||
|
||||
configuration: {
|
||||
friendlyName: 'Static WADO Local Data',
|
||||
|
||||
name: 'DCM4CHEE',
|
||||
|
||||
qidoRoot: 'http://localhost:5000/dicomweb',
|
||||
|
||||
wadoRoot: 'http://localhost:5000/dicomweb',
|
||||
|
||||
qidoSupportsIncludeField: false,
|
||||
|
||||
supportsReject: true,
|
||||
|
||||
supportsStow: true,
|
||||
|
||||
imageRendering: 'wadors',
|
||||
|
||||
thumbnailRendering: 'wadors',
|
||||
|
||||
enableStudyLazyLoad: true,
|
||||
|
||||
supportsFuzzyMatching: false,
|
||||
|
||||
supportsWildcard: true,
|
||||
|
||||
staticWado: true,
|
||||
|
||||
singlepart: 'video',
|
||||
|
||||
bulkDataURI: {
|
||||
enabled: true,
|
||||
relativeResolution: 'studies',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
// =========================================================
|
||||
// ✅ ORTHANC LOCAL VIA PROXY OHIF
|
||||
// =========================================================
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
|
||||
|
||||
sourceName: 'orthanc',
|
||||
|
||||
configuration: {
|
||||
friendlyName: 'local Orthanc DICOMWeb Server',
|
||||
name: 'DCM4CHEE',
|
||||
wadoUriRoot: 'http://localhost/pacs/dicom-web',
|
||||
qidoRoot: 'http://localhost/pacs/dicom-web',
|
||||
wadoRoot: 'http://localhost/pacs/dicom-web',
|
||||
// ✅ MODIFIÉ
|
||||
friendlyName: 'Orthanc local',
|
||||
|
||||
// ✅ MODIFIÉ
|
||||
name: 'Orthanc',
|
||||
|
||||
/*
|
||||
* ✅ MODIFIÉ IMPORTANT
|
||||
*
|
||||
* AVANT :
|
||||
* http://localhost:8042/wado
|
||||
*
|
||||
* MAINTENANT :
|
||||
* on passe par le serveur OHIF lui-même.
|
||||
*/
|
||||
wadoUriRoot: '/orthanc/wado',
|
||||
|
||||
/*
|
||||
* ✅ MODIFIÉ IMPORTANT
|
||||
*
|
||||
* AVANT :
|
||||
* http://localhost:8042/dicom-web
|
||||
*/
|
||||
qidoRoot: '/orthanc/dicom-web',
|
||||
|
||||
/*
|
||||
* ✅ MODIFIÉ IMPORTANT
|
||||
*
|
||||
* AVANT :
|
||||
* http://localhost:8042/dicom-web
|
||||
*/
|
||||
wadoRoot: '/orthanc/dicom-web',
|
||||
|
||||
qidoSupportsIncludeField: true,
|
||||
|
||||
supportsReject: true,
|
||||
|
||||
dicomUploadEnabled: true,
|
||||
|
||||
imageRendering: 'wadors',
|
||||
|
||||
thumbnailRendering: 'wadors',
|
||||
|
||||
// ✅ AJOUTÉ
|
||||
thumbnailRequestStrategy: 'fetch',
|
||||
|
||||
enableStudyLazyLoad: true,
|
||||
supportsFuzzyMatching: true,
|
||||
|
||||
// ✅ MODIFIÉ
|
||||
supportsFuzzyMatching: false,
|
||||
|
||||
supportsWildcard: true,
|
||||
|
||||
// ✅ AJOUTÉ
|
||||
staticWado: false,
|
||||
|
||||
// ✅ AJOUTÉ
|
||||
singlepart: 'bulkdata,video',
|
||||
|
||||
omitQuotationForMultipartRequest: true,
|
||||
|
||||
bulkDataURI: {
|
||||
enabled: true,
|
||||
|
||||
// ✅ AJOUTÉ
|
||||
relativeResolution: 'studies',
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
// =========================================================
|
||||
// dicomweb proxy
|
||||
// =========================================================
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomwebproxy',
|
||||
|
||||
sourceName: 'dicomwebproxy',
|
||||
|
||||
configuration: {
|
||||
friendlyName: 'dicomweb delegating proxy',
|
||||
|
||||
name: 'dicomwebproxy',
|
||||
},
|
||||
},
|
||||
|
||||
// =========================================================
|
||||
// dicomjson
|
||||
// =========================================================
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomjson',
|
||||
|
||||
sourceName: 'dicomjson',
|
||||
|
||||
configuration: {
|
||||
friendlyName: 'dicom json',
|
||||
|
||||
name: 'json',
|
||||
},
|
||||
},
|
||||
|
||||
// =========================================================
|
||||
// dicomlocal
|
||||
// =========================================================
|
||||
{
|
||||
namespace: '@ohif/extension-default.dataSourcesModule.dicomlocal',
|
||||
|
||||
sourceName: 'dicomlocal',
|
||||
|
||||
configuration: {
|
||||
friendlyName: 'dicom local',
|
||||
},
|
||||
},
|
||||
],
|
||||
|
||||
httpErrorHandler: error => {
|
||||
// This is 429 when rejected from the public idc sandbox too often.
|
||||
console.warn(error.status);
|
||||
|
||||
// Could use services manager here to bring up a dialog/modal if needed.
|
||||
console.warn('test, navigate to https://ohif.org/');
|
||||
},
|
||||
};
|
||||
@@ -317,6 +317,8 @@ export default function ModeRoute({
|
||||
extensionManager,
|
||||
commandsManager,
|
||||
appConfig,
|
||||
// ===== TRIZRIS =====
|
||||
studyInstanceUIDs,
|
||||
});
|
||||
|
||||
// Move hotkeys setup here, after onModeEnter
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
import React from 'react';
|
||||
|
||||
export default function NoAccess() {
|
||||
return (
|
||||
<div
|
||||
style={{
|
||||
height: '100vh',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
flexDirection: 'column',
|
||||
background: '#0b0f14',
|
||||
color: 'white',
|
||||
textAlign: 'center',
|
||||
padding: '20px',
|
||||
}}
|
||||
>
|
||||
<h1>Accès refusé</h1>
|
||||
|
||||
<p>Vous devez être connecté à TrizRis avec un compte médecin pour accéder au viewer.</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,72 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { Navigate } from 'react-router-dom';
|
||||
|
||||
import { checkTrizRisAccess } from '../../../../extensions/default/src/services/TrizRisAccessApi';
|
||||
|
||||
type Props = {
|
||||
children: React.ReactNode;
|
||||
};
|
||||
|
||||
export default function TrizRisProtectedRoute({ children }: Props) {
|
||||
const [checking, setChecking] = useState(true);
|
||||
const [authorized, setAuthorized] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
let mounted = true;
|
||||
|
||||
const checkAccess = async () => {
|
||||
try {
|
||||
const result = await checkTrizRisAccess();
|
||||
|
||||
if (!mounted) {
|
||||
return;
|
||||
}
|
||||
|
||||
console.log('### VERIFICATION ACCES TRIZRIS ###', result);
|
||||
|
||||
setAuthorized(result);
|
||||
} catch (error) {
|
||||
console.error('### ERREUR VERIFICATION ACCES TRIZRIS ###', error);
|
||||
|
||||
if (mounted) {
|
||||
setAuthorized(false);
|
||||
}
|
||||
} finally {
|
||||
if (mounted) {
|
||||
setChecking(false);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
checkAccess();
|
||||
|
||||
return () => {
|
||||
mounted = false;
|
||||
};
|
||||
}, []);
|
||||
|
||||
// Pendant la vérification :
|
||||
// on n'affiche PAS encore le viewer.
|
||||
if (checking) {
|
||||
return (
|
||||
<div
|
||||
style={{
|
||||
width: '100vw',
|
||||
height: '100vh',
|
||||
background: '#0b0f14',
|
||||
}}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
if (!authorized) {
|
||||
return (
|
||||
<Navigate
|
||||
to="/no-access"
|
||||
replace
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
return <>{children}</>;
|
||||
}
|
||||
@@ -18,6 +18,8 @@ import PropTypes from 'prop-types';
|
||||
import { routerBasename } from '../utils/publicUrl';
|
||||
import { useAppConfig } from '@state';
|
||||
import { history } from '../utils/history';
|
||||
import TrizRisProtectedRoute from './TrizRisProtectedRoute';
|
||||
import NoAccess from './NoAccess';
|
||||
|
||||
const NotFoundServer = ({
|
||||
message = 'Unable to query for studies at this time. Check your data source configuration or network connection',
|
||||
@@ -71,6 +73,10 @@ NotFoundStudy.propTypes = {
|
||||
|
||||
// TODO: Include "routes" debug route if dev build
|
||||
const bakedInRoutes = [
|
||||
{
|
||||
path: `/no-access`,
|
||||
children: NoAccess,
|
||||
},
|
||||
{
|
||||
path: `/notfoundserver`,
|
||||
children: NotFoundServer,
|
||||
@@ -105,7 +111,7 @@ const createRoutes = ({
|
||||
hotkeysManager,
|
||||
showStudyList,
|
||||
}: withAppTypes) => {
|
||||
const routes =
|
||||
const routes = (
|
||||
buildModeRoutes({
|
||||
modes,
|
||||
dataSources,
|
||||
@@ -113,7 +119,11 @@ const createRoutes = ({
|
||||
servicesManager,
|
||||
commandsManager,
|
||||
hotkeysManager,
|
||||
}) || [];
|
||||
}) || []
|
||||
).map(route => ({
|
||||
...route,
|
||||
trizRisProtected: true,
|
||||
}));
|
||||
|
||||
const { customizationService } = servicesManager.services;
|
||||
|
||||
@@ -176,23 +186,27 @@ const createRoutes = ({
|
||||
return (
|
||||
<Routes>
|
||||
{allRoutes.map((route, i) => {
|
||||
return route.private === true ? (
|
||||
let element = <RouteWithErrorBoundary route={route} />;
|
||||
|
||||
if (route.trizRisProtected === true) {
|
||||
element = <TrizRisProtectedRoute>{element}</TrizRisProtectedRoute>;
|
||||
}
|
||||
|
||||
if (route.private === true) {
|
||||
element = (
|
||||
<PrivateRoute
|
||||
handleUnauthenticated={() => userAuthenticationService.handleUnauthenticated()}
|
||||
>
|
||||
{element}
|
||||
</PrivateRoute>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<Route
|
||||
key={i}
|
||||
path={route.path}
|
||||
element={
|
||||
<PrivateRoute
|
||||
handleUnauthenticated={() => userAuthenticationService.handleUnauthenticated()}
|
||||
>
|
||||
<RouteWithErrorBoundary route={route} />
|
||||
</PrivateRoute>
|
||||
}
|
||||
></Route>
|
||||
) : (
|
||||
<Route
|
||||
key={i}
|
||||
path={route.path}
|
||||
element={<RouteWithErrorBoundary route={route} />}
|
||||
element={element}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
const TRIZRIS_BASE_URL = 'http://localhost:9090/TrizRis';
|
||||
const ORTHANC_BASE_URL = 'http://localhost:8042';
|
||||
|
||||
export const TrizRisConfig = {
|
||||
apiBaseUrl: `${TRIZRIS_BASE_URL}/api`,
|
||||
accessUrl: `${TRIZRIS_BASE_URL}/ohif/access`,
|
||||
|
||||
orthancBaseUrl: ORTHANC_BASE_URL,
|
||||
orthancDicomWebUrl: `${ORTHANC_BASE_URL}/dicom-web`,
|
||||
orthancWadoUrl: `${ORTHANC_BASE_URL}/wado`,
|
||||
|
||||
ohifBaseUrl: 'http://localhost:3000',
|
||||
};
|
||||
+17
-3
@@ -1,5 +1,6 @@
|
||||
import { annotation } from '@cornerstonejs/tools';
|
||||
import LocalStorageAnnotationPersistenceBackend from './LocalStorageAnnotationPersistenceBackend';
|
||||
import TrizRisAnnotationPersistenceBackend from './TrizRisAnnotationPersistenceBackend';
|
||||
|
||||
export interface AnnotationPersistenceBackend {
|
||||
save(record: Record<string, any>): Promise<void> | void;
|
||||
@@ -28,7 +29,8 @@ export default class AnnotationPersistenceService {
|
||||
name: 'annotationPersistenceService',
|
||||
altName: 'AnnotationPersistenceService',
|
||||
create: ({ servicesManager }: { servicesManager: any }) => {
|
||||
const backend = new LocalStorageAnnotationPersistenceBackend();
|
||||
// = new LocalStorageAnnotationPersistenceBackend();
|
||||
const backend = new TrizRisAnnotationPersistenceBackend();
|
||||
return new AnnotationPersistenceService(backend, {
|
||||
services: {
|
||||
measurementService: servicesManager.services.measurementService,
|
||||
@@ -207,8 +209,7 @@ export default class AnnotationPersistenceService {
|
||||
const resolvedSource =
|
||||
(persistedSource?.name && persistedSource?.version
|
||||
? measurementService.getSource(persistedSource.name, persistedSource.version)
|
||||
: null) ||
|
||||
measurementService.getSource('Cornerstone3DTools', '0.1');
|
||||
: null) || measurementService.getSource('Cornerstone3DTools', '0.1');
|
||||
|
||||
if (!resolvedSource) {
|
||||
console.warn('Annotation persistence: no registered source found, skipping restore');
|
||||
@@ -232,7 +233,20 @@ export default class AnnotationPersistenceService {
|
||||
|
||||
const normalizedAnnotation = this._normalizePersistedAnnotation(record.annotation);
|
||||
const rebuiltAnnotation = this._buildRestoredAnnotation(measurement, normalizedAnnotation);
|
||||
console.log('====================================');
|
||||
console.log('### RESTAURATION MEASUREMENT ###');
|
||||
|
||||
console.log('referencedImageId =', rebuiltAnnotation?.metadata?.referencedImageId);
|
||||
|
||||
console.log('FrameOfReferenceUID =', rebuiltAnnotation?.metadata?.FrameOfReferenceUID);
|
||||
|
||||
console.log('points JSON =', JSON.stringify(rebuiltAnnotation?.data?.handles?.points));
|
||||
|
||||
console.log('cachedStats JSON =', JSON.stringify(rebuiltAnnotation?.data?.cachedStats));
|
||||
|
||||
console.log('measurement JSON =', JSON.stringify(measurement));
|
||||
|
||||
console.log('====================================');
|
||||
measurementService.addOrUpdateMeasurement?.(measurement, {
|
||||
annotation: rebuiltAnnotation,
|
||||
});
|
||||
|
||||
+96
@@ -0,0 +1,96 @@
|
||||
export interface AnnotationPersistenceBackend {
|
||||
save(record: Record<string, any>): Promise<void> | void;
|
||||
update(record: Record<string, any>): Promise<void> | void;
|
||||
delete(uid: string): Promise<void> | void;
|
||||
load(studyInstanceUID: string): Promise<any[]> | any[];
|
||||
}
|
||||
|
||||
const BASE_URL = 'http://localhost:9090/TrizRis/api/annotation';
|
||||
|
||||
export default class TrizRisAnnotationPersistenceBackend implements AnnotationPersistenceBackend {
|
||||
public async save(record: Record<string, any>): Promise<void> {
|
||||
console.log('### SAUVEGARDE ANNOTATION TRIZRIS ###');
|
||||
|
||||
console.log(record);
|
||||
|
||||
const response = await fetch(BASE_URL, {
|
||||
method: 'POST',
|
||||
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
|
||||
body: JSON.stringify(record),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Erreur sauvegarde annotation : ${response.status}`);
|
||||
}
|
||||
|
||||
const resultat = await response.text();
|
||||
|
||||
console.log('Réponse TrizRis =', resultat);
|
||||
}
|
||||
|
||||
public async update(record: Record<string, any>): Promise<void> {
|
||||
console.log('### MODIFICATION ANNOTATION TRIZRIS ###');
|
||||
|
||||
console.log(record);
|
||||
|
||||
const response = await fetch(BASE_URL, {
|
||||
method: 'PUT',
|
||||
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
|
||||
body: JSON.stringify(record),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Erreur modification annotation : ${response.status}`);
|
||||
}
|
||||
|
||||
const resultat = await response.text();
|
||||
|
||||
console.log('Réponse TrizRis =', resultat);
|
||||
}
|
||||
|
||||
public async delete(uid: string): Promise<void> {
|
||||
console.log('### SUPPRESSION ANNOTATION TRIZRIS ###');
|
||||
|
||||
console.log('UID =', uid);
|
||||
|
||||
const response = await fetch(`${BASE_URL}/${encodeURIComponent(uid)}`, {
|
||||
method: 'DELETE',
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Erreur suppression annotation : ${response.status}`);
|
||||
}
|
||||
|
||||
const resultat = await response.text();
|
||||
|
||||
console.log('Réponse TrizRis =', resultat);
|
||||
}
|
||||
|
||||
public async load(studyInstanceUID: string): Promise<any[]> {
|
||||
console.log('### CHARGEMENT ANNOTATIONS TRIZRIS ###');
|
||||
|
||||
console.log('StudyInstanceUID =', studyInstanceUID);
|
||||
|
||||
const response = await fetch(
|
||||
`${BASE_URL}?studyInstanceUID=${encodeURIComponent(studyInstanceUID)}`
|
||||
);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Erreur chargement annotations : ${response.status}`);
|
||||
}
|
||||
|
||||
const records = await response.json();
|
||||
|
||||
console.log('Annotations reçues =', records);
|
||||
|
||||
return Array.isArray(records) ? records : [];
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user