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

feat(multiframe): enhanced support for multiframe dicom (#3164)

Browse Source 
* Changes in cswil version and multiframe

* Minor changes

* wip

* Adding support for NM multiframe images

* Applying PR suggestions

* fixing package versions

* Restoring default.js config file

* Check if NM subtype is reconstructable

* Restore default.js values

* refactore code

* feat: add flag for strict zspacing

---------

Co-authored-by: Alireza <ar.sedghi@gmail.com>
This commit is contained in:
rodrigobasilio2022andAlireza authored and GitHub committed 2023-03-31 22:21:16 -04:00
1 parent 5e42a42b5f
commit 226244a26c
31 files changed
+268 -86
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

platform/viewer/package.json
+1 -1
View File
@@ -65,7 +65,7 @@
"config-point": "^0.4.8",
"core-js": "^3.16.1",
"cornerstone-math": "^0.1.9",
"cornerstone-wado-image-loader": "^4.10.2",
"cornerstone-wado-image-loader": "^4.13.0",
"dcmjs": "^0.29.4",
"detect-gpu": "^4.0.16",
"dicom-parser": "^1.8.9",
platform/viewer/public/config/aws.js
+1
View File
@@ -9,6 +9,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
// filterQueryParam: false,
dataSources: [
{
platform/viewer/public/config/default.js
+3
View File
@@ -15,6 +15,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
maxNumRequests: {
interaction: 100,
thumbnail: 75,
@@ -34,10 +35,12 @@ window.config = {
// wadoUriRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/wado',
// qidoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs',
// wadoRoot: 'https://server.dcmjs.org/dcm4chee-arc/aets/DCM4CHEE/rs',
// new server
wadoUriRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb',
qidoRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb',
wadoRoot: 'https://domvja9iplmyu.cloudfront.net/dicomweb',
qidoSupportsIncludeField: false,
supportsReject: false,
imageRendering: 'wadors',
platform/viewer/public/config/demo.js
+1
View File
@@ -5,6 +5,7 @@ window.config = {
// below flag is for performance reasons, but it might not work for all servers
omitQuotationForMultipartRequest: true,
showWarningMessageForCrossOrigin: true,
strictZSpacingForVolumeViewport: true,
showCPUFallbackMessage: true,
servers: {
dicomWeb: [
platform/viewer/public/config/dicomweb-server.js
+15
View File
@@ -9,6 +9,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
// filterQueryParam: false,
dataSources: [
{
@@ -29,6 +30,20 @@ window.config = {
supportsWildcard: false,
},
},
{
friendlyName: 'dicom json',
namespace: '@ohif/extension-default.dataSourcesModule.dicomjson',
sourceName: 'dicomjson',
configuration: {
name: 'json',
},
},
{
friendlyName: 'dicom local',
namespace: '@ohif/extension-default.dataSourcesModule.dicomlocal',
sourceName: 'dicomlocal',
configuration: {},
},
],
defaultDataSourceName: 'dicomweb',
};
platform/viewer/public/config/dicomweb_relative.js
+1
View File
@@ -10,6 +10,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
// filterQueryParam: false,
dataSources: [
{
platform/viewer/public/config/docker_nginx-orthanc.js
+15
View File
@@ -8,6 +8,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
dataSources: [
{
friendlyName: 'Orthanc Server',
@@ -23,6 +24,20 @@ window.config = {
thumbnailRendering: 'wadors',
},
},
{
friendlyName: 'dicom json',
namespace: '@ohif/extension-default.dataSourcesModule.dicomjson',
sourceName: 'dicomjson',
configuration: {
name: 'json',
},
},
{
friendlyName: 'dicom local',
namespace: '@ohif/extension-default.dataSourcesModule.dicomlocal',
sourceName: 'dicomlocal',
configuration: {},
},
],
defaultDataSourceName: 'dicomweb',
};
platform/viewer/public/config/docker_openresty-orthanc-keycloak.js
+1
View File
@@ -6,6 +6,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
servers: {
// This is an array, but we'll only use the first entry for now
dicomWeb: [
platform/viewer/public/config/docker_openresty-orthanc.js
+15
View File
@@ -8,6 +8,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
dataSources: [
{
friendlyName: 'Orthanc Server',
@@ -23,6 +24,20 @@ window.config = {
thumbnailRendering: 'wadors',
},
},
{
friendlyName: 'dicom json',
namespace: '@ohif/extension-default.dataSourcesModule.dicomjson',
sourceName: 'dicomjson',
configuration: {
name: 'json',
},
},
{
friendlyName: 'dicom local',
namespace: '@ohif/extension-default.dataSourcesModule.dicomlocal',
sourceName: 'dicomlocal',
configuration: {},
},
],
defaultDataSourceName: 'dicomweb',
};
platform/viewer/public/config/e2e.js
+1
View File
@@ -8,6 +8,7 @@ window.config = {
maxNumberOfWebWorkers: 3,
showWarningMessageForCrossOrigin: false,
showCPUFallbackMessage: false,
strictZSpacingForVolumeViewport: true,
// filterQueryParam: false,
dataSources: [
{
platform/viewer/public/config/google.js
+1
View File
@@ -6,6 +6,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
// This is an array, but we'll only use the first entry for now
oidc: [
{
platform/viewer/public/config/idc.js
+1
View File
@@ -6,6 +6,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
servers: {
// This is an array, but we'll only use the first entry for now
dicomWeb: [],
platform/viewer/public/config/local_dcm4chee.js
+15
View File
@@ -8,6 +8,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
dataSources: [
{
friendlyName: 'DCM4CHEE Server',
@@ -27,6 +28,20 @@ window.config = {
},
},
},
{
friendlyName: 'dicom json',
namespace: '@ohif/extension-default.dataSourcesModule.dicomjson',
sourceName: 'dicomjson',
configuration: {
name: 'json',
},
},
{
friendlyName: 'dicom local',
namespace: '@ohif/extension-default.dataSourcesModule.dicomlocal',
sourceName: 'dicomlocal',
configuration: {},
},
],
studyListFunctionsEnabled: true,
defaultDataSourceName: 'dicomweb',
platform/viewer/public/config/local_orthanc.js
+1
View File
@@ -8,6 +8,7 @@ window.config = {
showLoadingIndicator: true,
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
strictZSpacingForVolumeViewport: true,
// filterQueryParam: false,
dataSources: [
{
platform/viewer/public/config/local_static.js
+1
View File
@@ -12,6 +12,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
// filterQueryParam: false,
dataSources: [
{
platform/viewer/public/config/multiple.js
+1
View File
@@ -20,6 +20,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
// filterQueryParam: false,
dataSources: [
{
platform/viewer/public/config/netlify.js
+1
View File
@@ -9,6 +9,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
// filterQueryParam: false,
dataSources: [
{
platform/viewer/public/config/public_dicomweb.js
+1
View File
@@ -6,6 +6,7 @@ window.config = {
showWarningMessageForCrossOrigin: true,
showCPUFallbackMessage: true,
showLoadingIndicator: true,
strictZSpacingForVolumeViewport: true,
servers: {
dicomWeb: [
{
platform/viewer/src/routes/buildModeRoutes.tsx
-7
View File
@@ -31,11 +31,6 @@ export default function buildModeRoutes({
hotkeysManager,
}) {
const routes = [];
// const dataSources = Object.keys(extensionManager.dataSourceMap).map(a =>
// extensionManager.getDataSources(a)
// );
const dataSourceNames = [];
dataSources.forEach(dataSource => {
@@ -61,7 +56,6 @@ export default function buildModeRoutes({
servicesManager={servicesManager}
commandsManager={commandsManager}
hotkeysManager={hotkeysManager}
commandsManager={commandsManager}
/>
);
@@ -86,7 +80,6 @@ export default function buildModeRoutes({
servicesManager={servicesManager}
commandsManager={commandsManager}
hotkeysManager={hotkeysManager}
commandsManager={commandsManager}
/>
);