From a0ba27b35c81ec7afc16c86b3c241706380bc544 Mon Sep 17 00:00:00 2001 From: Jojojoppe Date: Sun, 3 Aug 2025 17:30:12 +0200 Subject: [PATCH] Fixed logging --- negstation/negstation.py | 2 +- negstation/widgets/invert_stage.py | 2 +- negstation/widgets/log_widget.py | 12 +- negstation/widgets/monochrome_widget.py | 2 +- negstation_layout.ini | 172 +++++++++++++----------- 5 files changed, 111 insertions(+), 79 deletions(-) diff --git a/negstation/negstation.py b/negstation/negstation.py index 9e170f7..d9d5548 100644 --- a/negstation/negstation.py +++ b/negstation/negstation.py @@ -13,7 +13,7 @@ from .layout_manager import LayoutManager from .widgets.base_widget import BaseWidget -logging.basicConfig(level=logging.INFO, +logging.basicConfig(level=logging.DEBUG, format="%(asctime)s %(levelname)s %(message)s") logger = logging.getLogger(__name__) diff --git a/negstation/widgets/invert_stage.py b/negstation/widgets/invert_stage.py index 69bb43f..8528b71 100644 --- a/negstation/widgets/invert_stage.py +++ b/negstation/widgets/invert_stage.py @@ -14,7 +14,7 @@ class InvertStage(PipelineStageWidget): super().__init__(manager, logger, default_stage_out="inverted_image") def create_pipeline_stage_content(self): - dpg.add_text("Inversion is happening here") + pass def on_pipeline_data(self, img): if img is None: diff --git a/negstation/widgets/log_widget.py b/negstation/widgets/log_widget.py index 2006ac9..05f7242 100644 --- a/negstation/widgets/log_widget.py +++ b/negstation/widgets/log_widget.py @@ -22,6 +22,8 @@ class LogWindowWidget(BaseWidget): self.initialized = False self.log_tag = dpg.generate_uuid() self.log_lines = [] + self.update_counter = 0 + self.need_update = False # Create and attach handler self.handler = DPGLogHandler(self._on_log) @@ -40,7 +42,7 @@ class LogWindowWidget(BaseWidget): self.log_lines.append(msg) if self.initialized: dpg.add_text(msg, parent=self.log_tag) - dpg.set_y_scroll(self.log_tag, dpg.get_y_scroll_max(self.log_tag)) + self.need_update = True def on_resize(self, width: int, height: int): # Optional: could resize child window here if needed @@ -51,3 +53,11 @@ class LogWindowWidget(BaseWidget): self.logger.removeHandler(self.handler) self.handler = None super()._on_window_close() + + def update(self): + if self.need_update: + self.update_counter += 1 + if self.update_counter == 10: + dpg.set_y_scroll(self.log_tag, dpg.get_y_scroll_max(self.log_tag)) + self.update_counter = 0 + self.need_update = False \ No newline at end of file diff --git a/negstation/widgets/monochrome_widget.py b/negstation/widgets/monochrome_widget.py index 79dc413..d9c8622 100644 --- a/negstation/widgets/monochrome_widget.py +++ b/negstation/widgets/monochrome_widget.py @@ -14,7 +14,7 @@ class MonochromeStage(PipelineStageWidget): super().__init__(manager, logger, default_stage_out="monochrome") def create_pipeline_stage_content(self): - dpg.add_text("Converting to grayscale...") + pass def on_pipeline_data(self, img): if img is None: diff --git a/negstation_layout.ini b/negstation_layout.ini index 26be5e0..3eb3bdd 100644 --- a/negstation_layout.ini +++ b/negstation_layout.ini @@ -17,7 +17,7 @@ DockId=0x00000007,0 [Window][###51] Pos=0,19 -Size=270,469 +Size=270,691 Collapsed=0 DockId=0x00000035,1 @@ -46,7 +46,7 @@ DockId=0x0000000E,0 [Window][###23] Pos=0,19 -Size=270,567 +Size=270,691 Collapsed=0 DockId=0x00000035,0 @@ -88,7 +88,7 @@ DockId=0x00000011,0 [Window][###35] Pos=272,19 -Size=710,580 +Size=710,588 Collapsed=0 DockId=0x00000033,0 @@ -99,8 +99,8 @@ Collapsed=0 DockId=0x00000020,0 [Window][###81] -Pos=272,646 -Size=710,154 +Pos=272,609 +Size=710,191 Collapsed=0 DockId=0x00000010,0 @@ -108,19 +108,19 @@ DockId=0x00000010,0 Pos=0,646 Size=270,154 Collapsed=0 -DockId=0x00000015,1 +DockId=0x00000013,1 [Window][###87] -Pos=0,646 -Size=270,154 +Pos=0,712 +Size=270,88 Collapsed=0 -DockId=0x00000015,0 +DockId=0x00000036,1 [Window][###111] -Pos=984,412 -Size=216,388 +Pos=974,630 +Size=226,170 Collapsed=0 -DockId=0x0000001A,0 +DockId=0x00000015,0 [Window][###96] Pos=984,19 @@ -141,10 +141,10 @@ Collapsed=0 DockId=0x00000022,0 [Window][###103] -Pos=984,19 -Size=216,579 +Pos=984,649 +Size=216,151 Collapsed=0 -DockId=0x00000025,0 +DockId=0x00000032,0 [Window][###139] Pos=984,600 @@ -183,8 +183,8 @@ Collapsed=0 DockId=0x00000030,0 [Window][###44] -Pos=0,588 -Size=270,105 +Pos=0,712 +Size=270,88 Collapsed=0 DockId=0x00000036,0 @@ -201,65 +201,87 @@ Collapsed=0 DockId=0x00000034,0 [Window][###88] -Pos=0,695 -Size=270,105 +Pos=984,19 +Size=216,628 Collapsed=0 -DockId=0x00000032,0 +DockId=0x00000031,0 + +[Window][###95] +Pos=974,19 +Size=226,609 +Collapsed=0 +DockId=0x00000014,0 + +[Window][###120] +Pos=984,582 +Size=216,218 +Collapsed=0 +DockId=0x0000003A,0 + +[Window][###100] +Pos=984,19 +Size=216,561 +Collapsed=0 +DockId=0x00000039,0 [Docking][Data] -DockSpace ID=0x7C6B3D9B Window=0xA87D555D Pos=0,19 Size=1200,781 Split=X - DockNode ID=0x0000002D Parent=0x7C6B3D9B SizeRef=982,781 Split=X - DockNode ID=0x0000002B Parent=0x0000002D SizeRef=937,781 Split=X - DockNode ID=0x00000027 Parent=0x0000002B SizeRef=982,781 Split=X - DockNode ID=0x00000023 Parent=0x00000027 SizeRef=982,781 Split=X - DockNode ID=0x0000001B Parent=0x00000023 SizeRef=982,781 Split=X - DockNode ID=0x00000017 Parent=0x0000001B SizeRef=898,781 Split=X - DockNode ID=0x00000009 Parent=0x00000017 SizeRef=270,581 Split=Y Selected=0x3BEDC6B0 - DockNode ID=0x0000000B Parent=0x00000009 SizeRef=196,474 Split=Y Selected=0x3BEDC6B0 - DockNode ID=0x0000000D Parent=0x0000000B SizeRef=196,99 Split=Y Selected=0x99D84869 - DockNode ID=0x00000012 Parent=0x0000000D SizeRef=196,423 Selected=0x0F59680E - DockNode ID=0x00000013 Parent=0x0000000D SizeRef=196,156 Split=Y Selected=0xB4AD3310 - DockNode ID=0x00000014 Parent=0x00000013 SizeRef=244,625 Split=Y Selected=0xB4AD3310 - DockNode ID=0x0000001F Parent=0x00000014 SizeRef=270,469 Split=Y Selected=0xD36850C8 - DockNode ID=0x00000031 Parent=0x0000001F SizeRef=270,674 Split=Y Selected=0xF30D49C0 - DockNode ID=0x00000035 Parent=0x00000031 SizeRef=270,567 Selected=0xF30D49C0 - DockNode ID=0x00000036 Parent=0x00000031 SizeRef=270,105 Selected=0xB7116FC5 - DockNode ID=0x00000032 Parent=0x0000001F SizeRef=270,105 Selected=0x052342BF - DockNode ID=0x00000020 Parent=0x00000014 SizeRef=270,154 Selected=0x0531B3D5 - DockNode ID=0x00000015 Parent=0x00000013 SizeRef=244,154 Selected=0x8773D56E - DockNode ID=0x0000000E Parent=0x0000000B SizeRef=196,373 Selected=0x3BEDC6B0 - DockNode ID=0x0000000C Parent=0x00000009 SizeRef=196,105 Selected=0x4F81AB74 - DockNode ID=0x0000000A Parent=0x00000017 SizeRef=665,581 Split=X - DockNode ID=0x00000003 Parent=0x0000000A SizeRef=299,581 Split=Y Selected=0x52849BCC - DockNode ID=0x00000005 Parent=0x00000003 SizeRef=299,473 Split=Y Selected=0x52849BCC - DockNode ID=0x00000007 Parent=0x00000005 SizeRef=299,86 Selected=0x52849BCC - DockNode ID=0x00000008 Parent=0x00000005 SizeRef=299,385 Selected=0xBD79B41E - DockNode ID=0x00000006 Parent=0x00000003 SizeRef=299,106 Selected=0x84DD78D1 - DockNode ID=0x00000004 Parent=0x0000000A SizeRef=499,581 Split=Y - DockNode ID=0x00000001 Parent=0x00000004 SizeRef=800,379 Split=Y Selected=0x7FF1E0B5 - DockNode ID=0x0000000F Parent=0x00000001 SizeRef=602,425 Split=Y Selected=0x977476CD - DockNode ID=0x00000033 Parent=0x0000000F SizeRef=710,580 CentralNode=1 Selected=0x977476CD - DockNode ID=0x00000034 Parent=0x0000000F SizeRef=710,199 Selected=0x4F935A1E - DockNode ID=0x00000010 Parent=0x00000001 SizeRef=602,154 Selected=0x083320CE - DockNode ID=0x00000002 Parent=0x00000004 SizeRef=800,200 Selected=0x1834836D - DockNode ID=0x00000018 Parent=0x0000001B SizeRef=300,781 Selected=0x7E9438EA - DockNode ID=0x0000001C Parent=0x00000023 SizeRef=216,781 Split=Y Selected=0x714F2F7B - DockNode ID=0x0000001D Parent=0x0000001C SizeRef=216,344 Split=Y Selected=0x714F2F7B - DockNode ID=0x00000021 Parent=0x0000001D SizeRef=216,579 Split=Y Selected=0x714F2F7B - DockNode ID=0x00000019 Parent=0x00000021 SizeRef=216,391 Selected=0x714F2F7B - DockNode ID=0x0000001A Parent=0x00000021 SizeRef=216,388 Selected=0x7E9438EA - DockNode ID=0x00000022 Parent=0x0000001D SizeRef=216,200 Selected=0x0D80EC84 - DockNode ID=0x0000001E Parent=0x0000001C SizeRef=216,435 Selected=0x7740BFE4 - DockNode ID=0x00000024 Parent=0x00000027 SizeRef=216,781 Split=Y Selected=0xCF08B82F - DockNode ID=0x00000025 Parent=0x00000024 SizeRef=216,579 Selected=0xCF08B82F - DockNode ID=0x00000026 Parent=0x00000024 SizeRef=216,200 Selected=0x032CD220 - DockNode ID=0x00000028 Parent=0x0000002B SizeRef=216,781 Split=Y Selected=0xB5C8EB4F - DockNode ID=0x00000029 Parent=0x00000028 SizeRef=216,609 Selected=0xB5C8EB4F - DockNode ID=0x0000002A Parent=0x00000028 SizeRef=216,170 Selected=0xF8004A44 - DockNode ID=0x0000002C Parent=0x0000002D SizeRef=261,781 Split=Y Selected=0xC8700185 - DockNode ID=0x00000011 Parent=0x0000002C SizeRef=142,534 Selected=0x3A881EEF - DockNode ID=0x00000016 Parent=0x0000002C SizeRef=142,245 Selected=0xC8700185 - DockNode ID=0x0000002E Parent=0x7C6B3D9B SizeRef=216,781 Split=Y Selected=0x4C2F06CB - DockNode ID=0x0000002F Parent=0x0000002E SizeRef=216,560 Selected=0x4C2F06CB - DockNode ID=0x00000030 Parent=0x0000002E SizeRef=216,219 Selected=0x04546B8A +DockSpace ID=0x7C6B3D9B Window=0xA87D555D Pos=0,19 Size=1200,781 Split=X + DockNode ID=0x00000037 Parent=0x7C6B3D9B SizeRef=982,781 Split=X + DockNode ID=0x0000002D Parent=0x00000037 SizeRef=982,781 Split=X + DockNode ID=0x0000002B Parent=0x0000002D SizeRef=937,781 Split=X + DockNode ID=0x00000027 Parent=0x0000002B SizeRef=982,781 Split=X + DockNode ID=0x00000023 Parent=0x00000027 SizeRef=982,781 Split=X + DockNode ID=0x0000001B Parent=0x00000023 SizeRef=972,781 Split=X + DockNode ID=0x00000017 Parent=0x0000001B SizeRef=898,781 Split=X + DockNode ID=0x00000009 Parent=0x00000017 SizeRef=270,581 Split=Y Selected=0x3BEDC6B0 + DockNode ID=0x0000000B Parent=0x00000009 SizeRef=196,474 Split=Y Selected=0x3BEDC6B0 + DockNode ID=0x0000000D Parent=0x0000000B SizeRef=196,99 Split=Y Selected=0x99D84869 + DockNode ID=0x00000012 Parent=0x0000000D SizeRef=196,423 Selected=0x0F59680E + DockNode ID=0x00000013 Parent=0x0000000D SizeRef=196,156 Split=Y Selected=0xB4AD3310 + DockNode ID=0x0000001F Parent=0x00000013 SizeRef=270,469 Split=Y Selected=0xD36850C8 + DockNode ID=0x00000035 Parent=0x0000001F SizeRef=270,691 Selected=0xB4AD3310 + DockNode ID=0x00000036 Parent=0x0000001F SizeRef=270,88 Selected=0xB7116FC5 + DockNode ID=0x00000020 Parent=0x00000013 SizeRef=270,154 Selected=0x0531B3D5 + DockNode ID=0x0000000E Parent=0x0000000B SizeRef=196,373 Selected=0x3BEDC6B0 + DockNode ID=0x0000000C Parent=0x00000009 SizeRef=196,105 Selected=0x4F81AB74 + DockNode ID=0x0000000A Parent=0x00000017 SizeRef=700,581 Split=X + DockNode ID=0x00000003 Parent=0x0000000A SizeRef=299,581 Split=Y Selected=0x52849BCC + DockNode ID=0x00000005 Parent=0x00000003 SizeRef=299,473 Split=Y Selected=0x52849BCC + DockNode ID=0x00000007 Parent=0x00000005 SizeRef=299,86 Selected=0x52849BCC + DockNode ID=0x00000008 Parent=0x00000005 SizeRef=299,385 Selected=0xBD79B41E + DockNode ID=0x00000006 Parent=0x00000003 SizeRef=299,106 Selected=0x84DD78D1 + DockNode ID=0x00000004 Parent=0x0000000A SizeRef=499,581 Split=Y + DockNode ID=0x00000001 Parent=0x00000004 SizeRef=800,379 Split=Y Selected=0x7FF1E0B5 + DockNode ID=0x0000000F Parent=0x00000001 SizeRef=602,588 Split=Y Selected=0x977476CD + DockNode ID=0x00000033 Parent=0x0000000F SizeRef=710,580 CentralNode=1 Selected=0x977476CD + DockNode ID=0x00000034 Parent=0x0000000F SizeRef=710,199 Selected=0x4F935A1E + DockNode ID=0x00000010 Parent=0x00000001 SizeRef=602,191 Selected=0x083320CE + DockNode ID=0x00000002 Parent=0x00000004 SizeRef=800,200 Selected=0x1834836D + DockNode ID=0x00000018 Parent=0x0000001B SizeRef=300,781 Selected=0x7E9438EA + DockNode ID=0x0000001C Parent=0x00000023 SizeRef=226,781 Split=Y Selected=0x714F2F7B + DockNode ID=0x0000001D Parent=0x0000001C SizeRef=216,344 Split=Y Selected=0x714F2F7B + DockNode ID=0x00000021 Parent=0x0000001D SizeRef=216,579 Split=Y Selected=0x714F2F7B + DockNode ID=0x00000019 Parent=0x00000021 SizeRef=216,391 Selected=0x714F2F7B + DockNode ID=0x0000001A Parent=0x00000021 SizeRef=216,388 Split=Y Selected=0x7E9438EA + DockNode ID=0x00000014 Parent=0x0000001A SizeRef=216,609 Selected=0x36EF55AB + DockNode ID=0x00000015 Parent=0x0000001A SizeRef=216,170 Selected=0x7E9438EA + DockNode ID=0x00000022 Parent=0x0000001D SizeRef=216,200 Selected=0x0D80EC84 + DockNode ID=0x0000001E Parent=0x0000001C SizeRef=216,435 Selected=0x7740BFE4 + DockNode ID=0x00000024 Parent=0x00000027 SizeRef=216,781 Split=Y Selected=0xCF08B82F + DockNode ID=0x00000025 Parent=0x00000024 SizeRef=216,579 Split=Y Selected=0xCF08B82F + DockNode ID=0x00000031 Parent=0x00000025 SizeRef=216,628 Selected=0x052342BF + DockNode ID=0x00000032 Parent=0x00000025 SizeRef=216,151 Selected=0xCF08B82F + DockNode ID=0x00000026 Parent=0x00000024 SizeRef=216,200 Selected=0x032CD220 + DockNode ID=0x00000028 Parent=0x0000002B SizeRef=216,781 Split=Y Selected=0xB5C8EB4F + DockNode ID=0x00000029 Parent=0x00000028 SizeRef=216,609 Selected=0xB5C8EB4F + DockNode ID=0x0000002A Parent=0x00000028 SizeRef=216,170 Selected=0xF8004A44 + DockNode ID=0x0000002C Parent=0x0000002D SizeRef=261,781 Split=Y Selected=0xC8700185 + DockNode ID=0x00000011 Parent=0x0000002C SizeRef=142,534 Selected=0x3A881EEF + DockNode ID=0x00000016 Parent=0x0000002C SizeRef=142,245 Selected=0xC8700185 + DockNode ID=0x0000002E Parent=0x00000037 SizeRef=216,781 Split=Y Selected=0x4C2F06CB + DockNode ID=0x0000002F Parent=0x0000002E SizeRef=216,560 Selected=0x4C2F06CB + DockNode ID=0x00000030 Parent=0x0000002E SizeRef=216,219 Selected=0x04546B8A + DockNode ID=0x00000038 Parent=0x7C6B3D9B SizeRef=216,781 Split=Y Selected=0x88A8C2FF + DockNode ID=0x00000039 Parent=0x00000038 SizeRef=216,561 Selected=0x88A8C2FF + DockNode ID=0x0000003A Parent=0x00000038 SizeRef=216,218 Selected=0xC56063F4