From 79206cc326b5a81e50728a57f500107465325e26 Mon Sep 17 00:00:00 2001 From: DeannaLC Date: Tue, 24 Jun 2025 11:14:16 -0700 Subject: [PATCH 1/3] fix: adds an image input to column splitting to be used with interactive classifier --- rodan-main/code/rodan/jobs/column_split/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rodan-main/code/rodan/jobs/column_split/base.py b/rodan-main/code/rodan/jobs/column_split/base.py index 9a900f865..b46ed79ca 100644 --- a/rodan-main/code/rodan/jobs/column_split/base.py +++ b/rodan-main/code/rodan/jobs/column_split/base.py @@ -35,6 +35,7 @@ class ColumnSplit(RodanTask): {'name': 'Background Layer', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Music Notes Layer', 'minimum': 1, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Text Layer', 'minimum': 1, 'maximum': 1, 'resource_types': ['image/rgba+png']}, + {'name': 'Image', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgb+png']}, {'name': 'Layer 4', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Layer 5', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Layer 6', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, @@ -49,6 +50,7 @@ class ColumnSplit(RodanTask): {'name': 'Background Layer', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Music Notes Layer', 'minimum': 1, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Text Layer', 'minimum': 1, 'maximum': 1, 'resource_types': ['image/rgba+png']}, + {'name': 'Image', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgb+png']}, {'name': 'All Layers', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Layer 5', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Layer 6', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, From bbf0b5c4d1bbf4266ae5dcf27a5d880534411b7e Mon Sep 17 00:00:00 2001 From: DeannaLC Date: Sat, 12 Jul 2025 12:44:37 -0700 Subject: [PATCH 2/3] docs: updated image port name, added comment on 3 and 4 channels working for get_stacked_images --- rodan-main/code/rodan/jobs/column_split/base.py | 4 ++-- rodan-main/code/rodan/jobs/column_split/column_split.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rodan-main/code/rodan/jobs/column_split/base.py b/rodan-main/code/rodan/jobs/column_split/base.py index b46ed79ca..1b0aefd2c 100644 --- a/rodan-main/code/rodan/jobs/column_split/base.py +++ b/rodan-main/code/rodan/jobs/column_split/base.py @@ -35,7 +35,7 @@ class ColumnSplit(RodanTask): {'name': 'Background Layer', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Music Notes Layer', 'minimum': 1, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Text Layer', 'minimum': 1, 'maximum': 1, 'resource_types': ['image/rgba+png']}, - {'name': 'Image', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgb+png']}, + {'name': 'RGB Image', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgb+png']}, {'name': 'Layer 4', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Layer 5', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Layer 6', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, @@ -50,7 +50,7 @@ class ColumnSplit(RodanTask): {'name': 'Background Layer', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Music Notes Layer', 'minimum': 1, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Text Layer', 'minimum': 1, 'maximum': 1, 'resource_types': ['image/rgba+png']}, - {'name': 'Image', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgb+png']}, + {'name': 'RGB Image', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgb+png']}, {'name': 'All Layers', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Layer 5', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, {'name': 'Layer 6', 'minimum': 0, 'maximum': 1, 'resource_types': ['image/rgba+png']}, diff --git a/rodan-main/code/rodan/jobs/column_split/column_split.py b/rodan-main/code/rodan/jobs/column_split/column_split.py index f5fc4cd4b..1f753540c 100644 --- a/rodan-main/code/rodan/jobs/column_split/column_split.py +++ b/rodan-main/code/rodan/jobs/column_split/column_split.py @@ -96,6 +96,8 @@ def get_split_ranges(img,splits): return ranges # takes ranges in x, and stacks them vertically +# works for both RGB and RGBA images by adding white pixels regardless of amt of channels - +# constant_values=255 pads with (255, 255, 255) for 3, (255, 255, 255, 255) for 4 def get_stacked_image(img,ranges): chunks = [] max = 0 From 1473d047799df6b9c709add50f737b2bfdc2d114 Mon Sep 17 00:00:00 2001 From: DeannaLC Date: Sat, 12 Jul 2025 12:45:14 -0700 Subject: [PATCH 3/3] fix: removed RGB Image from All Layers output --- rodan-main/code/rodan/jobs/column_split/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rodan-main/code/rodan/jobs/column_split/base.py b/rodan-main/code/rodan/jobs/column_split/base.py index 1b0aefd2c..5013e2959 100644 --- a/rodan-main/code/rodan/jobs/column_split/base.py +++ b/rodan-main/code/rodan/jobs/column_split/base.py @@ -115,7 +115,8 @@ def run_my_task(self, inputs, settings, outputs): layer = inputs[key][0]['resource_path'] img = cv.imread(layer,cv.IMREAD_UNCHANGED) layer_stacked = get_stacked_image(img,ranges) - layers.append(img) + if key != 'RGB Image': + layers.append(img) if key in outputs: outfile = outputs[key][0]['resource_path'] cv.imwrite(outfile+".png",layer_stacked)