From 8e01cfa04592ebcfea13a4b47862c67d7114bb81 Mon Sep 17 00:00:00 2001 From: Keir Mierle Date: Sat, 3 Dec 2011 23:33:07 +0000 Subject: Don't show the "Correlation" tracking preset when the hybrid tracker is selected. --- release/scripts/startup/bl_ui/space_clip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index cacf61249dc..5cdd1de547f 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -129,7 +129,7 @@ class CLIP_PT_tools_marker(Panel): if settings.default_tracker == 'KLT': col.prop(settings, "default_pyramid_levels") - else: + elif settings.default_tracker == 'SAD': col.prop(settings, "default_correlation_min") col.separator() -- cgit v1.2.3 From d00bb6dd56e3e729426eceedf252ceddc4882a0d Mon Sep 17 00:00:00 2001 From: Keir Mierle Date: Sun, 4 Dec 2011 12:58:31 +0000 Subject: Add a toggle button to display motion tracker previews in grayscale. --- release/scripts/startup/bl_ui/space_clip.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 5cdd1de547f..3acf87f7776 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -353,9 +353,15 @@ class CLIP_PT_track(Panel): layout.template_track(sc, "scopes") row = layout.row(align=True) - row.prop(act_track, "use_red_channel", text="R", toggle=True) - row.prop(act_track, "use_green_channel", text="G", toggle=True) - row.prop(act_track, "use_blue_channel", text="B", toggle=True) + sub = row.row() + sub.prop(act_track, "use_red_channel", text="R", toggle=True) + sub.prop(act_track, "use_green_channel", text="G", toggle=True) + sub.prop(act_track, "use_blue_channel", text="B", toggle=True) + + row.separator() + + sub = row.row() + sub.prop(act_track, "preview_grayscale", text="B/W", toggle=True) layout.separator() -- cgit v1.2.3 From 4bd3a296bb5fd967811d354cdae1ab24c3fefbc4 Mon Sep 17 00:00:00 2001 From: Keir Mierle Date: Sun, 4 Dec 2011 13:46:25 +0000 Subject: Add support for detecting tracking failure in the ESM tracker component of libmv. Since both KLT and Hybrid rely on ESM underneath, KLT and Hybrid now have a minimum correlation setting to match. With this fix, track failures should get detected quicker, with the issue that sometimes the tracker will give up too easily. That is fixable by reducing the required correlation (in the track properties). --- release/scripts/startup/bl_ui/space_clip.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 3acf87f7776..1a58b77bca3 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -503,8 +503,7 @@ class CLIP_PT_track_settings(Panel): if active.tracker == 'KLT': col.prop(active, "pyramid_levels") - elif active.tracker == 'SAD': - col.prop(active, "correlation_min") + col.prop(active, "correlation_min") col.separator() col.prop(active, "frames_limit") -- cgit v1.2.3 From f1454ec399f4321e3a7aa28dbb5da96b52d6b661 Mon Sep 17 00:00:00 2001 From: Keir Mierle Date: Sun, 4 Dec 2011 13:58:40 +0000 Subject: Turn grayscale preview on if any channel toggles are active for motion tracking. --- release/scripts/startup/bl_ui/space_clip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 1a58b77bca3..d12d9bde4d5 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -361,7 +361,7 @@ class CLIP_PT_track(Panel): row.separator() sub = row.row() - sub.prop(act_track, "preview_grayscale", text="B/W", toggle=True) + sub.prop(act_track, "use_grayscale_preview", text="B/W", toggle=True) layout.separator() -- cgit v1.2.3 From e98e8acf1a00ec4fb1adf0c4e30bc687cfc8efad Mon Sep 17 00:00:00 2001 From: Keir Mierle Date: Sun, 4 Dec 2011 14:08:58 +0000 Subject: Add minimum correlation widget to tracker default settings panel. --- release/scripts/startup/bl_ui/space_clip.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'release') diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index d12d9bde4d5..c7511174e98 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -129,8 +129,7 @@ class CLIP_PT_tools_marker(Panel): if settings.default_tracker == 'KLT': col.prop(settings, "default_pyramid_levels") - elif settings.default_tracker == 'SAD': - col.prop(settings, "default_correlation_min") + col.prop(settings, "default_correlation_min") col.separator() -- cgit v1.2.3