1.4.17 release out

marcelvanherk · Jul 18th 2013

Barbara,

The patient ID is set correctly by what you give, the patient name is set to a checksum of the patient ID. Why do you feel this is not adequate?

Marcel

marcelvanherk · Jul 18th 2013

Hi all,

please try these full updates:

ftp://ftp-rt.nki.nl/outbox/Mar…rver/dicomserver1417a.zip

ftp://ftp-rt.nki.nl/outbox/Mar…conquestlinux1417a.tar.gz

It fixes some minor bugs and adds the scripting environment in the Linux build as well

Marcel

BStam · Jul 19th 2013

Hi Marcel,

Still some problems with the anonomization. I tested in all 3 versions of the 1.4.17; in chronological order:

When I anonomize to "testPatient", i obtain:
-in version 1.4.17alpha: PatID=testPatient and PatName=testPatient
-in version 1.4.17: PatID=3968165953.2771014250 and PatName=PAT3968165953
-in version 1.4.17a: PatID=testPatient and PatName=PAT1262383373

I'd prefer the first way of anonomizing...

Thanks,
Barbara

marcelvanherk · Jul 19th 2013

Hi Barbara,

the operation of 1.4.17a is by design. You can modify the algorithm that sets PatientName in dicomserver/lua/anonymize_script.lua (at lines 102 and 104), but unfortunately the new patient ID you give it is not passed to the script. This has to be improved because it also blocks reversing the anonymization.

Regards,

Marcel

jjoerg · Jul 31st 2013

Hi Marcel,

using conquest for almost 5 years in our RT-department, thanks!

a few issues with the current release:

1) filename character mixup (solved for me)
in the file/cgi-bin/viewers/LuanchWeasisStudy.cq the first two letters of the filename are mixed up

2) mismatching file extensions (solved for me)
in your example /cgi-bin/dicom.ini for the section you suggest

[weasis]
source = viewers\LaunchWeasis.lua

whereas the file is named viewers\LaunchWeasis.cq

3) dwv integration
I followed your instructions but received the following error-message window in my browser:

Error: Not a valid DICOM file (no magic DICM word found).

Looking in my apache-log I found multiple lines as the following one:
[Wed Jul 31 12:00:29 2013] [error] [client 192.168.14.106] script not found or unable to stat: C:/Program Files (x86)/Apache Software Foundation/Apache2.2/cgi-bin/W, referer: http://192.168.14.106/cgi-bin/…9795476912806639&size=560

The single character at the end of the script not found looks like a parsing error or something like this in the generation of this request. I have no experience in this field, do you have an idea?

Kind regards

Jörg

marcelvanherk · Jul 31st 2013

Hi Jorg,

thanks for reporting these. The sample files are always done a bit in a rush. I will correct them for the subsequent release.

As far as issue 3 is concerned, dwv works for me. I assume you get the dwv page. Can you post some WADOREQUEST it generates as found in the page source? Are both dgate.exe's (in dicomserver and cgi-bin) at the same new version?

Thanks.

Marcel

jjoerg · Aug 1st 2013

Hi Marcel,

Quote

I assume you get the dwv page

Yes.

Quote

Are both dgate.exe's (in dicomserver and cgi-bin) at the same new version

Yes, both at 1.4.17a.

I hope I will give you the right information:

the invoking html:

Code

<HEAD><TITLE>Conquest DICOM server - version 1.4.17a</TITLE></HEAD><BODY BGCOLOR='CFDFCF'><H2>Conquest DICOM server - version 1.4.17a</H2><table RULES=ALL BORDER=1><Caption>List of series on local server</caption><TR><TD>Patient ID<TD>Name<TD>Series date<TD>Series time<TD>Series description<TD>Modality</TR><TR><TD><A HREF=dgate.exe?port=9998&address=127.0.0.1&mode=queryallimages&key=&query=DICOMStudies.patientid+=+'2158676359.1602436055'+and+DICOMSeries.seriesinst+=+'1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162718.894.50'>     2158676359.1602436055 </A><TD>PAT2158676359<TD>19980414<TD>170346.000000<TD><TD>CT<TD><A HREF=dgate.exe?port=9998&address=127.0.0.1&mode=queryimages&query=DICOMStudies.patientid+=+'2158676359.1602436055'+and+DICOMSeries.seriesinst+=+'1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162718.894.50'&size=560>thumbs    </A><TD><A HREF=dgate.exe?port=9998&address=127.0.0.1&mode=dwv&series=2158676359.1602436055:1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162718.894.50&size=560>view    </A><TD><A HREF=dgate.exe?port=9998&address=127.0.0.1&mode=seriesmover&series=2158676359.1602436055:1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162718.894.50&source=(local)&key=>push    </A><TD><A HREF=dgate.exe?port=9998&address=127.0.0.1&mode=seriesdeleter&series=2158676359.1602436055:1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162718.894.50>delete    </A></TR></table></BODY>

As far as I understand I get the wado-requests in the error sitation only if I disable javascript to eliminate error-popups, since those inhibit access to the page source:

HTML

[ ...]


<html>
<head>
<title>DICOM Web Viewer</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" href="/dwv/css/style.css">
<style>
body { font-size: 80%; }
#pageHeader h1 { display: inline-block; margin: 0; }
#pageHeader #toolbar { display: inline-block; float: right; }
#toolbox li:first-child { list-style-type: none; padding-bottom: 10px; margin-left: -20px; }
#pageMain { height: 93%; width: 100%; margin-top: 10px; background-color: #333; }
#infotl { color: #333; text-shadow: 0 1px 0 #fff; }
#infotr { color: #333; text-shadow: 0 1px 0 #fff; }
</style>


<link rel="stylesheet" href="/dwv/ext/jquery/ui/1.10.2/themes/ui-darkness/jquery-ui-1.10.2.min.css">


<!-- Third party --> 
<script type="text/javascript" src="/dwv/ext/jquery/jquery-1.9.1.min.js"></script>
<script type="text/javascript" src="/dwv/ext/jquery/ui/1.10.2/jquery-ui-1.10.2.min.js"></script>
<script type="text/javascript" src="/dwv/ext/flot/jquery.flot.min.js"></script>


<!-- Local -->
<script type="text/javascript" src="/dwv/src/dwv.js"></script>
<script type="text/javascript" src="/dwv/src/application.js"></script>
<script type="text/javascript" src="/dwv/src/dicom/dicomParser.js"></script>
<script type="text/javascript" src="/dwv/src/dicom/dictionary.js"></script>
<script type="text/javascript" src="/dwv/src/html/gui.js"></script>
<script type="text/javascript" src="/dwv/src/html/gui_ui.js"></script>
<script type="text/javascript" src="/dwv/src/html/html.js"></script>
<script type="text/javascript" src="/dwv/src/html/style.js"></script>
<script type="text/javascript" src="/dwv/src/html/layer.js"></script>
<script type="text/javascript" src="/dwv/src/image/filter.js"></script>
<script type="text/javascript" src="/dwv/src/image/image.js"></script>
<script type="text/javascript" src="/dwv/src/image/luts.js"></script>
<script type="text/javascript" src="/dwv/src/image/reader.js"></script>
<script type="text/javascript" src="/dwv/src/math/shapes.js"></script>
<script type="text/javascript" src="/dwv/src/math/bucketQueue.js"></script>
<script type="text/javascript" src="/dwv/src/math/scissors.js"></script>
<script type="text/javascript" src="/dwv/src/utils/string.js"></script>


<!-- Tools: beware order is important... -->
<script type="text/javascript" src="/dwv/src/tools/toolbox.js"></script>
<script type="text/javascript" src="/dwv/src/tools/windowLevel.js"></script>
<script type="text/javascript" src="/dwv/src/tools/draw.js"></script>
<script type="text/javascript" src="/dwv/src/tools/line.js"></script>
<script type="text/javascript" src="/dwv/src/tools/rectangle.js"></script>
<script type="text/javascript" src="/dwv/src/tools/roi.js"></script>
<script type="text/javascript" src="/dwv/src/tools/circle.js"></script>
<script type="text/javascript" src="/dwv/src/tools/livewire.js"></script>
<script type="text/javascript" src="/dwv/src/tools/zoom.js"></script>
<script type="text/javascript" src="/dwv/src/tools/filter.js"></script>
<script type="text/javascript" src="/dwv/src/tools/undo.js"></script>


<script type="text/javascript">
function toggle(dialogName)
{
    if( $(dialogName).dialog('isOpen') )
    {
        $(dialogName).dialog('close');
    }
    else
    {
        $(dialogName).dialog('open');
    }
}


function load()
{
  app.loadURL('http://localhost/cgi-bin/dgate.exe?requestType=WADO&contentType=application/dicom'+
    '&studyUID=1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162718.879.49' +
    '&seriesUID=1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162718.894.50' +
    '&objectUID=' + document.forms[0].slice.value);
}


function nextslice()
{
  if (document.forms[0].slice.selectedIndex == document.forms[0].slice.length-1)
  {
    document.forms[0].slice.selectedIndex = 0;
  }
  else
  {
    document.forms[0].slice.selectedIndex = document.forms[0].slice.selectedIndex + 1;
  }
  load();
}


function previousslice()
{
  if (document.forms[0].slice.selectedIndex == 0)
  {
    document.forms[0].slice.selectedIndex = document.forms[0].slice.length-1;
  }
  else
  {
    document.forms[0].slice.selectedIndex = document.forms[0].slice.selectedIndex - 1;
  }
  load();
}


// main application
var app = new dwv.App();


// jquery
$(document).ready(function(){
    // initialise buttons
    $("button").button();
    $("#toggleInfoLayer").button({ icons: 
        { primary: "ui-icon-comment" }, text: false });
    // create dialogs
    $("#openData").dialog({ position: 
        {my: "left top", at: "left top", of: "#pageMain"} });
    $("#toolbox").dialog({ position: 
        {my: "left top+200", at: "left top", of: "#pageMain"} });
    $("#history").dialog({ position: 
        {my: "left top+370", at: "left top", of: "#pageMain"},
        autoOpen: false });
    $("#tags").dialog({ position: 
        {my: "right top", at: "right top", of: "#pageMain"},
        autoOpen: false, width: 500, height: 590 });


    // image dialog
    $("#layerDialog").dialog({ position: 
        {my: "left+320 top", at: "left top", of: "#pageMain"}});
    // default size
    $("#layerDialog").dialog({ width: "auto", resizable: false });
    // Resizable but keep aspect ratio
    // TODO it seems to add a border that bothers getting the cursor position...
    //$("#layerContainer").resizable({ aspectRatio: true });

    // initialise the application
    app.init();
    // align layers when the window is resized
    window.onresize = app.resize;


    // load wado URL
    app.loadURL("http://localhost/cgi-bin/dgate.exe?requestType=WADO&contentType=application/dicom&seriesUID=1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162718.894.50&studyUID=1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162718.879.49&objectUID=1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162718.879.47");
});


</script>
</head>
<body>
<div id="pageHeader">
<!-- Title -->
<h1>DICOM Web Viewer (<a href="https://github.com/ivmartel/dwv">dwv</a> v0.3)</h1>


<!-- Toolbar -->
<div id="toolbar">
<button onclick="toggle('#openData')">File</button>
<button onclick="toggle('#toolbox')">Toolbox</button>
<button onclick="toggle('#history')">History</button>
<button onclick="toggle('#tags')">Tags</button>
<button onclick="toggle('#layerDialog')">Image</button>
<button onclick="dwv.html.toggleDisplay('infoLayer')" id="toggleInfoLayer">Info</button>
</div><!-- /toolbar -->


</div><!-- pageHeader -->
<div id="pageMain">
<!-- Open file -->
<div id="openData" title="File">
<form><p>
Path: <input type="file" id="imagefiles" multiple />
URL: <input type="url" id="imageurl" />


<br>Slice: 
<input type=button value='<' onclick=previousslice() />
<select name=slice onchange=load()>


  <option value=1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162718.879.47>1</option>
  <option value=1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162718.941.53>2</option>
</select>
<input type=button value='>' onclick=nextslice() />


</p></form>
<div id="progressbar"></div>
</div>
<!-- Toolbox -->
<div id="toolbox" title="Toolbox">
<ul id="toolList"></ul>
</div>


<!-- History -->
<div id="history" title="History"></div>


<!-- Tags -->
<div id="tags" title="Tags" style="display:none;"></div>


<!-- Layer Container -->
<div id="layerDialog" title="Image">
<div id="layerContainer">
<canvas id="imageLayer">Only for HTML5 compatible browsers...</canvas>
<canvas id="drawLayer">Only for HTML5 compatible browsers...</canvas>
<canvas id="tempLayer">Only for HTML5 compatible browsers...</canvas>
<div id="infoLayer">
<div id="infotl"></div>
<div id="infotr"></div>
<div id="infobl"></div>
<div id="infobr"><div id="plot"></div></div>
</div><!-- /infoLayer -->
</div><!-- /layerContainer -->
</div><!-- /layerDialog -->


</div><!-- pageMain -->
</body>
</html>

Display More

Kind regards

Jörg

marcelvanherk · Aug 1st 2013

Hi,

everything looks allright to me, the page source is generated correctly. You are using and HTML5-enabled browser? IE9 is not good. Use e.g. IE10 or firefox.

What happens if you paste:

Quote

http://localhost/cgi-bin/dgate…65746.7.1375162718.879.47

Into your browsers address bar, does it download a file? Play with contentType (image/gif) to get an image.

Marcel

jjoerg · Aug 2nd 2013

Hi,

I tested opera, firefox and IE 10 initially.
Pasting the lines now (firefox) results in a download request (application/dicom) or the requested slice for (image/gif).

Kind regards

Jörg

marcelvanherk · Aug 2nd 2013

Hi,

You WADO reference is to localhost. You do address the conquest webpage as http://localhost/cgi-bin/dgate.exe? ... This may be necessary due to the same origin policy.

Marcel

jjoerg · Aug 2nd 2013

Hi,

I tried both now: setting everything to localhost and to 127.0.0.1 same result. My apache errorand access log looks like misinterpreting the request string by parsing it (by misinterpretation?). I can identify" h" "t" "p" (one t missing maybe because of similar error messages),
"c" "g" "i" "-" "b" "n", i missing ...

Apache access-log:

Code

192.168.14.106 - - [02/Aug/2013:19:50:32 +0200] "GET /cgi-bin/dgate.exe?mode=top HTTP/1.1" 200 3857
192.168.14.106 - - [02/Aug/2013:21:10:20 +0200] "GET /cgi-bin/dgate.exe?mode=querypatients&port=9998&address=localhost&key=&patientidmatch=&patientnamematch= HTTP/1.1" 200 294
192.168.14.106 - - [02/Aug/2013:21:10:44 +0200] "GET /cgi-bin/dgate.exe?mode=querypatients&port=9998&address=localhost&key=&patientidmatch=&patientnamematch= HTTP/1.1" 200 1135
192.168.14.106 - - [02/Aug/2013:21:10:46 +0200] "GET /cgi-bin/dgate.exe?port=9998&address=localhost&mode=querystudies&key=&query=patientid+=+%272158676359.1602436055%27 HTTP/1.1" 200 1638
192.168.14.106 - - [02/Aug/2013:21:10:48 +0200] "GET /cgi-bin/dgate.exe?port=9998&address=localhost&mode=queryseries&key=&query=DICOMStudies.patientid+=+%272158676359.1602436055%27+and+DICOMSeries.studyinsta+=+%271.2.826.0.1.3680043.2.135.735064.43065746.7.1375162676.86.8%27 HTTP/1.1" 200 1437
192.168.14.106 - - [02/Aug/2013:21:10:50 +0200] "GET /cgi-bin/dgate.exe?port=9998&address=localhost&mode=queryallimages&key=&query=DICOMStudies.patientid+=+%272158676359.1602436055%27+and+DICOMSeries.seriesinst+=+%271.2.826.0.1.3680043.2.135.735064.43065746.7.1375162676.102.12%27 HTTP/1.1" 200 6985
192.168.14.106 - - [02/Aug/2013:21:10:53 +0200] "GET /cgi-bin/dgate.exe?port=9998&address=localhost&mode=dwv&series=2158676359.1602436055:1.2.826.0.1.3680043.2.135.735064.43065746.7.1375162676.102.12&size=560 HTTP/1.1" 200 8868
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/h HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/t HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/p HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/: HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/1 HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/2 HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/7 HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/ HTTP/1.1" 403 210
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/c HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/g HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/0 HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/i HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/- HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/b HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/n HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/d HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/a HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/e HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/x HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/r HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/q HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/u HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/s HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/y HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/T HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/= HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/W HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/D HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/O HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/A HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/& HTTP/1.1" 404 211
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/l HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/m HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/o HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/U HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/8 HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/I HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/6 HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/3 HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/4 HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/5 HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/j HTTP/1.1" 404 207
192.168.14.106 - - [02/Aug/2013:21:10:55 +0200] "GET /cgi-bin/dgate.exe? HTTP/1.1" 200 567

Display More

I tried firebug but I am not familiar with the java programming structure and found the coded line where the string is parsed but I do have no idea whether it is an coding problem (I don't) believe or something else ...

Kind regards

Jörg

marcelvanherk · Aug 2nd 2013

Hi,

the strange thing is that the html code looks allright. Which version of dwv.lua did you use?

Here is mine that works for me:

HTML

--
-- DICOM Web Viewer (DWV) lua script for integration in a Conquest PACS server. 
--
-- Usage
-- In the dicom.ini of your web server, create the dwv viewer:
-- >> [dwv]
-- >> source = viewers\dwv.lua
-- And set it as the default viewer:
-- >> [webdefaults]
-- >> ...
-- >> viewer = dwv
-- This script relies on the 'kFactorFile', 'ACRNemaMap' and 'Dictionary' 
-- variables being set correctly.
-- Then copy the 'css', 'src' and 'ext' folders of DWV in a 'dwv' folder
-- in the web folder of your web server.


local patid = string.gsub(series2, ':.*$', '')
local seriesuid = string.gsub(series2, '^.*:', '')


-- Functions declaration


function getstudyuid()
  local a, b, s
  s = servercommand('get_param:MyACRNema')
  b = newdicomobject()
  b.PatientID = patientid
  b.SeriesInstanceUID = seriesuid
  b.StudyInstanceUID = ''
  a = dicomquery(s, 'SERIES', b)
  return a[0].StudyInstanceUID
end


function queryimages()
  local images, imaget, b, s
  s = servercommand('get_param:MyACRNema')
  b = newdicomobject()
  b.PatientID = patientid
  b.SeriesInstanceUID = seriesuid
  b.SOPInstanceUID = ''
  images = dicomquery(s, 'IMAGE', b)


  imaget={}
  for k=0,#images-1 do
    imaget[k+1]={}
    imaget[k+1].SOPInstanceUID = images[k].SOPInstanceUID
  end
  table.sort(imaget, function(a,b) return a.SOPInstanceUID < b.SOPInstanceUID end)


  return imaget
end


-- Main


local studyuid = getstudyuid()
local images = queryimages()


local url = webscriptadress
url = url .. '?requestType=WADO&contentType=application/dicom'
url = url .. '&seriesUID=' .. seriesuid
url = url .. '&studyUID=' .. studyuid
url = url .. '&objectUID=' .. images[1].SOPInstanceUID

-- Generate html


HTML('Content-type: text/html\n\n')
--print([[<!DOCTYPE html>]])
print([[<html>]])


print([[<head>
<title>DICOM Web Viewer</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" href="/dwv/css/style.css">
<style>
body { font-size: 80%; }
#toolbox li:first-child { list-style-type: none; padding-bottom: 10px; margin-left: -20px; }
</style>
<link rel="stylesheet" href="/dwv/ext/jquery/ui/1.10.1/themes/ui-darkness/jquery-ui.min.css">
</head>]])


print([[<body>]])


print([[<!-- Third party -->  
<script type="text/javascript" src="/dwv/ext/jquery/jquery-1.9.1.min.js"></script>
<script type="text/javascript" src="/dwv/ext/jquery/ui/1.10.1/jquery-ui.min.js"></script>
<script type="text/javascript" src="/dwv/ext/flot/jquery.flot.min.js"></script>]])


print([[<!-- Local -->
<script type="text/javascript" src="/dwv/src/dwv.js"></script>
<script type="text/javascript" src="/dwv/src/application.js"></script>
<script type="text/javascript" src="/dwv/src/dicom/dicomParser.js"></script>
<script type="text/javascript" src="/dwv/src/dicom/dictionary.js"></script>
<script type="text/javascript" src="/dwv/src/html/gui.js"></script>
<script type="text/javascript" src="/dwv/src/html/gui_ui.js"></script>
<script type="text/javascript" src="/dwv/src/html/html.js"></script>
<script type="text/javascript" src="/dwv/src/html/style.js"></script>
<script type="text/javascript" src="/dwv/src/html/layer.js"></script>
<script type="text/javascript" src="/dwv/src/image/filter.js"></script>
<script type="text/javascript" src="/dwv/src/image/image.js"></script>
<script type="text/javascript" src="/dwv/src/image/lookupTable.js"></script>
<script type="text/javascript" src="/dwv/src/image/luts.js"></script>
<script type="text/javascript" src="/dwv/src/math/shapes.js"></script>
<script type="text/javascript" src="/dwv/src/math/bucketQueue.js"></script>
<script type="text/javascript" src="/dwv/src/math/scissors.js"></script>
<script type="text/javascript" src="/dwv/src/utils/string.js"></script>]])


print([[<!-- Tools: beware order is important... -->
<script type="text/javascript" src="/dwv/src/tools/toolbox.js"></script>
<script type="text/javascript" src="/dwv/src/tools/windowLevel.js"></script>
<script type="text/javascript" src="/dwv/src/tools/draw.js"></script>
<script type="text/javascript" src="/dwv/src/tools/line.js"></script>
<script type="text/javascript" src="/dwv/src/tools/rectangle.js"></script>
<script type="text/javascript" src="/dwv/src/tools/roi.js"></script>
<script type="text/javascript" src="/dwv/src/tools/circle.js"></script>
<script type="text/javascript" src="/dwv/src/tools/livewire.js"></script>
<script type="text/javascript" src="/dwv/src/tools/zoom.js"></script>
<script type="text/javascript" src="/dwv/src/tools/filter.js"></script>
<script type="text/javascript" src="/dwv/src/tools/undo.js"></script>]])


print([[<script type="text/javascript">
function toggle(dialogName)
{
    if( $(dialogName).dialog('isOpen') )
    {
        $(dialogName).dialog('close');
    }
    else
    {
        $(dialogName).dialog('open');
    }
}
function getUriParam(name)
{
    var val = 0;
    var regex = new RegExp("[\\?&]" + name + "=([^&#]*)")
    var results = regex.exec(window.location.href);
    if( results && results[1] ) val = results[1];
    return val;
}


function load()
{
  app.loadDicomURL(']]..webscriptadress..[[?requestType=WADO&contentType=application/dicom'+
                           '&studyUID=]]..studyuid..[[' +
                           '&seriesUID=]]..seriesuid..[[' +
                           '&objectUID=' + document.forms[0].slice.value);
}


function nextslice()
{ if (document.forms[0].slice.selectedIndex == document.forms[0].slice.length-1) document.forms[0].slice.selectedIndex = 0; else document.forms[0].slice.selectedIndex = document.forms[0].slice.selectedIndex + 1; load()
}
]])


print([[// main application
var app = new dwv.App();
// jquery
$(document).ready(function(){
    // create buttons and dialogs
    $("button").button();
    $("#openData").dialog({ position: [10, 110] });
    $("#toolbox").dialog({ position: [10, 280] });
    $("#history").dialog({ position: [10, 450], autoOpen: false });
    $("#tags").dialog({ position: ['right', 110], autoOpen: false, height: 400, width: 400 });
    $("#layerContainer").dialog({ position: [340, 110], 
        width: [570], height: [590] });
    // initialise the application
    app.init();
    // possible load from URL
    app.loadDicomURL("]].. url ..[[");
});
</script>]])


print([[<!-- Title -->
<h1>DICOM Web Viewer (<a href="https://github.com/ivmartel/dwv">dwv</a> v0.3b)</h1>


<!-- Buttons -->
<button onclick="toggle('#openData')">Open</button>
<button onclick="toggle('#toolbox')">Toolbox</button>
<button onclick="toggle('#history')">History</button>
<button onclick="toggle('#tags')">Tags</button>
<button onclick="toggle('#layerContainer')">Image</button>]])


print([[<!-- Open file -->
<div id="openData" title="Open">
<p><form>
Path: <input type="file" id="dicomfiles" multiple />
URL: <input type="url" id="dicomurl" />
</form></p>
<div id="progressbar"></div>
</div>]])


print([[<!-- Toolbox -->
<div id="toolbox" title="Toolbox">
<ul id="toolList"></ul>
</div>


<!-- History -->
<div id="history" title="History"></div>


<!-- Tags -->
<div id="tags" title="Tags" style="display:none;"></div>]])


print([[<!-- Layer Container -->
<div id="layerContainer" title="Image">
<canvas id="imageLayer" width="512" height="512"></canvas>
<canvas id="drawLayer" width="512" height="512"></canvas>
<canvas id="infoLayer" width="512" height="512"></canvas>
<canvas id="tempLayer" width="512" height="512"></canvas>
<div id="plot" style="width:100px;height:70px"></div>
</div>]])


print([[
<FORM>
Slice:
  <select name=slice onchange=load()>
]]
)


for i=1, #images do
  print('<option value='..images[i].SOPInstanceUID..'>'..i..'</option>')
end
print([[
  </select>
  <INPUT TYPE=BUTTON VALUE='>' onclick=nextslice() >
</FORM>
]])


print([[</body>]])
print([[</html>]])

Display More

Note that I last downloaded the dwv code march 7, so maybe something broke there.

Marcel

jjoerg · Aug 5th 2013

Hi Marcel,

one crash of the test-machine later: the lua file ist different, I picked mine out of your 1.4.17a-release.

Using your lua-file I recieve from Apache a reference to a js-File not in my dwv-Distribution:

[Mon Aug 05 12:17:09 2013] [error] [client 192.168.14.106] File does not exist: C:/Program Files (x86)/Apache Software Foundation/Apache2.2/htdocs/dwv/src/image/lookupTable.js, referer: http://192.168.14.106/cgi-bin/…3061117053645631&size=560

I will look on the dwv-side and report.

Kind regards

Jörg

marcelvanherk · Aug 5th 2013

Hi,

I can duplicate the problem, apparently something broke in the recent dwv code. I see no wado request being generated at all, so it appears that the links are not passed or used correctly.

Marcel

marcelvanherk · Aug 5th 2013

Hi,

LoadUrl now expects an array of URLs. I modified the dwv.lua from github as follows by putting brackets around the generated URL values. Now dwv fails again elsewhere.

HTML

--
-- DICOM Web Viewer (DWV) lua script for integration in a Conquest PACS server. 
--
-- Usage
-- In the dicom.ini of your web server, create the dwv viewer:
-- >> [dwv]
-- >> source = viewers\dwv.lua
-- And set it as the default viewer:
-- >> [webdefaults]
-- >> ...
-- >> viewer = dwv
-- This script relies on the 'kFactorFile', 'ACRNemaMap' and 'Dictionary'
-- variables being set correctly.
-- Then copy the 'css', 'src' and 'ext' folders of DWV in a 'dwv' folder
-- in the web folder of your web server.


-- Get ids


local patientid = string.gsub(series2, ':.*$', '')
local seriesuid = string.gsub(series2, '^.*:', '')


-- Functions declaration


function getstudyuid()
  local a, b, s
  s = servercommand('get_param:MyACRNema')
  b = newdicomobject()
  b.PatientID = patientid
  b.SeriesInstanceUID = seriesuid
  b.StudyInstanceUID = ''
  a = dicomquery(s, 'SERIES', b)
  return a[0].StudyInstanceUID
end


function queryimages()
  local images, imaget, b, s
  s = servercommand('get_param:MyACRNema')
  b = newdicomobject()
  b.PatientID = patientid
  b.SeriesInstanceUID = seriesuid
  b.SOPInstanceUID = ''
  images = dicomquery(s, 'IMAGE', b)


  imaget={}
  for k=0,#images-1 do
    imaget[k+1]={}
    imaget[k+1].SOPInstanceUID = images[k].SOPInstanceUID
  end
  table.sort(imaget, function(a,b) return a.SOPInstanceUID < b.SOPInstanceUID end)


  return imaget
end


-- Main


local studyuid = getstudyuid()
local images = queryimages()


local url = webscriptadress
url = url .. '?requestType=WADO&contentType=application/dicom'
url = url .. '&seriesUID=' .. seriesuid
url = url .. '&studyUID=' .. studyuid
url = url .. '&objectUID=' .. images[1].SOPInstanceUID
 
-- Generate html


HTML('Content-type: text/html\n\n')
--print([[<!DOCTYPE html>]])
print([[<html>]])


print([[<head>]])


print([[
<title>DICOM Web Viewer</title>
<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
<link rel="stylesheet" href="/dwv/css/style.css">
<style>
body { font-size: 80%; }
#pageHeader h1 { display: inline-block; margin: 0; }
#pageHeader #toolbar { display: inline-block; float: right; }
#toolbox li:first-child { list-style-type: none; padding-bottom: 10px; margin-left: -20px; }
#pageMain { height: 93%; width: 100%; margin-top: 10px; background-color: #333; }
#infotl { color: #333; text-shadow: 0 1px 0 #fff; }
#infotr { color: #333; text-shadow: 0 1px 0 #fff; }
</style>
]])


-- path with extra /dwv
print([[
<link rel="stylesheet" href="/dwv/ext/jquery/ui/1.10.2/themes/ui-darkness/jquery-ui-1.10.2.min.css">
]])


-- path with extra /dwv
print([[
<!-- Third party --> 
<script type="text/javascript" src="/dwv/ext/jquery/jquery-1.9.1.min.js"></script>
<script type="text/javascript" src="/dwv/ext/jquery/ui/1.10.2/jquery-ui-1.10.2.min.js"></script>
<script type="text/javascript" src="/dwv/ext/flot/jquery.flot.min.js"></script>
]])


-- path with extra /dwv
print([[
<!-- Local -->
<script type="text/javascript" src="/dwv/src/dwv.js"></script>
<script type="text/javascript" src="/dwv/src/application.js"></script>
<script type="text/javascript" src="/dwv/src/dicom/dicomParser.js"></script>
<script type="text/javascript" src="/dwv/src/dicom/dictionary.js"></script>
<script type="text/javascript" src="/dwv/src/html/gui.js"></script>
<script type="text/javascript" src="/dwv/src/html/gui_ui.js"></script>
<script type="text/javascript" src="/dwv/src/html/html.js"></script>
<script type="text/javascript" src="/dwv/src/html/style.js"></script>
<script type="text/javascript" src="/dwv/src/html/layer.js"></script>
<script type="text/javascript" src="/dwv/src/image/filter.js"></script>
<script type="text/javascript" src="/dwv/src/image/image.js"></script>
<script type="text/javascript" src="/dwv/src/image/luts.js"></script>
<script type="text/javascript" src="/dwv/src/image/reader.js"></script>
<script type="text/javascript" src="/dwv/src/math/shapes.js"></script>
<script type="text/javascript" src="/dwv/src/math/bucketQueue.js"></script>
<script type="text/javascript" src="/dwv/src/math/scissors.js"></script>
<script type="text/javascript" src="/dwv/src/utils/string.js"></script>
]])


-- path with extra /dwv
print([[
<!-- Tools: beware order is important... -->
<script type="text/javascript" src="/dwv/src/tools/toolbox.js"></script>
<script type="text/javascript" src="/dwv/src/tools/windowLevel.js"></script>
<script type="text/javascript" src="/dwv/src/tools/info.js"></script>
<script type="text/javascript" src="/dwv/src/tools/draw.js"></script>
<script type="text/javascript" src="/dwv/src/tools/line.js"></script>
<script type="text/javascript" src="/dwv/src/tools/rectangle.js"></script>
<script type="text/javascript" src="/dwv/src/tools/roi.js"></script>
<script type="text/javascript" src="/dwv/src/tools/circle.js"></script>
<script type="text/javascript" src="/dwv/src/tools/livewire.js"></script>
<script type="text/javascript" src="/dwv/src/tools/zoom.js"></script>
<script type="text/javascript" src="/dwv/src/tools/filter.js"></script>
<script type="text/javascript" src="/dwv/src/tools/undo.js"></script>
]])


print([[<script type="text/javascript">]])


print([[
function toggle(dialogName)
{
    if( $(dialogName).dialog('isOpen') )
    {
        $(dialogName).dialog('close');
    }
    else
    {
        $(dialogName).dialog('open');
    }
}
]])


-- custom method
print([[
function load()
{
  app.loadURL([']]..webscriptadress..[[?requestType=WADO&contentType=application/dicom'+
    '&studyUID=]]..studyuid..[[' +
    '&seriesUID=]]..seriesuid..[[' +
    '&objectUID=' + document.forms[0].slice.value]);
}
]])


-- custom method
print([[
function nextslice()
{
  if (document.forms[0].slice.selectedIndex == document.forms[0].slice.length-1)
  {
    document.forms[0].slice.selectedIndex = 0;
  }
  else
  {
    document.forms[0].slice.selectedIndex = document.forms[0].slice.selectedIndex + 1;
  }
  load();
}
]])


-- custom method
print([[
function previousslice()
{
  if (document.forms[0].slice.selectedIndex == 0)
  {
    document.forms[0].slice.selectedIndex = document.forms[0].slice.length-1;
  }
  else
  {
    document.forms[0].slice.selectedIndex = document.forms[0].slice.selectedIndex - 1;
  }
  load();
}
]])


print([[
// main application
var app = new dwv.App();
]])


print([[
// jquery
$(document).ready(function(){
    // initialise buttons
    $("button").button();
    $("#toggleInfoLayer").button({ icons: 
        { primary: "ui-icon-comment" }, text: false });
    // create dialogs
    $("#openData").dialog({ position: 
        {my: "left top", at: "left top", of: "#pageMain"} });
    $("#toolbox").dialog({ position: 
        {my: "left top+200", at: "left top", of: "#pageMain"} });
    $("#history").dialog({ position: 
        {my: "left top+370", at: "left top", of: "#pageMain"},
        autoOpen: false });
    $("#tags").dialog({ position: 
        {my: "right top", at: "right top", of: "#pageMain"},
        autoOpen: false, width: 500, height: 590 });
]])

print([[
    // image dialog
    $("#layerDialog").dialog({ position: 
        {my: "left+320 top", at: "left top", of: "#pageMain"}});
    // default size
    $("#layerDialog").dialog({ width: "auto", resizable: false });
    // Resizable but keep aspect ratio
    // TODO it seems to add a border that bothers getting the cursor position...
    //$("#layerContainer").resizable({ aspectRatio: true });

    // initialise the application
    app.init();
    // align layers when the window is resized
    window.onresize = app.resize;
]])


-- custom load
print([[
    // load wado URL
    app.loadURL(["]].. url ..[["]);
});
]])


print([[</script>]])
print([[</head>]])
print([[<body>]])


print([[<div id="pageHeader">]])


print([[
<!-- Title -->
<h1>DICOM Web Viewer (<a href="https://github.com/ivmartel/dwv">dwv</a> v0.4beta)</h1>


<!-- Toolbar -->
<div id="toolbar">
<button onclick="toggle('#openData')">File</button>
<button onclick="toggle('#toolbox')">Toolbox</button>
<button onclick="toggle('#history')">History</button>
<button onclick="toggle('#tags')">Tags</button>
<button onclick="toggle('#layerDialog')">Image</button>
<button onclick="app.toggleInfoLayerDisplay()">Info</button>
</div><!-- /toolbar -->
]])


print([[</div><!-- pageHeader -->]])


print([[<div id="pageMain">]])


print([[
<!-- Open file -->
<div id="openData" title="File">
<form><p>
Path: <input type="file" id="imagefiles" multiple />
URL: <input type="url" id="imageurl" />
]])


-- custom slice chooser
print([[
<br>Slice: 
<input type=button value='<' onclick=previousslice() />
<select name=slice onchange=load()>
]])
for i=1, #images do
  print('  <option value='..images[i].SOPInstanceUID..'>'..i..'</option>')
end
print([[
</select>
<input type=button value='>' onclick=nextslice() />
]])


print([[</p></form>]])


print([[<div id="progressbar"></div>]])


print([[</div>]])


print([[
<!-- Toolbox -->
<div id="toolbox" title="Toolbox">
<ul id="toolList"></ul>
</div>


<!-- History -->
<div id="history" title="History"></div>


<!-- Tags -->
<div id="tags" title="Tags" style="display:none;"></div>
]])


print([[
<!-- Layer Container -->
<div id="layerDialog" title="Image">
<div id="layerContainer">
<canvas id="imageLayer">Only for HTML5 compatible browsers...</canvas>
<canvas id="drawLayer">Only for HTML5 compatible browsers...</canvas>
<canvas id="tempLayer">Only for HTML5 compatible browsers...</canvas>
<div id="infoLayer">
<div id="infotl"></div>
<div id="infotr"></div>
<div id="infobl"></div>
<div id="infobr"><div id="plot"></div></div>
</div><!-- /infoLayer -->
</div><!-- /layerContainer -->
</div><!-- /layerDialog -->
]])


print([[</div><!-- pageMain -->]])


print([[</body>]])
print([[</html>]])

Display More

jjoerg · Aug 5th 2013

Hi,

similar to me, I can duplicate your dwv integration with an older code of dwv 0.3. I am a litlle bit confused about the versions you can download at github. The versions ivmartel-dwv-v0.3-97-g34f266b and dwv-master do not work, version dwv-0.3 works with your lua file.

Jörg

marcelvanherk · Aug 5th 2013

Hi Joerg,

I just posted an issue on github about this. Thanks for reporting.

Marcel

ivmartel · Aug 9th 2013

Hi,
As you figured out, only dwv version 0.3 will work for now with Conquest 1.4.17. I am working on allowing multi-slice directly in dwv, this will be availlable with the final v0.4.
To download v0.3, check this page: https://github.com/ivmartel/dwv/releases/tag/v0.3. You can download the full code or just browse it.
Best,
Yves

mrudiansyah · Sep 15th 2013

hi Marcell,

why I could not take pictures DICOM from GUI or command. Example :

c:\dicomserver>dgate --movepatient:CONQUESTSRV2,CONQUESTSRV1,R1009
Move failed from CONQUESTSRV2 to CONQUESTSRV1
c:\dicomserver>

but
c:\dicomserver>dgate --movepatient:CONQUESTSRV1,CONQUESTSRV2,R1009
c:\dicomserver>
success

status :
CONQUESTSRV1 is server in home and no ip public
CONQUESTSRV2 is server in office, use ip public (ip:x.x.x.x) router mikrotik forward to server CONQUESTSRV2 (ip:y.y.y.y)

query CONQUESTSRV2 success.

but --movepatient no success

Thanks

marcelvanherk · Sep 16th 2013

Hi,

you have to send the move command to the source server, use e.g.,

dgate -pport -qip --movepatient:CONQUESTSRV2,CONQUESTSRV1,R1009

where ip and port correspond with the source server, in this case CONQUESTSRV2

Marcel

1.4.17 release out

Participate now!

Share