Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: cleaning remainings of merge

Browse source
This commit is contained in:
Jakub Jezek 2019-08-01 17:25:48 +02:00
parent 850aae8700
commit 98552c1cb9
4 changed files with 26 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pype/api.py
View file

@ -20,7 +20,6 @@ from pypeapp import Logger
from .lib import (
version_up,
get_handle_irregular,
get_asset,
get_project,
get_hierarchy,
@ -51,7 +50,6 @@ __all__ = [
# get contextual data
"version_up",
"get_handle_irregular",
"get_project",
"get_hierarchy",
"get_asset",

12
pype/lib.py
View file

@ -315,20 +315,20 @@ def _get_host_name():
def get_asset(asset_name=None):
entity_data_keys_from_project_when_miss = [
"fstart", "fend", "handle_start", "handle_end", "fps",
"resolution_width", "resolution_height"
"frameStart", "frameEnd", "handleStart", "handleEnd", "fps",
"resolutionWidth", "resolutionHeight"
]
entity_keys_from_project_when_miss = []
alternatives = {
"handle_start": "handles",
"handle_end": "handles"
"handleStart": "handles",
"handleEnd": "handles"
}
defaults = {
"handle_start": 0,
"handle_end": 0
"handleStart": 0,
"handleEnd": 0
}
if not asset_name:

48
pype/nuke/lib.py
View file

@ -45,7 +45,7 @@ def checkInventoryVersions():
if container:
node = container["_node"]
avalon_knob_data = get_avalon_knob_data(node)
avalon_knob_data = avalon.nuke.get_avalon_knob_data(node)
# get representation from io
representation = io.find_one({
@ -88,7 +88,7 @@ def writes_version_sync():
for each in nuke.allNodes():
if each.Class() == 'Write':
avalon_knob_data = get_avalon_knob_data(each)
avalon_knob_data = avalon.nuke.get_avalon_knob_data(each)
try:
if avalon_knob_data['families'] not in ["render"]:
@ -119,7 +119,7 @@ def version_up_script():
def get_render_path(node):
data = dict()
data['avalon'] = get_avalon_knob_data(node)
data['avalon'] = avalon.nuke.get_avalon_knob_data(node)
data_preset = {
"class": data['avalon']['family'],
@ -158,7 +158,7 @@ def format_anatomy(data):
"root": api.Session["AVALON_PROJECTS"],
"subset": data["avalon"]["subset"],
"asset": data["avalon"]["asset"],
"task": str(pype.get_task()).lower(),
"task": api.Session["AVALON_TASK"].lower(),
"family": data["avalon"]["family"],
"project": {"name": project_document["name"],
"code": project_document["data"].get("code", '')},
@ -449,14 +449,14 @@ def reset_frame_range_handles():
root = nuke.root()
name = api.Session["AVALON_ASSET"]
asset = io.find_one({"name": name, "type": "asset"})
asset_entity = pype.get_asset(name)
if "data" not in asset:
if "data" not in asset_entity:
msg = "Asset {} don't have set any 'data'".format(name)
log.warning(msg)
nuke.message(msg)
return
data = asset["data"]
data = asset_entity["data"]
missing_cols = []
check_cols = ["fps", "frameStart", "frameEnd", "handleStart", "handleEnd"]
@ -473,30 +473,27 @@ def reset_frame_range_handles():
return
# get handles values
handles = avalon.nuke.get_handles(asset)
asset_entity = pype.get_asset(asset)
handle_start = asset_entity["data"]["handle_start"]
handle_end = asset_entity["data"]["handle_end"]
handle_start = asset_entity["data"]["handleStart"]
handle_end = asset_entity["data"]["handleEnd"]
fps = asset["data"]["fps"]
frame_start= int(asset["data"]["frameStart"]) - handle_start
frame_end= int(asset["data"]["frameEnd"]) + handle_end
fps = asset_entity["data"]["fps"]
frame_start = int(asset_entity["data"]["frameStart"]) - handle_start
frame_end = int(asset_entity["data"]["frameEnd"]) + handle_end
root["fps"].setValue(fps)
root["first_frame"].setValue(frame_start)
root["last_frame"].setValue(frame_end)
log.info("__ handles: `{}`".format(handles))
log.info("__ handle_start: `{}`".format(handle_start))
log.info("__ handle_end: `{}`".format(handle_end))
log.info("__ fps: `{}`".format(fps))
# setting active viewers
nuke.frame(int(asset["data"]["frameStart"]))
nuke.frame(int(asset_entity["data"]["frameStart"]))
range = '{0}-{1}'.format(
int(asset["data"]["frameStart"]),
int(asset["data"]["frameEnd"]))
int(asset_entity["data"]["frameStart"]),
int(asset_entity["data"]["frameEnd"]))
for node in nuke.allNodes(filter="Viewer"):
node['frame_range'].setValue(range)
@ -516,15 +513,6 @@ def reset_frame_range_handles():
log.warning("Cannot set Avalon knob to Root node!")
def get_avalon_knob_data(node):
import toml
try:
data = toml.loads(node['avalon'].value())
except Exception:
return None
return data
def reset_resolution():
"""Set resolution to project resolution."""
log.info("Reseting resolution")
@ -620,13 +608,13 @@ def make_format_string(**args):
"{y} "
"{r} "
"{t} "
"{pixel_aspect:.2f}".format(**args)
"{pixelAspect:.2f}".format(**args)
)
else:
return (
"{width} "
"{height} "
"{pixel_aspect:.2f}".format(**args)
"{pixelAspect:.2f}".format(**args)
)
@ -675,7 +663,7 @@ def get_write_node_template_attr(node):
'''
# get avalon data from node
data = dict()
data['avalon'] = get_avalon_knob_data(node)
data['avalon'] = avalon.nuke.get_avalon_knob_data(node)
data_preset = {
"class": data['avalon']['family'],
"preset": data['avalon']['families']

4
pype/plugins/nuke/publish/validate_write_bounding_box.py
View file

@ -74,8 +74,8 @@ class ValidateNukeWriteBoundingBox(pyblish.api.InstancePlugin):
def check_bounding_box(self, instance):
node = instance[0]
first_frame = instance.data["startFrame"]
last_frame = instance.data["endFrame"]
first_frame = instance.data["frameStart"]
last_frame = instance.data["frameEnd"]
format_width = node.format().width()
format_height = node.format().height()