Menu
▾
▴
[dcm4che-commits] SF.net SVN: dcm4che:[18957] oviyam/oviyam/trunk/web
|
From: <bal...@us...> - 2021-03-10 12:42:32
|
Revision: 18957
http://sourceforge.net/p/dcm4che/svn/18957
Author: balamuruganr
Date: 2021-03-10 12:42:27 +0000 (Wed, 10 Mar 2021)
Log Message:
-----------
OV-233: Minor UI improvements
Modified Paths:
--------------
oviyam/oviyam/trunk/web/Study.jsp
oviyam/oviyam/trunk/web/css/jquery-gentleSelect.css
oviyam/oviyam/trunk/web/css/settings.css
oviyam/oviyam/trunk/web/index.html
oviyam/oviyam/trunk/web/js/framecontent.js
oviyam/oviyam/trunk/web/newSearch.jsp
oviyam/oviyam/trunk/web/queryResult.jsp
oviyam/oviyam/trunk/web/westContainer.jsp
oviyam/oviyam/trunk/web/westContainer1.jsp
Added Paths:
-----------
oviyam/oviyam/trunk/web/images/broken-img.jpg
Modified: oviyam/oviyam/trunk/web/Study.jsp
===================================================================
--- oviyam/oviyam/trunk/web/Study.jsp 2021-03-08 17:21:10 UTC (rev 18956)
+++ oviyam/oviyam/trunk/web/Study.jsp 2021-03-10 12:42:27 UTC (rev 18957)
@@ -22,8 +22,10 @@
*
* Contributor(s):
* Babu Hussain A
+* Balamurugan R
* Devishree V
* Guruprasath R
+* Karthikeyan S
* Meer Asgar Hussain B
* Prakash J
* Suresh V
@@ -314,6 +316,12 @@
lbl.removeClass('waiting');
}
</script>
+ <style type="text/css">
+ .error-test{
+ width: 32%!important;
+ height: 70px;
+ }
+ </style>
</head>
<body>
@@ -419,10 +427,10 @@
<td align="right" style="vertical-align: top;">
<c:choose>
<c:when test="${numberOfImages > 3}">
- <img class="toggleImgView" src="images/three.png" name="${seriesId} | ${numberOfImages}" onclick="changeImgView(this)" />
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" class="toggleImgView" src="images/three.png" name="${seriesId} | ${numberOfImages}" onclick="changeImgView(this)" />
</c:when>
<c:otherwise>
- <img class="toggleImgView" src="images/all.png" name="${seriesId} | ${numberOfImages}" />
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" class="toggleImgView" src="images/all.png" name="${seriesId} | ${numberOfImages}" />
</c:otherwise>
</c:choose>
</td>
@@ -464,11 +472,11 @@
<c:when test="${param.wadoUrl == 'C-GET' || param.wadoUrl == 'C-MOVE'}">
<c:choose>
<c:when test="${(instanceNumber == middle) || (instanceNumber==1) || (instanceNumber==numberOfImages)}">
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" class="image" style="${thumbSize};" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${seriesId}&object=${imageId}&retrieveType=${param.wadoUrl}&sopClassUID=${sopClassUID}&seriesDesc=${seriesDesc}&images=${numberOfImages}&modality=${modality}"
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" class="image img-width" style="${thumbSize};" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${seriesId}&object=${imageId}&retrieveType=${param.wadoUrl}&sopClassUID=${sopClassUID}&seriesDesc=${seriesDesc}&images=${numberOfImages}&modality=${modality}"
onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" />
</c:when>
<c:otherwise>
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" class="other" class="image" style="${thumbSize}; display: none;" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${seriesId}&object=${imageId}&retrieveType=${param.wadoUrl}&sopClassUID=${sopClassUID}&seriesDesc=${seriesDesc}&images=${numberOfImages}&modality=${modality}"
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" class="other img-width" class="image" style="${thumbSize}; display: none;" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${seriesId}&object=${imageId}&retrieveType=${param.wadoUrl}&sopClassUID=${sopClassUID}&seriesDesc=${seriesDesc}&images=${numberOfImages}&modality=${modality}"
onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" onload='showProgress("${seriesId}","${instanceNumber}");' />
</c:otherwise>
</c:choose>
@@ -476,11 +484,11 @@
<c:otherwise>
<c:choose>
<c:when test="${(instanceNumber == middle) || (instanceNumber==1) || (instanceNumber==numberOfImages)}">
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" class="image" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&sopClassUID=${sopClassUID}&seriesDesc=${seriesDesc}&images=${numberOfImages}&modality=${modality}&contentType=${param.contentType}&dicomURL=${param.dcmURL}"
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" class="image img-width" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&sopClassUID=${sopClassUID}&seriesDesc=${seriesDesc}&images=${numberOfImages}&modality=${modality}&contentType=${param.contentType}&dicomURL=${param.dcmURL}"
onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" />
</c:when>
<c:otherwise>
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" class="other image" style="${thumbSize} display: none;" link="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&sopClassUID=${sopClassUID}&seriesDesc=${seriesDesc}&images=${numberOfImages}&modality=${modality}&contentType=${param.contentType}&dicomURL=${param.dcmURL}"
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" class="other image img-width" style="${thumbSize} display: none;" link="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&sopClassUID=${sopClassUID}&seriesDesc=${seriesDesc}&images=${numberOfImages}&modality=${modality}&contentType=${param.contentType}&dicomURL=${param.dcmURL}"
onclick="changeSeries(this)" ondragstart="clearSelectedFrames()" ondragend="changeOnDrag(this);" onload='showProgress("${seriesId}","${instanceNumber}");' />
</c:otherwise>
</c:choose>
Modified: oviyam/oviyam/trunk/web/css/jquery-gentleSelect.css
===================================================================
--- oviyam/oviyam/trunk/web/css/jquery-gentleSelect.css 2021-03-08 17:21:10 UTC (rev 18956)
+++ oviyam/oviyam/trunk/web/css/jquery-gentleSelect.css 2021-03-10 12:42:27 UTC (rev 18957)
@@ -36,10 +36,10 @@
margin: 0; padding: 0;
}
-.gentleselect-dialog > ul { padding: 0; margin: 0; list-style: none; }
+.gentleselect-dialog > ul { padding: 0; margin: 0; list-style: none; background: #323232; }
.gentleselect-dialog > ul > li {
margin: 0;
- padding: 3px 20px 3px 25px;
+ padding: 10px 20px 10px 25px;
cursor: pointer;
}
Modified: oviyam/oviyam/trunk/web/css/settings.css
===================================================================
--- oviyam/oviyam/trunk/web/css/settings.css 2021-03-08 17:21:10 UTC (rev 18956)
+++ oviyam/oviyam/trunk/web/css/settings.css 2021-03-10 12:42:27 UTC (rev 18957)
@@ -31,6 +31,7 @@
text-align: left;
-moz-border-radius: 5px;
border-radius: 5px;
+ background: #323232!important;
}
.the_menu li {
Added: oviyam/oviyam/trunk/web/images/broken-img.jpg
===================================================================
(Binary files differ)
Index: oviyam/oviyam/trunk/web/images/broken-img.jpg
===================================================================
--- oviyam/oviyam/trunk/web/images/broken-img.jpg 2021-03-08 17:21:10 UTC (rev 18956)
+++ oviyam/oviyam/trunk/web/images/broken-img.jpg 2021-03-10 12:42:27 UTC (rev 18957)
Property changes on: oviyam/oviyam/trunk/web/images/broken-img.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: oviyam/oviyam/trunk/web/index.html
===================================================================
--- oviyam/oviyam/trunk/web/index.html 2021-03-08 17:21:10 UTC (rev 18956)
+++ oviyam/oviyam/trunk/web/index.html 2021-03-10 12:42:27 UTC (rev 18957)
@@ -129,6 +129,10 @@
.fa-3x {
font-size: 24px !important;
}
+ #newQueryParamDiv .ui-widget-content input{
+ padding: 6px;
+ width: 54%;
+ }
</style>
<script type="text/javascript" src="js/lib/jquery-ui-latest.js"></script>
Modified: oviyam/oviyam/trunk/web/js/framecontent.js
===================================================================
--- oviyam/oviyam/trunk/web/js/framecontent.js 2021-03-08 17:21:10 UTC (rev 18956)
+++ oviyam/oviyam/trunk/web/js/framecontent.js 2021-03-10 12:42:27 UTC (rev 18957)
@@ -1116,7 +1116,8 @@
navState.outline = {x:x,y:y,w:w,h:h};
var context = highlightCanvas.getContext('2d');
context.clearRect(0,0,highlightCanvas.width,highlightCanvas.height);
- context.strokeStyle="yellow";
+ context.strokeStyle="#FF8A00";
+ context.lineWidth = 2;
context.strokeRect(x,y,w,h);
} else {
jQuery('#previewCanvas').hide();
@@ -1189,4 +1190,4 @@
return jQuery("#" + getParameter(jQuery('#frameSrc').html(),'object').replace(/\./g,'_')+"_"+iNo,window.parent.document).get(0);
}
}
-}
+}
\ No newline at end of file
Modified: oviyam/oviyam/trunk/web/newSearch.jsp
===================================================================
--- oviyam/oviyam/trunk/web/newSearch.jsp 2021-03-08 17:21:10 UTC (rev 18956)
+++ oviyam/oviyam/trunk/web/newSearch.jsp 2021-03-10 12:42:27 UTC (rev 18957)
@@ -72,6 +72,8 @@
float: left;
width: 10em;
font-size: 13px;
+ position: relative;
+ top: 6px;
}
/* .ui-state-default { */
@@ -183,4 +185,4 @@
</table>
</div>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: oviyam/oviyam/trunk/web/queryResult.jsp
===================================================================
--- oviyam/oviyam/trunk/web/queryResult.jsp 2021-03-08 17:21:10 UTC (rev 18956)
+++ oviyam/oviyam/trunk/web/queryResult.jsp 2021-03-10 12:42:27 UTC (rev 18957)
@@ -25,6 +25,7 @@
* Balamurugan R
* Devishree V
* Guruprasath R
+* Karthikeyan S
* Meer Asgar Hussain B
* Prakash J
* Suresh V
@@ -66,9 +67,9 @@
<head>
<style>
/*
- ##Device = Desktops
- ##Screen = 1281px to higher resolution desktops
- */
+##Device = Desktops
+##Screen = 1281px to higher resolution desktops
+*/
@media ( min-width : 1281px) {
.dataTables_scrollBody {
max-height: 100% !important;
@@ -77,9 +78,9 @@
}
/*
- ##Device = Laptops, Desktops
- ##Screen = B/w 1025px to 1280px
- */
+##Device = Laptops, Desktops
+##Screen = B/w 1025px to 1280px
+*/
@media ( min-width : 1025px) and (max-width: 1280px) {
.dataTables_scrollBody {
max-height: 100% !important;
@@ -88,16 +89,16 @@
}
/*
- ##Device = Tablets, Ipads (portrait)
- ##Screen = B/w 768px to 1024px
- */
+##Device = Tablets, Ipads (portrait)
+##Screen = B/w 768px to 1024px
+*/
@media ( min-width : 768px) and (max-width: 1024px) {
}
/*
- ##Device = Tablets, Ipads (landscape)
- ##Screen = B/w 768px to 1024px
- */
+##Device = Tablets, Ipads (landscape)
+##Screen = B/w 768px to 1024px
+*/
@media ( min-width : 768px) and (max-width: 1024px) and (orientation:
landscape) {
}
@@ -104,7 +105,7 @@
.dataTables_scrollBody {
min-height: 80% !important;
- max-height: 82% !important;
+ max-height: 88% !important;
border-collapse: collapse;
}
@@ -146,7 +147,7 @@
}
tr.odd {
- background-color: #bbbbbb;
+ background-color: #e6e6e6;
}
tr.even {
@@ -177,7 +178,7 @@
/* For the standard odd/even */
tr.odd td.sorting_1 {
- background-color: #bbbbbb;
+ background-color: #e6e6e6;
}
tr.even td.sorting_1 {
@@ -198,6 +199,94 @@
.dataTables_scrollHead table thead{
display:none;
}
+.instance-legend{
+ position: absolute;
+ margin-top: -28px;
+ right: 400px;
+}
+.instance-legend ul li{
+ display: inline-flex;
+ vertical-align: middle;
+ line-height: 16px;
+ margin-right: 10px;
+ font-size: 13px;
+ color: #fff;
+}
+.instance-legend ul li:first-child span{
+ display: inline-block;
+ background-color: #6fbb6f;
+ width: 15px;
+ height: 15px;
+ margin-right: 5px;
+}
+.instance-legend ul li:last-child span{
+ display: inline-block;
+ background-color: #FF8A00;
+ width: 15px;
+ height: 15px;
+ margin-right: 5px;
+}
+table.display td:first-child{
+ width: 5%;
+}
+table.display td:nth-of-type(2){
+ width: 20%;
+}
+table.display td:nth-of-type(3){
+ width: 14%;
+}
+table.display td:nth-of-type(4){
+ width: 7%;
+ padding: 20px !important;
+}
+table.display td:nth-of-type(5){
+ width: 20%;
+ padding: 0!important;
+}
+table.display td:nth-of-type(6){
+ width: 20%;
+}
+table.display td:nth-of-type(7){
+ width: 20%;
+}
+table.display td:nth-of-type(8){
+ width: 20%;
+}
+table.display td:nth-of-type(9){
+ width: 20%;
+}
+table.display thead th{
+ text-align: left;
+ position: sticky;
+ top: 0;
+}
+/* table.display th:first-child{
+ width: 5%!important;
+}
+table.display th:nth-of-type(2){
+ width: 20%!important;
+}
+table.display th:nth-of-type(3){
+ width: 20%!important;
+}
+table.display th:nth-of-type(4){
+ width: 20%!important;
+}
+table.display th:nth-of-type(5){
+ width: 20%!important;
+}
+table.display th:nth-of-type(6){
+ width: 20%!important;
+}
+table.display th:nth-of-type(7){
+ width: 20%!important;
+}
+table.display th:nth-of-type(8){
+ width: 20%!important;
+}
+table.display th:nth-of-type(9){
+ width: 20%!important;
+} */
</style>
<script type="text/javascript" src="js/LoadLanguage.js"></script>
<script type="text/javascript">
@@ -228,6 +317,7 @@
"sScrollBody":"100%",
//"sScrollXInner": "100%",
"aaSorting": [[4, "desc"]],
+ "pageLength":25,
"aoColumnDefs": [{
"aTargets": [0],
"fnCreatedCell": function (nTd, sData, oData, iRow, iCol) {
@@ -290,8 +380,8 @@
function toggleDivider(divider) {
var serverName = $("#tabUL .ui-state-active").find('a').get(0);
serverName = $(serverName).attr('href');
- $('.dataTables_scrollBody table thead').hide();
- $('.dataTables_scrollHead table thead').show();
+ $('.dataTables_scrollBody table thead').show();
+ $('.dataTables_scrollHead table thead').hide();
var toggler = $(serverName + '_Toggler');
var westPane = $(serverName + '_westPane');
@@ -314,6 +404,7 @@
$(divider).next().css('background', 'url("images/hidewest.png")');
}
} else {
+
loadWest();
$(westPane).show();
$(toggler).next().css('left', '256px');
@@ -328,7 +419,7 @@
$(divider).next().css('background', 'url("images/showall.png")');
}
}
- $('#' + tableName + '_table').css('width', '100%');
+ $('#' + tableName + '_table').css('width', '100%');
dTable.columns.adjust().draw();
}
@@ -478,13 +569,13 @@
<td>${studyDescription}</td>
<td>${referPhysician}</td>
<td align="center">
- <div class="${modality}" style="color: #fff; font-weight: bold; display:inline; padding: 3px; text-align: center; background: #008080; border-radius: 10px;">${modality}</div>
+ <div class="${modality}" style="color: #fff; font-weight: bold; display:inline; padding: 6px; text-align: center; background: #008080; border-radius: 0px;">${modality}</div>
</td>
<td>
<div class="${instanceAvailability}" title="${instanceAvailability}"
style="color: #fff; font-weight: bold;
- display:inline; padding: 3px;
- text-align: center; border-radius: 10px;">
+ display:inline-block; padding: 6px;
+ text-align: center; border-radius: 0px;min-width: 30px;">
${totalInstances}
</div>
</td>
@@ -495,7 +586,13 @@
</pat:Patient>
</tbody>
</table>
+ <div class="instance-legend">
+ <ul>
+ <li><span></span> Online</li>
+ <li><span></span> Nearline</li>
+ </ul>
</div>
+ </div>
</body>
</html>
\ No newline at end of file
Modified: oviyam/oviyam/trunk/web/westContainer.jsp
===================================================================
--- oviyam/oviyam/trunk/web/westContainer.jsp 2021-03-08 17:21:10 UTC (rev 18956)
+++ oviyam/oviyam/trunk/web/westContainer.jsp 2021-03-10 12:42:27 UTC (rev 18957)
@@ -22,7 +22,9 @@
*
* Contributor(s):
* Babu Hussain A
+* Balamurugan R
* Devishree V
+* Karthikeyan S
* Meer Asgar Hussain B
* Prakash J
* Suresh V
@@ -197,7 +199,7 @@
});
} else {
div.attr('title', 'Close');
- div.parent().css('width', '20%');
+ div.parent().css('width', '255px');
div.parent().next().css('width', '80%');
div.css('background', 'url("images/hideleft.png")');
$('#previews').show();
@@ -267,7 +269,7 @@
</table>
</div>
- <div id="previews" style="overflow: auto; height: 88%; border-top: 2px solid black;">
+ <div id="previews" style="overflow: auto; height: 88%; border-top: 2px solid black;width: 255px;">
<jsp:include page="Study.jsp?patient=${encodedPatient}&patient1=${param.patient}&study=${param.study}&dcmURL=${param.dcmURL}&wadoUrl=${param.wadoUrl}&descDisplay=true&studyDesc=${param.studyDesc}&studyDate=${param.studyDate}&contentType=${param.contentType}&modaliy=${param.modality}"></jsp:include>
<div id="otherStudiesInfo" style="display: none;"> </div>
<div id="otherModalities"></div>
@@ -275,4 +277,4 @@
</div>
</div>
</body>
-</html>
+</html>
\ No newline at end of file
Modified: oviyam/oviyam/trunk/web/westContainer1.jsp
===================================================================
--- oviyam/oviyam/trunk/web/westContainer1.jsp 2021-03-08 17:21:10 UTC (rev 18956)
+++ oviyam/oviyam/trunk/web/westContainer1.jsp 2021-03-10 12:42:27 UTC (rev 18957)
@@ -22,7 +22,9 @@
*
* Contributor(s):
* Babu Hussain A
+* Balamurugan R
* Devishree V
+* Karthikeyan S
* Meer Asgar Hussain B
* Prakash J
* Suresh V
@@ -103,7 +105,14 @@
border-radius: 10px;
background: #262626;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.5);
- }
+ }
+ .img-width img{
+ /* width: 32%!important; */
+ }
+ .error-test{
+ width: 32%!important;
+ height: 70px;
+ }
</style>
<script type="text/javascript">
@@ -262,7 +271,7 @@
</tr>
<tr>
<td colspan="2">
- <table style="table-layout:fixed; width:100%;">
+ <table class="img-width" style="table-layout:fixed; width:100%;">
<!-- <tr>
<td id="${fn:replace(seriesId, '.','_')}" class="seriesImgsIndex" style="width: 100%">
<c:forEach var="i" begin="1" end="${numberOfImages}">
@@ -282,19 +291,19 @@
<img:Image patientId="${param.patient}" study="${param.study}" series="${seriesId}" dcmURL="${param.dcmURL}" serverURL="${param.wadoUrl}">
<c:choose>
<c:when test="${modality == 'SR'}">
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/SR_Latest.png" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&dicomURL=${param.dcmURL}" ondblclick="openSeriesInViewer(this)" />
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/SR_Latest.png" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&dicomURL=${param.dcmURL}" ondblclick="openSeriesInViewer(this)" />
</c:when>
<c:when test="${sopClassUID == '1.2.840.10008.5.1.4.1.1.104.1'}">
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/pdf.png" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&dicomURL=${param.dcmURL}" ondblclick="openSeriesInViewer(this)" />
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/pdf.png" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&dicomURL=${param.dcmURL}" ondblclick="openSeriesInViewer(this)" />
</c:when>
<c:when test="${fn:contains(sopClassUID,'1.2.840.10008.5.1.4.1.1.9')}"> <!-- Wave Forms -->
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/pdf.png" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&rid=true&dicomURL=${param.dcmURL}" ondblclick="openSeriesInViewer(this)" />
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/pdf.png" imgSrc="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&rid=true&dicomURL=${param.dcmURL}" ondblclick="openSeriesInViewer(this)" />
</c:when>
<c:when test="${sopClassUID == '1.2.840.10008.5.1.4.1.1.66'}"> <!-- Raw Data Storage -->
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/rawdata.png"/>
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="images/rawdata.png"/>
</c:when>
<c:otherwise>
@@ -302,12 +311,12 @@
<c:when test="${param.wadoUrl == 'C-GET'}">
<c:choose>
<c:when test="${multiframe=='yes'}">
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${seriesId}&object=${imageId}&retrieveType=${param.wadoUrl}&sopClassUID=${sopClassUID}&frameNumber=1"
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${seriesId}&object=${imageId}&retrieveType=${param.wadoUrl}&sopClassUID=${sopClassUID}&frameNumber=1"
ondblclick="openSeriesInViewer(this)" />
</c:when>
<c:otherwise>
<c:if test="${(instanceNumber == middle) || (instanceNumber==1) || (instanceNumber==numberOfImages)}">
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${seriesId}&object=${imageId}&retrieveType=${param.wadoUrl}&sopClassUID=${sopClassUID}"
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${seriesId}&object=${imageId}&retrieveType=${param.wadoUrl}&sopClassUID=${sopClassUID}"
ondblclick="openSeriesInViewer(this)" />
</c:if>
</c:otherwise>
@@ -316,12 +325,12 @@
<c:when test="${param.wadoUrl == 'C-MOVE'}">
<c:choose>
<c:when test="${multiframe=='yes'}">
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${seriesId}&object=${imageId}&retrieveType=${param.wadoUrl}&frameNumber=1" ondblclick="openSeriesInViewer(this)"
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${seriesId}&object=${imageId}&retrieveType=${param.wadoUrl}&frameNumber=1" ondblclick="openSeriesInViewer(this)"
/>
</c:when>
<c:otherwise>
<c:if test="${(instanceNumber == middle) || (instanceNumber==1) || (instanceNumber==numberOfImages)}">
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${seriesId}&object=${imageId}&retrieveType=${param.wadoUrl}" ondblclick="openSeriesInViewer(this)"
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Wado.do?dicomURL=${param.dcmURL}&study=${param.study}&series=${seriesId}&object=${imageId}&retrieveType=${param.wadoUrl}" ondblclick="openSeriesInViewer(this)"
/>
</c:if>
</c:otherwise>
@@ -330,12 +339,12 @@
<c:otherwise>
<c:choose>
<c:when test="${multiframe=='yes'}">
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&contentType=${param.contentType}&frameNumber=1&dicomURL=${param.dcmURL}"
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&contentType=${param.contentType}&frameNumber=1&dicomURL=${param.dcmURL}"
ondblclick="openSeriesInViewer(this);" />
</c:when>
<c:otherwise>
<c:if test="${(instanceNumber == middle) || (instanceNumber==1) || (instanceNumber==numberOfImages)}">
- <img name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&contentType=${param.contentType}&dicomURL=${param.dcmURL}" ondblclick="openSeriesInViewer(this);"
+ <img onerror="this.src='images/broken-img.jpg';this.className='error-test'" name="${instanceNumber}" id="${fn:replace(seriesId, '.','_')}_${instanceNumber}" style="${thumbSize}" src="Image.do?serverURL=${param.wadoUrl}&study=${param.study}&series=${seriesId}&object=${imageId}&contentType=${param.contentType}&dicomURL=${param.dcmURL}" ondblclick="openSeriesInViewer(this);"
/>
</c:if>
</c:otherwise>
@@ -359,7 +368,6 @@
</table>
<div style="height:3px"></div>
</ser:Series>
-
</div>
</body>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
