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

AWV-1: Clearing empty viewports labels

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-09-03 11:38:26 -03:00
parent e4dfd7c4bf
commit 54481cf716
4 changed files with 92 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Packages/lesiontracker/client/components/lesionTrackerViewportOverlay/lesionTrackerViewportOverlay.html
View File

@ -22,7 +22,7 @@
<div>{{seriesDescription}}</div> <div>{{seriesDescription}}</div>
</div> </div>
{{#if gt numImages 1}} {{#if gt numImages 1}}
{{> imageControls imageIndex=imageIndex numImages=numImages}} {{>imageControls imageIndex=imageIndex numImages=numImages}}
{{ /if }} {{/if}}
</div> </div>
</template> </template>

27
Packages/viewerbase/client/components/viewer/loadingIndicator/loadingIndicator.styl
View File

@ -8,29 +8,32 @@
.imageViewerErrorLoadingIndicator .imageViewerErrorLoadingIndicator
color: $uiYellow color: $uiYellow
p, h4 p, h4
text-align: center
padding: 4px 0 padding: 4px 0
text-align: center
word-wrap: break-word
p p
font-size: 11pt font-size: 11pt
.loadingIndicator .loadingIndicator
background-color: rgba(0,0,0,0.75)
display: none display: none
font-size: 18px
height: 100%
overflow: hidden
pointer-events: none // Necessary for click-through to cornerstone element below pointer-events: none // Necessary for click-through to cornerstone element below
position: absolute position: absolute
top: 0 top: 0
width: 100% width: 100%
height: 100%
font-size: 18px
z-index: 100 z-index: 100
background-color: rgba(0,0,0,0.75)
.indicatorContents .indicatorContents
position: absolute
top: 40%
width: 100%
font-size: 30px font-size: 30px
font-weight: 300 font-weight: 300
text-align: center position: absolute
text-align: center
top: 50%
transform(translateY(-50%))
width: 100%

135
Packages/viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.html
View File

@ -1,75 +1,76 @@
<template name="viewportOverlay"> <template name="viewportOverlay">
<div class="imageViewerViewportOverlay noselect {{#if gt numImages 1}}controlsVisible{{/if}}"> <div class="imageViewerViewportOverlay noselect {{#if gt numImages 1}}controlsVisible{{/if}}">
{{ #unless tagDisplaySpecified }} {{#unless tagDisplaySpecified}}
<div class="topleft dicomTag"> <div class="topleft dicomTag">
<div>{{formatPN patientName}}</div> <div>{{formatPN patientName}}</div>
<div>{{patientId}}</div> <div>{{patientId}}</div>
<div class='priorIndicator'>{{prior}}</div> <div class='priorIndicator'>{{prior}}</div>
</div>
<div class="topright dicomTag">
<div>{{studyDescription}}</div>
<div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
</div>
<div class="bottomright dicomTag">
<div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 0}}%{{/if}}</div>
<div>{{compression}}</div>
<div>{{wwwc}}</div>
</div>
<div class="bottomleft dicomTag">
<div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
<div>{{#if gt numImages 1}}Img: {{instanceNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
<div>{{#if frameRate}}{{frameRate}} FPS{{/if}}</div>
<div>{{imageDimensions}}</div>
<div>{{#if location}}Loc: {{location}} mm{{/if}}
{{#if thickness}}Thick: {{thickness}} mm{{/if}}
{{#if spacingBetweenSlices}}Spacing: {{spacingBetweenSlices}} mm{{/if}}
</div> </div>
<div>{{seriesDescription}}</div> <div class="topright dicomTag">
</div> <div>{{studyDescription}}</div>
{{ /unless }} <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
</div>
<div class="bottomright dicomTag">
<div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 0}}%{{/if}}</div>
<div>{{compression}}</div>
<div>{{wwwc}}</div>
</div>
<div class="bottomleft dicomTag">
<div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
<div>{{#if gt numImages 1}}Img: {{instanceNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
<div>{{#if frameRate}}{{frameRate}} FPS{{/if}}</div>
<div>{{imageDimensions}}</div>
<div>
<span>{{#if location}}Loc: {{location}} mm{{/if}}</span>
<span>{{#if thickness}}Thick: {{thickness}} mm{{/if}}</span>
<span>{{#if spacingBetweenSlices}}Spacing: {{spacingBetweenSlices}} mm{{/if}}</span>
</div>
<div>{{seriesDescription}}</div>
</div>
{{/unless}}
{{ #if tagDisplayRightOnly }} {{#if tagDisplayRightOnly}}
<div class="topright dicomTag"> <div class="topright dicomTag">
<div>{{formatPN patientName}}</div> <div>{{formatPN patientName}}</div>
<div>{{patientId}}</div> <div>{{patientId}}</div>
<div class='priorIndicator'>{{prior}}</div> <div class='priorIndicator'>{{prior}}</div>
<div>{{studyDescription}}</div> <div>{{studyDescription}}</div>
<div>{{formatDA studyDate}} {{formatTM studyTime}}</div> <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
</div> </div>
<div class="bottomright dicomTag"> <div class="bottomright dicomTag">
<div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div> <div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
<div>{{#if gt numImages 1}}Img: {{instanceNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div> <div>{{#if gt numImages 1}}Img: {{instanceNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
<div>{{#if frameRate}}{{frameRate}} FPS{{/if}}</div> <div>{{#if frameRate}}{{frameRate}} FPS{{/if}}</div>
<div>{{imageDimensions}}</div> <div>{{imageDimensions}}</div>
<div>{{seriesDescription}}</div> <div>{{seriesDescription}}</div>
<div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 0}}%{{/if}}</div> <div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 0}}%{{/if}}</div>
<div>{{compression}}</div> <div>{{compression}}</div>
<div>{{wwwc}}</div> <div>{{wwwc}}</div>
</div> </div>
{{ /if }} {{/if}}
{{ #if tagDisplayLeftOnly }} {{#if tagDisplayLeftOnly}}
<div class="topleft dicomTag"> <div class="topleft dicomTag">
<div>{{formatPN patientName}}</div> <div>{{formatPN patientName}}</div>
<div>{{patientId}}</div> <div>{{patientId}}</div>
<div class='priorIndicator'>{{prior}}</div> <div class='priorIndicator'>{{prior}}</div>
<div>{{studyDescription}}</div> <div>{{studyDescription}}</div>
<div>{{formatDA studyDate}} {{formatTM studyTime}}</div> <div>{{formatDA studyDate}} {{formatTM studyTime}}</div>
</div> </div>
<div class="bottomleft dicomTag"> <div class="bottomleft dicomTag">
<div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div> <div>{{#if seriesNumber}}Ser: {{seriesNumber}}{{/if}}</div>
<div>{{#if gt numImages 1}}Img: {{instanceNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div> <div>{{#if gt numImages 1}}Img: {{instanceNumber}} ({{imageIndex}}/{{numImages}}){{/if}}</div>
<div>{{#if frameRate}}{{frameRate}} FPS{{/if}}</div> <div>{{#if frameRate}}{{frameRate}} FPS{{/if}}</div>
<div>{{imageDimensions}}</div> <div>{{imageDimensions}}</div>
<div>{{seriesDescription}}</div> <div>{{seriesDescription}}</div>
<div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 0}}%{{/if}}</div> <div>{{#if zoom}}Zoom: {{formatNumberPrecision zoom 0}}%{{/if}}</div>
<div>{{compression}}</div> <div>{{compression}}</div>
<div>{{wwwc}}</div> <div>{{wwwc}}</div>
</div> </div>
{{ /if }} {{/if}}
{{#if gt numImages 1}} {{#if gt numImages 1}}
{{> imageControls imageIndex=imageIndex numImages=numImages}} {{>imageControls imageIndex=imageIndex numImages=numImages}}
{{ /if }} {{/if}}
</div> </div>
</template> </template>

9
Packages/viewerbase/client/components/viewer/viewportOverlay/viewportOverlay.styl
View File

@ -2,6 +2,9 @@
$viewportTagPadding = 20px $viewportTagPadding = 20px
.imageViewerViewport.empty ~ .imageViewerViewportOverlay
display: none
.imageViewerViewportOverlay .imageViewerViewportOverlay
color: $textSecondaryColor color: $textSecondaryColor
@ -27,11 +30,11 @@ $viewportTagPadding = 20px
bottom: $viewportTagPadding bottom: $viewportTagPadding
right: $viewportTagPadding right: $viewportTagPadding
text-align: right text-align: right
.priorIndicator .priorIndicator
font-weight: bold font-weight: bold
color: yellow color: yellow
&.controlsVisible &.controlsVisible
.topright, .bottomright .topright, .bottomright
right: "calc(%s + 19px)" % $viewportTagPadding right: "calc(%s + 19px)" % $viewportTagPadding