From 768be9645a7cad7efdba49c070e67ddb95698dc7 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Wed, 2 Dec 2020 20:56:06 +0100 Subject: [PATCH] move attributes to anatomy --- .../defaults/environments/avalon.json | 16 ---------- .../defaults/environments/global.json | 32 ------------------- .../defaults/project_anatomy/attributes.json | 13 ++++++++ .../defaults/project_settings/global.json | 18 ----------- .../projects_schema/0_project_gui_schema.json | 7 +++- .../schema_project_global.json | 5 +-- .../schemas/schema_anatomy_attributes.json | 2 +- 7 files changed, 21 insertions(+), 72 deletions(-) delete mode 100644 pype/settings/defaults/environments/avalon.json delete mode 100644 pype/settings/defaults/environments/global.json create mode 100644 pype/settings/defaults/project_anatomy/attributes.json diff --git a/pype/settings/defaults/environments/avalon.json b/pype/settings/defaults/environments/avalon.json deleted file mode 100644 index 832ba07e71..0000000000 --- a/pype/settings/defaults/environments/avalon.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "AVALON_CONFIG": "pype", - "AVALON_PROJECTS": "{PYPE_PROJECTS_PATH}", - "AVALON_USERNAME": "avalon", - "AVALON_PASSWORD": "secret", - "AVALON_DEBUG": "1", - "AVALON_MONGO": "mongodb://localhost:2707", - "AVALON_DB": "avalon", - "AVALON_DB_DATA": "{PYPE_SETUP_PATH}/../mongo_db_data", - "AVALON_EARLY_ADOPTER": "1", - "AVALON_SCHEMA": "{PYPE_MODULE_ROOT}/schema", - "AVALON_LOCATION": "http://127.0.0.1", - "AVALON_LABEL": "Pype", - "AVALON_TIMEOUT": "1000", - "AVALON_THUMBNAIL_ROOT": "" -} diff --git a/pype/settings/defaults/environments/global.json b/pype/settings/defaults/environments/global.json deleted file mode 100644 index 717e337db8..0000000000 --- a/pype/settings/defaults/environments/global.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "PYPE_STUDIO_NAME": "Studio Name", - "PYPE_STUDIO_CODE": "stu", - "PYPE_APP_ROOT": "{PYPE_SETUP_PATH}/pypeapp", - "PYPE_MODULE_ROOT": "{PYPE_SETUP_PATH}/repos/pype", - "PYPE_PROJECT_PLUGINS": "", - "STUDIO_SOFT": "{PYP_SETUP_ROOT}/soft", - "FFMPEG_PATH": { - "windows": "{VIRTUAL_ENV}/localized/ffmpeg_exec/windows/bin;{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/windows/bin", - "darwin": "{VIRTUAL_ENV}/localized/ffmpeg_exec/darwin/bin:{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/darwin/bin", - "linux": "{VIRTUAL_ENV}/localized/ffmpeg_exec/linux:{PYPE_SETUP_PATH}/vendor/bin/ffmpeg_exec/linux" - }, - "PATH": [ - "{PYPE_CONFIG}/launchers", - "{PYPE_APP_ROOT}", - "{FFMPEG_PATH}", - "{PATH}" - ], - "PYPE_OCIO_CONFIG": "{STUDIO_SOFT}/OpenColorIO-Configs", - "PYTHONPATH": { - "windows": "{VIRTUAL_ENV}/Lib/site-packages;{PYPE_MODULE_ROOT}/pype/tools;{PYTHONPATH}", - "linux": "{VIRTUAL_ENV}/lib/python{PYTHON_VERSION}/site-packages:{PYPE_MODULE_ROOT}/pype/tools:{PYTHONPATH}", - "darwin": "{VIRTUAL_ENV}/lib/python{PYTHON_VERSION}/site-packages:{PYPE_MODULE_ROOT}/pype/tools:{PYTHONPATH}" - }, - "PYPE_PROJECT_CONFIGS": "{PYPE_SETUP_PATH}/../studio-project-configs", - "PYPE_PYTHON_EXE": { - "windows": "{VIRTUAL_ENV}/Scripts/python.exe", - "linux": "{VIRTUAL_ENV}/Scripts/python", - "darwin": "{VIRTUAL_ENV}/bin/python" - }, - "PYBLISH_GUI": "pyblish_pype" -} diff --git a/pype/settings/defaults/project_anatomy/attributes.json b/pype/settings/defaults/project_anatomy/attributes.json new file mode 100644 index 0000000000..fbf0218999 --- /dev/null +++ b/pype/settings/defaults/project_anatomy/attributes.json @@ -0,0 +1,13 @@ +{ + "fps": 25, + "frameStart": 1001, + "frameEnd": 1001, + "clipIn": 1, + "clipOut": 1, + "handleStart": 0, + "handleEnd": 0, + "resolutionWidth": 1920, + "resolutionHeight": 1080, + "pixelAspect": 1, + "applications": [] +} \ No newline at end of file diff --git a/pype/settings/defaults/project_settings/global.json b/pype/settings/defaults/project_settings/global.json index 407dd23593..7cedd7cf88 100644 --- a/pype/settings/defaults/project_settings/global.json +++ b/pype/settings/defaults/project_settings/global.json @@ -161,24 +161,6 @@ } } }, - "attributes": { - "fps": 25, - "frameStart": 1001, - "frameEnd": 1001, - "clipIn": 1, - "clipOut": 1, - "handleStart": 0, - "handleEnd": 0, - "resolutionWidth": 1920, - "resolutionHeight": 1008, - "pixelAspect": 1, - "applications": [ - "maya_2020", - "nuke_12.2", - "hiero_12.2", - "blender_2.91" - ] - }, "project_folder_structure": { "__project_root__": { "prod": {}, diff --git a/pype/tools/settings/settings/gui_schemas/projects_schema/0_project_gui_schema.json b/pype/tools/settings/settings/gui_schemas/projects_schema/0_project_gui_schema.json index 06937778d6..837eab0b43 100644 --- a/pype/tools/settings/settings/gui_schemas/projects_schema/0_project_gui_schema.json +++ b/pype/tools/settings/settings/gui_schemas/projects_schema/0_project_gui_schema.json @@ -14,7 +14,12 @@ "type": "anatomy_templates", "key": "templates", "is_file": true - }, { + }, + { + "type": "schema", + "name": "schema_anatomy_attributes" + }, + { "type": "schema", "name": "schema_anatomy_imageio" } diff --git a/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_global.json b/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_global.json index d78d430e9b..75731fe207 100644 --- a/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_global.json +++ b/pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_global.json @@ -13,10 +13,7 @@ "type": "schema", "name": "schema_global_tools" }, - { - "type": "schema", - "name": "schema_anatomy_attributes" - }, + { "type": "collapsible-wrap", "label": "Project Folder Structure", diff --git a/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_anatomy_attributes.json b/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_anatomy_attributes.json index c56e4432e3..6283100fca 100644 --- a/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_anatomy_attributes.json +++ b/pype/tools/settings/settings/gui_schemas/projects_schema/schemas/schema_anatomy_attributes.json @@ -2,7 +2,7 @@ "type": "dict", "collapsable": true, "key": "attributes", - "label": "Project Attribute Defaults", + "label": "Attribute Defaults", "is_file": true, "children": [ {