From 00f2f5c6f76ded25d2b18db62c5945891d3c6067 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Fri, 20 Dec 2024 10:07:50 -0500 Subject: [PATCH 1/7] enable tools in volume viewport --- modes/longitudinal/src/initToolGroups.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modes/longitudinal/src/initToolGroups.js b/modes/longitudinal/src/initToolGroups.js index 6743602d02..b29b9d9b3f 100644 --- a/modes/longitudinal/src/initToolGroups.js +++ b/modes/longitudinal/src/initToolGroups.js @@ -243,6 +243,9 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager, m { toolName: toolNames.Angle }, { toolName: toolNames.CobbAngle }, { toolName: toolNames.PlanarFreehandROI }, + { toolName: toolNames.SplineROI }, + { toolName: toolNames.LivewireContour }, + { toolName: toolNames.CalibrationLine }, { toolName: toolNames.WindowLevelRegion }, { toolName: toolNames.PlanarFreehandContourSegmentation, From 3c129fa5f97b690486d8d05b9d28a3230b6683d7 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Fri, 20 Dec 2024 10:12:50 -0500 Subject: [PATCH 2/7] updates --- modes/basic-test-mode/src/initToolGroups.ts | 1 + modes/longitudinal/src/initToolGroups.js | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/modes/basic-test-mode/src/initToolGroups.ts b/modes/basic-test-mode/src/initToolGroups.ts index ef56f9cd60..45742848b8 100644 --- a/modes/basic-test-mode/src/initToolGroups.ts +++ b/modes/basic-test-mode/src/initToolGroups.ts @@ -202,6 +202,7 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager) { { toolName: toolNames.WindowLevelRegion }, { toolName: toolNames.PlanarFreehandROI }, { toolName: toolNames.SplineROI }, + { toolName: toolNames.LivewireContour }, ], disabled: [ { diff --git a/modes/longitudinal/src/initToolGroups.js b/modes/longitudinal/src/initToolGroups.js index b29b9d9b3f..2622d40f6d 100644 --- a/modes/longitudinal/src/initToolGroups.js +++ b/modes/longitudinal/src/initToolGroups.js @@ -245,7 +245,6 @@ function initMPRToolGroup(extensionManager, toolGroupService, commandsManager, m { toolName: toolNames.PlanarFreehandROI }, { toolName: toolNames.SplineROI }, { toolName: toolNames.LivewireContour }, - { toolName: toolNames.CalibrationLine }, { toolName: toolNames.WindowLevelRegion }, { toolName: toolNames.PlanarFreehandContourSegmentation, From 500d5c417130a417013e7222072e269c9e7898aa Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Fri, 20 Dec 2024 10:13:21 -0500 Subject: [PATCH 3/7] bump cs3d --- extensions/cornerstone-dicom-pmap/package.json | 4 ++-- extensions/cornerstone-dicom-seg/package.json | 4 ++-- extensions/cornerstone-dicom-sr/package.json | 6 +++--- extensions/cornerstone-dynamic-volume/package.json | 4 ++-- extensions/cornerstone/package.json | 8 ++++---- extensions/measurement-tracking/package.json | 4 ++-- platform/app/package.json | 2 +- platform/core/package.json | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/extensions/cornerstone-dicom-pmap/package.json b/extensions/cornerstone-dicom-pmap/package.json index 78317678c5..83048e7ae3 100644 --- a/extensions/cornerstone-dicom-pmap/package.json +++ b/extensions/cornerstone-dicom-pmap/package.json @@ -46,8 +46,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.11.2", - "@cornerstonejs/core": "^2.11.2", + "@cornerstonejs/adapters": "^2.14.0", + "@cornerstonejs/core": "^2.14.0", "@kitware/vtk.js": "32.1.1", "react-color": "^2.19.3" } diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json index b2caf9e0e7..a698a21bb5 100644 --- a/extensions/cornerstone-dicom-seg/package.json +++ b/extensions/cornerstone-dicom-seg/package.json @@ -46,8 +46,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.11.2", - "@cornerstonejs/core": "^2.11.2", + "@cornerstonejs/adapters": "^2.14.0", + "@cornerstonejs/core": "^2.14.0", "@kitware/vtk.js": "32.1.1", "react-color": "^2.19.3" } diff --git a/extensions/cornerstone-dicom-sr/package.json b/extensions/cornerstone-dicom-sr/package.json index 0c35cdaa05..cf4aee1ca6 100644 --- a/extensions/cornerstone-dicom-sr/package.json +++ b/extensions/cornerstone-dicom-sr/package.json @@ -46,9 +46,9 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.11.2", - "@cornerstonejs/core": "^2.11.2", - "@cornerstonejs/tools": "^2.11.2", + "@cornerstonejs/adapters": "^2.14.0", + "@cornerstonejs/core": "^2.14.0", + "@cornerstonejs/tools": "^2.14.0", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone-dynamic-volume/package.json b/extensions/cornerstone-dynamic-volume/package.json index a760f16c08..79638972c1 100644 --- a/extensions/cornerstone-dynamic-volume/package.json +++ b/extensions/cornerstone-dynamic-volume/package.json @@ -42,8 +42,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/core": "^2.11.2", - "@cornerstonejs/tools": "^2.11.2", + "@cornerstonejs/core": "^2.14.0", + "@cornerstonejs/tools": "^2.14.0", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index 8c828c0e20..3160e8d1ed 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -38,7 +38,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^2.11.2", + "@cornerstonejs/dicom-image-loader": "^2.14.0", "@icr/polyseg-wasm": "^0.4.0", "@ohif/core": "3.10.0-beta.31", "@ohif/ui": "3.10.0-beta.31", @@ -55,9 +55,9 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.11.2", - "@cornerstonejs/core": "^2.11.2", - "@cornerstonejs/tools": "^2.11.2", + "@cornerstonejs/adapters": "^2.14.0", + "@cornerstonejs/core": "^2.14.0", + "@cornerstonejs/tools": "^2.14.0", "@icr/polyseg-wasm": "^0.4.0", "@kitware/vtk.js": "32.1.1", "html2canvas": "^1.4.1", diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json index b98e99cf78..8794cd0950 100644 --- a/extensions/measurement-tracking/package.json +++ b/extensions/measurement-tracking/package.json @@ -32,8 +32,8 @@ "start": "yarn run dev" }, "peerDependencies": { - "@cornerstonejs/core": "^2.11.2", - "@cornerstonejs/tools": "^2.11.2", + "@cornerstonejs/core": "^2.14.0", + "@cornerstonejs/tools": "^2.14.0", "@ohif/core": "3.10.0-beta.31", "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.31", "@ohif/extension-default": "3.10.0-beta.31", diff --git a/platform/app/package.json b/platform/app/package.json index 5c028fa47e..20aed573f8 100644 --- a/platform/app/package.json +++ b/platform/app/package.json @@ -53,7 +53,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^2.11.2", + "@cornerstonejs/dicom-image-loader": "^2.14.0", "@emotion/serialize": "^1.1.3", "@ohif/core": "3.10.0-beta.31", "@ohif/extension-cornerstone": "3.10.0-beta.31", diff --git a/platform/core/package.json b/platform/core/package.json index be6dac596b..4aa1dc27c1 100644 --- a/platform/core/package.json +++ b/platform/core/package.json @@ -37,7 +37,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^2.11.2", + "@cornerstonejs/dicom-image-loader": "^2.14.0", "@ohif/ui": "3.10.0-beta.31", "cornerstone-math": "0.1.9", "dicom-parser": "^1.8.21" From 7ed7e0fe8afbbdd8c68ad54ecf8c01a902b89290 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Fri, 20 Dec 2024 10:18:14 -0500 Subject: [PATCH 4/7] update lock files --- bun.lockb | Bin 1341970 -> 1341970 bytes yarn.lock | 73 +++++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 53 insertions(+), 20 deletions(-) diff --git a/bun.lockb b/bun.lockb index fcc3b408810d45704a81d90e0a8f2e62f63acd9a..52ad6e9388eb691ed6a990db48dff4004123c09a 100755 GIT binary patch delta 1257 zcmbRAC2-Q0zzKQ^Zdz)S4diEeMt^$1WUQm`wJLt^u|U?{3O$ojmUvj&9B=e%^<&)X z$Mo#cbQ4}ilj#|cnRvjg?JFKLoneDAUorVGf|>0aZDWKFub$LcZNA{q>g`W+*%LS&mc;4X9SRq8opJ3! z)Y~5~RyhRUcA910A8csyb*XCmwv6Zw&Q*n+SJ<5AMse$#9o9LtRrP7%%eZqoA%E^V zu;qkrZ!KrP!03>AC@W#{#9ZEW`-MYoCiFa0^bq}Ld2H%|1AlhReR^N&s(q{3>-@JC zURQq!>eOU4wDYf?HSOS~@V~h+OI`{+J!{)OwUQl(Ie?fGh`E568;E&;n0NcsO1{}o zWli)97{1+NVh~|qXjsrtzsB8Hp$Oq^BRs=T8Bv)GXllXT)lm0Nk>vh5XOK zitCGjim@BJowbCYTLo24z69tOAWlJbK|(pu#R>EHYuGR~O$Ta{+OD^h{~0ex zvR!;LKM)H5vEX*`%|g$1f<&j~3WtK|?Gd@cu^j9`mR?DE)pY%GVX^I(N`)^o!i5AY pfI^4Lg@1qNHa28<7kZ^)i;QW*^b`3as-ptKGCa0(l!|b%0sy9C;b{N> delta 1257 zcmbRAC2-Q0zzKQ^?3UZk-@W?!NR7w8H=2S;Y=zw2DXkw~yLNQBvs5Wv6KeEp^<&)X z$Mo#c^b#*dlj#|cnRvjg?JFKLoneDAUorVGf|>0aZmG*M`L$GiRctoUt5|NJZrIw#VcU3B1f!k?WD_N#6=@U(`cF&yXEX7;kXuC=AO zRi(aXxus8)<#L~|(|dE-B^*M_nyYmm${gOce`9>{kCh$omfu* z_EI;5B3ilG{+tm1BObk*p?PJV2LIMM=c_gbY;kjBe6#&&E_(u}1H12q@(rh_Mk;;3 zG;`Ozlm}PNxBra&cak-*=0xqbg4TGSua`o6FK}f1y<}8*|NPBnuX_RU^DFM&RlI)Z zT3%%Qt?jMl>=zgv;sRDA2!-%(Z&lelM`c=UnSYop!xq6;|9O7tH8tuvba#Dts=lQ? zlCflp$9{=~Lw}cS-MHV$NPE$y!ZTL`Y>b`Tr&h89F$WNH0x=g5a|1CC5c6)ITFE#2 zsjQ)%5yQ7zObj9n3=In!>bJS}a3mWr#u@1u0%fK@jOCZ!o)ORgkBtSSaQcKYeyQy( zY5W|_%s~G3{!IRdtRU9(i^crnV20p4C?oL%pY-%Y`TQwhm6`?o{)|{H6M$PbwUGZg zSaE$3P%(C6x3iY;bE}}r$(H~f=`n-<7{n>4E=VW`x;SATe+?U^rs+UUQrq>G@;~DR zNw$k`<_BT{AQs#%zFFwmPLSxdT;Wg Date: Fri, 20 Dec 2024 10:43:55 -0500 Subject: [PATCH 5/7] comma --- extensions/measurement-tracking/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json index b0bbe300bf..da88426920 100644 --- a/extensions/measurement-tracking/package.json +++ b/extensions/measurement-tracking/package.json @@ -34,7 +34,7 @@ "peerDependencies": { "@cornerstonejs/core": "^2.14.0", "@cornerstonejs/tools": "^2.14.0", - "@ohif/core": "3.10.0-beta.32" + "@ohif/core": "3.10.0-beta.32", "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.32", "@ohif/extension-default": "3.10.0-beta.32", "@ohif/ui": "3.10.0-beta.32", From e9534a12fe9554186b93d289fc2d6c39dc8a059e Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Fri, 20 Dec 2024 11:00:58 -0500 Subject: [PATCH 6/7] wait --- platform/app/cypress/integration/volume/MPR.spec.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/app/cypress/integration/volume/MPR.spec.js b/platform/app/cypress/integration/volume/MPR.spec.js index 5677468ca3..4c34e7a500 100644 --- a/platform/app/cypress/integration/volume/MPR.spec.js +++ b/platform/app/cypress/integration/volume/MPR.spec.js @@ -38,8 +38,9 @@ describe('OHIF MPR', () => { cy.window() .its('cornerstone') .then(cornerstone => { - const viewports = cornerstone.getRenderingEngines()[0].getViewports(); + cy.wait(4000); + const viewports = cornerstone.getRenderingEngines()[0].getViewports(); // The stack viewport still exists after the changes to viewportId and inde const imageData1 = viewports[0].getImageData(); const imageData2 = viewports[1].getImageData(); From 69c438baa608ea9c33934b40c642426f77a11f70 Mon Sep 17 00:00:00 2001 From: Ibrahim Date: Fri, 20 Dec 2024 12:18:40 -0500 Subject: [PATCH 7/7] fix issues --- bun.lockb | Bin 1341970 -> 1341970 bytes .../cornerstone-dicom-pmap/package.json | 4 +-- extensions/cornerstone-dicom-seg/package.json | 4 +-- extensions/cornerstone-dicom-sr/package.json | 6 ++-- .../cornerstone-dynamic-volume/package.json | 4 +-- extensions/cornerstone/package.json | 8 ++--- extensions/measurement-tracking/package.json | 4 +-- .../cypress/integration/volume/MPR.spec.js | 2 -- platform/app/package.json | 2 +- platform/core/package.json | 2 +- yarn.lock | 32 +++++++++--------- 11 files changed, 33 insertions(+), 35 deletions(-) diff --git a/bun.lockb b/bun.lockb index 52ad6e9388eb691ed6a990db48dff4004123c09a..609e29776a62fefea7587dec72c54c1c774d1950 100755 GIT binary patch delta 1162 zcmbRAC2-Q0zzKQ^&zgjj&#modX5^8tY1Q1+wK0pe+s897E#PXnl}KvcnMS`>KgO+o zOs^hIuh_|CFg@cjlK_~teZ^y@3v5v4E2aQOFtc6b4HFPE12GE_vu@XT!=~Eku;Nnh z?~NIqcJrr6gsr*7m~{UAtMo-Xvy-;IGWpQdQU7}CG6TkWeoqBTUz|H)A<3jvp;X-` z)h=6nCRg!7`=XTX(|dE-B^<7N#I~7jO3~n0Sj*;Pbk`>EEV4SDY!-d1Y1LkB+KCyt;GW{^cz!5x;b( zp?LGj`0cIb>=zgv{u@no=V{OOTAY~1rOW#9`MzHU6X%?8nz4Pi_^jJpe0B|L;U6#N zix~Xf&lB)8b9sFHj8jF9hdiv#TiyBG+jb(ieQG5;5OV-AClGT1F*gwN05R|Osg-C10e>JPP^!8REH$-||0Phg zz6c_UqHjBE2|uq2!Zi63e(CKVGx$${Y(O?Tp&aOhgn9gRY^aK-0~Jec*IUZ}f|t># zU3@b?5DNgY;CAuNLN9hQ8coX;4hPyEkt-a}!D^&el3q1kzg$>s`=wIhtBgp9r-?@w!#NS?z|76UjG5tioh}tNB$cD#uj#3dWRsai>$W{OV delta 1162 zcmbRAC2-Q0zzKQ^Zdz)S4diEeMt^$1WUQm`wJLt^u|U?{3O$ojmUvj&9B=e%^<&)X z$MovabPHZagXtNMnFPSB?JFKLU0{PUUoizRf|>0aZDWKFub$LcZNA{q>g`W+*%LS&mc;4X9SRq8opJ3! z)Y~5~RyhRUcA910A8csyb*XCmwv6Zw&Q*n+SJ<5AMse$#9o9LtRrP7%%eZqoA%E^V zu;qkrZ!KrP!03>AC@W#{#9ZEW`-MYoCiFa0^bq}Ld2H%|1AlhReR^N&s(q{3>-@JC zURQq!>eOU4wDYf?HSOS~@V~h+OI`{+J!{)OwUQl(Ie?fGh`E568;E&;n0NcsO1`;I zr41Oq-C|-8VPI%j&``h4wTC0wfHBTU&(K8AVEV&Ye(B{I@%-#e1`N|Dl<`Y#Z%O0l zVrDeh-k-_;m=zdR7mN8Nft27pFqL?MPkQ>HeEu|`3e5ukKt`Zcbs<=4Y9aqiplE#& zL=;8ecGePpUKNCC@+JJz+dXFRp8(l_Y;;07&Y@V`Lv5~ z<_BT{AQs#%zFFwSPDX=ixx(Q<+aq#?<2hIj^h(mJrt6mri*3JDDtwg@Dj-+^6gX5a j{O3EDA;Y`SD-~O0OdF=3$QMx?;z?(57B diff --git a/extensions/cornerstone-dicom-pmap/package.json b/extensions/cornerstone-dicom-pmap/package.json index 34d74e0881..03645f3dad 100644 --- a/extensions/cornerstone-dicom-pmap/package.json +++ b/extensions/cornerstone-dicom-pmap/package.json @@ -46,8 +46,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.14.0", - "@cornerstonejs/core": "^2.14.0", + "@cornerstonejs/adapters": "^2.14.2", + "@cornerstonejs/core": "^2.14.2", "@kitware/vtk.js": "32.1.1", "react-color": "^2.19.3" } diff --git a/extensions/cornerstone-dicom-seg/package.json b/extensions/cornerstone-dicom-seg/package.json index 96c1b0751f..b1ebb267cb 100644 --- a/extensions/cornerstone-dicom-seg/package.json +++ b/extensions/cornerstone-dicom-seg/package.json @@ -46,8 +46,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.14.0", - "@cornerstonejs/core": "^2.14.0", + "@cornerstonejs/adapters": "^2.14.2", + "@cornerstonejs/core": "^2.14.2", "@kitware/vtk.js": "32.1.1", "react-color": "^2.19.3" } diff --git a/extensions/cornerstone-dicom-sr/package.json b/extensions/cornerstone-dicom-sr/package.json index 42daee9ec2..ec3f5eee69 100644 --- a/extensions/cornerstone-dicom-sr/package.json +++ b/extensions/cornerstone-dicom-sr/package.json @@ -46,9 +46,9 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.14.0", - "@cornerstonejs/core": "^2.14.0", - "@cornerstonejs/tools": "^2.14.0", + "@cornerstonejs/adapters": "^2.14.2", + "@cornerstonejs/core": "^2.14.2", + "@cornerstonejs/tools": "^2.14.2", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone-dynamic-volume/package.json b/extensions/cornerstone-dynamic-volume/package.json index 10f618a8af..cd87fad000 100644 --- a/extensions/cornerstone-dynamic-volume/package.json +++ b/extensions/cornerstone-dynamic-volume/package.json @@ -42,8 +42,8 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/core": "^2.14.0", - "@cornerstonejs/tools": "^2.14.0", + "@cornerstonejs/core": "^2.14.2", + "@cornerstonejs/tools": "^2.14.2", "classnames": "^2.3.2" } } diff --git a/extensions/cornerstone/package.json b/extensions/cornerstone/package.json index bfc5cdba53..4fe0fccdd2 100644 --- a/extensions/cornerstone/package.json +++ b/extensions/cornerstone/package.json @@ -38,7 +38,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^2.14.0", + "@cornerstonejs/dicom-image-loader": "^2.14.2", "@icr/polyseg-wasm": "^0.4.0", "@ohif/core": "3.10.0-beta.32", "@ohif/ui": "3.10.0-beta.32", @@ -55,9 +55,9 @@ }, "dependencies": { "@babel/runtime": "^7.20.13", - "@cornerstonejs/adapters": "^2.14.0", - "@cornerstonejs/core": "^2.14.0", - "@cornerstonejs/tools": "^2.14.0", + "@cornerstonejs/adapters": "^2.14.2", + "@cornerstonejs/core": "^2.14.2", + "@cornerstonejs/tools": "^2.14.2", "@icr/polyseg-wasm": "^0.4.0", "@kitware/vtk.js": "32.1.1", "html2canvas": "^1.4.1", diff --git a/extensions/measurement-tracking/package.json b/extensions/measurement-tracking/package.json index da88426920..241b6f2fde 100644 --- a/extensions/measurement-tracking/package.json +++ b/extensions/measurement-tracking/package.json @@ -32,8 +32,8 @@ "start": "yarn run dev" }, "peerDependencies": { - "@cornerstonejs/core": "^2.14.0", - "@cornerstonejs/tools": "^2.14.0", + "@cornerstonejs/core": "^2.14.2", + "@cornerstonejs/tools": "^2.14.2", "@ohif/core": "3.10.0-beta.32", "@ohif/extension-cornerstone-dicom-sr": "3.10.0-beta.32", "@ohif/extension-default": "3.10.0-beta.32", diff --git a/platform/app/cypress/integration/volume/MPR.spec.js b/platform/app/cypress/integration/volume/MPR.spec.js index 4c34e7a500..a315394d6f 100644 --- a/platform/app/cypress/integration/volume/MPR.spec.js +++ b/platform/app/cypress/integration/volume/MPR.spec.js @@ -38,8 +38,6 @@ describe('OHIF MPR', () => { cy.window() .its('cornerstone') .then(cornerstone => { - cy.wait(4000); - const viewports = cornerstone.getRenderingEngines()[0].getViewports(); // The stack viewport still exists after the changes to viewportId and inde const imageData1 = viewports[0].getImageData(); diff --git a/platform/app/package.json b/platform/app/package.json index 2f046fc806..9f1d3127d0 100644 --- a/platform/app/package.json +++ b/platform/app/package.json @@ -53,7 +53,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^2.14.0", + "@cornerstonejs/dicom-image-loader": "^2.14.2", "@emotion/serialize": "^1.1.3", "@ohif/core": "3.10.0-beta.32", "@ohif/extension-cornerstone": "3.10.0-beta.32", diff --git a/platform/core/package.json b/platform/core/package.json index a65e3cf387..74c921a217 100644 --- a/platform/core/package.json +++ b/platform/core/package.json @@ -37,7 +37,7 @@ "@cornerstonejs/codec-libjpeg-turbo-8bit": "^1.2.2", "@cornerstonejs/codec-openjpeg": "^1.2.4", "@cornerstonejs/codec-openjph": "^2.4.5", - "@cornerstonejs/dicom-image-loader": "^2.14.0", + "@cornerstonejs/dicom-image-loader": "^2.14.2", "@ohif/ui": "3.10.0-beta.32", "cornerstone-math": "0.1.9", "dicom-parser": "^1.8.21" diff --git a/yarn.lock b/yarn.lock index 35ba68f1dd..5aae859745 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2580,10 +2580,10 @@ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== -"@cornerstonejs/adapters@^2.14.0": - version "2.14.0" - resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-2.14.0.tgz#30e7c7ff3155a1ed783e496e997928281384dd45" - integrity sha512-ZcJqYKORbQ2uvxNVPJCM5iFIFf45xpXAwPy4neXfGtU/hTbrb+04StX6ESx8aoCHD6ualsHSV/1tXKTpEuXNPQ== +"@cornerstonejs/adapters@^2.14.2": + version "2.14.2" + resolved "https://registry.yarnpkg.com/@cornerstonejs/adapters/-/adapters-2.14.2.tgz#cd1f750c34a7b723e09092ba3b2486d287a9ccb2" + integrity sha512-/zKVRwyHa0qjYWYKLQXx5776MJGcyEKYt7sXmtsKDj6AJlfx0W8UMP2/DFDlaadfX5jKckHCSDrPOtzzjYbIbQ== dependencies: "@babel/runtime-corejs2" "^7.17.8" buffer "^6.0.3" @@ -2616,19 +2616,19 @@ resolved "https://registry.yarnpkg.com/@cornerstonejs/codec-openjph/-/codec-openjph-2.4.5.tgz#8690b61a86fa53ef38a70eee9d665a79229517c0" integrity sha512-MZCUy8VG0VG5Nl1l58+g+kH3LujAzLYTfJqkwpWI2gjSrGXnP6lgwyy4GmPRZWVoS40/B1LDNALK905cNWm+sg== -"@cornerstonejs/core@^2.14.0": - version "2.14.0" - resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-2.14.0.tgz#6354e9dec57b00aea5a04710639ff9fd056c2c6f" - integrity sha512-5MfSZlI2/qGSQO0yWZBy5evheb1aRIn1zWK6bY4jZi++Aj4ItC6njS9lvGvW4jIOcT52cBtd/NvVySirN6Diqw== +"@cornerstonejs/core@^2.14.2": + version "2.14.2" + resolved "https://registry.yarnpkg.com/@cornerstonejs/core/-/core-2.14.2.tgz#35817e0c5cc9e3641df757e43e071ee3c91fde54" + integrity sha512-1a8+b4RtnyPRI6bevfEu4KXhVNiEd1CNeaByKegWbd+FyE5yek6DIwW0fJPIxdhA+z6nacFVdKtgbdAwuTDqoA== dependencies: "@kitware/vtk.js" "32.1.1" comlink "^4.4.1" gl-matrix "^3.4.3" -"@cornerstonejs/dicom-image-loader@^2.14.0": - version "2.14.0" - resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-2.14.0.tgz#2e2dfa9e7f2b4b9775fe80697abbef3324f08746" - integrity sha512-XRIQB2Z7iatex4BhNoKHeYYT0MF0TXURMj3ot97aFLNgU+8VRgYvWm4Jkb65KNR/iw8FGx99ye6IcLikPm0UYg== +"@cornerstonejs/dicom-image-loader@^2.14.2": + version "2.14.2" + resolved "https://registry.yarnpkg.com/@cornerstonejs/dicom-image-loader/-/dicom-image-loader-2.14.2.tgz#643c3d7d1f8ba6632665bce94e9a54c52dedc2b7" + integrity sha512-qNKN+7FoiT6flhhWrNoBYs/v6meiuWtiteo08IKIf+uVpjABnk7lEHXozsQ4GQIieCJ7jhqHHXPMbSHQh6Jktw== dependencies: "@cornerstonejs/codec-charls" "^1.2.3" "@cornerstonejs/codec-libjpeg-turbo-8bit" "^1.2.2" @@ -2639,10 +2639,10 @@ pako "^2.0.4" uuid "^9.0.0" -"@cornerstonejs/tools@^2.14.0": - version "2.14.0" - resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-2.14.0.tgz#87da4e424e4b9f3efed4312c9c81858abf3b7ed0" - integrity sha512-pF4vPsJXEUWY1uBa7fjoqkBT20KaN49TMTT1pSWHtmhbiAmqcQnUBkOdWgsvNsMswrUl5XHpXs4sVPzdQAZsVw== +"@cornerstonejs/tools@^2.14.2": + version "2.14.2" + resolved "https://registry.yarnpkg.com/@cornerstonejs/tools/-/tools-2.14.2.tgz#2647a564bfda88fa11c7edb6ad691fb4b1ec080c" + integrity sha512-kiWD/hmXxX7N60KLghuN7aItJ2z1jaO3TnCR2gkQ865Rl/aV5yGZEonUqlH4iHrCDS2d7f0NcXQX0sKAc7PJXw== dependencies: "@types/offscreencanvas" "2019.7.3" comlink "^4.4.1"