TVPaint extractor enhancement

pype/hosts/tvpaint/lib.py

@@ -0,0 +1,20 @@
+from PIL import Image
+
+
+def composite_images(input_image_paths, output_filepath):
+ """Composite images in order from passed list.
+
+ Raises:
+ ValueError: When entered list is empty.
+ """
+ if not input_image_paths:
+ raise ValueError("Nothing to composite.")
+
+ img_obj = None
+ for image_filepath in input_image_paths:
+ _img_obj = Image.open(image_filepath)
+ if img_obj is None:
+ img_obj = _img_obj
+ else:
+ img_obj.alpha_composite(_img_obj)
+ img_obj.save(output_filepath)

pype/plugins/tvpaint/publish/collect_instances.py

@@ -48,7 +48,10 @@ def process(self, context):
  instance_data["subset"] = new_subset_name
 
  instance = context.create_instance(**instance_data)
- instance.data["layers"] = context.data["layersData"]
+
+ instance.data["layers"] = copy.deepcopy(
+ context.data["layersData"]
+ )
  # Add ftrack family
  instance.data["families"].append("ftrack")
 
@@ -70,15 +73,16 @@ def process(self, context):
  if instance is None:
  continue
 
- frame_start = context.data["frameStart"]
- frame_end = frame_start
+ any_visible = False
  for layer in instance.data["layers"]:
- _frame_end = layer["frame_end"]
- if _frame_end > frame_end:
- frame_end = _frame_end
+ if layer["visible"]:
+ any_visible = True
+ break
+
+ instance.data["publish"] = any_visible
 
- instance.data["frameStart"] = frame_start
- instance.data["frameEnd"] = frame_end
+ instance.data["frameStart"] = context.data["frameStart"]
+ instance.data["frameEnd"] = context.data["frameEnd"]
 
  self.log.debug("Created instance: {}\n{}".format(
  instance, json.dumps(instance.data, indent=4)
@@ -107,7 +111,7 @@ def create_render_layer_instance(self, context, instance_data):
  group_id = instance_data["group_id"]
  group_layers = []
  for layer in layers_data:
- if layer["group_id"] == group_id and layer["visible"]:
+ if layer["group_id"] == group_id:
  group_layers.append(layer)
 
  if not group_layers:

pype/plugins/tvpaint/publish/collect_workfile_data.py

@@ -113,33 +113,45 @@ def process(self, context):
  self.log.info("Collecting scene data from workfile")
  workfile_info_parts = lib.execute_george("tv_projectinfo").split(" ")
 
- frame_start = int(workfile_info_parts.pop(-1))
+ # Project frame start - not used
+ workfile_info_parts.pop(-1)
  field_order = workfile_info_parts.pop(-1)
  frame_rate = float(workfile_info_parts.pop(-1))
  pixel_apsect = float(workfile_info_parts.pop(-1))
  height = int(workfile_info_parts.pop(-1))
  width = int(workfile_info_parts.pop(-1))
  workfile_path = " ".join(workfile_info_parts).replace("\"", "")
 
- # TODO This is not porper way of getting last frame
- # - but don't know better
- last_frame = frame_start
- for layer in layers_data:
- frame_end = layer["frame_end"]
- if frame_end > last_frame:
- last_frame = frame_end
-
+ frame_start, frame_end = self.collect_clip_frames()
  scene_data = {
  "currentFile": workfile_path,
  "sceneWidth": width,
  "sceneHeight": height,
  "pixelAspect": pixel_apsect,
  "frameStart": frame_start,
- "frameEnd": last_frame,
+ "frameEnd": frame_end,
  "fps": frame_rate,
  "fieldOrder": field_order
  }
  self.log.debug(
  "Scene data: {}".format(json.dumps(scene_data, indent=4))
  )
  context.data.update(scene_data)
+
+ def collect_clip_frames(self):
+ clip_info_str = lib.execute_george("tv_clipinfo")
+ self.log.debug("Clip info: {}".format(clip_info_str))
+ clip_info_items = clip_info_str.split(" ")
+ # Color index - not used
+ clip_info_items.pop(-1)
+ clip_info_items.pop(-1)
+
+ mark_out = int(clip_info_items.pop(-1))
+ frame_end = mark_out + 1
+ clip_info_items.pop(-1)
+
+ mark_in = int(clip_info_items.pop(-1))
+ frame_start = mark_in + 1
+ clip_info_items.pop(-1)
+
+ return frame_start, frame_end