Merge remote-tracking branch 'origin/dev' into zachr/2043/match-mode-config

Author: rutmanz

.gitignore

@@ -2,6 +2,8 @@
 .vscode/
 build/
 dist/
+out/
+renderer/
 *.log
 .DS_Store
 *.pkg

exporter/SynthesisFusionAddin/src/Logging.py

@@ -12,7 +12,7 @@
 import adsk.core
 
 from src import INTERNAL_ID, IS_RELEASE, SUPPORT_PATH
-from src.Util import makeDirectories
+from src.lib.Util import makeDirectories
 
 MAX_LOG_FILES_TO_KEEP = 10
 TIMING_LEVEL = 25

exporter/SynthesisFusionAddin/src/UI/Camera.py

@@ -3,9 +3,9 @@
 import adsk.core
 
 from src import SUPPORT_PATH
+from src.lib.Util import makeDirectories
 from src.Logging import logFailure
 from src.Types import OString
-from src.Util import makeDirectories
 
 
 @logFailure

exporter/SynthesisFusionAddin/src/UI/ConfigCommand.py

@@ -21,13 +21,13 @@
 import src.UI.TaggingConfigTab as TaggingConfigTab
 from src import APP_WEBSITE_URL, Logging, gm
 from src.APS.APS import getAuth, getUserInfo
+from src.lib.Handlers import PersistentEventHandler
+from src.lib.Util import convertMassUnitsTo, designMassCalculation
 from src.Logging import getLogger, logFailure
 from src.Parser.ExporterOptions import ExporterOptions
 from src.Parser.SynthesisParser.Utilities import guid_occurrence
 from src.Types import SELECTABLE_JOINT_TYPES, ExportLocation, ExportMode
 from src.UI import FileDialogConfig
-from src.UI.Handlers import PersistentEventHandler
-from src.Util import convertMassUnitsTo, designMassCalculation
 
 generalConfigTab: GeneralConfigTab.GeneralConfigTab
 jointConfigTab: JointConfigTab.JointConfigTab

exporter/SynthesisFusionAddin/src/UI/GamepieceConfigTab.py

@@ -1,6 +1,7 @@
 import adsk.core
 import adsk.fusion
 
+from src.lib.Util import convertMassUnitsFrom, convertMassUnitsTo, getFusionUnitSystem
 from src.Logging import logFailure
 from src.Parser.ExporterOptions import ExporterOptions
 from src.Parser.SynthesisParser.Utilities import guid_occurrence
@@ -10,7 +11,6 @@
     createTableInput,
     createTextBoxInput,
 )
-from src.Util import convertMassUnitsFrom, convertMassUnitsTo, getFusionUnitSystem
 
 
 class GamepieceConfigTab:

exporter/SynthesisFusionAddin/src/UI/GeneralConfigTab.py

@@ -1,19 +1,19 @@
 import adsk.core
 import adsk.fusion
 
+from src.lib.Util import (
+    convertMassUnitsFrom,
+    convertMassUnitsTo,
+    designMassCalculation,
+    getFusionUnitSystem,
+)
 from src.Logging import logFailure
 from src.Parser.ExporterOptions import ExporterOptions
 from src.Types import KG, ExportLocation, ExportMode, UnitSystem
 from src.UI.CreateCommandInputsHelper import createBooleanInput
 from src.UI.GamepieceConfigTab import GamepieceConfigTab
 from src.UI.JointConfigTab import JointConfigTab
 from src.UI.TaggingConfigTab import TaggingConfigTab
-from src.Util import (
-    convertMassUnitsFrom,
-    convertMassUnitsTo,
-    designMassCalculation,
-    getFusionUnitSystem,
-)
 
 
 class GeneralConfigTab:

exporter/SynthesisFusionAddin/src/UI/HUI.py

@@ -3,8 +3,8 @@
 import adsk.core
 
 from src import INTERNAL_ID, gm
+from src.lib import Handlers, OsHelper
 from src.Logging import logFailure
-from src.UI import Handlers, OsHelper
 
 
 # no longer used

exporter/SynthesisFusionAddin/src/UI/JointConfigTab.py

@@ -1,6 +1,7 @@
 import adsk.core
 import adsk.fusion
 
+from src.lib import IconPaths
 from src.Logging import logFailure
 from src.Types import (
     SELECTABLE_JOINT_TYPES,
@@ -10,7 +11,6 @@
     Wheel,
     WheelType,
 )
-from src.UI import IconPaths
 from src.UI.CreateCommandInputsHelper import (
     createBooleanInput,
     createTableInput,

exporter/SynthesisFusionAddin/src/UI/TaggingConfigTab.py

@@ -1,8 +1,8 @@
 import adsk.core
 import adsk.fusion
 
+from src.lib import IconPaths
 from src.Logging import getLogger, logFailure
-from src.UI import IconPaths
 from src.UI.CreateCommandInputsHelper import createTableInput, createTextBoxInput
 
 logger = getLogger()

exporter/SynthesisFusionAddin/src/__init__.py

@@ -2,8 +2,8 @@
 import platform
 from pathlib import Path
 
-from src.GlobalManager import GlobalManager
-from src.Util import makeDirectories
+from src.lib.GlobalManager import GlobalManager
+from src.lib.Util import makeDirectories
 
 APP_NAME = "Synthesis"
 APP_TITLE = "Synthesis Robot Exporter"