Some small bugs fixed

negstation/event_bus.py

@@ -1,6 +1,8 @@
 import threading
 import queue
 import logging
+import inspect
+import types
 
 
 class EventBus:
@@ -42,3 +44,14 @@ class EventBus:
                 callback(data)
             except queue.Empty:
                 break
+
+    def unsubscribe_instance(self, instance):
+        for event_type, subs in list(self.subscribers.items()):
+            new_subs = []
+            for callback, main_thread in subs:
+                # if it's a bound method to our instance, skip it
+                if inspect.ismethod(callback) and callback.__self__ is instance:
+                    continue
+                new_subs.append((callback, main_thread))
+            if len(new_subs) != len(subs):
+                self.subscribers[event_type] = new_subs

negstation/image_pipeline.py

@@ -6,17 +6,19 @@ from .event_bus import EventBus
 class ImagePipeline:
     def __init__(self, bus: EventBus):
         self.bus = bus
-        self.stages = []
+        self.id_counter = 0
+        self.stages = {}
         self.stagedata = {}
 
     def register_stage(self, name: str):
-        self.stages.append(name)
-        self.stagedata[name] = None
+        self.stages[self.id_counter] = name
+        self.stagedata[self.id_counter] = None
         self.bus.publish_deferred("pipeline_stages", self.stages)
-        return len(self.stages) - 1
+        self.id_counter += 1
+        return self.id_counter-1
 
     def rename_stage(self, id: int, name: str):
-        if id >= 0 and id < len(self.stages):
+        if id in self.stages:
             self.stages[id] = name
             self.bus.publish_deferred("pipeline_stages", self.stages)
 
@@ -30,11 +32,16 @@ class ImagePipeline:
         else:
             return None
 
-    def get_stage_name(self, id:int):
+    def get_stage_name(self, id: int):
         if id >= 0 and id < len(self.stages):
-            return self.stages[id] 
+            return self.stages[id]
         else:
             return None
-        
+
     def republish_stages(self):
-        self.bus.publish_deferred("pipeline_stages", self.stages)
+        self.bus.publish_deferred("pipeline_stages", self.stages)
+
+    def remove_stage(self, id: int):
+        del self.stages[id]
+        del self.stagedata[id]
+        self.republish_stages()

negstation/negstation.py

@@ -12,7 +12,7 @@ from .layout_manager import LayoutManager
 
 from .widgets.base_widget import BaseWidget
 
-logging.basicConfig(level=logging.DEBUG,
+logging.basicConfig(level=logging.INFO,
                     format="%(asctime)s %(levelname)s %(message)s")
 logger = logging.getLogger(__name__)
 
@@ -76,6 +76,7 @@ class EditorManager:
     def _add_widget(self, widget_type: str):
         WidgetClass = self.widget_classes[widget_type]
         instance = WidgetClass(self, logger)
+        logger.info(f'Created instance: {str(instance)}')
         self.widgets.append(instance)
         instance.create()
 

negstation/widgets/base_widget.py

@@ -1,5 +1,6 @@
 import dearpygui.dearpygui as dpg
 import logging
+import gc
 
 from typing import TYPE_CHECKING
 
@@ -40,9 +41,10 @@ class BaseWidget:
             dpg.add_item_resize_handler(
                 callback=self._on_window_resize, parent=self.window_handler
             )
-            dpg.bind_item_handler_registry(self.window_tag, self.window_handler)
 
             self.create_content()
+            
+            dpg.bind_item_handler_registry(self.window_tag, self.window_handler)
 
     def create_content(self):
         """Must be implemented by the widget, creates the content of the window"""
@@ -65,14 +67,24 @@ class BaseWidget:
     # Callbacks
 
     def _on_window_close(self):
-        try:
-            dpg.delete_item(self.window_tag)
-            self.manager.widgets.remove(self)
-        except ValueError:
-            pass
+        """Some cleanup after closing a window"""
+        self.manager.bus.unsubscribe_instance(self)
+
+        dpg.delete_item(self.window_tag)
+        dpg.delete_item(self.window_handler)
+
+        self.manager.widgets.remove(self)
+
+        self.manager = None
+        self.logger = None
+        
+        gc.collect()
 
     def _on_window_resize(self, data):
         win_w, win_h = dpg.get_item_rect_size(self.window_tag)
         self.window_height = win_h
         self.window_width = win_w
         self.on_resize(win_w, win_h)
+
+    def __del__(self):
+        print("Widget deleted")

negstation/widgets/pipeline_stage_widget.py

@@ -22,6 +22,7 @@ class PipelineStageWidget(BaseWidget):
         self.pipeline_stage_in_id = None
         self.pipeline_stage_out_id = None
         self.pipeline_config_group_tag = dpg.generate_uuid()
+        self.stage_in_combo = dpg.generate_uuid()
 
         if self.has_pipeline_out:
             self.pipeline_stage_out_id = self.manager.pipeline.register_stage(
@@ -38,11 +39,12 @@ class PipelineStageWidget(BaseWidget):
     def create_content(self):
         with dpg.group(tag=self.pipeline_config_group_tag):
             if self.has_pipeline_in:
-                self.stage_in_combo = dpg.add_combo(
+                dpg.add_combo(
                     label="Stage In",
                     items=[],
                     callback=self._on_stage_in_select,
                     default_value=f"{self.manager.pipeline.get_stage_name(0)} : 0",
+                    tag=self.stage_in_combo
                 )
             if self.has_pipeline_out:
                 dpg.add_input_text(
@@ -72,9 +74,14 @@ class PipelineStageWidget(BaseWidget):
 
     # Callbacks
 
+    def _on_window_close(self):
+        if self.has_pipeline_out:
+            self.manager.pipeline.remove_stage(self.pipeline_stage_out_id)
+        return super()._on_window_close()
+
     def _on_stage_list(self, stagelist):
         if self.has_pipeline_in:
-            stages = [f"{stage} : {id}" for id, stage in enumerate(stagelist)]
+            stages = [f"{stage} : {id}" for id, stage in stagelist.items()]
             dpg.configure_item(self.stage_in_combo, items=stages)
 
     def _on_stage_in_select(self, sender, selected_stage: str):

negstation/widgets/stage_viewer_widget.py

@@ -32,6 +32,7 @@ class PipelineStageViewer(PipelineStageWidget):
 
     def update_texture(self, img: np.ndarray):
         """Only call from update function"""
+        # TODO show a smaller version of the image to speed things up
         if img is None:
             dpg.configure_item(self.image_item, show=False)
             return