archive/attract
0
0
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Implement Trim End

Browse Source
This commit is contained in:
Dalai Felinto
2016-11-10 18:51:06 +01:00
parent 389c5c03e1
commit a9b894ed77
3 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
attract/node_types/shot.py
View File

@@ -6,6 +6,10 @@ node_type_shot = {
'trim_start_in_frames': { 'trim_start_in_frames': {
'type': 'integer', 'type': 'integer',
}, },
# How many frames are trimmed after the end of the shot in the edit.
'trim_end_in_frames': {
'type': 'integer',
},
# Duration (of the visible part) of the shot in the edit. # Duration (of the visible part) of the shot in the edit.
'duration_in_edit_in_frames': { 'duration_in_edit_in_frames': {
'type': 'integer', 'type': 'integer',
@@ -43,6 +47,7 @@ task_types = ['layout', 'animation', 'lighting', 'fx', 'rendering']
human_readable_properties = { human_readable_properties = {
'properties.trim_start_in_frames': 'Trim Start', 'properties.trim_start_in_frames': 'Trim Start',
'properties.trim_end_in_frames': 'Trim End',
'properties.duration_in_edit_in_frames': 'Duration in Edit', 'properties.duration_in_edit_in_frames': 'Duration in Edit',
'properties.cut_in_timeline_in_frames': 'Cut-in', 'properties.cut_in_timeline_in_frames': 'Cut-in',
} }

1
attract/shots_and_assets/__init__.py
View File

@@ -25,6 +25,7 @@ VALID_SHOT_PATCH_FIELDS = {
u'name', u'name',
u'picture', u'picture',
u'properties.trim_start_in_frames', u'properties.trim_start_in_frames',
u'properties.trim_end_in_frames',
u'properties.duration_in_edit_in_frames', u'properties.duration_in_edit_in_frames',
u'properties.cut_in_timeline_in_frames', u'properties.cut_in_timeline_in_frames',
u'properties.status', u'properties.status',

3
tests/test_shots.py
View File

@@ -158,6 +158,7 @@ class PatchShotTest(AbstractShotTest):
'$set': { '$set': {
'name': u'"shot" is "geschoten" in Dutch', 'name': u'"shot" is "geschoten" in Dutch',
'properties.trim_start_in_frames': 123, 'properties.trim_start_in_frames': 123,
'properties.trim_end_in_frames': 0,
'properties.duration_in_edit_in_frames': 4215, 'properties.duration_in_edit_in_frames': 4215,
'properties.cut_in_timeline_in_frames': 1245, 'properties.cut_in_timeline_in_frames': 1245,
'properties.status': u'on_hold', 'properties.status': u'on_hold',
@@ -168,6 +169,7 @@ class PatchShotTest(AbstractShotTest):
dbnode = self.get(url, auth_token='token').json() dbnode = self.get(url, auth_token='token').json()
self.assertEqual(u'"shot" is "geschoten" in Dutch', dbnode['name']) self.assertEqual(u'"shot" is "geschoten" in Dutch', dbnode['name'])
self.assertEqual(123, dbnode['properties']['trim_start_in_frames']) self.assertEqual(123, dbnode['properties']['trim_start_in_frames'])
self.assertEqual(0, dbnode['properties']['trim_end_in_frames'])
self.assertEqual(u'on_hold', dbnode['properties']['status']) self.assertEqual(u'on_hold', dbnode['properties']['status'])
@responses.activate @responses.activate
@@ -410,6 +412,7 @@ class RequiredAfterCreationTest(AbstractShotTest):
shot = {'name': u'test shot', shot = {'name': u'test shot',
'description': u'', 'description': u'',
'properties': {u'trim_start_in_frames': 0, 'properties': {u'trim_start_in_frames': 0,
u'trim_end_in_frames': 0,
u'duration_in_edit_in_frames': 1, u'duration_in_edit_in_frames': 1,
u'cut_in_timeline_in_frames': 0}, u'cut_in_timeline_in_frames': 0},
'node_type': node_type_name, 'node_type': node_type_name,