Merge branch 'main' into socket-server

cmudig · Jan 6, 2022 · f4612f3 · f4612f3
2 parents 7069476 + d0bf117
commit f4612f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/emblaze/viewer.py b/emblaze/viewer.py
@@ -47,8 +47,7 @@ class Viewer(DOMWidget):
 
     embeddings = Instance(EmbeddingSet, allow_none=True)
     data = Dict(None, allow_none=True).tag(sync=True)
-    file = Any(allow_none=True).tag(sync=True)
-
+    file = Any(allow_none=True).tag(sync=True)    
     plotPadding = Float(10.0).tag(sync=True)
 
     currentFrame = Integer(0).tag(sync=True)
@@ -120,6 +119,8 @@ def __init__(self, *args, **kwargs):
         file: A file path or file-like object from which to read a comparison JSON file.
         """
         super(Viewer, self).__init__(*args, **kwargs)
+        if self.file:
+            self.load_comparison(self.file)
         assert len(self.embeddings) > 0, "Must have at least one embedding"
         self.saveSelectionFlag = False
         self.loadSelectionFlag = False

diff --git a/src/App.svelte b/src/App.svelte
@@ -62,7 +62,7 @@
 
   $: updateDataset($data);
 
-  function updateDataset(rawData) {
+  function updateDataset(rawData, neighbors) {
     if (!!rawData && !!rawData['data']) {
       dataset = new Dataset(rawData, 'color');
       if (!!$frameTransformations && $frameTransformations.length > 0)