Skip to content
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

Editorial: UX improvements #12

Merged
merged 3 commits into from
Sep 11, 2024
Merged

Editorial: UX improvements #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31f8fc0
New fields and disabled properties.
jakubjezek001 Sep 6, 2024
937ff34
Add 'integrate' key with value False to shot instance data.
jakubjezek001 Sep 11, 2024
1a96e5b
Merge branch 'develop' into enhancement/publisher_ux_improvements
jakubjezek001 Sep 11, 2024
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
61 changes: 48 additions & 13 deletions client/ayon_traypublisher/plugins/create/create_editorial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,25 +35,55 @@
{"value": 24, "label": "24"},
{"value": 25, "label": "25"},
{"value": 29.97, "label": "29.97"},
{"value": 30, "label": "30"}
{"value": 30, "label": "30"},
],
label="FPS"
label="FPS",
),
NumberDef("workfile_start_frame", default=1001, label="Workfile start frame"),
NumberDef("handle_start", default=0, label="Handle start"),
NumberDef("handle_end", default=0, label="Handle end"),
NumberDef(
"workfile_start_frame",
default=1001,
label="Workfile start frame"
"frameStart",
default=0,
label="Frame start",
disabled=True,
),
NumberDef(
"frameEnd",
default=0,
label="Frame end",
disabled=True,
),
NumberDef(
"clipIn",
default=0,
label="Clip in",
disabled=True,
),
NumberDef(
"clipOut",
default=0,
label="Clip out",
disabled=True,
),
NumberDef(
"handle_start",
"clipDuration",
default=0,
label="Handle start"
label="Clip duration",
disabled=True,
),
NumberDef(
"handle_end",
"sourceIn",
default=0,
label="Handle end"
)
label="Media source in",
disabled=True,
),
NumberDef(
"sourceOut",
default=0,
label="Media source out",
disabled=True,
),
]


Expand All @@ -79,7 +109,12 @@ def get_instance_attr_defs(self):
"add_review_family",
default=True,
label="Review"
)
),
TextDef(
"parent_instance",
label="Linked to",
disabled=True
),
]


Expand All @@ -96,7 +131,8 @@ def get_instance_attr_defs(self):
instance_attributes = [
TextDef(
"folderPath",
label="Folder path"
label="Folder path",
disabled=True,
)
]
instance_attributes.extend(CLIP_ATTR_DEFS)
Expand Down Expand Up @@ -318,7 +354,6 @@ def _get_path_from_file_data(self, file_path_data, multi=False):
"""
return_path_list = []


if isinstance(file_path_data, list):
return_path_list = [
os.path.join(f["directory"], f["filenames"][0])
Expand Down
1 change: 1 addition & 0 deletions client/ayon_traypublisher/plugins/publish/collect_shot_instances.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ def _solve_inputs_to_data(self, instance):
"sourceOut": _cr_attrs["sourceOut"],
"workfileFrameStart": workfile_start_frame,
"folderPath": _cr_attrs["folderPath"],
"integrate": False,
}

def _solve_hierarchy_context(self, instance):
Expand Down