Skip to content

Commit 342872c

Browse files
feat: moving util files into /lib/ and fixing imports (#1246)
Co-authored-by: Dhruv Arora <100000915+Dhruv-0-Arora@users.noreply.github.com>
2 parents d036af2 + 73c8319 commit 342872c

File tree

16 files changed

+19
-18
lines changed

16 files changed

+19
-18
lines changed

exporter/SynthesisFusionAddin/src/Logging.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import adsk.core
1313

1414
from src import INTERNAL_ID, IS_RELEASE, SUPPORT_PATH
15-
from src.Util import makeDirectories
15+
from src.lib.Util import makeDirectories
1616

1717
MAX_LOG_FILES_TO_KEEP = 10
1818
TIMING_LEVEL = 25

exporter/SynthesisFusionAddin/src/UI/Camera.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import adsk.core
44

55
from src import SUPPORT_PATH
6+
from src.lib.Util import makeDirectories
67
from src.Logging import logFailure
78
from src.Types import OString
8-
from src.Util import makeDirectories
99

1010

1111
@logFailure

exporter/SynthesisFusionAddin/src/UI/ConfigCommand.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
import src.UI.TaggingConfigTab as TaggingConfigTab
2222
from src import APP_WEBSITE_URL, Logging, gm
2323
from src.APS.APS import getAuth, getUserInfo
24+
from src.lib.Handlers import PersistentEventHandler
25+
from src.lib.Util import convertMassUnitsTo, designMassCalculation
2426
from src.Logging import getLogger, logFailure
2527
from src.Parser.ExporterOptions import ExporterOptions
2628
from src.Parser.SynthesisParser.Utilities import guid_occurrence
2729
from src.Types import SELECTABLE_JOINT_TYPES, ExportLocation, ExportMode
2830
from src.UI import FileDialogConfig
29-
from src.UI.Handlers import PersistentEventHandler
30-
from src.Util import convertMassUnitsTo, designMassCalculation
3131

3232
generalConfigTab: GeneralConfigTab.GeneralConfigTab
3333
jointConfigTab: JointConfigTab.JointConfigTab

exporter/SynthesisFusionAddin/src/UI/GamepieceConfigTab.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import adsk.core
22
import adsk.fusion
33

4+
from src.lib.Util import convertMassUnitsFrom, convertMassUnitsTo, getFusionUnitSystem
45
from src.Logging import logFailure
56
from src.Parser.ExporterOptions import ExporterOptions
67
from src.Parser.SynthesisParser.Utilities import guid_occurrence
@@ -10,7 +11,6 @@
1011
createTableInput,
1112
createTextBoxInput,
1213
)
13-
from src.Util import convertMassUnitsFrom, convertMassUnitsTo, getFusionUnitSystem
1414

1515

1616
class GamepieceConfigTab:

exporter/SynthesisFusionAddin/src/UI/GeneralConfigTab.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import adsk.core
22
import adsk.fusion
33

4+
from src.lib.Util import (
5+
convertMassUnitsFrom,
6+
convertMassUnitsTo,
7+
designMassCalculation,
8+
getFusionUnitSystem,
9+
)
410
from src.Logging import logFailure
511
from src.Parser.ExporterOptions import ExporterOptions
612
from src.Types import KG, ExportLocation, ExportMode, UnitSystem
713
from src.UI.CreateCommandInputsHelper import createBooleanInput
814
from src.UI.GamepieceConfigTab import GamepieceConfigTab
915
from src.UI.JointConfigTab import JointConfigTab
1016
from src.UI.TaggingConfigTab import TaggingConfigTab
11-
from src.Util import (
12-
convertMassUnitsFrom,
13-
convertMassUnitsTo,
14-
designMassCalculation,
15-
getFusionUnitSystem,
16-
)
1717

1818

1919
class GeneralConfigTab:

exporter/SynthesisFusionAddin/src/UI/HUI.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import adsk.core
44

55
from src import INTERNAL_ID, gm
6+
from src.lib import Handlers, OsHelper
67
from src.Logging import logFailure
7-
from src.UI import Handlers, OsHelper
88

99

1010
# no longer used

exporter/SynthesisFusionAddin/src/UI/JointConfigTab.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import adsk.core
22
import adsk.fusion
33

4+
from src.lib import IconPaths
45
from src.Logging import logFailure
56
from src.Types import (
67
SELECTABLE_JOINT_TYPES,
@@ -10,7 +11,6 @@
1011
Wheel,
1112
WheelType,
1213
)
13-
from src.UI import IconPaths
1414
from src.UI.CreateCommandInputsHelper import (
1515
createBooleanInput,
1616
createTableInput,

exporter/SynthesisFusionAddin/src/UI/TaggingConfigTab.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import adsk.core
22
import adsk.fusion
33

4+
from src.lib import IconPaths
45
from src.Logging import getLogger, logFailure
5-
from src.UI import IconPaths
66
from src.UI.CreateCommandInputsHelper import createTableInput, createTextBoxInput
77

88
logger = getLogger()

exporter/SynthesisFusionAddin/src/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import platform
33
from pathlib import Path
44

5-
from src.GlobalManager import GlobalManager
6-
from src.Util import makeDirectories
5+
from src.lib.GlobalManager import GlobalManager
6+
from src.lib.Util import makeDirectories
77

88
APP_NAME = "Synthesis"
99
APP_TITLE = "Synthesis Robot Exporter"

0 commit comments

Comments
 (0)