Skip to content

SVG adapter fixes #1195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 20, 2022
Merged

SVG adapter fixes #1195

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5915a6
- Check if media reference contains target_url
KarthikRIyer Jan 16, 2022
19f4051
Remove test code
KarthikRIyer Jan 16, 2022
484b776
Remove comment
KarthikRIyer Jan 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions src/py-opentimelineio/opentimelineio/adapters/svg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ class ClipData(object):

def __init__(self, src_start=0.0, src_end=0.0, avlbl_start=0.0,
avlbl_end=0.0, avlbl_duration=0.0,
trim_start=0.0, trim_duration=0.0, target_url='', clip_id=0,
trim_start=0.0, trim_duration=0.0, clip_id=0,
transition_begin=None, transition_end=None):
self.src_start = src_start
self.src_end = src_end
Expand All @@ -528,7 +528,6 @@ def __init__(self, src_start=0.0, src_end=0.0, avlbl_start=0.0,
self.avlbl_duration = avlbl_duration
self.trim_start = trim_start
self.trim_duration = trim_duration
self.target_url = target_url
self.clip_id = clip_id
self.transition_begin = transition_begin
self.transition_end = transition_end
Expand Down Expand Up @@ -587,7 +586,7 @@ def _draw_timeline(timeline, svg_writer, extra_data=()):
clip_data = ClipData(src_start, src_end, avlbl_start,
avlbl_end, avlbl_duration, trim_start,
trim_duration,
item.media_reference.target_url, clip_count - 1)
clip_count - 1)
if current_transition is not None:
clip_data.transition_begin = current_transition
current_transition = None
Expand Down Expand Up @@ -808,7 +807,7 @@ def _draw_track(track, svg_writer, extra_data=()):
draw_item(item, svg_writer, (clips_data[item_count],))
item_count += 1
elif isinstance(item, otio.schema.Transition):
cut_x = svg_writer.x_origin + (clips_data[item_count].src_start *
cut_x = svg_writer.x_origin + (clips_data[clip_count].src_start *
svg_writer.scale_x)
draw_item(item, svg_writer, (cut_x,))
transition_count += 1
Expand Down Expand Up @@ -935,19 +934,19 @@ def _draw_clip(clip, svg_writer, extra_data=()):
available_range_text = r'available_range: {}, {}'.format(
repr(float(round(clip.available_range().start_time.value, 1))),
repr(float(round(clip.available_range().duration.value, 1))))
if clip.media_reference.target_url is None:
target_url_text = r'target_url: {}'.format('Media Unavailable')
else:
target_url_text = r'target_url: {}'.format(clip.media_reference.target_url)
available_range_text = available_range_text
available_range_location = Point(media_origin.x + svg_writer.font_size,
media_origin.y - svg_writer.font_size)
target_url_location = Point(media_origin.x + svg_writer.font_size,
media_origin.y - 2.0 * svg_writer.font_size)
svg_writer.draw_text(available_range_text, available_range_location,
svg_writer.font_size,
)
svg_writer.draw_text(target_url_text, target_url_location, svg_writer.font_size)
if hasattr(clip.media_reference, 'target_url'):
if clip.media_reference.target_url is None:
target_url_text = r'target_url: {}'.format('Media Unavailable')
else:
target_url_text = r'target_url: {}'.format(clip.media_reference.target_url)
target_url_location = Point(media_origin.x + svg_writer.font_size,
media_origin.y - 2.0 * svg_writer.font_size)
svg_writer.draw_text(target_url_text, target_url_location, svg_writer.font_size)
# Draw arrow from clip to media reference
clip_media_height_difference = (((clip_count - 1) * 2.0 + 1) *
svg_writer.clip_rect_height)
Expand Down