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

LT-297: Fixing rendering position for rename and making rename real time on database

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-11-10 15:51:34 -02:00 committed by Erik Ziegler
parent 5c36074f8a
commit 998cdce9fb
2 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Packages/ohif-measurements/client/components/measureFlow/measureFlow.js
View File

@ -83,7 +83,10 @@ Template.measureFlow.onRendered(() => {
instance.$('.btn-add').focus(); instance.$('.btn-add').focus();
if (instance.data.autoClick) { if (instance.data.autoClick) {
instance.$('.btn-add').hide().trigger('click'); instance.$('.btn-add').hide().trigger('click', {
clientX: instance.data.position.x,
clientY: instance.data.position.Y
});
} }
}); });
@ -100,11 +103,19 @@ Template.measureFlow.events({
// Wait template rerender before rendering the selectTree // Wait template rerender before rendering the selectTree
Tracker.afterFlush(() => { Tracker.afterFlush(() => {
// Get the click position // Get the click or rendering position
const position = { let position;
left: event.clientX, if (_.isUndefined(event.clientX)) {
top: event.clientY, position = {
}; left: instance.data.position.x,
top: instance.data.position.y,
};
} else {
position = {
left: event.clientX,
top: event.clientY,
};
}
// Define the data for selectTreeComponent // Define the data for selectTreeComponent
const data = { const data = {
@ -235,6 +246,8 @@ Template.measureFlow.events({
// Reset the flag to avoid wrong positioning when clicking normal labels again // Reset the flag to avoid wrong positioning when clicking normal labels again
instance.commonClicked = false; instance.commonClicked = false;
instance.data.updateCallback(instance.value.value, instance.description.get());
}); });
// Wait the fade-out transition and remove the selectTree component // Wait the fade-out transition and remove the selectTree component
@ -262,8 +275,6 @@ Template.measureFlow.events({
'close .measure-flow'(event, instance) { 'close .measure-flow'(event, instance) {
const $measureFlow = $(event.currentTarget); const $measureFlow = $(event.currentTarget);
$measureFlow.one('animationend', () => { $measureFlow.one('animationend', instance.data.doneCallback).addClass('fadeOut');
instance.data.doneCallback(instance.value.value, instance.description.get());
}).addClass('fadeOut');
} }
}); });

9
Packages/ohif-measurements/client/lib/toggleLabelButton.js
View File

@ -31,11 +31,8 @@ OHIF.measurements.toggleLabelButton = options => {
threeColumns: true, threeColumns: true,
hideCommon: true, hideCommon: true,
autoClick: options.autoClick, autoClick: options.autoClick,
doneCallback(location, description) { doneCallback: removeButtonView,
if (_.isFunction(options.callback)) { updateCallback(location, description) {
options.callback(options, location, description);
}
toolCollection.update({ toolCollection.update({
measurementNumber: measurement.measurementNumber, measurementNumber: measurement.measurementNumber,
toolType: measurement.toolType, toolType: measurement.toolType,
@ -48,8 +45,6 @@ OHIF.measurements.toggleLabelButton = options => {
}, { }, {
multi: true multi: true
}); });
removeButtonView();
} }
}; };
const view = Blaze.renderWithData(Template.measureFlow, data, options.element); const view = Blaze.renderWithData(Template.measureFlow, data, options.element);