Refactor DCCsi to work better with O3DE changes (#4226)

* moving files in refactor/re-org Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * dev env refactor/re-org Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * moving/re-org so we can deprate the SDK nomiclature Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * moving/re-org so we can deprate the SDK nomiclature Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Refactoring env so I can replace SDK with Tools folder Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * re-org and prune, from SKD to Tools Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Removing old .bat files from SDK Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * updated how to retreive PYTHONHOME Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Can't use/set PYTHONHOME with DCC Tools Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * small refactor Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * repaired a missed typo (causes error) Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Added missing EntityId.h include to FocusModeInterface.h Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> * refactor additional LY to O3DE tags Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Some design scaffold file stubs Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * stubbing in scaffold file pattern Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Removal of corrupted prefabs Signed-off-by: Benjamin Black <benblac@amazon.com> * refactored config_utils to maintain py2.7 support for maya 2020 Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * refactored config_utils to maintain py2.7 support for maya 2020 Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * pruning and cleanup Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * .env is for local dev overrides Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * .env is for local dev overrides Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * clean up init and logging patterns Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * Core refactoring, config.py functional standalone Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * cleaned up some bad logging, fixed up boostrap Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * fixed validation errors Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * fix logging issue, tiddy up Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * tiddy up maya for .bat bootstraping and launch Signed-off-by: Jonny Gallowy <gallowj@amazon.com> * name stub, fix validation Signed-off-by: Jonny Gallowy <gallowj@amazon.com> Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Co-authored-by: Benjamin Black <benblac@amazon.com>
2021-10-21 19:03:49 -05:00
parent 50068bcae7
commit b779f358d0
197 changed files with 3779 additions and 3636 deletions
@@ -11,24 +11,26 @@

 """azpy.shared.ui.__init__"""

-import os
+import logging as _logging

-from azpy.env_bool import env_bool
+import azpy.env_bool as env_bool
 from azpy.constants import ENVAR_DCCSI_GDEBUG
 from azpy.constants import ENVAR_DCCSI_DEV_MODE
+from azpy.constants import FRMT_LOG_LONG

-#  global space
-_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
-_DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)
+_DCCSI_GDEBUG = env_bool.env_bool(ENVAR_DCCSI_GDEBUG, False)
+_DCCSI_DEV_MODE = env_bool.env_bool(ENVAR_DCCSI_DEV_MODE, False)

 _PACKAGENAME = __name__
 if _PACKAGENAME is '__main__':
    _PACKAGENAME = 'azpy.shared.ui'

-import azpy
-_LOGGER = azpy.initialize_logger(_PACKAGENAME)
-_LOGGER.debug('Invoking __init__.py for {0}.'.format({_PACKAGENAME}))
-
+# set up module logging
+for handler in _logging.root.handlers[:]:
+    _logging.root.removeHandler(handler)
+_LOGGER = _logging.getLogger(_PACKAGENAME)
+_logging.basicConfig(format=FRMT_LOG_LONG)
+_LOGGER.debug('Initializing: {0}.'.format({_PACKAGENAME}))
 # -------------------------------------------------------------------------
 #
 __all__ = []
@@ -34,7 +34,7 @@ from shiboken2 import wrapInstance

 # -------------------------------------------------------------------------
 #  global space debug flag
-_G_DEBUG = settings.DCCSI_GDEBUG
+_DCCSI_GDEBUG = settings.DCCSI_GDEBUG

 #  global space debug flag
 _DCCSI_DEV_MODE = settings.DCCSI_DEV_MODE
@@ -30,7 +30,7 @@ import PySide2.QtGui as QtGui
 # -------------------------------------------------------------------------
 #  global space
 # To Do: update to dynaconf dynamic env and settings?
-_G_DEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
+_DCCSI_GDEBUG = env_bool(ENVAR_DCCSI_GDEBUG, False)
 _DCCSI_DEV_MODE = env_bool(ENVAR_DCCSI_DEV_MODE, False)

 _MODULE_PATH = Path(__file__)
@@ -38,7 +38,7 @@ _MODULE_PATH = Path(__file__)
 _MODULENAME = 'azpy.shared.ui.custom_treemodel'

 _log_level = int(20)
-if _G_DEBUG:
+if _DCCSI_GDEBUG:
    _log_level = int(10)
 _LOGGER = azpy.initialize_logger(_MODULENAME,
                                 log_to_file=False,
@@ -27,7 +27,7 @@ import PySide2.QtWidgets as QtWidgets

 # -------------------------------------------------------------------------
 #  global space debug flag
-_G_DEBUG = os.getenv('DCCSI_GDEBUG', False)
+_DCCSI_GDEBUG = os.getenv('DCCSI_GDEBUG', False)

 #  global space developer mode flag
 _DCCSI_DEV_MODE = os.getenv('DCCSI_DEV_MODE', False)
@@ -32,7 +32,7 @@ from PySide2.QtCore import QTimer

 # -------------------------------------------------------------------------
 #  global space debug flag
-_G_DEBUG = os.getenv('DCCSI_GDEBUG', False)
+_DCCSI_GDEBUG = os.getenv('DCCSI_GDEBUG', False)

 #  global space debug flag
 _DCCSI_DEV_MODE = os.getenv('DCCSI_DEV_MODE', False)
@@ -48,7 +48,7 @@ _MODULENAME = __name__
 if _MODULENAME is '__main__':
    _MODULENAME = _TOOL_TAG

-if _G_DEBUG:
+if _DCCSI_GDEBUG:
    _LOGGER = initialize_logger(_MODULENAME, log_to_file=True)
    _LOGGER.debug('Something invoked :: {0}.'.format({_MODULENAME}))
 else:
@@ -130,7 +130,7 @@ if __name__ == '__main__':
    _TOOL_TAG = 'azpy.shared.ui.pyside2_qtextedit_stdout'
    _TYPE_TAG = 'test'

-    if _G_DEBUG:
+    if _DCCSI_GDEBUG:
        _LOGGER = initialize_logger('{0}-TEST'.format(_TOOL_TAG), log_to_file=True)
        _LOGGER.debug('Something invoked :: {0}.'.format({_MODULENAME}))

@@ -155,7 +155,7 @@ if __name__ == '__main__':
    _READER.start('python', ['-u', _TEST_PY_FILE])  # start the process

    # after that starts, this will show the console
-    # LY_QSS = Path(_MODULE_PATH.parent, 'resources', 'stylesheets', 'LYstyle.qss')
+    # O3DE_QSS = Path(_MODULE_PATH.parent, 'resources', 'stylesheets', 'LYstyle.qss')
    _DARK_STYLE = Path(_MODULE_PATH.parent, 'resources', 'qdarkstyle', 'style.qss')
    _CONSOLE.qapp.setStyleSheet(_DARK_STYLE.read_file())
    _CONSOLE.show()  # make the console visible
@@ -51,7 +51,7 @@ import azpy.shared.ui.help_menu as help_menu

 # -------------------------------------------------------------------------
 #  global space debug flag
-_G_DEBUG = settings.DCCSI_GDEBUG
+_DCCSI_GDEBUG = settings.DCCSI_GDEBUG

 #  global space debug flag
 _DCCSI_DEV_MODE = settings.DCCSI_DEV_MODE
@@ -112,7 +112,7 @@ def from_ui_generate_form_and_base_class(filename, return_output=False):
        ui_file.exists()
    except FileNotFoundError as error:
        output += 'File does not exist: {0}/r'.format(error)
-        if _G_DEBUG:
+        if _DCCSI_GDEBUG:
            print(error)
        if return_output:
            return False, output
@@ -24,7 +24,7 @@ import azpy.config_utils
 _config = azpy.config_utils.get_dccsi_config()
 # ^ this is effectively an import and retreive of <dccsi>\config.py
 # init lumberyard Qy/PySide2 access
-_config.init_ly_pyside(settings.LY_DEV)
+_config.init_o3de_pyside(settings.O3DE_DEV)

 # now we can import lumberyards PySide2
 import PySide2.QtCore as QtCore
@@ -32,7 +32,7 @@ import PySide2.QtWidgets as QtWidgets

 # -------------------------------------------------------------------------
 #  global space debug flag
-_G_DEBUG = settings.DCCSI_GDEBUG
+_DCCSI_GDEBUG = settings.DCCSI_GDEBUG

 #  global space debug flag
 _DCCSI_DEV_MODE = settings.DCCSI_DEV_MODE
@@ -47,7 +47,7 @@ import PySide2.QtUiTools as QtUiTools

 # -------------------------------------------------------------------------
 #  global space debug flag
-_G_DEBUG = settings.DCCSI_GDEBUG
+_DCCSI_GDEBUG = settings.DCCSI_GDEBUG

 #  global space debug flag
 _DCCSI_DEV_MODE = settings.DCCSI_DEV_MODE