Merge pull request #8 from pypeclub/bugfix/nks-resolution-data-missco…

…llected

nks collecting fps and resolution data to anatomy

pype/plugins/global/publish/collect_instance_anatomy_data.py

@@ -108,9 +108,13 @@ def process(self, instance):
  if resolution_height:
  anatomy_data["resolution_height"] = resolution_height
 
+ pixel_aspect = instance.data.get("pixelAspect")
+ if pixel_aspect:
+ anatomy_data["pixel_aspect"] = float("{:0.2f}".format(pixel_aspect))
+
  fps = instance.data.get("fps")
  if resolution_height:
- anatomy_data["fps"] = fps
+ anatomy_data["fps"] = float("{:0.2f}".format(fps))
 
  instance.data["projectEntity"] = project_entity
  instance.data["assetEntity"] = asset_entity

pype/plugins/nukestudio/publish/collect_hierarchy_context.py

@@ -42,6 +42,7 @@ def process(self, context):
  width = int(sequence.format().width())
  height = int(sequence.format().height())
  pixel_aspect = sequence.format().pixelAspect()
+ fps = context.data["fps"]
 
  # build data for inner nukestudio project property
  data = {
@@ -161,9 +162,10 @@ def process(self, context):
  "asset": asset,
  "hierarchy": hierarchy,
  "parents": parents,
- "width": width,
- "height": height,
+ "resolutionWidth": width,
+ "resolutionHeight": height,
  "pixelAspect": pixel_aspect,
+ "fps": fps,
  "tasks": instance.data["tasks"]
  })
 
@@ -223,9 +225,12 @@ def process(self, context):
  instance.data["parents"] = s_asset_data["parents"]
  instance.data["hierarchy"] = s_asset_data["hierarchy"]
  instance.data["tasks"] = s_asset_data["tasks"]
- instance.data["width"] = s_asset_data["width"]
- instance.data["height"] = s_asset_data["height"]
+ instance.data["resolutionWidth"] = s_asset_data[
+ "resolutionWidth"]
+ instance.data["resolutionHeight"] = s_asset_data[
+ "resolutionHeight"]
  instance.data["pixelAspect"] = s_asset_data["pixelAspect"]
+ instance.data["fps"] = s_asset_data["fps"]
 
  # adding frame start if any on instance
  start_frame = s_asset_data.get("startingFrame")
@@ -275,8 +280,8 @@ def process(self, context):
  # adding SourceResolution if Tag was present
  if instance.data.get("main"):
  in_info['custom_attributes'].update({
- "resolutionWidth": instance.data["width"],
- "resolutionHeight": instance.data["height"],
+ "resolutionWidth": instance.data["resolutionWidth"],
+ "resolutionHeight": instance.data["resolutionHeight"],
  "pixelAspect": instance.data["pixelAspect"]
  })
 

pype/plugins/nukestudio/publish/collect_plates.py

@@ -83,7 +83,7 @@ def process(self, instance):
 class CollectPlatesData(api.InstancePlugin):
  """Collect plates"""
 
- order = api.CollectorOrder + 0.495
+ order = api.CollectorOrder + 0.48
  label = "Collect Plates Data"
  hosts = ["nukestudio"]
  families = ["plate"]
@@ -126,7 +126,7 @@ def process(self, instance):
  transfer_data = [
  "handleStart", "handleEnd", "sourceIn", "sourceOut", "frameStart",
  "frameEnd", "sourceInH", "sourceOutH", "clipIn", "clipOut",
- "clipInH", "clipOutH", "asset", "track", "version", "width", "height", "pixelAspect"
+ "clipInH", "clipOutH", "asset", "track", "version", "resolutionWidth", "resolutionHeight", "pixelAspect", "fps"
  ]
 
  # pass data to version