fix(bugs): enhancements and bug fixes - more (#4043)

extensions/cornerstone/src/commandsModule.ts

@@ -415,6 +415,7 @@ function commandsModule({
             onClose: uiModalService.hide,
             cornerstoneViewportService,
           },
+          containerDimensions: 'w-[70%] max-w-[900px]',
         });
       }
     },

extensions/cornerstone/src/components/WindowLevelActionMenu/Colorbar.tsx

@@ -102,6 +102,7 @@ export function Colorbar({
 
   return (
     <div className="all-in-one-menu-item flex w-full justify-center">
+      <div className="mr-2 w-[28px]"></div>
       <SwitchButton
         label="Display Color bar"
         checked={showColorbar}

extensions/cornerstone/src/components/WindowLevelActionMenu/VolumeRenderingOptions.tsx

@@ -25,7 +25,7 @@ export function VolumeRenderingOptions({
         commandsManager={commandsManager}
         serviceManager={serviceManager}
       />
-      <div className="all-in-one-menu-item flex !h-[20px] w-full justify-start">
+      <div className="all-in-one-menu-item mt-2 flex !h-[20px] w-full justify-start">
         <div className="text-aqua-pale text-[13px]">LIGHTING</div>
       </div>
       <div className="bg-primary-dark mt-1 mb-1 h-[2px] w-full"></div>

extensions/cornerstone/src/components/WindowLevelActionMenu/WindowLevelActionMenu.tsx

@@ -52,6 +52,7 @@ export function WindowLevelActionMenu({
   } = colorbarProperties;
   const { colorbarService, cornerstoneViewportService } = serviceManager.services;
   const viewportInfo = cornerstoneViewportService.getViewportInfo(viewportId);
+  const viewport = cornerstoneViewportService.getCornerstoneViewport(viewportId);
   const backgroundColor = viewportInfo.getViewportOptions().background;
   const isLight = backgroundColor ? utilities.isEqual(backgroundColor, [1, 1, 1]) : false;
 
@@ -93,13 +94,7 @@ export function WindowLevelActionMenu({
       colorbarService.removeColorbar(viewportId);
       onSetColorbar();
     }, 0);
-  }, [viewportId]);
-
-  useEffect(() => {
-    if (colorbarService.hasColorbar(viewportId)) {
-      colorbarService.removeColorbar(viewportId);
-    }
-  }, [displaySets]);
+  }, [viewportId, displaySets, viewport]);
 
   useEffect(() => {
     setMenuKey(menuKey + 1);

extensions/cornerstone/src/services/ColorbarService/ColorbarService.ts

@@ -75,10 +75,7 @@ export default class ColorbarService extends PubSubService {
 
     displaySetInstanceUIDs.forEach((displaySetInstanceUID, index) => {
       const actorEntry = actorEntries.find(entry => entry.uid.includes(displaySetInstanceUID));
-      if (!actorEntry) {
-        return;
-      }
-      const { uid: volumeId } = actorEntry;
+      const volumeId = actorEntry?.uid;
       const properties = viewport?.getProperties(volumeId);
       const colormap = properties?.colormap;
       // if there's an initial colormap set, and no colormap on the viewport, set it
@@ -194,8 +191,10 @@ export default class ColorbarService extends PubSubService {
   private setViewportColormap(viewportId, displaySetInstanceUID, colormap, immediate = false) {
     const renderingEngine = getRenderingEngine(RENDERING_ENGINE_ID);
     const viewport = renderingEngine.getViewport(viewportId);
-    const actorEntries = viewport.getActors();
-
+    const actorEntries = viewport?.getActors();
+    if (!viewport || !actorEntries || actorEntries.length === 0) {
+      return;
+    }
     const setViewportProperties = (viewport, uid) => {
       const actorEntry = actorEntries.find(entry => entry.uid.includes(uid));
       const { actor: volumeActor, uid: volumeId } = actorEntry;