diff --git a/OHIFViewer/client/components/toolbarSection/toolbarSection.js b/OHIFViewer/client/components/toolbarSection/toolbarSection.js
index 1bf77f6aa..b96c7653c 100644
--- a/OHIFViewer/client/components/toolbarSection/toolbarSection.js
+++ b/OHIFViewer/client/components/toolbarSection/toolbarSection.js
@@ -121,9 +121,9 @@ Template.toolbarSection.helpers({
id: 'toggleCineDialog',
title: 'CINE',
classes: 'imageViewerCommand',
- iconClasses: 'fa fa-youtube-play'
+ iconClasses: 'fa fa-youtube-play',
+ disableFunction: hasMultipleFrames
});
-
}
buttonData.push({
diff --git a/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.html b/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.html
index a3233bbd5..d4e00b679 100644
--- a/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.html
+++ b/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.html
@@ -13,23 +13,23 @@
- {{#button action='cineFirst' title='Skip to first image'}}
+ {{#button action='cineFirst' title='Skip to first image' disabled=(buttonDisabled)}}
{{/button}}
- {{#button action='cinePrevious' title='Previous image'}}
+ {{#button action='cinePrevious' title='Previous image' disabled=(buttonDisabled)}}
{{/button}}
- {{#button action='cineToggle' title='Play / Stop' class=(valueIf isPlaying 'active' '')}}
+ {{#button action='cineToggle' title='Play / Stop' class=(valueIf isPlaying 'active' '') disabled=(buttonDisabled)}}
{{#if isPlaying}}
{{else}}
{{/if}}
{{/button}}
- {{#button action='cineNext' title='Next image'}}
+ {{#button action='cineNext' title='Next image' disabled=(buttonDisabled)}}
{{/button}}
- {{#button action='cineLast' title='Skip to last image'}}
+ {{#button action='cineLast' title='Skip to last image' disabled=(buttonDisabled)}}
{{/button}}
diff --git a/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.js b/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.js
index 71d3ff09a..50c38a1aa 100644
--- a/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.js
+++ b/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.js
@@ -251,6 +251,10 @@ Template.cineDialog.helpers({
return !OHIF.viewer.canMoveDisplaySets(isNext) ? 'disabled' : '';
},
+ buttonDisabled() {
+ return hasMultipleFrames();
+ },
+
getClassNames(baseCls) {
return baseCls + ' ' + (OHIF.uiSettings.displayEchoUltrasoundWorkflow ? 'single' : 'double') + '-row-style'
}
diff --git a/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.styl b/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.styl
index 16c3659ca..72c6fa927 100644
--- a/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.styl
+++ b/Packages/viewerbase/client/components/viewer/cineDialog/cineDialog.styl
@@ -27,6 +27,10 @@
&:active, &.active
theme('color', '$activeColor')
+
+ &[disabled]
+ &:hover
+ color: inherit
.cine-navigation, .cine-controls, .cine-options
cursor: default
diff --git a/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js b/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
index 765c2de54..acc7de1cf 100644
--- a/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
+++ b/Packages/viewerbase/client/components/viewer/imageViewerViewport/imageViewerViewport.js
@@ -216,12 +216,12 @@ function loadDisplaySetIntoViewport(data, templateData) {
var multiframeMetadata = instance.multiframeMetadata;
var cineToolData = {
loop: OHIF.viewer.cine.loop,
- framesPerSecond: multiframeMetadata.averageFrameRate || OHIF.viewer.cine.framesPerSecond
+ framesPerSecond: multiframeMetadata ? multiframeMetadata.averageFrameRate : OHIF.viewer.cine.framesPerSecond
};
cornerstoneTools.addToolState(element, 'playClip', cineToolData);
// Autoplay datasets that have framerates set
- if (multiframeMetadata.isMultiframeImage && multiframeMetadata.averageFrameRate > 0) {
+ if (multiframeMetadata && multiframeMetadata.isMultiframeImage && multiframeMetadata.averageFrameRate > 0) {
cornerstoneTools.playClip(element);
}
diff --git a/Packages/viewerbase/client/components/viewer/playClipButton/playClipButton.html b/Packages/viewerbase/client/components/viewer/playClipButton/playClipButton.html
index 5ec6b45fb..2cc9216a4 100644
--- a/Packages/viewerbase/client/components/viewer/playClipButton/playClipButton.html
+++ b/Packages/viewerbase/client/components/viewer/playClipButton/playClipButton.html
@@ -1,6 +1,6 @@