resolve discrepencies between app and cli

labsyspharm · Mar 22, 2024 · d076738 · d076738
1 parent c2a663e
commit d076738
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/minerva-story/index.html b/minerva-story/index.html
@@ -10,7 +10,7 @@
 <body>
     <div id="minerva-browser" style="position: absolute; top: 0; left: 0; height: 100%; width: 100%;"> </div>
     <script defer src="https://use.fontawesome.com/releases/v5.2.0/js/all.js" integrity="sha384-4oV5EgaV02iISL2ban6c/RmotsABqE4yZxZLcYMAdG7FAPsyHYAPpywE9PJo+Khy" crossorigin="anonymous"></script>
-    <script src="https://cdn.jsdelivr.net/npm/minerva-browser@3.19.4/build/bundle.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/minerva-browser@3.19.6/build/bundle.js"></script>
   <script>
         window.viewer = MinervaStory.default.build_page({
           hideWelcome: true,

diff --git a/src/exhibit.py b/src/exhibit.py
@@ -27,7 +27,7 @@ def json_to_html(exhibit):
         '    <body>\n'
         '        <div id="minerva-browser" style="position: absolute; top: 0; left: 0; height: 100%; width: 100%;"></div>\n'
         '        <script defer src="https://use.fontawesome.com/releases/v5.2.0/js/all.js" integrity="sha384-4oV5EgaV02iISL2ban6c/RmotsABqE4yZxZLcYMAdG7FAPsyHYAPpywE9PJo+Khy" crossorigin="anonymous"></script>\n'
-        '        <script src="https://cdn.jsdelivr.net/npm/minerva-browser@3.15.0/build/bundle.js"></script>\n'
+        '        <script src="https://cdn.jsdelivr.net/npm/minerva-browser@3.19.6/build/bundle.js"></script>\n'
         '        <script>\n'
         '         window.viewer = MinervaStory.default.build_page({\n'
                      f'exhibit: {exhibit},\n'
@@ -99,10 +99,12 @@ def make_exhibit_config(in_shape, root_url, saved, rgba):
         "Groups": list(make_groups(saved["groups"])),
         "Masks": [],
     }
-    first_group = saved["sample_info"].get("first_group", None)
-    default_group = saved["sample_info"].get("default_group", None)
+    first_group = saved.get("first_group", None)
+    default_group = saved.get("default_group", None)
+    first_viewport = saved.get("first_viewport", None)
     pixels_per_micron = saved["sample_info"].get("pixels_per_micron", None)
     exhibit = set_if_not_none(exhibit, "PixelsPerMicron", pixels_per_micron)
+    exhibit = set_if_not_none(exhibit, "FirstViewport", first_viewport)
     exhibit = set_if_not_none(exhibit, "DefaultGroup", default_group)
     exhibit = set_if_not_none(exhibit, "FirstGroup", first_group)
 

diff --git a/src/render.py b/src/render.py
@@ -35,7 +35,7 @@ def json_to_html(exhibit):
         '    <body>\n'
         '        <div id="minerva-browser" style="position: absolute; top: 0; left: 0; height: 100%; width: 100%;"></div>\n'
         '        <script defer src="https://use.fontawesome.com/releases/v5.2.0/js/all.js" integrity="sha384-4oV5EgaV02iISL2ban6c/RmotsABqE4yZxZLcYMAdG7FAPsyHYAPpywE9PJo+Khy" crossorigin="anonymous"></script>\n'
-        '        <script src="https://cdn.jsdelivr.net/npm/minerva-browser@3.19.4/build/bundle.js"></script>\n'
+        '        <script src="https://cdn.jsdelivr.net/npm/minerva-browser@3.19.6/build/bundle.js"></script>\n'
         '        <script>\n'
         '         window.viewer = MinervaStory.default.build_page({\n'
                      f'exhibit: {exhibit},\n'
@@ -129,10 +129,12 @@ def make_exhibit_config(in_shape, root_url, saved, rgba):
         "Groups": list(make_groups(saved["groups"])),
         "Masks": [],
     }
-    first_group = saved["sample_info"].get("first_group", None)
-    default_group = saved["sample_info"].get("default_group", None)
+    first_group = saved.get("first_group", None)
+    default_group = saved.get("default_group", None)
+    first_viewport = saved.get("first_viewport", None)
     pixels_per_micron = saved["sample_info"].get("pixels_per_micron", None)
     exhibit = set_if_not_none(exhibit, "PixelsPerMicron", pixels_per_micron)
+    exhibit = set_if_not_none(exhibit, "FirstViewport", first_viewport)
     exhibit = set_if_not_none(exhibit, "DefaultGroup", default_group)
     exhibit = set_if_not_none(exhibit, "FirstGroup", first_group)