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

Fixing minor issues on OHIF Viewer

Browse Source
This commit is contained in:
Bruno Alves de Faria 2017-03-29 17:14:57 -03:00
parent 0cd4714f1a
commit 2cde0fea76
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OHIFViewer/client/components/toolbarSection/toolbarSection.js
View File

@ -233,7 +233,7 @@ Template.toolbarSection.onRendered(function() {
instance.$('#layout').dropdown(); instance.$('#layout').dropdown();
if (OHIF.uiSettings.displayEchoUltrasoundWorkflow) { if (OHIF.uiSettings.displayEchoUltrasoundWorkflow) {
toggleCineDialog(); OHIF.viewerbase.viewportUtils.toggleCineDialog();
} }
// Set disabled/enabled tool buttons that are set in toolManager // Set disabled/enabled tool buttons that are set in toolManager
@ -241,7 +241,7 @@ Template.toolbarSection.onRendered(function() {
const disabledToolButtons = states.disabledToolButtons; const disabledToolButtons = states.disabledToolButtons;
const allToolbarButtons = $('#toolbar').find('button'); const allToolbarButtons = $('#toolbar').find('button');
if (disabledToolButtons && disabledToolButtons.length > 0) { if (disabledToolButtons && disabledToolButtons.length > 0) {
for (var i = 0; i < allToolbarButtons.length; i++) { for (let i = 0; i < allToolbarButtons.length; i++) {
const toolbarButton = allToolbarButtons[i]; const toolbarButton = allToolbarButtons[i];
$(toolbarButton).prop('disabled', false); $(toolbarButton).prop('disabled', false);

2
OHIFViewer/client/components/toolbarSection/toolbarSection.styl
View File

@ -1,4 +1,4 @@
@import "{ohif:design}/app" @require '{ohif:design}/app'
.toolbarSection .toolbarSection
theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness) theme('border-bottom', '%s solid $uiBorderColor' % $uiBorderThickness)

16
OHIFViewer/client/config.js
View File

@ -3,15 +3,15 @@ import { OHIF } from 'meteor/ohif:core';
import { cornerstoneWADOImageLoader } from 'meteor/ohif:cornerstone'; import { cornerstoneWADOImageLoader } from 'meteor/ohif:cornerstone';
Meteor.startup(function() { Meteor.startup(function() {
const maxWebWorkers = Math.max(navigator.hardwareConcurrency - 1, 1); const maxWebWorkers = Math.max(navigator.hardwareConcurrency - 1, 1);
const config = { const config = {
maxWebWorkers: maxWebWorkers, maxWebWorkers: maxWebWorkers,
startWebWorkersOnDemand: true, startWebWorkersOnDemand: true,
webWorkerPath : OHIF.utils.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js'), webWorkerPath: OHIF.utils.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderWebWorker.es5.js'),
taskConfiguration: { taskConfiguration: {
'decodeTask' : { decodeTask: {
loadCodecsOnStartup : true, loadCodecsOnStartup: true,
initializeCodecsOnStartup: false, initializeCodecsOnStartup: false,
codecsPath: OHIF.utils.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js'), codecsPath: OHIF.utils.absoluteUrl('packages/ohif_cornerstone/public/js/cornerstoneWADOImageLoaderCodecs.es5.js'),
usePDFJS: false usePDFJS: false
} }
@ -19,4 +19,4 @@ Meteor.startup(function() {
}; };
cornerstoneWADOImageLoader.webWorkerManager.initialize(config); cornerstoneWADOImageLoader.webWorkerManager.initialize(config);
}); });

5
Packages/ohif-design/components/roundedButtonGroup/roundedButtonGroup.styl
View File

@ -8,7 +8,7 @@ $height = 25px
cursor: pointer cursor: pointer
display: inline-block display: inline-block
float: left float: left
margin-left: -1px margin-left: -2px
text-decoration: none text-decoration: none
text-align: center text-align: center
@ -28,8 +28,10 @@ $height = 25px
height: $height height: $height
line-height: $height line-height: $height
padding: 0 22px padding: 0 22px
position: relative
text-transform: uppercase text-transform: uppercase
transition: transition($sidebarTransition) transition: transition($sidebarTransition)
z-index: 1
svg svg
theme('fill', '$defaultColor') theme('fill', '$defaultColor')
@ -68,6 +70,7 @@ $height = 25px
theme('background-color', '$activeColor') theme('background-color', '$activeColor')
theme('border-color', '$uiBorderColorActive') theme('border-color', '$uiBorderColorActive')
theme('color', '$uiGrayDark') theme('color', '$uiGrayDark')
z-index: 2
&:hover .roundedButton &:hover .roundedButton
&.active .roundedButton &.active .roundedButton