Skip to content

Commit 950b6bc

Browse files
committed
Changes: Add unique export feature
1 parent 752ff32 commit 950b6bc

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "Diff and Merge Images Projects",
2+
"name": "Scortex Diff and Merge Images Projects",
33
"type": "app",
44
"categories": [
55
"images",

src/main.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def init_ui(api: sly.Api, task_id, app_logger):
166166
"projectPreviewUrl2": api.image.preview_url(PROJECT2.reference_image_url, 100, 100),
167167
"table": result,
168168
"images": {"columns": [], "data": []},
169-
"mergeOptions": ["unify", "intersect"],
169+
"mergeOptions": ["unify", "intersect", "unique only", "unique left", "unique right"],
170170
"resolveOptions": ["skip image", "use left", "use right"],
171171
"createdProjectId": None,
172172
"createdProjectName": None,
@@ -272,6 +272,8 @@ def _add_simple(res_dataset, images, ds_name):
272272

273273
# "matched", "conflicts", "unique (left)", "unique (right)"
274274
if message == "matched":
275+
if state["merge"] in ["unique only", "unique left", "unique right"]:
276+
continue
275277
progress_img = sly.Progress(f"Images", len(images))
276278
progress_ann = sly.Progress(f"Annotations", len(images))
277279
_increment_progress(api, task_id, progress_img)
@@ -382,6 +384,8 @@ def _add_simple(res_dataset, images, ds_name):
382384
_increment_progress(api, task_id, progress_ann, len(anns))
383385

384386
elif message == "conflicts":
387+
if state["merge"] in ["unique only", "unique left", "unique right"]:
388+
continue
385389
#["unify", "intersect"]
386390
if state["merge"] == "intersect" or state["resolve"] == "skip image":
387391
continue
@@ -390,8 +394,12 @@ def _add_simple(res_dataset, images, ds_name):
390394
elif state["resolve"] == "use right":
391395
res_dataset = _add_simple(res_dataset, images, right_ds)
392396
elif message == "unique (left)" or message == 'new dataset (left)':
397+
if state["merge"] == "unique right":
398+
continue
393399
res_dataset = _add_simple(res_dataset, images, left_ds)
394400
elif message == "unique (right)" or message == 'new dataset (right)':
401+
if state["merge"] == "unique left":
402+
continue
395403
res_dataset = _add_simple(res_dataset, images, right_ds)
396404

397405
fields = [
@@ -416,4 +424,4 @@ def main():
416424

417425

418426
if __name__ == "__main__":
419-
sly.main_wrapper("main", main)
427+
sly.main_wrapper("main", main)

0 commit comments

Comments
 (0)