Chore/kill yalc with fire (#629)

* init * more shifting * Move @babel dependencies up to workspace root * Begin updating dependent libraries to use sync'd webpack builds w/ watches * Commit changes before a long weekend * Split packages into platform and extensions * Consolidate how/where we specify file/module type entrypoints * Make it possible to pass in extensions as App props * Resolve viewer's modules * Target for UMD bundle * Add Webpack Stylus loader * Provide WebPack build options for microscopy, vtk, and ui * Better entrypoint for extensions * Push changes up to switch PCs * Fix ESM symlink build for Viewers * Shift docs to root * Specify additional lerna config props * Begin providing basic readme info * Rename example extension folder * Shift links to bottom of doc * First attempt at a netlify deploy preview * Attempt to fix deploy preview build * push workspace enabled to initial command; remove second yarn install; use npx to call gitbook cli commands * Try to use global gitbook-cli * Export node_modules path * More agressive with modifying PATH * Follow deploy log output advice * try again to set bin path * Try swapping bash with a new shell * Try bash -l instead of exec bash * Annd let's try again * and again * We may have figured it out johnny, boy * We need to pull cornerstone-wado-image-loader files from hoisted node_modules * Attempt to fix ticks/escapes * Change copy syntax; try running tests on viewers from root for circleci * Lower version to match circleci image * Try alternative jest-canvas-mock location and version file syntax * Run version command instead of calling node directly * Try alternative jest transform * Set path and enable workspaces * Add codecov flags * Use cpx so our copying finishes? * Get all platform unit tests to run * Run and report individually and in parallel * Try once relying on codecov yaml to split w/ flags * Add projects to split by flags * Generate separate reports * Trigger codecov after everything has finished running; these may not support flags * Use recommended flags from issue comments for codecov * Fix typo * Remove clear flag * Shift back to calling codecov from root * Generate example for codecov issue * Try fixing paths * Simplify * Try using codecov orb * Bump circleci version * Upload core and viewer * Use full string paths * Remove individual codecov calls * Fix dir * Combine files before upload * Escape anchors * tryfix syntax * Escape string literal * Combine lines to reduce path * long paths * Use home alias * Fix filename * Try to see the contents of our cat'd file * Also upload `core` * Try running with aliased folder * Fix path; split PR and Merge unit tests into separate jobs * Set default threshold * Fix typo * Changing to scoped package names * Adding note * Catch more updates * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.0 - @ohif/extension-dicom-html@0.0.4-alpha.0 - @ohif/extension-dicom-microscopy@0.0.9-alpha.0 - @ohif/extension-dicom-pdf@0.0.8-alpha.0 - @ohif/extension-vtk@0.1.4-alpha.0 - @ohif/core@0.11.1-alpha.0 - @ohif/i18n@0.2.3-alpha.0 - @ohif/ui@0.2.18-alpha.0 - @ohif/viewer@0.0.22-alpha.0 * Clean up primary readme * Support for dev and dev:* commands * Shift build command; satisfy default PWA build * Remove old scripts * Clean up UI to set webpack scripts * Tidy up project links * Clean duplicate code in UI project * Update UI project's docs * Clean up ui and i18n config * Reduce duplicate code in `@ohif/core` * Fix @ohif/ui versions * bump @ohif/core versions * Redux testkit dep * Remove unused/duplicate config files for projects/packages * ohif-core --> @ohif/core * Safer publish command * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.1 - @ohif/extension-dicom-html@0.0.4-alpha.1 - @ohif/extension-dicom-microscopy@0.0.9-alpha.1 - @ohif/extension-dicom-pdf@0.0.8-alpha.1 - @ohif/extension-vtk@0.1.4-alpha.1 - @ohif/core@0.11.1-alpha.1 - @ohif/i18n@0.2.3-alpha.1 - @ohif/ui@0.2.18-alpha.1 - @ohif/viewer@0.0.22-alpha.1 * test version bump * Add global prettier config * chore(release): publish %s [skip ci] - @ohif/viewer@0.0.22-alpha.2 * test lerna publish * Update package.jsons * Fix build scripts * catch changes * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.2 - @ohif/extension-dicom-html@0.0.4-alpha.2 - @ohif/extension-dicom-microscopy@0.0.9-alpha.2 - @ohif/extension-dicom-pdf@0.0.8-alpha.2 - @ohif/extension-vtk@0.1.4-alpha.2 - @ohif/core@0.11.1-alpha.2 - @ohif/i18n@0.2.3-alpha.2 - @ohif/ui@0.2.18-alpha.2 - @ohif/viewer@0.0.22-alpha.3 * fix eslint issues caused by eslint 6 and our react-app config * Publish with canary tag * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.3 - @ohif/extension-dicom-html@0.0.4-alpha.3 - @ohif/extension-dicom-microscopy@0.0.9-alpha.3 - @ohif/extension-dicom-pdf@0.0.8-alpha.3 - @ohif/extension-vtk@0.1.4-alpha.3 - @ohif/core@0.11.1-alpha.3 - @ohif/i18n@0.2.3-alpha.3 - @ohif/ui@0.2.18-alpha.3 - @ohif/viewer@0.0.22-alpha.4 * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.4 - @ohif/extension-dicom-html@0.0.4-alpha.4 - @ohif/extension-dicom-microscopy@0.0.9-alpha.4 - @ohif/extension-dicom-pdf@0.0.8-alpha.4 - @ohif/extension-vtk@0.1.4-alpha.4 - @ohif/core@0.11.1-alpha.4 - @ohif/i18n@0.2.3-alpha.4 - @ohif/ui@0.2.18-alpha.4 - @ohif/viewer@0.0.22-alpha.5 * Simplify build * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.5 - @ohif/extension-dicom-html@0.0.4-alpha.5 - @ohif/extension-dicom-microscopy@0.0.9-alpha.5 - @ohif/extension-dicom-pdf@0.0.8-alpha.5 - @ohif/extension-vtk@0.1.4-alpha.5 - @ohif/core@0.11.1-alpha.5 - @ohif/i18n@0.2.3-alpha.5 - @ohif/ui@0.2.18-alpha.5 - @ohif/viewer@0.0.22-alpha.6 * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.6 - @ohif/extension-dicom-html@0.0.4-alpha.6 - @ohif/extension-dicom-microscopy@0.0.9-alpha.6 - @ohif/extension-dicom-pdf@0.0.8-alpha.6 - @ohif/extension-vtk@0.1.4-alpha.6 - @ohif/core@0.11.1-alpha.6 - @ohif/i18n@0.2.3-alpha.6 - @ohif/ui@0.2.18-alpha.6 - @ohif/viewer@0.0.22-alpha.7 * Split version and publish * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.7 - @ohif/extension-dicom-html@0.0.4-alpha.7 - @ohif/extension-dicom-microscopy@0.0.9-alpha.7 - @ohif/extension-dicom-pdf@0.0.8-alpha.7 - @ohif/extension-vtk@0.1.4-alpha.7 - @ohif/core@0.11.1-alpha.7 - @ohif/i18n@0.2.3-alpha.7 - @ohif/ui@0.2.18-alpha.7 - @ohif/viewer@0.0.22-alpha.8 * Try simplify netlify build * react-viewerbase --> @ohif/ui * add test for stylus loader * Try new way to specify publish path * Use an output folder that won't be ignored * Try move command * fiddle with paths * Dig for some information * Make sure we're in root for our commands * Remove discovery * Setup script-tag example * Fix typo * Move config folder * Update cornerstone extension to use shared/root webpack configs * capture changes * Update extension webpack configs * Don't check in docz output * Fix babel runtime resolution issue * Simplify ui build steps * Push in progress * Shift directories * Get viewer dev path to work * Fix viewer commonjs build * Fix build pwa config for viewers * Make sure our package specific command can be called from root * Update notes * Fix imports and misc. merge notes * Bump wado-image-loader version * Switch up commands to remove webworkers copy * Fix CI config * Fix more broken package references * Add react-dropzone * Persist so e2e test can use * Fix lockfile * Use cypress orb to simplify CI * Fix config * Try again * Install yarn latest for orb * Install yarn a different way * Wait on correct port * Run tests in viewer project * Fix cypress config * Make Cypress happier - use default location * Simplify e2e testing * Capture UI changes since fork * Catch core up * Grab latest deps after merge * Fix broken import * Make sure cornerstone-wado-image-loader resolves to 3+ * Note regarding orbs * Fix refresh on 404 routes * Fix odd error for cornerstone-wado-image-loader * Different target for UMD * Simplify dev script * Try to get fancy with netlify output * Let's do it again * Try to fix measurementTools issue * See if we can get our lerna magic to work on merge to monorepo branch
2019-08-13 15:36:46 -04:00
1 parent cac911f08e
commit 08ff214ea6
@@ -0,0 +1,255 @@
+import log from '../log.js';
+import OHIFError from './OHIFError';
+import cornerstone from 'cornerstone-core';
+import cornerstoneTools from 'cornerstone-tools';
+import getImageId from '../utils/getImageId.js';
+
+export class StudyPrefetcher {
+  constructor(studies) {
+    this.studies = studies || [];
+    this.prefetchDisplaySetsTimeout = 300;
+    this.lastActiveViewportElement = null;
+
+    cornerstone.events.addEventListener(
+      'cornerstoneimagecachefull.StudyPrefetcher',
+      this.cacheFullHandler
+    );
+  }
+
+  destroy() {
+    this.stopPrefetching();
+    cornerstone.events.removeEventListener(
+      'cornerstoneimagecachefull.StudyPrefetcher',
+      this.cacheFullHandler
+    );
+  }
+
+  static getInstance() {
+    if (!StudyPrefetcher.instance) {
+      StudyPrefetcher.instance = new StudyPrefetcher([]);
+    }
+
+    return StudyPrefetcher.instance;
+  }
+
+  setStudies(studies) {
+    this.stopPrefetching();
+    this.studies = studies;
+  }
+
+  prefetch() {
+    if (!this.studies || !this.studies.length) {
+      return;
+    }
+
+    this.stopPrefetching();
+    this.prefetchDisplaySets();
+  }
+
+  stopPrefetching() {
+    cornerstoneTools.requestPoolManager.clearRequestStack('prefetch');
+  }
+
+  prefetchDisplaySetsAsync(timeout) {
+    timeout = timeout || this.prefetchDisplaySetsTimeout;
+
+    clearTimeout(this.prefetchDisplaySetsHandler);
+    this.prefetchDisplaySetsHandler = setTimeout(() => {
+      this.prefetchDisplaySets();
+    }, timeout);
+  }
+
+  prefetchDisplaySets() {
+    // TODO: Allow passing in config
+    let config = {
+      order: 'closest',
+      displaySetCount: 1,
+    };
+
+    const displaySetsToPrefetch = this.getDisplaySetsToPrefetch(config);
+    const imageIds = this.getImageIdsFromDisplaySets(displaySetsToPrefetch);
+
+    this.prefetchImageIds(imageIds);
+  }
+
+  prefetchImageIds(imageIds) {
+    const nonCachedImageIds = this.filterCachedImageIds(imageIds);
+    const requestPoolManager = cornerstoneTools.requestPoolManager;
+    const requestType = 'prefetch';
+    const preventCache = false;
+    const noop = () => {};
+
+    nonCachedImageIds.forEach(imageId => {
+      requestPoolManager.addRequest(
+        {},
+        imageId,
+        requestType,
+        preventCache,
+        noop,
+        noop
+      );
+    });
+
+    requestPoolManager.startGrabbing();
+  }
+
+  getStudy(image) {
+    const studyMetadata = cornerstone.metaData.get('study', image.imageId);
+    return OHIF.viewer.Studies.find(
+      study => study.studyInstanceUid === studyMetadata.studyInstanceUid
+    );
+  }
+
+  getSeries(study, image) {
+    const seriesMetadata = cornerstone.metaData.get('series', image.imageId);
+    const studyMetadata = OHIF.viewerbase.getStudyMetadata(study);
+
+    return studyMetadata.getSeriesByUID(seriesMetadata.seriesInstanceUid);
+  }
+
+  getInstance(series, image) {
+    const instanceMetadata = cornerstone.metaData.get(
+      'instance',
+      image.imageId
+    );
+    return series.getInstanceByUID(instanceMetadata.sopInstanceUid);
+  }
+
+  getActiveDisplaySet(displaySets, instance) {
+    return displaySets.find(displaySet => {
+      return displaySet.images.some(displaySetImage => {
+        return displaySetImage.sopInstanceUid === instance.sopInstanceUid;
+      });
+    });
+  }
+
+  getDisplaySetsToPrefetch(config) {
+    const image = this.getActiveViewportImage();
+
+    if (!image || !config || !config.displaySetCount) {
+      return [];
+    }
+
+    /*const study = this.getStudy(image);
+    const series = this.getSeries(study, image);
+    const instance = this.getInstance(series, image);*/
+    const displaySets = study.displaySets;
+    const activeDisplaySet = null; //this.getActiveDisplaySet(displaySets, instance);
+    const prefetchMethodMap = {
+      topdown: 'getFirstDisplaySets',
+      downward: 'getNextDisplaySets',
+      closest: 'getClosestDisplaySets',
+    };
+
+    const prefetchOrder = config.order;
+    const methodName = prefetchMethodMap[prefetchOrder];
+    const getDisplaySets = this[methodName];
+
+    if (!getDisplaySets) {
+      if (prefetchOrder) {
+        log.warn(`Invalid prefetch order configuration (${prefetchOrder})`);
+      }
+
+      return [];
+    }
+
+    return getDisplaySets.call(
+      this,
+      displaySets,
+      activeDisplaySet,
+      config.displaySetCount
+    );
+  }
+
+  getFirstDisplaySets(displaySets, activeDisplaySet, displaySetCount) {
+    const length = displaySets.length;
+    const selectedDisplaySets = [];
+
+    for (let i = 0; i < length && displaySetCount; i++) {
+      const displaySet = displaySets[i];
+
+      if (displaySet !== activeDisplaySet) {
+        selectedDisplaySets.push(displaySet);
+        displaySetCount--;
+      }
+    }
+
+    return selectedDisplaySets;
+  }
+
+  getNextDisplaySets(displaySets, activeDisplaySet, displaySetCount) {
+    const activeDisplaySetIndex = displaySets.indexOf(activeDisplaySet);
+    const begin = activeDisplaySetIndex + 1;
+    const end = Math.min(begin + displaySetCount, displaySets.length);
+
+    return displaySets.slice(begin, end);
+  }
+
+  getClosestDisplaySets(displaySets, activeDisplaySet, displaySetCount) {
+    const activeDisplaySetIndex = displaySets.indexOf(activeDisplaySet);
+    const length = displaySets.length;
+    const selectedDisplaySets = [];
+    let left = activeDisplaySetIndex - 1;
+    let right = activeDisplaySetIndex + 1;
+
+    while ((left >= 0 || right < length) && displaySetCount) {
+      if (left >= 0) {
+        selectedDisplaySets.push(displaySets[left]);
+        displaySetCount--;
+        left--;
+      }
+
+      if (right < length && displaySetCount) {
+        selectedDisplaySets.push(displaySets[right]);
+        displaySetCount--;
+        right++;
+      }
+    }
+
+    return selectedDisplaySets;
+  }
+
+  getImageIdsFromDisplaySets(displaySets) {
+    let imageIds = [];
+
+    displaySets.forEach(displaySet => {
+      imageIds = imageIds.concat(this.getImageIdsFromDisplaySet(displaySet));
+    });
+
+    return imageIds;
+  }
+
+  getImageIdsFromDisplaySet(displaySet) {
+    const imageIds = [];
+
+    // TODO: This duplicates work done by the stack manager
+    displaySet.images.forEach(image => {
+      const numFrames = image.numFrames;
+      if (numFrames > 1) {
+        for (let i = 0; i < numFrames; i++) {
+          let imageId = getImageId(image, i);
+          imageIds.push(imageId);
+        }
+      } else {
+        let imageId = getImageId(image);
+        imageIds.push(imageId);
+      }
+    });
+
+    return imageIds;
+  }
+
+  filterCachedImageIds(imageIds) {
+    return imageIds.filter(imageId => !this.isImageCached(imageId));
+  }
+
+  isImageCached(imageId) {
+    const image = cornerstone.imageCache.imageCache[imageId];
+    return image && image.sizeInBytes;
+  }
+
+  cacheFullHandler = () => {
+    log.warn('Cache full');
+    this.stopPrefetching();
+  };
+}