Fixes after rebasing

extensions/vtk/src/LoadingIndicator.js

@@ -32,16 +32,16 @@ class LoadingIndicator extends PureComponent {
             </div>
           </div>
         ) : (
-            <div className="imageViewerLoadingIndicator loadingIndicator">
-              <div className="indicatorContents">
-                <p>
-                  {this.props.t('Loading...')}
-                  <i className="fa fa-spin fa-circle-o-notch fa-fw" />
-                  {percComplete}
-                </p>
-              </div>
+          <div className="imageViewerLoadingIndicator loadingIndicator">
+            <div className="indicatorContents">
+              <p>
+                {this.props.t('Loading...')}
+                <i className="fa fa-spin fa-circle-o-notch fa-fw" />
+                {percComplete}
+              </p>
             </div>
-          )}
+          </div>
+        )}
       </React.Fragment>
     );
   }

extensions/vtk/src/OHIFVTKViewport.js

@@ -49,7 +49,7 @@ class OHIFVTKViewport extends Component {
   state = {
     volumes: null,
     paintFilterLabelMapImageData: null,
-    paintFilterBackgroundImageData: null
+    paintFilterBackgroundImageData: null,
   };
 
   static propTypes = {
@@ -69,7 +69,7 @@ class OHIFVTKViewport extends Component {
   };
 
   static defaultProps = {
-    onScroll: () => { },
+    onScroll: () => {},
   };
 
   static id = 'OHIFVTKViewport';
@@ -156,9 +156,11 @@ class OHIFVTKViewport extends Component {
       const { activeLabelmapIndex } = brushStackState;
       const labelmap3D = brushStackState.labelmaps3D[activeLabelmapIndex];
 
-      this.segmentsDefaultProperties = labelmap3D.segmentsHidden.map(isHidden => {
-        return { visible: !isHidden };
-      });
+      this.segmentsDefaultProperties = labelmap3D.segmentsHidden.map(
+        isHidden => {
+          return { visible: !isHidden };
+        }
+      );
 
       const vtkLabelmapID = `${firstImageId}_${activeLabelmapIndex}`;
 
@@ -349,7 +351,7 @@ class OHIFVTKViewport extends Component {
 
     if (
       displaySet.displaySetInstanceUID !==
-      prevDisplaySet.displaySetInstanceUID ||
+        prevDisplaySet.displaySetInstanceUID ||
       displaySet.SOPInstanceUID !== prevDisplaySet.SOPInstanceUID ||
       displaySet.frameIndex !== prevDisplaySet.frameIndex
     ) {
@@ -435,7 +437,7 @@ class OHIFVTKViewport extends Component {
                 segmentsDefaultProperties: this.segmentsDefaultProperties,
                 onNewSegmentationRequested: () => {
                   this.setStateFromProps();
-                }
+                },
               }}
               onScroll={this.props.onScroll}
             />

extensions/vtk/src/commandsModule.js

@@ -165,7 +165,7 @@ const commandsModule = ({ commandsManager }) => {
       segmentNumber,
       frameIndex,
       frame,
-      done = () => { }
+      done = () => {},
     }) => {
       let api = apis[viewports.activeViewportIndex];
 
@@ -180,10 +180,13 @@ const commandsModule = ({ commandsManager }) => {
         displaySetInstanceUID,
         SOPClassUID,
         SOPInstanceUID,
-        frameIndex,
+        frameIndex
       );
 
-      const imageDataObject = getImageData(stack.imageIds, displaySetInstanceUID);
+      const imageDataObject = getImageData(
+        stack.imageIds,
+        displaySetInstanceUID
+      );
 
       let pixelIndex = 0;
       let x = 0;
@@ -209,7 +212,10 @@ const commandsModule = ({ commandsManager }) => {
       y /= count;
 
       const position = [x, y, frameIndex];
-      const worldPos = _convertModelToWorldSpace(position, imageDataObject.vtkImageData);
+      const worldPos = _convertModelToWorldSpace(
+        position,
+        imageDataObject.vtkImageData
+      );
 
       api.svgWidgets.crosshairsWidget.moveCrosshairs(worldPos, apis);
       done();

extensions/vtk/src/toolbarComponents/VTKMPRToolbarButton.js

@@ -8,10 +8,13 @@ const { studyMetadataManager } = utils;
 
 let isVisible = true;
 
-const _isDisplaySetReconstructable = (viewportSpecificData = {}, activeViewportIndex) => {
+const _isDisplaySetReconstructable = (
+  viewportSpecificData = {},
+  activeViewportIndex
+) => {
   if (!viewportSpecificData[activeViewportIndex]) {
     return false;
-  };
+  }
 
   const { displaySetInstanceUID, StudyInstanceUID } = viewportSpecificData[
     activeViewportIndex
@@ -27,11 +30,13 @@ const _isDisplaySetReconstructable = (viewportSpecificData = {}, activeViewportI
     return false;
   }
 
-  const displaySet = study._displaySets.find(set => set.displaySetInstanceUID === displaySetInstanceUID);
+  const displaySet = study._displaySets.find(
+    set => set.displaySetInstanceUID === displaySetInstanceUID
+  );
 
   if (!displaySet) {
     return false;
-  };
+  }
 
   return displaySet.isReconstructable;
 };
@@ -52,12 +57,12 @@ function VTKMPRToolbarButton({
     return {
       viewportSpecificData,
       activeViewportIndex,
-    }
+    };
   });
 
   isVisible = _isDisplaySetReconstructable(
     viewportSpecificData,
-    activeViewportIndex,
+    activeViewportIndex
   );
 
   return (

extensions/vtk/src/toolbarModule.js

@@ -131,4 +131,4 @@ const definitions = [
 export default {
   definitions,
   defaultContext: 'ACTIVE_VIEWPORT::VTK',
-}
+};