From 9dbcf6467bacaa4689b2a6f207b37026f9a98ba5 Mon Sep 17 00:00:00 2001
From: Wei Ouyang <oeway007@gmail.com>
Date: Fri, 29 Sep 2023 18:31:01 +0200
Subject: [PATCH] Improve loading animation

---
 public/plugins/bioengine-test-run.imjoy.html | 38 ++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/public/plugins/bioengine-test-run.imjoy.html b/public/plugins/bioengine-test-run.imjoy.html
index ba62f3e9..919372e7 100644
--- a/public/plugins/bioengine-test-run.imjoy.html
+++ b/public/plugins/bioengine-test-run.imjoy.html
@@ -233,9 +233,9 @@
     }
 
     setWaiting(waiting) {
-        const waitAnimation = document.getElementById("wait-animation")
+        const waitAnimation = document.getElementById("overlay")
         if (waiting) {
-            waitAnimation.style.display = "inline-block"
+            waitAnimation.style.display = "flex"
         } else {
             waitAnimation.style.display = "none"
         }
@@ -325,15 +325,17 @@
         placeholder="Input axes"
         id="input-axes-input" />
 
-    <div id="info" class="mt-2">
-        <div id="wait-animation" role="status" style="display: none">
-            <svg aria-hidden="true" class="w-4 h-4 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-                <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
-                <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
-            </svg>
-            <span class="sr-only">Loading...</span>
+    <div id="overlay" class="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center">
+        <div id="info" class="mt-2 bg-white p-6 rounded shadow-lg">
+            <div id="wait-animation" role="status" style="display: none">
+                <svg aria-hidden="true" class="w-4 h-4 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
+                    <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
+                    <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
+                </svg>
+                <span class="sr-only">Loading...</span>
+            </div>
+            <p class="text-gray-500 text-sm" style="display: inline-block" id="info-panel"></p>
         </div>
-        <p class="text-gray-500 text-sm" style="display: inline-block" id="info-panel"></p>
     </div>
 
 
@@ -594,15 +596,23 @@
             await api.alert("Please load an image first.")
             return False
         shape_spec = rdf['inputs'][0]['shape']
+        expected_axes = rdf['inputs'][0]['axes']
         if isinstance(shape_spec, list):
             expected_shape = tuple(shape_spec)
-            if transformed.shape != expected_shape:
+            if len(expected_shape) != len(transformed.shape):
                 await api.alert(
-                    f"Transformed input image shape {transformed.shape} "
-                    f"does not match the expected shape {expected_shape}."
-                    f"Original image shape: {self.image.shape}"
+                    f"Transformed input image dimension {len(expected_shape)}"
+                    f"does not match the expected dimension ({len(expected_shape)})."
                 )
                 return False
+            for idx in range(len(expected_shape)):
+                if expected_axes[idx] == "c":
+                    if transformed.shape[idx] != expected_shape[idx]:
+                        await api.alert(
+                            f"Transformed input image channels {transformed.shape[idx]}"
+                            f"does not match the expected channels ({expected_shape[idx]})."
+                        )
+                        return False
         return True
 
     async def run_model(