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

Finished Creator

Browse source
This commit is contained in:
Petr Kalis 2020-08-20 20:12:03 +02:00
parent dce5de4938
commit fc2018e22b
2 changed files with 39 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

27
pype/modules/websocket_server/clients/photoshop_client.py
View file

@ -102,13 +102,28 @@ class PhotoshopClientStub():
return ret
def group_selected_layers(self):
def create_group(self, name):
"""
Group selected layers into new layer
:return:
Create new group (eg. LayerSet)
:return: <namedTuple Layer("id":XX, "name":"YYY")>
"""
self.websocketserver.call(self.client.call
('Photoshop.group_selected_layers'))
ret = self.websocketserver.call(self.client.call
('Photoshop.create_group',
name=name))
# create group on PS is asynchronous, returns only id
layer = {"id": ret, "name": name, "group": True}
return namedtuple('Layer', layer.keys())(*layer.values())
def group_selected_layers(self, name):
"""
Group selected layers into new LayerSet (eg. group)
:return: <json representation of Layer>
"""
res = self.websocketserver.call(self.client.call
('Photoshop.group_selected_layers',
name=name)
)
return self._to_records(res)
def get_selected_layers(self):
"""
@ -241,6 +256,8 @@ class PhotoshopClientStub():
raise ValueError("Received broken JSON {}".format(res))
ret = []
# convert to namedtuple to use dot donation
if isinstance(layers_data, dict): # TODO refactore
layers_data = [layers_data]
for d in layers_data:
ret.append(namedtuple('Layer', d.keys())(*d.values()))
return ret

32
pype/plugins/photoshop/create/create_image.py
View file

@ -1,5 +1,8 @@
from avalon import api, photoshop
from avalon import api
from avalon.vendor import Qt
from pype.modules.websocket_server.clients.photoshop_client import (
PhotoshopClientStub
)
class CreateImage(api.Creator):
@ -13,11 +16,12 @@ class CreateImage(api.Creator):
groups = []
layers = []
create_group = False
group_constant = photoshop.get_com_objects().constants().psLayerSet
photoshopClient = PhotoshopClientStub()
if (self.options or {}).get("useSelection"):
multiple_instances = False
selection = photoshop.get_selected_layers()
selection = photoshopClient.get_selected_layers()
self.log.info("selection {}".format(selection))
if len(selection) > 1:
# Ask user whether to create one image or image per selected
# item.
@ -40,19 +44,19 @@ class CreateImage(api.Creator):
if multiple_instances:
for item in selection:
if item.LayerType == group_constant:
if item.group:
groups.append(item)
else:
layers.append(item)
else:
group = photoshop.group_selected_layers()
group.Name = self.name
group = photoshopClient.group_selected_layers()
group.name = self.name
groups.append(group)
elif len(selection) == 1:
# One selected item. Use group if its a LayerSet (group), else
# create a new group.
if selection[0].LayerType == group_constant:
if selection[0].group:
groups.append(selection[0])
else:
layers.append(selection[0])
@ -63,16 +67,14 @@ class CreateImage(api.Creator):
create_group = True
if create_group:
group = photoshop.app().ActiveDocument.LayerSets.Add()
group.Name = self.name
group = photoshopClient.create_group(self.name)
groups.append(group)
for layer in layers:
photoshop.select_layers([layer])
group = photoshop.group_selected_layers()
group.Name = layer.Name
photoshopClient.select_layers([layer])
group = photoshopClient.group_selected_layers(layer.name)
groups.append(group)
for group in groups:
self.data.update({"subset": "image" + group.Name})
photoshop.imprint(group, self.data)
self.data.update({"subset": "image" + group.name})
photoshopClient.imprint(group, self.data)