Remove tabbed layout in favour of current Lesion Tracker design (OHIF-49)

2016-07-23 20:11:01 +02:00
1 parent 8b364ce9d0
commit 82e374b1e3
@@ -0,0 +1,8 @@
+<template name="emailVerification">
+    <div id="emailVerification">
+        <div id="emailVerificationContent">
+            <h3>Verify Your Email Address</h3>
+            <p>We need to verify your email address. We've sent an email to <b>{{emailAddress}}</b> to verify your address. Please click the link in your email to continue.</p>
+        </div>
+    </div>
+</template>
@@ -0,0 +1,5 @@
+Template.emailVerification.helpers({
+    emailAddress: function() {
+        return Meteor.user().emails[0].address;
+    }
+});
@@ -0,0 +1,15 @@
+#emailVerification
+  #emailVerificationContent
+    position: absolute
+    top: 0
+    bottom: 0
+    left: 0
+    right: 0
+    margin: auto
+    width: 60%
+    height: 20%
+    z-index: 100
+    border-radius: 5px
+    padding: 10px 20px 10px 20px
+    background-color: rgba(255,255,255,1)
+    outline: none
@@ -0,0 +1,3 @@
+<template name="layout">
+    {{>yield }}
+</template>
@@ -1,11 +0,0 @@
-<template name="relatedStudySelect">
-    <div class="relatedStudySelect">
-        <label>Study:</label>
-        <span class="loading"><i class="fa fa-spinner fa-spin"></i></span>
-        <select id="selectStudyDate">
-            {{#each relatedStudies}}
-                <option value="{{studyInstanceUid}}" selected={{selected}}>{{formatDA studyDate}}: {{studyDescription}}</option>
-            {{/each}}
-        </select>
-    </div>
-</template>
@@ -1,105 +0,0 @@
-Template.relatedStudySelect.helpers({
-    /**
-     * Returns an array of studies that are related to the current study by patient ID.
-     * The value for 'selected' for the currently loaded study is set to true, so that
-     * this becomes the current option in the combo box.
-     *
-     * @returns {*} Array of studies that are related to the current study by patient ID
-     */
-    relatedStudies: function() {
-        // Check which study is currently loaded into the study browser
-        var currentStudyInBrowser = ViewerStudies.findOne({
-            selected: true
-        });
-
-        // Find all studies in the Worklist which have the same patientId as the currently selected study
-        var relatedStudies = WorklistStudies.find({
-            patientId: currentStudyInBrowser.patientId
-        }, {
-            sort: {
-                studyDate: -1
-            }
-        }).fetch();
-
-        // If no Study / Timepoint associated studies exist, just
-        // return the list of loaded studies
-        if (!relatedStudies.length) {
-            return ViewerStudies.find();
-        }
-
-        // Modify the array of related studies so the default option is the currently selected study
-        relatedStudies.forEach(function(study, index) {
-            // If the studyInstanceUid matches that of the current study in the browser,
-            // Set this to 'selected', so that it becomes the default option
-            if (study.studyInstanceUid === currentStudyInBrowser.studyInstanceUid) {
-                relatedStudies[index].selected = true;
-            }
-        });
-
-        // Use this array to populate the combo box
-        return relatedStudies;
-    }
-});
-
-Template.relatedStudySelect.events({
-    /**
-     * When the study date selector combo box is changed, we will
-     * hide the select box, temporarily display a loading sign, and grab
-     * the selected study. Once the study has been retrieved it is added
-     * into the ViewerStudies collection and set as selected. This reactively
-     * populated the thumbnail browser.
-     *
-     * @param e The select box change event
-     */
-    'change select#selectStudyDate': function(e) {
-        var selectBox = $(e.currentTarget);
-        var studyInstanceUid = selectBox.val();
-
-        // Hide the select box
-        selectBox.css('display', 'none');
-
-        // Show the loading indicator
-        var loadingIndicator = selectBox.siblings('.loading');
-        loadingIndicator.css('display', 'block');
-
-        getStudyMetadata(studyInstanceUid, function(study) {
-            sortStudy(study);
-
-            // Hide the loading indicator
-            loadingIndicator.css('display', 'none');
-
-            // Show the select box again
-            selectBox.css('display', 'block');
-
-            // Set "Selected" to false for the entire collection
-            ViewerStudies.update({}, {
-                $set: {
-                    selected: false
-                }
-            }, {
-                multi: true
-            });
-
-            // Check if this study already exists in the ViewerStudies collection
-            // of loaded studies. If it does, set it's 'selected' value to true.
-            var existingStudy = ViewerStudies.findOne({
-                studyInstanceUid: studyInstanceUid
-            });
-
-            if (existingStudy) {
-                // Set the current finding in the collection to true
-                ViewerStudies.update(existingStudy._id, {
-                    $set: {
-                        selected: true
-                    }
-                });
-                return;
-            }
-
-            // If the study does not exist, add the 'selected' key to the object
-            // with the value True, and insert it into the ViewerStudies Collection
-            study.selected = true;
-            ViewerStudies.insert(study);
-        });
-    }
-});
@@ -1,23 +0,0 @@
-.relatedStudySelect
-  margin: 0 auto 15px
-  text-align: center
-  width: 100px
-
-  #selectStudyDate
-    color: black
-    background-color: #666
-    border-color: #666
-    width: 96%
-    margin: 0 auto
-
-  label
-    font-weight: normal
-    color: #666
-    float: left
-    padding-left: 2%
-
-  .loading
-    display: none
-    color: white
-    text-align: center
-
@@ -29,12 +29,4 @@ Template.gridLayout.helpers({

        return viewportData;
    }
-});
-
-Template.gridLayout.onRendered(function() {
-    OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('CornerstoneNewImage', cornerstoneTools.updateImageSynchronizer);
-});
-
-Template.gridLayout.onDestroyed(function() {
-    OHIF.viewer.updateImageSynchronizer.destroy();
-});
+});
@@ -2,19 +2,4 @@

 #imageViewerViewports
  height: 100%
-  width: 100%
-
-  .viewportContainer
-    float: left
-    border: $viewportBorderThickness solid $viewportBorderColor
-    
-    &.active, &:hover.active
-      border: $viewportBorderThickness solid $viewportBorderColorActive
-      
-    &:hover
-      border: $viewportBorderThickness solid $viewportBorderColorHover
-    
-    .removable
-      width: 100%
-      height: 100%
-      position: relative // Necessary so that the viewportOverlay is on top of the viewports
+  width: 100%
@@ -25,6 +25,11 @@ function loadSeriesIntoViewport(data, templateData) {
    var viewportIndex = $('.imageViewerViewport').index(element);

    layoutManager = layoutManager || window.layoutManager;
+    layoutManager.viewportData = layoutManager.viewportData || {};
+    if (layoutManager.viewportData[viewportIndex] === undefined) {
+    	layoutManager.viewportData[viewportIndex] = {};	
+    }
+
    layoutManager.viewportData[viewportIndex].viewportIndex = viewportIndex;

    // Get the contentID of the current worklist tab, if the viewport is running
@@ -1,6 +1,9 @@
 Template.viewerMain.onCreated(() => {
    // Attach the Window resize listener
    $(window).on('resize', handleResize);
+
+    // Create the synchronizer used to update reference lines
+    OHIF.viewer.updateImageSynchronizer = new cornerstoneTools.Synchronizer('CornerstoneNewImage', cornerstoneTools.updateImageSynchronizer);
 });

 Template.viewerMain.onRendered(() => {
@@ -21,6 +24,6 @@ Template.viewerMain.onDestroyed(() => {
    // Remove the Window resize listener
    $(window).off('resize', handleResize);

-    // Destory the synchronizer used to update reference lines
+    // Destroy the synchronizer used to update reference lines
    OHIF.viewer.updateImageSynchronizer.destroy();
 });
@@ -7,11 +7,22 @@
  #layoutManagerTarget
    width: 100%
    height: 100%
-
    transition(all 0.3s ease)

    #imageViewerViewports
-      .viewportContainer:not(:last-child)
+      .viewportContainer
+        float: left
+        border: $viewportBorderThickness solid $viewportBorderColor
+
+        &:hover
+          border: $viewportBorderThickness solid $viewportBorderColorHover
+          
+        &.active, &:hover.active
+          border: $viewportBorderThickness solid $viewportBorderColorActive
+
        .removable
-          .imageViewerViewport
-            border-right: $uiBorderThickness solid #436270
+          width: 100%
+          height: 100%
+          position: relative // Necessary so that the viewportOverlay is on top of the viewports
+
+
@@ -11,13 +11,13 @@
            <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
        </div>
        <div class="bottomright dicomTag">
-            <div>Zoom: {{formatNumberPrecision zoom 2}}%</div>
+            <div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 2}}%{{/if}}</div>
            <div>{{compression}}</div>
            <div>{{wwwc}}</div>
        </div>
        <div class="bottomleft dicomTag">
-            <div>Ser: {{seriesNumber}}</div>
-            <div>Img: {{imageNumber}} ({{imageIndex}}/{{numImages}})</div>
+            <div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
+            <div>{{#if numImages}}Img: {{imageNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
            <div>{{#if frameRate}}{{frameRate}} FPS{{/if}}</div>
            <div>{{imageDimensions}}</div>
            <div>{{seriesDescription}}</div>
@@ -33,12 +33,12 @@
            <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
        </div>
        <div class="bottomright dicomTag">
-            <div>Ser: {{seriesNumber}}</div>
-            <div>Img: {{imageNumber}} ({{imageIndex}}/{{numImages}})</div>
+            <div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
+            <div>{{#if numImages}}Img: {{imageNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
            <div>{{#if frameRate}}{{frameRate}} FPS{{/if}}</div>
            <div>{{imageDimensions}}</div>
            <div>{{seriesDescription}}</div>
-            <div>Zoom: {{formatNumberPrecision zoom 2}}%</div>
+            <div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 2}}%{{/if}}</div>
            <div>{{compression}}</div>
            <div>{{wwwc}}</div>
        </div>
@@ -53,12 +53,12 @@
            <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
        </div>
        <div class="bottomleft dicomTag">
-            <div>Ser: {{seriesNumber}}</div>
-            <div>Img: {{imageNumber}} ({{imageIndex}}/{{numImages}})</div>
+            <div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
+            <div>{{#if numImages}}Img: {{imageNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
            <div>{{#if frameRate}}{{frameRate}} FPS{{/if}}</div>
            <div>{{imageDimensions}}</div>
            <div>{{seriesDescription}}</div>
-            <div>Zoom: {{formatNumberPrecision zoom 2}}%</div>
+            <div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 2}}%{{/if}}</div>
            <div>{{compression}}</div>
            <div>{{wwwc}}</div>
        </div>
@@ -133,12 +133,12 @@ Template.viewportOverlay.helpers({
        Session.get('CornerstoneImageRendered' + this.viewportIndex);
        var element = getElementIfNotEmpty(this.viewportIndex);
        if (!element) {
-            return '';
+            return;
        }

        var viewport = cornerstone.getViewport(element);
        if (!viewport) {
-            return '';
+            return;
        }

        return (viewport.scale * 100.0);