# HG changeset patch # User Alain Mazy # Date 1547111426 -3600 # Node ID 9b18c8d4d45981d69c9eff8e8e4dbfb44762efe8 # Parent 3db9697a0a58bbdba8ed302d31473d7bce17fe9d 'fix' for Orthanc issue 21: added a select file button + a warning specific for Firefox users diff -r 3db9697a0a58 -r 9b18c8d4d459 .hgignore --- a/.hgignore Sat Dec 29 14:21:43 2018 +0100 +++ b/.hgignore Thu Jan 10 10:10:26 2019 +0100 @@ -3,3 +3,4 @@ CMakeLists.txt.user *.cpp.orig *.h.orig +.vs/ diff -r 3db9697a0a58 -r 9b18c8d4d459 OrthancExplorer/explorer.html --- a/OrthancExplorer/explorer.html Sat Dec 29 14:21:43 2018 +0100 +++ b/OrthancExplorer/explorer.html Thu Jan 10 10:10:26 2019 +0100 @@ -1,627 +1,639 @@ - - - - Orthanc Explorer + + + + + Orthanc Explorer - - - - - - - - - - - - - - - + + + + + + - - - - + + + + + + + + + + + + + - - - - - - - -
-
-

Lookup studies

-
- Lookup - Plugins -
-
- Upload - Query/Retrieve - Jobs -
+ + + + + + + + +
+
+

Lookup studies

+
+ Lookup + Plugins
-
-
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
-
- All patients -
-
- All studies -
-
- -
-
-
 
-
-
-
-
-

Warning:

Your lookup led to many results! - Showing only ? studies to - avoid performance issue. Please make your query more - specific, then relaunch the lookup. -
-
 
-
-
    -
-
+
+ Upload + Query/Retrieve + Jobs
+
+
+
+ + +
-
-
-

All patients

-
- Lookup - Plugins +
+ + +
+ +
+ + +
+ +
+ +
-
- Upload - Query/Retrieve - Jobs + +
+ +
-
-
-
+ +
+
+ All patients +
+
+ All studies +
+
+ +
+
+
 
+ +
+
-

Warning:

This is a large Orthanc server. Showing - only ? patients to avoid - performance issue. Make sure to use lookup if targeting - specific patients! +

Warning:

Your lookup led to many results! + Showing only ? studies to + avoid performance issue. Please make your query more + specific, then relaunch the lookup.
 
-
    -
-
-
- -
-
-

All studies

-
- Lookup - Plugins -
-
- Upload - Query/Retrieve - Jobs -
-
-
-
-
-

Warning:

This is a large Orthanc server. Showing - only ? studies to avoid - performance issue. Make sure to use lookup if targeting - specific studies! -
-
 
-
-
    +
+
-
-
-

Upload DICOM files

-
- Lookup - Plugins -
+
+
+

All patients

+
+ Lookup + Plugins
-
-
- +
+ Upload + Query/Retrieve + Jobs +
+
+
+
+
+

Warning:

This is a large Orthanc server. Showing + only ? patients to avoid + performance issue. Make sure to use lookup if targeting + specific patients!
-

-

-
- -
-
-

-
    -
  • Drag and drop DICOM files here
    • -
+
 
+
+
    +
+
+
+ +
+
+

All studies

+
+ Lookup + Plugins +
+
+ Upload + Query/Retrieve + Jobs +
+
+
+
+
+

Warning:

This is a large Orthanc server. Showing + only ? studies to avoid + performance issue. Make sure to use lookup if targeting + specific studies! +
+
 
+
+
    +
+
+
+ +
+
+

Upload DICOM files

+
+ Lookup + Plugins
+
+ +

+

+
+ +
+
+

+
    +
  • Drag and drop DICOM files here
    • +
+
+

Warning:

Orthanc issue #21: On Firefox, especially on Linux & OSX systems, files might be missing when + using drag-and-drop. Use the "Select files to upload" button instead ! +
+
+
-
-
-

Patient

-
- Lookup - Plugins -
-
- Upload - Query/Retrieve - Jobs -
+
+
+

Patient

+
+ Lookup + Plugins
-
-
-
-
-
    -
-

-

- -
-

- +
+ Upload + Query/Retrieve + Jobs +
+
+
+
+
+
+
    +
+

+

+ +
+

+ - -
+
-
-
-
    -
-
+
+
+
+
    +
+
-
-
-

- - Patient » - Study -

-
- Lookup - Plugins +
+
+

+ + Patient » + Study +

+
+ Lookup + Plugins +
+
+ Upload + Query/Retrieve + Jobs +
+
+
+
+
+
-
- Upload - Query/Retrieve - Jobs +
+
+
    +
+
-
-
-
-
-
    -
+
+
- +
+
+

+ + Patient » + Study » + Series +

+
+ Lookup + Plugins +
+
+ Upload + Query/Retrieve + Jobs +
+
+
+
+
+ + +
+
+
+
+
    +
-
-
-
    -
+
+
+
+
+ +
+
+

+ + Patient » + Study » + Series » + Instance +

+
+ Lookup + Plugins +
+
+ Upload + Query/Retrieve + Jobs +
+
+
+
+
+ +
+
+
+
+

DICOM Tags

+

+ + +

+
- -
-
-

- - Patient » - Study » - Series -

-
- Lookup - Plugins -
-
- Upload - Query/Retrieve - Jobs -
-
-
-
-
-
-
    -
+
- +
+
+

Plugins

+
+ Lookup + Plugins +
+
+
+
    +
+
+
- -
-
-
-
-
    -
-
-
-
+
+
+

DICOM Query/Retrieve (1/4)

+
+ Lookup + Plugins
+
+
+
+ + +
-
-
-

- - Patient » - Study » - Series » - Instance -

-
- Lookup - Plugins +
+
+ Field of interest: + + + + + + + + +
-
- Upload - Query/Retrieve - Jobs -
-
-
-
-
-
-
    -
- +
+ + +
+ +
+ + +
- -
-
-
-
-
-

DICOM Tags

-

- - -

-
-
-
+
+
+
+ Modalities: + + + + + + + + + +
-
+ +
+
+ +
+
+ +
+
+
+
+ -
-
-

Plugins

-
- Lookup - Plugins -
+
+
+

DICOM Query/Retrieve (2/4)

+
+ Lookup + Plugins
-
-
    -
+ Query/Retrieve +
+
+
    +
+
+
+ + +
+
+

DICOM Query/Retrieve (3/4)

+
+ Lookup + Plugins
+ Query/Retrieve +
+
+
    +
+
+
+ + +
+
+

DICOM Query/Retrieve (4/4)

+
+ Lookup + Plugins +
+ Query/Retrieve
-
-
-

DICOM Query/Retrieve (1/4)

-
- Lookup - Plugins -
-
-
-
-
- - -
- -
-
- Field of interest: - - - - - - - - -
-
- -
- - -
- -
- - -
- -
-
-
- Modalities: - - - - - - - - - -
-
-
- -
-
- -
-
- -
-
-
-
-
- - -
-
-

DICOM Query/Retrieve (2/4)

-
- Lookup - Plugins +
+
+
+ +
- Query/Retrieve -
-
-
    -
-
-
- - -
-
-

DICOM Query/Retrieve (3/4)

-
- Lookup - Plugins -
- Query/Retrieve -
-
-
    -
-
-
- - -
-
-

DICOM Query/Retrieve (4/4)

-
- Lookup - Plugins -
- Query/Retrieve -
- -
- -
- - -
- -
-
-
- -
-
-
- -
-
- - -
-
-

Jobs

-
- Lookup - Plugins -
-
-
-
    -
-
-
- -
-
-

Job

-
- Lookup - Plugins -
-
- Jobs -
-
-
-
    -
-
- - - - +
+
-
+ + +
+
+ + +
+
+

Jobs

+
+ Lookup + Plugins +
+
+
+
    +
+
+
+ +
+
+

Job

+
+ Lookup + Plugins +
+
+ Jobs
+
+
    +
- - - +
- + + + - - - + + + + + + \ No newline at end of file diff -r 3db9697a0a58 -r 9b18c8d4d459 OrthancExplorer/file-upload.js --- a/OrthancExplorer/file-upload.js Sat Dec 29 14:21:43 2018 +0100 +++ b/OrthancExplorer/file-upload.js Thu Jan 10 10:10:26 2019 +0100 @@ -27,11 +27,7 @@ $('#progress .label').text('Failure'); }) .bind('fileuploaddrop', function (e, data) { - let target = $('#upload-list'); - $.each(data.files, function (index, file) { - target.append('
  • ' + file.name + '
    • '); - }); - target.listview('refresh'); + appendFilesToUploadList(data.files); }) .bind('fileuploadsend', function (e, data) { // Update the progress bar. Note: for some weird reason, the @@ -45,14 +41,28 @@ }); }); +function appendFilesToUploadList(files) { + let target = $('#upload-list'); + $.each(files, function (index, file) { + target.append('
  • ' + file.name + '
    • '); + }); + target.listview('refresh'); +} +$('#fileupload').live('change', function (e) { + appendFilesToUploadList(e.target.files); +}) $('#upload').live('pageshow', function() { - alert('WARNING - This page is currently affected by Orthanc issue #21: ' + - '"DICOM files might be missing after uploading with Mozilla Firefox." ' + - 'Do not use this upload feature for clinical uses, or carefully ' + - 'check that all instances have been properly received by Orthanc. ' + - 'Please use the command-line "ImportDicomFiles.py" script to circumvent this issue.'); + if (navigator.userAgent.toLowerCase().indexOf('firefox') == -1) { + $("#issue-21-warning").css('display', 'none'); + } + + // alert('WARNING - This page is currently affected by Orthanc issue #21: ' + + // '"DICOM files might be missing after uploading with Mozilla Firefox." ' + + // 'Do not use this upload feature for clinical uses, or carefully ' + + // 'check that all instances have been properly received by Orthanc. ' + + // 'Please use the command-line "ImportDicomFiles.py" script to circumvent this issue.'); $('#fileupload').fileupload('enable'); });