Implementing image download dialog behaviors

This commit is contained in:
Bruno Alves de Faria 2018-01-17 13:59:07 -02:00
parent 56093a9d68
commit 98480d134b
11 changed files with 190 additions and 219 deletions

View File

@ -26,6 +26,7 @@ import './form/link.html';
import './input/checkbox.html';
import './input/hidden.html';
import './input/groupRadio.html';
import './input/number.html';
import './input/password.html';
import './input/radio.html';
import './input/range.html';

View File

@ -0,0 +1,14 @@
<template name="inputNumber">
{{#baseComponent (extend this
base='baseInput'
type='number'
class=(concat 'form-control ' this.class)
mixins=(concat 'input ' this.mixins)
wrappers=(concat ''
(valueIf reactive this.label 'wrapperLabel ' '')
this.wrappers
)
)}}
{{>UI.contentBlock}}
{{/baseComponent}}
</template>

View File

@ -65,7 +65,7 @@ OHIF.ui.showDialog = (templateName, dialogData={}) => {
$body.off('ohif.navigated', navigationHandler);
};
promise.then(dismissModal).catch(dismissModal);
promise.then(() => dismissModal(false)).catch(() => dismissModal(false));
// Dismiss the modal if navigation occurs and it should not be kept opened
if (!dialogData.keepOpenOnNavigation) {

View File

@ -15,7 +15,7 @@ label.wrapperLabel:not(.checkboxLabel)
.form-themed
.btn, input[type=text], input[type=password]
.btn, input[type=text], input[type=password], input[type=number]
&[disabled], &.disabled
@ -28,7 +28,7 @@ label.wrapperLabel:not(.checkboxLabel)
theme('color', '$textPrimaryColor')
cursor: auto
input[type=text], input[type=password]
input[type=text], input[type=password], input[type=number]
theme('background-color', '$uiGray')
theme('border-color', '$uiBorderColor')
theme('color', '$textPrimaryColor')

View File

@ -149,3 +149,6 @@ body .select2-container--default .select2-results>.select2-results__options
.flex-grow
flex-grow: 1
.nowrap
white-space: nowrap

View File

@ -0,0 +1,15 @@
import { OHIF } from 'meteor/ohif:core';
OHIF.viewerbase.getImageDownloadDialogAnnotationTools = () => {
const { measurementTools } = OHIF.measurements.MeasurementApi.getConfiguration();
const resultSet = new Set();
Object.values(measurementTools).forEach(toolGroup => {
toolGroup.childTools.forEach(tool => {
if (tool.childTools) return;
resultSet.add(tool.cornerstoneToolType);
});
});
return Array.from(resultSet);
};

View File

@ -1,4 +1,5 @@
import './bidirectionalTool';
import './imageDownload.js';
import './nonTargetTool.js';
import './scaleOverlayTool.js';
import './deleteLesionKeyboardTool.js';

View File

@ -4,7 +4,8 @@
class='themed'
dialogClass='modal-lg'
formClass='form-themed'
confirmLabel='Download'
confirmLabel='Download Image'
confirmCallback=instance.getConfirmCallback
cancelLabel='Cancel'
id='imageDownloadDialog'
schema=instance.schema
@ -16,8 +17,8 @@
<table class="full-width">
<tbody>
<tr>
<td class="text-right p-r-1">Width</td>
<td>{{>inputText key='width'}}</td>
<td class="text-right p-r-1 nowrap">Image width (px)</td>
<td>{{>inputNumber key='width' min="1" max="16384"}}</td>
<td class="p-l-1" rowspan="2">
<button class="btn btn-secondary js-keep-aspect {{#if keepAspect}}active{{/if}}" title="Keep aspect ratio">
<i class="fa fa-chain{{#unless keepAspect}}-broken{{/unless}}"></i>
@ -25,8 +26,8 @@
</td>
</tr>
<tr>
<td class="text-right p-r-1">Height</td>
<td>{{>inputText key='height'}}</td>
<td class="text-right p-r-1 nowrap">Image height (px)</td>
<td>{{>inputNumber key='height' min="1" max="16384"}}</td>
</tr>
</tbody>
</table>
@ -40,56 +41,32 @@
</tr>
<tr>
<td class="text-right p-r-1">File type</td>
<td>{{>inputSelect key='type'}}</td>
<td>{{>inputSelect key='type' hideSearch=true}}</td>
</tr>
</tbody>
</table>
</div>
<div class="col-lg-3">{{>inputCheckbox key='showAnnotations'}}</div>
<div class="col-lg-3">
<table class="full-width">
<tbody>
<tr>
<td class="text-right" colspan="2">{{>inputCheckbox key='showAnnotations'}}</td>
</tr>
{{#if showQuality}}
<tr>
<td class="text-right p-r-1 nowrap">Image quality (%)</td>
<td>{{>inputNumber key='quality' min="1" max="100"}}</td>
</tr>
{{/if}}
</tbody>
</table>
</div>
</div>
</div>
<div class="viewport-element hidden"></div>
<img class="viewport-preview" />
<div class="image-preview card-round m-t-2 text-center">
<h4 class="m-t-0">Image Preview</h4>
<img class="viewport-preview" />
</div>
{{/dialogForm}}
<!--
<dialog id="downloadDialog">
{{#form id='downloadDialogForm' schema=instance.schema api=instance.api}}
<div class="instructions">Please specify the dimensions, filename, and desired type for the output image.</div>
<div class="form-group row">
<div class="col-sm-8">
<div class="input-group">
<input type="text" id="fileName" class="form-control fileName" aria-label="File name input">
<div class="input-group-btn">
<button type="button" class="btn btn-secondary dropdown-toggle extension" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">png</button>
<div class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="#">png</a>
<a class="dropdown-item" href="#">jpeg</a>
</div>
</div>
</div>
</div>
<div class="form-check col-sm-4">
<label class="form-check-label">
<input type="checkbox" class="form-check-input"> Show Annotations
</label>
</div>
</div>
<div class="form-group row">
<label for="width" class="col-sm-2 col-form-label">Width (px):</label>
<div class="col-sm-4">
<input type="number" name="width" id="width" class="form-control" value="300"/>
</div>
<label for="height" class="col-sm-2 col-form-label">Height (px):</label>
<div class="col-sm-4">
<input type="number" name="height" id="height" class="form-control" value="200"/>
</div>
</div>
<div id="previewElement"></div>
<div class="form-group button-holder row">
<button class="btn btn-danger col-sm-offset-2 col-sm-3 cancel">cancel</button>
<button class="btn btn-primary col-sm-offset-2 col-sm-3 download">download</button>
</div>
{{/form}}
</dialog>
-->
</template>

View File

@ -1,10 +1,15 @@
import { Template } from 'meteor/templating';
import { Tracker } from 'meteor/tracker';
import { ReactiveVar } from 'meteor/reactive-var';
import { Session } from 'meteor/session';
import { $ } from 'meteor/jquery';
import { SimpleSchema } from 'meteor/aldeed:simple-schema';
import { OHIF } from 'meteor/ohif:core';
import { cornerstone } from 'meteor/ohif:cornerstone';
import { cornerstone, cornerstoneTools } from 'meteor/ohif:cornerstone';
OHIF.viewerbase.getImageDownloadDialogAnnotationTools = () => {
return ['length', 'probe', 'simpleAngle', 'arrowAnnotate', 'ellipticalRoi', 'rectangleRoi'];
};
Template.imageDownloadDialog.onCreated(() => {
const instance = Template.instance();
@ -25,19 +30,30 @@ Template.imageDownloadDialog.onCreated(() => {
showAnnotations: {
type: Boolean,
label: 'Show Annotations',
defaultValue: false
defaultValue: true
},
quality: {
type: Number,
defaultValue: 100
}
});
instance.changeObserver = new Tracker.Dependency();
instance.keepAspect = new ReactiveVar(true);
instance.showAnnotations = new ReactiveVar(false);
instance.lastImage = {};
instance.getConfirmCallback = () => () => {
instance.downloadImage();
};
});
Template.imageDownloadDialog.onRendered(() => {
const instance = Template.instance();
const { viewportUtils } = OHIF.viewerbase;
instance.quality = 1;
instance.$viewportElement = instance.$('.viewport-element');
instance.viewportElement = instance.$viewportElement[0];
instance.$viewportPreview = instance.$('.viewport-preview');
@ -53,14 +69,22 @@ Template.imageDownloadDialog.onRendered(() => {
canvas[size] = value;
canvas.style[size] = `${value}px`;
instance.form.item(size).value(value);
instance.form.item(size).$element.val(value);
};
instance.toggleAnnotations = toggle => {
const action = toggle ? 'enable' : 'disable';
const annotationTools = OHIF.viewerbase.getImageDownloadDialogAnnotationTools();
annotationTools.forEach(tool => cornerstoneTools[tool][action](instance.viewportElement));
};
instance.updateViewportPreview = () => {
instance.$viewportElement.one('CornerstoneImageRendered', (event, enabledElement) => {
const formData = instance.form.value();
const image = instance.viewportPreview;
const type = 'image/' + instance.form.item('type').value();
const dataUrl = instance.downloadCanvas.toDataURL(type, instance.quality);
const type = 'image/' + formData.type;
const quality = formData.type === 'png' ? 1 : formData.quality / 100;
const dataUrl = instance.downloadCanvas.toDataURL(type, quality);
image.src = dataUrl;
const $element = $(enabledElement.element);
@ -77,13 +101,30 @@ Template.imageDownloadDialog.onRendered(() => {
});
};
// TODO: Add quality parameter to cornerstoneTools' saveAs method
instance.downloadImage = () => {
const formData = instance.form.value();
const link = document.createElement('a');
link.download = `${formData.name}.${formData.type}`;
link.href = instance.viewportPreview.src;
// Create a 'fake' click event to trigger the download
if (document.createEvent) {
const event = document.createEvent('MouseEvents');
event.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
link.dispatchEvent(event);
} else if (link.fireEvent) {
link.fireEvent('onclick');
}
};
instance.autorun(() => {
instance.changeObserver.depend();
Session.get('UpdateDownloadViewport');
const activeViewport = viewportUtils.getActiveViewportElement();
if (activeViewport) {
const enabledElement = cornerstone.getEnabledElement(activeViewport);
const { width, height } = enabledElement.image;
const viewport = Object.assign({}, enabledElement.viewport);
delete viewport.scale;
@ -93,140 +134,83 @@ Template.imageDownloadDialog.onRendered(() => {
};
cornerstone.loadImage(enabledElement.image.imageId).then(image => {
cornerstone.displayImage(instance.viewportElement, image);
cornerstone.setViewport(instance.viewportElement, viewport);
cornerstone.resize(instance.viewportElement, true);
instance.lastImage = image;
const { viewportElement, downloadCanvas } = instance;
const formData = instance.form.value();
instance.setElementSize(instance.viewportElement, instance.downloadCanvas, 'width', width);
instance.setElementSize(instance.viewportElement, instance.downloadCanvas, 'height', height);
cornerstone.displayImage(viewportElement, image);
cornerstone.setViewport(viewportElement, viewport);
cornerstone.resize(viewportElement, true);
cornerstone.fitToWindow(instance.viewportElement);
instance.toggleAnnotations(formData.showAnnotations);
const width = Math.min(formData.width || image.width, 16384);
const height = Math.min(formData.height || image.height, 16384);
instance.setElementSize(viewportElement, downloadCanvas, 'width', width);
instance.setElementSize(viewportElement, downloadCanvas, 'height', height);
cornerstone.fitToWindow(viewportElement);
instance.updateViewportPreview();
});
}
});
});
Template.imageDownloadDialog.helpers({
keepAspect() {
return Template.instance().keepAspect.get();
}
});
Template.imageDownloadDialog.events({
'click .js-keep-aspect'(event, instance) {
const currentState = instance.keepAspect.get();
instance.keepAspect.set(!currentState);
instance.$('[data-key=width]').trigger('input');
},
'change [data-key=showAnnotations], change [data-key=type]'(event, instance) {
instance.changeObserver.changed();
},
'input [data-key=quality]'(event, instance) {
instance.changeObserver.changed();
},
'input [data-key=width]'(event, instance) {
const { viewportElement, downloadCanvas } = instance;
const formData = instance.form.value();
const { width, height } = instance.lastImage;
const newWidth = formData.width;
instance.setElementSize(viewportElement, downloadCanvas, 'width', newWidth);
if (instance.keepAspect.get()) {
const multiplier = newWidth / width;
const newHeight = Math.round(height * multiplier);
instance.setElementSize(viewportElement, downloadCanvas, 'height', newHeight);
}
instance.changeObserver.changed();
},
'input [data-key=height]'(event, instance) {
const { viewportElement, downloadCanvas } = instance;
const formData = instance.form.value();
const { width, height } = instance.lastImage;
const newHeight = formData.height;
instance.setElementSize(viewportElement, downloadCanvas, 'height', newHeight);
if (instance.keepAspect.get()) {
const multiplier = newHeight / height;
const newWidth = Math.round(width * multiplier);
instance.setElementSize(viewportElement, downloadCanvas, 'width', newWidth);
}
instance.changeObserver.changed();
}
});
// import { Template } from 'meteor/templating';
// import { Session } from 'meteor/session';
// import { OHIF } from 'meteor/ohif:core';
// import { cornerstone, cornerstoneTools } from 'meteor/ohif:cornerstone';
//
// function setElementSize(element, canvas, size, value) {
// $(element)[size](value);
// canvas[size] = value;
// canvas.style[size] = `${value}px`;
// }
//
// Template.imageDownloadDialog.onCreated(() => {
// const instance = Template.instance();
// const { viewportUtils } = OHIF.viewerbase;
//
// instance.autorun(() => {
// Session.get('UpdateDownloadViewport');
// const activeViewport = viewportUtils.getActiveViewportElement();
//
// if (activeViewport) {
// const enabledElement = cornerstone.getEnabledElement(activeViewport);
//
// cornerstone.loadImage(enabledElement.image.imageId).then(function(image) {
// cornerstone.displayImage(instance.$previewElement, image);
// cornerstone.displayImage(instance.$downloadElement, image);
// cornerstone.resize(instance.$previewElement, true);
//
// setElementSize(instance.$downloadElement, instance.$downloadCanvas, 'width', 300);
// setElementSize(instance.$downloadElement, instance.$downloadCanvas, 'height', 200);
//
// cornerstone.fitToWindow(instance.$downloadElement);
// });
// }
// });
// });
//
// Template.imageDownloadDialog.onRendered(() => {
// const instance = Template.instance();
// const $dialog = instance.$('#imageDownloadDialog');
//
// instance.$previewElement = $('#previewElement')[0];
// instance.$downloadElement = document.createElement('div');
// instance.availableTools = ['length', 'probe', 'simpleAngle', 'arrowAnnotate', 'ellipticalRoi', 'rectangleRoi'];
// instance.showAnnotations = false;
//
// cornerstone.enable(instance.$previewElement);
// cornerstone.enable(instance.$downloadElement);
// instance.$downloadCanvas = $(instance.$downloadElement).find('canvas')[0];
//
// // Make the dialog bounded and draggable
// $dialog.draggable({ defaultElementCursor: 'move' });
//
// // Polyfill for older browsers
// dialogPolyfill.registerDialog($dialog.get(0));
//
// // // Prevent dialog from being dragged when user clicks any button
// const $controls = $dialog.find('.form-group, .instructions');
// $controls.on('mousedown touchstart', event => event.stopPropagation());
// });
//
// Template.imageDownloadDialog.events({
// 'change .form-group input[name=width]'(event, instance){
// const width = $(event.currentTarget).val();
//
// setElementSize(instance.$downloadElement, instance.$downloadCanvas, 'width', width);
// cornerstone.fitToWindow(instance.$downloadElement);
// },
//
// 'change .form-group input[name=height]'(event, instance){
// const height = $(event.currentTarget).val();
//
// setElementSize(instance.$downloadElement, instance.$downloadCanvas, 'height', height);
// cornerstone.fitToWindow(instance.$downloadElement);
// },
//
// 'change #imageDownloadDialog .form-group .form-check input[type=checkbox]'(event, instance) {
// const $previewElement = instance.$previewElement;
// const $downloadElement = instance.$downloadElement;
//
// instance.showAnnotations = !instance.showAnnotations;
//
// const action = (instance.showAnnotations) ? 'enable' : 'disable';
//
// instance.availableTools.forEach(tool => {
// cornerstoneTools[tool][action]($previewElement);
// cornerstoneTools[tool][action]($downloadElement);
// });
// },
//
// 'click .dropdown-menu .dropdown-item'(event, instance) {
// const extension = $(event.currentTarget).text();
// const $extensionButton = $('.btn.extension');
//
// $extensionButton.text(extension);
// },
//
// 'click button.download'(event, instance) {
// const fileName = $('.fileName').val();
// const extension = $('.btn.extension').text().trim();
//
// if (!fileName || !extension) return;
//
// cornerstoneTools.saveAs(instance.$downloadElement, `${fileName}.${extension}`, `image/${extension}`);
// },
//
// 'click button.cancel'(event, instance) {
// const { viewportUtils } = OHIF.viewerbase;
// viewportUtils.toggleDownloadDialog();
// }
// });
Template.imageDownloadDialog.helpers({
keepAspect() {
return Template.instance().keepAspect.get();
},
showQuality() {
const instance = Template.instance();
instance.changeObserver.depend();
if (!instance.form) return true;
return instance.form.item('type').value() === 'jpeg';
}
});

View File

@ -1,43 +1,14 @@
@import "{ohif:design}/app"
@require '{ohif:design}/app'
#imageDownloadDialog
.image-preview
display: table
margin: 0 auto
h3
white-space: nowrap
.viewport-preview
max-width: 512px
max-height: 512px
.instructions
margin-bottom: 20px
text-align: center
.extension
color: #000000
background-color: #888
.col-form-label
margin-top: 5px
.dropdown-menu .dropdown-item
display: block;
width: 100%;
padding: 3px 1.5rem;
clear: both;
font-weight: 400;
color: #292b2c;
text-align: inherit;
white-space: nowrap;
background: 0 0;
border: 0;
#previewElement, #downloadElement
width: 300px
height: 200px
margin: 0 auto
#downloadElement
display: none
.button-holder
margin-top: 15px

View File

@ -229,7 +229,12 @@ const toggleCineDialog = () => {
const toggleDownloadDialog = () => {
stopActiveClip();
OHIF.ui.showDialog('imageDownloadDialog');
const $dialog = $('#imageDownloadDialog');
if ($dialog.length) {
$dialog.find('.close:first').click();
} else {
OHIF.ui.showDialog('imageDownloadDialog');
}
};
const isDownloadEnabled = () => {