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

[WIP] Hanging Protocol: improving protocol engine to use OHIFError object

Browse Source
This commit is contained in:
Eloízio Salgado committed 2017-03-02 10:16:09 -03:00
1 parent 638c3df924
commit 6973cd4ec8
3 files changed
+123 -79
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Packages/ohif-hanging-protocols/client/protocolEngine.js
+2 -1
View File
@@ -665,7 +665,8 @@ HP.ProtocolEngine = class ProtocolEngine {
}
if (!currentViewportData.displaySetInstanceUid) {
throw new Meteor.Error('No matching display set found?');
//@TODO: make OHIFError use Meteor.Error instead of simple Error()
throw new OHIF.viewerbase.OHIFError('ProtocolEngine::updateViewports No matching display set found?');
}
viewportData.push(currentViewportData);
Packages/ohif-viewerbase/client/components/viewer/viewerMain/viewerMain.js
-78
View File
@@ -33,84 +33,6 @@ Template.viewerMain.onRendered(() => {
OHIF.viewerbase.layoutManager = new LayoutManager(parentElement, studies);
// @TODO: move this logic to the viewers to break dependency of ohif-hanging-protocols package and avoid circurlar dependencies
// HP.ProtocolStore.onReady(() => {
// const { studies, currentTimepointId, measurementApi, timepointIds } = instance.data;
// // Default actions for Associated Studies
// if(currentTimepointId) {
// // Follow-up studies: same as the first measurement in the table
// // Baseline studies: target-tool
// if(studies[0]) {
// let activeTool;
// // In follow-ups, get the baseline timepointId
// const timepointId = timepointIds.find(id => id !== currentTimepointId);
// // Follow-up studies
// if(studies[0].timepointType === 'followup' && timepointId) {
// const measurementTools = OHIF.measurements.MeasurementApi.getConfiguration().measurementTools;
// // Create list of measurement tools
// const measurementTypes = measurementTools.map(
// tool => {
// const { id, cornerstoneToolType } = tool;
// return {
// id,
// cornerstoneToolType
// }
// }
// );
// // Iterate over each measurment tool to find the first baseline
// // measurment. If so, stops the loop and prevent fetching from all
// // collections
// measurementTypes.every(({id, cornerstoneToolType}) => {
// // Get measurement
// if(measurementApi[id]) {
// const measurement = measurementApi[id].findOne({ timepointId });
// // Found a measurement, save tool and stop loop
// if(measurement) {
// activeTool = cornerstoneToolType;
// return false;
// }
// }
// return true;
// });
// }
// // If not set, for associated studies default is target-tool
// toolManager.setActiveTool(activeTool || 'bidirectional');
// }
// // Toggle Measurement Table
// if(instance.data.state) {
// instance.data.state.set('rightSidebar', 'measurements');
// }
// }
// // Hide as default for single study
// else {
// if(instance.data.state) {
// instance.data.state.set('rightSidebar', null);
// }
// }
// if (OHIF.viewer.isProtocolEngineDisabled === true) {
// OHIF.viewerbase.layoutManager.updateViewports();
// } else {
// // updateViewports method from current layout manager will be automatically called by the protocol engine;
// const studyMetadataList = OHIF.viewer.StudyMetadataList.all();
// const layoutManager = OHIF.viewerbase.layoutManager;
// const studyMetadataSource = new NucleusStudyMetadataSource;
// ProtocolEngine = new HP.ProtocolEngine(layoutManager, studyMetadataList, [], studyMetadataSource);
// HP.setEngine(ProtocolEngine);
// }
// Session.set('ViewerMainReady', Random.id());
// });
// Enable hotkeys
hotkeyUtils.enableHotkeys();