From 6d57ef119726466d2b7e283a7e1c28ca6d9ec713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elo=C3=ADzio=20Salgado?= <eloisalgado@gmail.com>
Date: Thu, 26 Jan 2017 18:56:52 -0200
Subject: [PATCH] Removing seriesNavigation

---
 Packages/ohif-viewerbase/client/index.js      |  4 -
 .../ohif-viewerbase/client/lib/hotkeyUtils.js | 11 +--
 .../client/lib/seriesNavigation.js            | 91 -------------------
 3 files changed, 2 insertions(+), 104 deletions(-)
 delete mode 100644 Packages/ohif-viewerbase/client/lib/seriesNavigation.js

diff --git a/Packages/ohif-viewerbase/client/index.js b/Packages/ohif-viewerbase/client/index.js
index c88b7778f..b6ccded13 100644
--- a/Packages/ohif-viewerbase/client/index.js
+++ b/Packages/ohif-viewerbase/client/index.js
@@ -92,10 +92,6 @@ Viewerbase.imageViewerViewportData = imageViewerViewportData;
 import { panelNavigation } from './lib/panelNavigation';
 Viewerbase.panelNavigation = panelNavigation;
 
-// seriesNavigation.*
-import { seriesNavigation } from './lib/seriesNavigation';
-Viewerbase.seriesNavigation = seriesNavigation;
-
 // WLPresets.*
 import { WLPresets } from './lib/WLPresets';
 Viewerbase.wlPresets = WLPresets;
diff --git a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
index d94a5aae3..a91bbfcad 100644
--- a/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
+++ b/Packages/ohif-viewerbase/client/lib/hotkeyUtils.js
@@ -7,7 +7,6 @@ import { switchToImageRelative } from './switchToImageRelative';
 import { switchToImageByIndex } from './switchToImageByIndex';
 import { viewportUtils } from './viewportUtils';
 import { panelNavigation } from './panelNavigation';
-import { seriesNavigation } from './seriesNavigation';
 import { WLPresets } from './WLPresets';
 
 // TODO: add this to namespace definitions
@@ -138,10 +137,10 @@ Meteor.startup(function() {
             }
         },
         previousDisplaySet() {
-            OHIF.viewer.moveDisplaySets(false);
+            OHIF.viewerbase.layoutManager.moveDisplaySets(false);
         },
         nextDisplaySet() {
-            OHIF.viewer.moveDisplaySets(true);
+            OHIF.viewerbase.layoutManager.moveDisplaySets(true);
         },
         nextPanel() {
             panelNavigation.loadNextActivePanel();
@@ -199,12 +198,6 @@ Meteor.startup(function() {
             flashButton(button);
             clearImageAnnotations();
         },
-        nextSeries () {
-            seriesNavigation.loadNextSeries();
-        },
-        previousSeries () {
-            seriesNavigation.loadPreviousSeries();
-        },
         cineDialog () {
             /**
              * TODO: This won't work in OHIF's, since this element
diff --git a/Packages/ohif-viewerbase/client/lib/seriesNavigation.js b/Packages/ohif-viewerbase/client/lib/seriesNavigation.js
deleted file mode 100644
index 0cd0cdb93..000000000
--- a/Packages/ohif-viewerbase/client/lib/seriesNavigation.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import { Session } from 'meteor/session';
-import { OHIF } from 'meteor/ohif:core';
-// @TODO: import symbols into local scope: ViewerData
-
-const getStudyFromStudyInstanceUid = studyInstanceUid => {
-    // @TypeSafeStudies
-    return OHIF.viewer.Studies.findBy({ studyInstanceUid });
-};
-
-const getNumberOfStacks = studyInstanceUid => {
-    // May not work if the Study contains non-image series?
-    const study = getStudyFromStudyInstanceUid(studyInstanceUid);
-
-    if (!study || !study.displaySets || !study.displaySets.length) {
-      return;
-    }
-
-    return study.displaySets.length;
-};
-
-const getActiveViewportIndex = () => {
-    return Session.get('activeViewport');
-};
-
-const loadSeries = indexCalculator => {
-    if(typeof indexCalculator !== 'function') {
-      return;
-    }
-
-    const viewportIndex = getActiveViewportIndex();
-    const contentId = Session.get('activeContentId');
-    const viewerData = ViewerData[contentId].loadedSeriesData[viewportIndex];
-
-    if(!viewerData && !viewerData.studyInstanceUid) {
-      return;
-    }
-
-    const { studyInstanceUid, seriesInstanceUid, displaySetInstanceUid } = viewerData;
-
-    if(!studyInstanceUid) {
-      return;
-    }
-
-    const numberOfStacks = getNumberOfStacks(studyInstanceUid);
-    if (!numberOfStacks || numberOfStacks === 1) {
-      return;
-    }
-
-    const study = getStudyFromStudyInstanceUid(studyInstanceUid);
-
-    const displaySetInstanceUids = study.displaySets.map(displaySet => {
-      return displaySet.displaySetInstanceUid;
-    });
-
-    const currentLoadedStackIndex = displaySetInstanceUids.indexOf(displaySetInstanceUid);
-
-    const newStackIndex = indexCalculator(currentLoadedStackIndex, numberOfStacks);
-    if (currentLoadedStackIndex === newStackIndex) {
-      return;
-    }
-
-    const newDisplaySetInstanceUid = displaySetInstanceUids[newStackIndex];
-
-    const data = {
-      displaySetInstanceUid: newDisplaySetInstanceUid,
-      viewportIndex,
-      studyInstanceUid,
-      seriesInstanceUid
-    };
-
-    OHIF.viewerbase.layoutManager.rerenderViewportWithNewDisplaySet(viewportIndex, data);
-};
-
-const loadPreviousSeries = () => {
-    const indexCalculator = currentLoadedStackIndex => Math.max(currentLoadedStackIndex - 1, 0);
-    
-    loadSeries(indexCalculator);
-};
-
-const loadNextSeries = () => {
-    const indexCalculator = (currentLoadedStackIndex, numberOfStacks) => Math.min(currentLoadedStackIndex + 1, numberOfStacks - 1);
-
-    loadSeries(indexCalculator);
-};
-
-const seriesNavigation = {
-    loadPreviousSeries,
-    loadNextSeries
-};
-
-export { seriesNavigation };