diff --git a/login.html b/login.html index ff755c53d..63f061afb 100644 --- a/login.html +++ b/login.html @@ -1,10 +1,13 @@ +

Redirecting...

diff --git a/package/GhcAuth.js b/package/GhcAuth.js deleted file mode 100644 index 436ec87b3..000000000 --- a/package/GhcAuth.js +++ /dev/null @@ -1,27 +0,0 @@ -function GhcAuth() { - // Fill in all the values between the hash marks - // ############################################# - const CLIENT_ID = 'INSERT-YOUR-CLIENT-ID-HERE' - // ############################################# - - const CLOUD_HEALTHCARE_API_BASE = - 'https://healthcare.googleapis.com/v1beta1/projects/'; - const SCOPE = 'https://www.googleapis.com/auth/cloud-healthcare'; - const STUDIES_PATH = '/studies'; - const SERIES_PATH = '/series'; - gapi.auth2.init({'clientId': CLIENT_ID, 'scope': SCOPE}) - .then( - function() { - googleAuth = gapi.auth2.getAuthInstance(); - - if (googleAuth == null) { - alert( - `OAuth failed, please make sure correct apiKey and clientId - filled in.`); - return; - } - - googleAuth.currentUser.get().getAuthResponse(true).access_token; - user.hasGrantedScopes(SCOPE); - }); -} diff --git a/package/ghc_package.js b/package/ghc_package.js index e69de29bb..139a3c33b 100644 --- a/package/ghc_package.js +++ b/package/ghc_package.js @@ -0,0 +1,40 @@ +// this is not working yet. WIP until I can look at the data +CaMic.prototype.loadImg = function(func) { + // do we have a GHC token? + // load up! + var img_id = urlParams.get('id'); + this.slideId = slideId + this.slideName = slideId + this.study = "" + this.specimen = "" + + this.mpp = 1e9; + this.mpp_x = this.mpp; + this.mpp_y = this.mpp; + // TODO what to do about this + var ghc_source = { + height: maxHeightPx, + width: maxWidthPx, + tileSize: tileWidthPx, + maxLevel: countLevels - 1, + minLevel: 0, + getTileUrl: function(level, row, col) { + const x = 1 + (tileWidthPx * row); + const y = 1 + (tileHeightPx * col); + const z = countLevels - 1 - level; + const key = x + '/' + y + '/' + z; + const params = pyramidMeta[key]; + return toDicomWebWADOUrl( + instancesPath + '/' + params.SOPInstanceUID + '/frames/' + + params.FrameNumber + '/rendered'); + }, + getLevelScale: function(level) { + return sortedLevelWidths[countLevels - 1 - level] / maxWidthPx; + } + }; + this.viewer.open(ghc_source); + + if (func && typeof func === 'function') { + func.call(null, x); + } +}