TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LT-295 HUD menu should be closed whenever a case is closed.

Browse Source
This commit is contained in:
Emanuel F. Oliveira 2016-11-10 11:59:27 -02:00 committed by Erik Ziegler
parent 2cc7fcc846
commit 24d3c1bd8a
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LesionTracker/client/components/toolbarSection/toolbarSection.js
View File

@ -144,7 +144,7 @@ Template.toolbarSection.helpers({
}); });
Template.toolbarSection.events({ Template.toolbarSection.events({
'click #toggleHUD'() { 'click #toggleHUD'(event) {
const $this = $(event.currentTarget).find('#toggleHUD'); const $this = $(event.currentTarget).find('#toggleHUD');
// Stop here if the tool is disabled // Stop here if the tool is disabled
@ -155,7 +155,7 @@ Template.toolbarSection.events({
const state = Session.get('measurementTableHudOpen'); const state = Session.get('measurementTableHudOpen');
Session.set('measurementTableHudOpen', !state); Session.set('measurementTableHudOpen', !state);
}, },
'click #toggleTrial'() { 'click #toggleTrial'(event) {
const $this = $(event.currentTarget).find('#toggleHUD'); const $this = $(event.currentTarget).find('#toggleHUD');
// Stop here if the tool is disabled // Stop here if the tool is disabled

2
Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.html
View File

@ -1,5 +1,5 @@
<template name="measurementTableHUD"> <template name="measurementTableHUD">
<div id="measurementTableHUD" class="dialog-animated {{hudHidden}}"> <div id="measurementTableHUD" class="{{hudHidden}}">
<div class="header"> <div class="header">
<span>Measurements</span> <span>Measurements</span>
<svg class="buttonClose"> <svg class="buttonClose">

18
Packages/ohif-measurements/client/components/measurementTable/measurementTableHUD/measurementTableHUD.js
View File

@ -1,11 +1,19 @@
Template.measurementTableHUD.onCreated(() => { Template.measurementTableHUD.onCreated(() => {
const instance = Template.instance(); const instance = Template.instance();
instance.isRemoved = true;
if (instance.data.timepointApi) { if (instance.data.timepointApi) {
instance.data.timepoints = new ReactiveVar(instance.data.timepointApi.currentAndPrior()); instance.data.timepoints = new ReactiveVar(instance.data.timepointApi.currentAndPrior());
} }
}); });
Template.measurementTableHUD.onDestroyed(() => {
const instance = Template.instance();
instance.isRemoved = true;
Session.set('measurementTableHudOpen', false);
});
Template.measurementTableHUD.onRendered(() => { Template.measurementTableHUD.onRendered(() => {
const instance = Template.instance(); const instance = Template.instance();
instance.$('#measurementTableHUD').resizable().draggable(); instance.$('#measurementTableHUD').resizable().draggable();
@ -19,7 +27,15 @@ Template.measurementTableHUD.events({
Template.measurementTableHUD.helpers({ Template.measurementTableHUD.helpers({
hudHidden() { hudHidden() {
return Session.get('measurementTableHudOpen') ? 'dialog-open' : 'dialog-closed'; let instance = Template.instance(),
isOpen = Session.get('measurementTableHudOpen');
if (isOpen) {
instance.isRemoved = false;
return 'dialog-animated dialog-open';
}
return instance.isRemoved !== true ? 'dialog-animated dialog-closed' : 'hidden';
}, },
toolbarButtons() { toolbarButtons() {
let buttonData = []; let buttonData = [];