Skip to content

Commit

Permalink
Merge pull request #11 from planetx-vfx/feature/FP-65/update-slate-no…
Browse files Browse the repository at this point in the history
…de-styling

Update slate node styling
  • Loading branch information
MaximumFX authored Sep 13, 2024
2 parents 21046c9 + b73d073 commit cc38dca
Show file tree
Hide file tree
Showing 5 changed files with 1,347 additions and 303 deletions.
10 changes: 0 additions & 10 deletions info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,6 @@ configuration:
description: ShotGrid script key

# --- PATHS ---
logo_path_linux:
type: str
description: Linux path to the company logo.
logo_path_mac:
type: str
description: Mac path to the company logo.
logo_path_windows:
type: str
description: Windows path to the company logo.

font_path_linux:
type: str
description: Linux path to the regular font to use.
Expand Down
4 changes: 0 additions & 4 deletions python/app/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,21 +81,18 @@ def __init__(self, app, logger) -> None:

if sgtk.util.is_linux():
self.nuke_path = "{}".format(app.get_setting("nuke_path_linux"))
self.logo_path = "{}".format(app.get_setting("logo_path_linux"))
self.font_path = "{}".format(app.get_setting("font_path_linux"))
self.font_bold_path = "{}".format(
app.get_setting("font_bold_path_linux")
)
elif sgtk.util.is_macos():
self.nuke_path = "{}".format(app.get_setting("nuke_path_mac"))
self.logo_path = "{}".format(app.get_setting("logo_path_mac"))
self.font_path = "{}".format(app.get_setting("font_path_mac"))
self.font_bold_path = "{}".format(
app.get_setting("font_bold_path_mac")
)
elif sgtk.util.is_windows():
self.nuke_path = "{}".format(app.get_setting("nuke_path_windows"))
self.logo_path = "{}".format(app.get_setting("logo_path_windows"))
self.font_path = "{}".format(app.get_setting("font_path_windows"))
self.font_bold_path = "{}".format(
app.get_setting("font_bold_path_windows")
Expand Down Expand Up @@ -692,7 +689,6 @@ def deliver_version(
self.settings.sg_server_path,
self.settings.sg_script_name,
self.settings.sg_script_key,
self.logo_path,
"--version-id",
version.id_str,
"-idt",
Expand Down
7 changes: 0 additions & 7 deletions python/app/slate.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ class ShotGridSlate(object):
shotgrid_site (str): url for ShotGrid site
script_name (str): API name for script on ShotGrid
script_key (str): API key for script on ShotGrid
logo_path (str): Path to company logo
fps (float, optional): fps used by project. Defaults to 25.0.
company (str, optional): company name to add to slate. Defaults to "ShotGrid".
colorspace_idt (str, optional): Input colorspace. Defaults to "ACES - ACEScg".
Expand All @@ -68,7 +67,6 @@ def __init__(
shotgrid_site,
script_name,
script_key,
logo_path: str,
fps=25.0,
company="ShotGrid",
colorspace_idt="ACES - ACEScg",
Expand All @@ -85,7 +83,6 @@ def __init__(
self.shotgrid_site = shotgrid_site
self.script_name = script_name
self.script_key = script_key
self.logo_path = logo_path
self.fps = fps
self.company = company
self.colorspace_idt = colorspace_idt
Expand Down Expand Up @@ -403,10 +400,6 @@ def __setup_slate(
for node in nuke.selectedNodes():
node["selected"].setValue(False)

logo = nuke.toNode("LOGO")

logo.knob("file").setValue(self.logo_path)

slate = nuke.toNode("NETFLIX_TEMPLATE_SLATE")

sg_project = self.__get_project_data()
Expand Down
1 change: 0 additions & 1 deletion python/app/slate_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
parser.add_argument("shotgrid_site", type=str)
parser.add_argument("script_name", type=str)
parser.add_argument("script_key", type=str)
parser.add_argument("logo_path", type=str)

parser.add_argument(
"-c", "--company", default="ShotGrid", type=str, metavar="name"
Expand Down
Loading

0 comments on commit cc38dca

Please sign in to comment.