fix(merge) Fixes after merging various changes

This commit is contained in:
Erik Ziegler committed 2018-07-12 15:22:07 +02:00
1 parent 589be952b7
commit 4279396f9f
18 files changed
+2179 -8674

No files matched your search

File diff suppressed because it is too large. Load diff
+1 -4
View File
@@ -1,8 +1,5 @@
import Hammer from 'hammerjs';
// TODO: [PWV-379] delete local cornerstone.js and switch back to the npm library after
// merging https://github.com/cornerstonejs/cornerstone/pull/2
// import * as cornerstone from 'cornerstone-core/dist/cornerstone.js';
import * as cornerstone from './cornerstone.js';
import * as cornerstone from 'cornerstone-core/dist/cornerstone.js';
import * as cornerstoneMath from 'cornerstone-math/dist/cornerstoneMath.js';
import * as cornerstoneTools from 'cornerstone-tools/dist/cornerstoneTools.js';
import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader/dist/cornerstoneWADOImageLoader.js';
@@ -83,3 +83,5 @@ organGroups.forEach(function(organGroup) {
isNodal: isNodal
});
});
export { LesionLocations };
@@ -276,12 +276,7 @@ Template.studylistResult.onRendered(() => {
}
}).data('daterangepicker');
if (startDate && endDate) {
instance.datePicker.updateInputText();
} else {
// Retrieve all studies
search();
}
search();
});
Template.studylistResult.onDestroyed(() => {
@@ -1,4 +1,4 @@
@require '{ohif:design}/app'
@import "{ohif:design}/app"
.thumbnailEntry.active .imageThumbnail
theme('border-color', '$activeColor')