fix pivot tool bug w/ no rows not updating columns; set debug log mes…

…sages to debug level
CountESS-Project · Sep 26, 2024 · d52c32e · d52c32e
1 parent 9b4a665
commit d52c32e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/countess/core/plugins.py b/countess/core/plugins.py
@@ -212,8 +212,7 @@ def process(self, data: pd.DataFrame, source: str) -> Iterable[pd.DataFrame]:
 
     def finalize(self) -> Iterable[pd.DataFrame]:
         yield from super().finalize()
-        for p in self.params.values():
-            p.set_column_choices(self.input_columns.keys())
+        self.set_column_choices(self.input_columns.keys())
 
 
 class PandasConcatProcessPlugin(PandasProcessPlugin):

diff --git a/countess/gui/main.py b/countess/gui/main.py
@@ -233,7 +233,7 @@ def notes_modified_callback(self, *_):
 
     def config_change_callback(self, *_):
         """Called immediately if a change to config has occurred."""
-        logger.info("config_change_callback")
+        logger.debug("config_change_callback")
 
         # Leave it a bit to see if the user is still typing, if so cancel.
         if self.config_change_task:
@@ -242,33 +242,33 @@ def config_change_callback(self, *_):
 
     def config_change_task_callback(self):
         """Called when the user makes a change then pauses for a bit"""
-        logger.info("config_change_task_callback")
+        logger.debug("config_change_task_callback")
 
         # if there's already an update running, delay a bit longer
         if self.node_update_thread and self.node_update_thread.is_alive():
             # XXX need some way to tell the thread to stop
-            logger.info("config_change_task_callback: waiting for thread %s", self.node_update_thread)
+            logger.debug("config_change_task_callback: waiting for thread %s", self.node_update_thread)
             self.config_change_task = self.frame.after(1000, self.config_change_task_callback)
             return
 
         self.config_change_task = None
         self.node.mark_dirty()
 
         self.node_update_thread = threading.Thread(target=self.node.prerun)
-        logger.info("config_change_task_callback: starting thread %s", self.node_update_thread)
+        logger.debug("config_change_task_callback: starting thread %s", self.node_update_thread)
         self.node_update_thread.start()
 
         self.config_change_task_callback_2()
 
     def config_change_task_callback_2(self):
-        logger.info("config_change_task_callback_2")
+        logger.debug("config_change_task_callback_2")
 
         if self.node_update_thread and self.node_update_thread.is_alive():
-            logger.info("config_change_task_callback_2: waiting for thread %s", self.node_update_thread)
+            logger.debug("config_change_task_callback_2: waiting for thread %s", self.node_update_thread)
             self.frame.after(500, self.config_change_task_callback_2)
             return
 
-        logger.info("config_change_task_callback_2: joining thread %s", self.node_update_thread)
+        logger.debug("config_change_task_callback_2: joining thread %s", self.node_update_thread)
         self.node_update_thread.join()
         self.node_update_thread = None
 

diff --git a/countess/plugins/pivot.py b/countess/plugins/pivot.py
@@ -98,6 +98,8 @@ def _aggfunc():
         return []
 
     def finalize(self) -> Iterable[pd.DataFrame]:
+        yield from super().finalize()
+
         if not self.dataframes:
             return
 
@@ -123,5 +125,3 @@ def _aggfunc():
             yield dataframe
         except (KeyError, ValueError, TypeError) as exc:
             logger.warning("Exception", exc_info=exc)
-
-        yield from super().finalize()
diff --git a/tests/gui/test_actions.py b/tests/gui/test_actions.py
@@ -48,7 +48,7 @@ def test_open_new():
         button.invoke()
         root.update()
 
-    for _ in range(0,30):
+    for _ in range(0, 30):
         time.sleep(0.1)
         root.update()