diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/contracts/node_types.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/contracts/node_types.py index c8c4d67..4ffefc1 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/contracts/node_types.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/contracts/node_types.py @@ -51,7 +51,6 @@ class NodeType(blender_type_enum.BlenderTypeEnum): Viewer = enum.auto() ## Outputs / File Exporters Tidy3DWebExporter = enum.auto() - Tidy3DWebRunner = enum.auto() ## Outputs / Web Exporters JSONFileExporter = enum.auto() diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/inputs/constants/__init__.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/inputs/constants/__init__.py index 2d0008d..f02646f 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/inputs/constants/__init__.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/inputs/constants/__init__.py @@ -17,22 +17,16 @@ from . import ( blender_constant, expr_constant, - number_constant, - physical_constant, scientific_constant, ) BL_REGISTER = [ *expr_constant.BL_REGISTER, *scientific_constant.BL_REGISTER, - *number_constant.BL_REGISTER, - *physical_constant.BL_REGISTER, *blender_constant.BL_REGISTER, ] BL_NODES = { **expr_constant.BL_NODES, **scientific_constant.BL_NODES, - **number_constant.BL_NODES, - **physical_constant.BL_NODES, **blender_constant.BL_NODES, } diff --git a/src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/inputs/web_importers/tidy3d_web_runner.py b/src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/inputs/web_importers/tidy3d_web_runner.py index b00fa02..6b40a3f 100644 --- a/src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/inputs/web_importers/tidy3d_web_runner.py +++ b/src/blender_maxwell/node_trees/maxwell_sim_nodes/nodes/inputs/web_importers/tidy3d_web_runner.py @@ -33,7 +33,7 @@ log = logger.get(__name__) # - Operators #################### class RunSimulation(bpy.types.Operator): - """Run a Tidy3D simulation accessible from a `Tidy3DWebRunnerNode`.""" + """Run a Tidy3D simulation accessible from a `Tidy3DWebImporterNode`.""" bl_idname = ct.OperatorType.NodeRunSimulation bl_label = 'Run Sim' @@ -44,10 +44,10 @@ class RunSimulation(bpy.types.Operator): return ( # Check Tidy3D Cloud tdcloud.IS_AUTHENTICATED - # Check Tidy3DWebRunnerNode is Accessible + # Check Tidy3DWebImporterNode is Accessible and hasattr(context, 'node') and hasattr(context.node, 'node_type') - and context.node.node_type == ct.NodeType.Tidy3DWebRunner + and context.node.node_type == ct.NodeType.Tidy3DWebImporter # Check Task is Runnable and context.node.is_task_runnable ) @@ -60,7 +60,7 @@ class RunSimulation(bpy.types.Operator): class ReloadTrackedTask(bpy.types.Operator): - """Reload information of the selected task in a `Tidy3DWebRunnerNode`.""" + """Reload information of the selected task in a `Tidy3DWebImporterNode`.""" bl_idname = ct.OperatorType.NodeReloadTrackedTask bl_label = 'Reload Tracked Tidy3D Cloud Task' @@ -71,10 +71,10 @@ class ReloadTrackedTask(bpy.types.Operator): return ( # Check Tidy3D Cloud tdcloud.IS_AUTHENTICATED - # Check Tidy3DWebRunnerNode is Accessible + # Check Tidy3DWebImporterNode is Accessible and hasattr(context, 'node') and hasattr(context.node, 'node_type') - and context.node.node_type == ct.NodeType.Tidy3DWebRunner + and context.node.node_type == ct.NodeType.Tidy3DWebImporter ) def execute(self, context): @@ -87,9 +87,9 @@ class ReloadTrackedTask(bpy.types.Operator): #################### # - Node #################### -class Tidy3DWebRunnerNode(base.MaxwellSimNode): - node_type = ct.NodeType.Tidy3DWebRunner - bl_label = 'Tidy3D Web Runner' +class Tidy3DWebImporterNode(base.MaxwellSimNode): + node_type = ct.NodeType.Tidy3DWebImporter + bl_label = 'Tidy3D Web Runner/Importer' input_sockets: typ.ClassVar = { 'Cloud Task': sockets.Tidy3DCloudTaskSocketDef( @@ -269,8 +269,8 @@ class Tidy3DWebRunnerNode(base.MaxwellSimNode): BL_REGISTER = [ RunSimulation, ReloadTrackedTask, - Tidy3DWebRunnerNode, + Tidy3DWebImporterNode, ] BL_NODES = { - ct.NodeType.Tidy3DWebRunner: (ct.NodeCategory.MAXWELLSIM_INPUTS_WEBIMPORTERS) + ct.NodeType.Tidy3DWebImporter: (ct.NodeCategory.MAXWELLSIM_INPUTS_WEBIMPORTERS) }