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

Fix hanging protocol stage bugs

Browse Source
This commit is contained in:
Evren Ozkan 2017-05-11 11:01:08 -04:00
parent 1a0cd03abd
commit 6b87b3aff3
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Packages/ohif-hanging-protocols/client/components/stageSortable/stageSortable.js
View File

@ -155,7 +155,7 @@ Template.stageSortable.events({
var stageIndex = getStageIndex(ProtocolEngine.protocol, this.id); var stageIndex = getStageIndex(ProtocolEngine.protocol, this.id);
// Display the selected stage // Display the selected stage
ProtocolEngine.setCurrentProtocolStage(stageIndex); ProtocolEngine.setCurrentProtocolStage(stageIndex - ProtocolEngine.stage);
}, },
/** /**
* Creates a new stage and adds it to the currently loaded Protocol at * Creates a new stage and adds it to the currently loaded Protocol at
@ -177,11 +177,8 @@ Template.stageSortable.events({
// Append the new stage the list of new stage IDs, so we can label it properly // Append the new stage the list of new stage IDs, so we can label it properly
ProtocolEngine.newStageIds.push(newStage.id); ProtocolEngine.newStageIds.push(newStage.id);
// Calculate the index of the last stage in the display set sequence // Switch to the next stage in the display set sequence
var stageIndex = ProtocolEngine.protocol.stages.length - 1; ProtocolEngine.setCurrentProtocolStage(1);
// Switch to the last stage in the display set sequence
ProtocolEngine.setCurrentProtocolStage(stageIndex);
}, },
/** /**
* Deletes a stage from the currently loaded Protocol by removing it from * Deletes a stage from the currently loaded Protocol by removing it from
@ -201,7 +198,7 @@ Template.stageSortable.events({
text: 'Are you sure you would like to remove this Protocol Stage? This cannot be reversed.' text: 'Are you sure you would like to remove this Protocol Stage? This cannot be reversed.'
}; };
showConfirmDialog(function() { OHIF.viewerbase.dialogUtils.showConfirmDialog(function() {
// Retrieve the index of this stage in the display set sequences // Retrieve the index of this stage in the display set sequences
var stageIndex = getStageIndex(ProtocolEngine.protocol, stageId); var stageIndex = getStageIndex(ProtocolEngine.protocol, stageId);
@ -210,11 +207,8 @@ Template.stageSortable.events({
// If we have removed the currently active stage, switch to the one before it // If we have removed the currently active stage, switch to the one before it
if (ProtocolEngine.stage === stageIndex) { if (ProtocolEngine.stage === stageIndex) {
// Make sure we don't try to switch to a stage index below zero // Display the previous stage
var newStageIndex = Math.max(stageIndex - 1, 0); ProtocolEngine.setCurrentProtocolStage(-1);
// Display the new stage
ProtocolEngine.setCurrentProtocolStage(newStageIndex);
} }
// Update the Session variable to the UI re-renders // Update the Session variable to the UI re-renders