Clean up

holoviz · Jul 10, 2023 · fddae93 · fddae93
1 parent 79a8efe
commit fddae93
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/holonote/annotate/annotator.py b/holonote/annotate/annotator.py
@@ -110,7 +110,7 @@ class AnnotatorInterface(param.Parameterized):
 
     def __init__(self, init=True, **params):
         if "annotation_table" not in params:
-            params["annotation_table"] = AnnotationTable() #connector=params.get("connector"))
+            params["annotation_table"] = AnnotationTable()
 
         super().__init__(**params)
         self._region = {}
@@ -175,12 +175,12 @@ def refresh(self, clear=False):
         "Method to update display state of the annotator and optionally clear stale visual state"
         pass
 
-    # def set_annotation_table(self, annotation_table): # FIXME! Won't work anymore, set_connector??
-    #     self._region = {}
-    #     self.annotation_table = annotation_table
-    #     self.annotation_table.register_annotator(self)
-    #     self.annotation_table._update_index()
-    #     self.snapshot()
+    def set_annotation_table(self, annotation_table): # FIXME! Won't work anymore, set_connector??
+        self._region = {}
+        self.annotation_table = annotation_table
+        self.annotation_table.register_annotator(self)
+        self.annotation_table._update_index()
+        self.snapshot()
 
     # Selecting annotations
 

diff --git a/holonote/annotate/connector.py b/holonote/annotate/connector.py
@@ -363,5 +363,5 @@ def update_row(self, **updates): # updates as a dictionary OR remove posarg?
         self.con.commit()
 
     def add_schema(self, schema):
-        # self._schemas.append(schema)
-        self.column_schema |= schema
+        # TODO: Check if schema don't overwrite existing columns
+        self.column_schema = {**self.column_schema, **schema}
diff --git a/holonote/annotate/table.py b/holonote/annotate/table.py
@@ -57,10 +57,6 @@ def load(self, connector=None, fields_df=None, primary_key_name=None, fields=Non
             fields_df = fields_df.set_index(primary_key_name)
             self._field_df = fields_df
 
-        # FIXME: Proper solution is to only load relevant columns
-        self._field_df = self._field_df
-        self._region_df = self._region_df
-
         self.clear_edits()
         self._update_index()
 
@@ -359,8 +355,6 @@ def _mask2D(self, kdims):
         )
 
     def load_annotation_table(self, conn, fields):
-        # if conn.table_name not in conn.get_tables():
-        #     return
         df = conn.transforms['load'](conn.load_dataframe())
         fields_df = df[fields].copy()
         self.define_fields(fields_df, {ind:ind for ind in fields_df.index})
@@ -394,7 +388,6 @@ def load_annotation_table(self, conn, fields):
         self.clear_edits()
 
     def add_schema_to_conn(self, conn):
-        # if conn.table_name not in conn.get_tables():
         field_dtypes = {col: str for col in conn.fields} # FIXME - generalize
         all_region_types = [an.region_types for an in self._annotators.values()]
         all_kdim_dtypes = [an.kdim_dtypes for an in self._annotators.values()]