# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1680189626 -7200
# Node ID 0d814292a17ec8dbaca16375ff9633673e0b3b19
# Parent  85ab86f10d014a33a4e9f5d22a6ecb59b54c07f9# Parent  d77fea5934fbb57ed8f277215c417a8f0cdfdc1b
integration mainline->deep-learning

diff -r 85ab86f10d01 -r 0d814292a17e Applications/StoneWebViewer/NEWS
--- a/Applications/StoneWebViewer/NEWS	Thu Mar 16 21:28:22 2023 +0100
+++ b/Applications/StoneWebViewer/NEWS	Thu Mar 30 17:20:26 2023 +0200
@@ -3,6 +3,11 @@
 
 * New button "Stretch to whole range" in the "Change windowing" menu
 
+Maintenance
+-----------
+
+* Prevent dragging series before they are ready
+
 
 Version 2.5 (2022-12-05)
 ========================
diff -r 85ab86f10d01 -r 0d814292a17e Applications/StoneWebViewer/WebApplication/app.js
--- a/Applications/StoneWebViewer/WebApplication/app.js	Thu Mar 16 21:28:22 2023 +0100
+++ b/Applications/StoneWebViewer/WebApplication/app.js	Thu Mar 30 17:20:26 2023 +0200
@@ -809,13 +809,17 @@
     },
     
     SeriesDragStart: function(event, seriesIndex) {
-      // It is necessary to use ".toString()" for Microsoft Edge Legacy (*)
-      event.dataTransfer.setData('seriesIndex', seriesIndex.toString());
+      if (this.series[seriesIndex].numberOfFrames > 0) { // prevent dragging before the series metadata have been loaded
+        // It is necessary to use ".toString()" for Microsoft Edge Legacy (*)
+        event.dataTransfer.setData('seriesIndex', seriesIndex.toString());
+      }
     },
 
     VirtualSeriesDragStart: function(event, seriesIndex, virtualSeriesId) {
-      event.dataTransfer.setData('seriesIndex', seriesIndex.toString());
-      event.dataTransfer.setData('virtualSeriesId', virtualSeriesId.toString());
+      if (this.series[seriesIndex].numberOfFrames > 0) { // prevent dragging before the series metadata have been loaded
+        event.dataTransfer.setData('seriesIndex', seriesIndex.toString());
+        event.dataTransfer.setData('virtualSeriesId', virtualSeriesId.toString());
+      }
     },
 
     SetViewportSeriesInstanceUid: function(viewportIndex, seriesInstanceUid) {
diff -r 85ab86f10d01 -r 0d814292a17e TODO
--- a/TODO	Thu Mar 16 21:28:22 2023 +0100
+++ b/TODO	Thu Mar 30 17:20:26 2023 +0200
@@ -44,10 +44,6 @@
 Known issues
 ------------
 
-* When opening a CT with 700 slices, if you drop the thumbnail in the viewport
-  before the studies/../metadata have been loaded, the series will never be displayed.
-  https://groups.google.com/g/orthanc-users/c/04D4exKMVSA
-
 * Compatibility with Google Chrome browser on iPad Air 4:
   https://groups.google.com/g/orthanc-users/c/7SgedbIiA2k/
   https://groups.google.com/g/orthanc-users/c/RfQJFgkOUYY/m/za7rkcLNBQAJ
@@ -61,7 +57,7 @@
 
 * Replace calls to /studies/.../series/.../metadata by calls to
   /instances?StudyInstanceUID=...&SeriesInstanceUID=...&includefield=...&includefield=...
-  to benefit from ExtraMainDicomTags stored in DB and avoid reading from disk
+  to benefit from ExtraMainDicomTags stored in DB and avoid reading from disk.
 
 --------
 Wishlist
@@ -86,11 +82,6 @@
   type of modality to be displayed):
   https://groups.google.com/g/orthanc-users/c/bGtK3q9ZUmg/m/gr8kCcVWCAAJ
 
-* When opening the viewer, directly load the first series in the
-  viewport (like the OsimisViewer). Whatch out the known issue
-  wrt. dropping a series before the studies/../metadata have been
-  loaded.
-
 * Create secondary capture DICOM images with the annotations burned in:
   https://groups.google.com/g/orthanc-users/c/T3h-6dIjvww/m/sVtHxwT_AQAJ