fix: @base event callbacks now use @events
parent
01cfc61094
commit
a282d1e7ef
GPG Key ID:
AD901CB0F3701434
|
|
@ -59,10 +59,7 @@ def import_geonodes(
|
|||
- Retrieve the node group and return it.
|
||||
"""
|
||||
if geonodes in bpy.data.node_groups and not force_import:
|
||||
log.info(
|
||||
'Found Existing GeoNodes Tree (name=%s)',
|
||||
geonodes
|
||||
)
|
||||
log.info('Found Existing GeoNodes Tree (name=%s)', geonodes)
|
||||
return bpy.data.node_groups[geonodes]
|
||||
|
||||
filename = geonodes
|
||||
|
|
@ -72,7 +69,7 @@ def import_geonodes(
|
|||
directory = filepath.removesuffix(geonodes)
|
||||
log.info(
|
||||
'%s GeoNodes (filename=%s, directory=%s, filepath=%s)',
|
||||
"Linking" if import_method == 'link' else "Appending",
|
||||
'Linking' if import_method == 'link' else 'Appending',
|
||||
filename,
|
||||
directory,
|
||||
filepath,
|
||||
|
|
|
|||
|
|
@ -82,9 +82,7 @@ BL_NODE_CATEGORIES = mk_node_categories(
|
|||
syllable_prefix=['MAXWELLSIM'],
|
||||
)
|
||||
## TODO: refactor, this has a big code smell
|
||||
BL_REGISTER = [
|
||||
*DYNAMIC_SUBMENU_REGISTRATIONS
|
||||
] ## Must be run after, right now.
|
||||
BL_REGISTER = [*DYNAMIC_SUBMENU_REGISTRATIONS] ## Must be run after, right now.
|
||||
|
||||
|
||||
## TEST - TODO this is a big code smell
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
from .socket_types import SocketType as ST
|
||||
|
||||
## TODO: Don't just presume sRGB.
|
||||
|
|
|
|||
|
|
@ -6,11 +6,9 @@ BL_SOCKET_DIRECT_TYPE_MAP = {
|
|||
('NodeSocketImage', 1): ST.BlenderImage,
|
||||
('NodeSocketObject', 1): ST.BlenderObject,
|
||||
('NodeSocketMaterial', 1): ST.BlenderMaterial,
|
||||
|
||||
# Basic
|
||||
('NodeSocketString', 1): ST.String,
|
||||
('NodeSocketBool', 1): ST.Bool,
|
||||
|
||||
# Float
|
||||
('NodeSocketFloat', 1): ST.RealNumber,
|
||||
# ("NodeSocketFloatAngle", 1): ST.PhysicalAngle,
|
||||
|
|
@ -19,17 +17,14 @@ BL_SOCKET_DIRECT_TYPE_MAP = {
|
|||
('NodeSocketFloatPercentage', 1): ST.RealNumber,
|
||||
# ("NodeSocketFloatTime", 1): ST.PhysicalTime,
|
||||
# ("NodeSocketFloatTimeAbsolute", 1): ST.PhysicalTime,
|
||||
|
||||
# Int
|
||||
('NodeSocketInt', 1): ST.IntegerNumber,
|
||||
('NodeSocketIntFactor', 1): ST.IntegerNumber,
|
||||
('NodeSocketIntPercentage', 1): ST.IntegerNumber,
|
||||
('NodeSocketIntUnsigned', 1): ST.IntegerNumber,
|
||||
|
||||
# Array-Like
|
||||
('NodeSocketColor', 3): ST.Color,
|
||||
('NodeSocketRotation', 2): ST.PhysicalRot2D,
|
||||
|
||||
('NodeSocketVector', 2): ST.Real2DVector,
|
||||
('NodeSocketVector', 3): ST.Real3DVector,
|
||||
# ("NodeSocketVectorAcceleration", 2): ST.PhysicalAccel2D,
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
from .managed_bl_empty import ManagedBLEmpty
|
||||
from .managed_bl_image import ManagedBLImage
|
||||
|
||||
#from .managed_bl_collection import ManagedBLCollection
|
||||
#from .managed_bl_object import ManagedBLObject
|
||||
# from .managed_bl_collection import ManagedBLCollection
|
||||
# from .managed_bl_object import ManagedBLObject
|
||||
from .managed_bl_mesh import ManagedBLMesh
|
||||
|
||||
#from .managed_bl_volume import ManagedBLVolume
|
||||
# from .managed_bl_volume import ManagedBLVolume
|
||||
from .managed_bl_modifier import ManagedBLModifier
|
||||
|
||||
__all__ = [
|
||||
|
|
|
|||
|
|
@ -107,9 +107,7 @@ class ManagedBLImage(ct.schemas.ManagedObj):
|
|||
"""
|
||||
if preview_area := self.preview_area:
|
||||
return next(
|
||||
space
|
||||
for space in preview_area.spaces
|
||||
if space.type == SPACE_TYPE
|
||||
space for space in preview_area.spaces if space.type == SPACE_TYPE
|
||||
)
|
||||
|
||||
####################
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import tidy3d as td
|
|||
|
||||
from ... import contracts as ct
|
||||
from ... import sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
|
||||
class BoundCondsNode(base.MaxwellSimNode):
|
||||
|
|
@ -28,7 +28,7 @@ class BoundCondsNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'BCs', input_sockets={'+X', '-X', '+Y', '-Y', '+Z', '-Z'}
|
||||
)
|
||||
def compute_simulation(self, input_sockets) -> td.BoundarySpec:
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import typing as typ
|
|||
|
||||
from .... import contracts as ct
|
||||
from .... import sockets
|
||||
from ... import base
|
||||
from ... import base, events
|
||||
|
||||
|
||||
class BlenderConstantNode(base.MaxwellSimNode):
|
||||
|
|
@ -31,7 +31,7 @@ class BlenderConstantNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Callbacks
|
||||
####################
|
||||
@base.computes_output_socket('Value', input_sockets={'Value'})
|
||||
@events.computes_output_socket('Value', input_sockets={'Value'})
|
||||
def compute_value(self, input_sockets) -> typ.Any:
|
||||
return input_sockets['Value']
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import typing as typ
|
|||
|
||||
from .... import contracts as ct
|
||||
from .... import sockets
|
||||
from ... import base
|
||||
from ... import base, events
|
||||
|
||||
|
||||
class NumberConstantNode(base.MaxwellSimNode):
|
||||
|
|
@ -28,7 +28,7 @@ class NumberConstantNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Callbacks
|
||||
####################
|
||||
@base.computes_output_socket('Value', input_sockets={'Value'})
|
||||
@events.computes_output_socket('Value', input_sockets={'Value'})
|
||||
def compute_value(self, input_sockets) -> typ.Any:
|
||||
return input_sockets['Value']
|
||||
|
||||
|
|
@ -39,6 +39,4 @@ class NumberConstantNode(base.MaxwellSimNode):
|
|||
BL_REGISTER = [
|
||||
NumberConstantNode,
|
||||
]
|
||||
BL_NODES = {
|
||||
ct.NodeType.NumberConstant: (ct.NodeCategory.MAXWELLSIM_INPUTS_CONSTANTS)
|
||||
}
|
||||
BL_NODES = {ct.NodeType.NumberConstant: (ct.NodeCategory.MAXWELLSIM_INPUTS_CONSTANTS)}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
from ... import contracts as ct
|
||||
from ... import sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
|
||||
class PhysicalUnitSystemNode(base.MaxwellSimNode):
|
||||
|
|
@ -19,7 +19,7 @@ class PhysicalUnitSystemNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Callbacks
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Unit System',
|
||||
input_sockets={'Unit System'},
|
||||
)
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ from .....utils import extra_sympy_units as spux
|
|||
from .....utils import sci_constants as constants
|
||||
from ... import contracts as ct
|
||||
from ... import sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
|
||||
class WaveConstantNode(base.MaxwellSimNode):
|
||||
|
|
@ -44,7 +44,7 @@ class WaveConstantNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Event Methods: Listy Output
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'WL',
|
||||
input_sockets={'WL', 'Freq'},
|
||||
)
|
||||
|
|
@ -57,7 +57,7 @@ class WaveConstantNode(base.MaxwellSimNode):
|
|||
msg = 'Vac WL and Freq are both None'
|
||||
raise RuntimeError(msg)
|
||||
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Freq',
|
||||
input_sockets={'WL', 'Freq'},
|
||||
)
|
||||
|
|
@ -73,7 +73,7 @@ class WaveConstantNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Event Methods: Listy Output
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'WLs',
|
||||
input_sockets={'WLs', 'Freqs'},
|
||||
)
|
||||
|
|
@ -86,7 +86,7 @@ class WaveConstantNode(base.MaxwellSimNode):
|
|||
msg = 'Vac WL and Freq are both None'
|
||||
raise RuntimeError(msg)
|
||||
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Freqs',
|
||||
input_sockets={'WLs', 'Freqs'},
|
||||
)
|
||||
|
|
@ -102,7 +102,7 @@ class WaveConstantNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Event Methods
|
||||
####################
|
||||
@base.on_value_changed(prop_name='active_socket_set', props={'active_socket_set'})
|
||||
@events.on_value_changed(prop_name='active_socket_set', props={'active_socket_set'})
|
||||
def on_active_socket_set_changed(self, props: dict):
|
||||
# Singular: Normal Output Sockets
|
||||
if props['active_socket_set'] in {'Vacuum WL', 'Frequency'}:
|
||||
|
|
@ -124,7 +124,7 @@ class WaveConstantNode(base.MaxwellSimNode):
|
|||
msg = f"Active socket set invalid for wave constant: {props['active_socket_set']}"
|
||||
raise RuntimeError(msg)
|
||||
|
||||
@base.on_init()
|
||||
@events.on_init()
|
||||
def on_init(self):
|
||||
self.on_active_socket_set_changed()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,11 @@
|
|||
import tempfile
|
||||
import typing as typ
|
||||
from pathlib import Path
|
||||
|
||||
import tidy3d as td
|
||||
|
||||
from ...... import info
|
||||
from ......services import tdcloud
|
||||
from .... import contracts as ct
|
||||
from .... import sockets
|
||||
from ... import base
|
||||
from ... import base, events
|
||||
|
||||
|
||||
def _sim_data_cache_path(task_id: str) -> Path:
|
||||
|
|
@ -36,7 +33,7 @@ class Tidy3DWebImporterNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Event Methods
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'FDTD Sim Data',
|
||||
input_sockets={'Cloud Task'},
|
||||
)
|
||||
|
|
@ -61,7 +58,7 @@ class Tidy3DWebImporterNode(base.MaxwellSimNode):
|
|||
cloud_task, _sim_data_cache_path(cloud_task.task_id)
|
||||
)
|
||||
|
||||
@base.on_value_changed(socket_name='Cloud Task', input_sockets={'Cloud Task'})
|
||||
@events.on_value_changed(socket_name='Cloud Task', input_sockets={'Cloud Task'})
|
||||
def on_cloud_task_changed(self, input_sockets: dict):
|
||||
if (
|
||||
(cloud_task := input_sockets['Cloud Task']) is not None
|
||||
|
|
@ -74,7 +71,7 @@ class Tidy3DWebImporterNode(base.MaxwellSimNode):
|
|||
else:
|
||||
self.loose_output_sockets = {}
|
||||
|
||||
@base.on_init()
|
||||
@events.on_init()
|
||||
def on_init(self):
|
||||
self.on_cloud_task_changed()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import sympy as sp
|
||||
|
||||
from .. import contracts as ct
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import sympy.physics.units as spu
|
|||
import tidy3d as td
|
||||
|
||||
from ... import contracts, sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
|
||||
class DrudeLorentzMediumNode(base.MaxwellSimTreeNode):
|
||||
|
|
@ -46,7 +46,7 @@ class DrudeLorentzMediumNode(base.MaxwellSimTreeNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket('medium')
|
||||
@events.computes_output_socket('medium')
|
||||
def compute_medium(self: contracts.NodeTypeProtocol) -> td.Sellmeier:
|
||||
## Retrieval
|
||||
return td.Lorentz(
|
||||
|
|
@ -77,7 +77,5 @@ BL_REGISTER = [
|
|||
DrudeLorentzMediumNode,
|
||||
]
|
||||
BL_NODES = {
|
||||
contracts.NodeType.DrudeLorentzMedium: (
|
||||
contracts.NodeCategory.MAXWELLSIM_MEDIUMS
|
||||
)
|
||||
contracts.NodeType.DrudeLorentzMedium: (contracts.NodeCategory.MAXWELLSIM_MEDIUMS)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import tidy3d as td
|
|||
from .....utils import extra_sympy_units as spuex
|
||||
from ... import contracts as ct
|
||||
from ... import managed_objs, sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
VAC_SPEED_OF_LIGHT = sc.constants.speed_of_light * spu.meter / spu.second
|
||||
|
||||
|
|
@ -72,9 +72,7 @@ class LibraryMediumNode(base.MaxwellSimNode):
|
|||
/ spuex.terahertz
|
||||
for val in mat.medium.frequency_range
|
||||
]
|
||||
return sp.pretty(
|
||||
[freq_range[0].n(4), freq_range[1].n(4)], use_unicode=True
|
||||
)
|
||||
return sp.pretty([freq_range[0].n(4), freq_range[1].n(4)], use_unicode=True)
|
||||
|
||||
@property
|
||||
def nm_range_str(self) -> str:
|
||||
|
|
@ -88,9 +86,7 @@ class LibraryMediumNode(base.MaxwellSimNode):
|
|||
/ spu.nanometer
|
||||
for val in reversed(mat.medium.frequency_range)
|
||||
]
|
||||
return sp.pretty(
|
||||
[nm_range[0].n(4), nm_range[1].n(4)], use_unicode=True
|
||||
)
|
||||
return sp.pretty([nm_range[0].n(4), nm_range[1].n(4)], use_unicode=True)
|
||||
|
||||
####################
|
||||
# - UI
|
||||
|
|
@ -115,14 +111,14 @@ class LibraryMediumNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Sockets
|
||||
####################
|
||||
@base.computes_output_socket('Medium')
|
||||
@events.computes_output_socket('Medium')
|
||||
def compute_vac_wl(self) -> sp.Expr:
|
||||
return td.material_library[self.material].medium
|
||||
|
||||
####################
|
||||
# - Event Callbacks
|
||||
####################
|
||||
@base.on_show_plot(
|
||||
@events.on_show_plot(
|
||||
managed_objs={'nk_plot'},
|
||||
props={'material'},
|
||||
stop_propagation=True, ## Plot only the first plottable node
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import sympy.physics.units as spu
|
|||
import tidy3d as td
|
||||
|
||||
from ... import contracts, sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
|
||||
class TripleSellmeierMediumNode(base.MaxwellSimTreeNode):
|
||||
|
|
@ -20,9 +20,7 @@ class TripleSellmeierMediumNode(base.MaxwellSimTreeNode):
|
|||
)
|
||||
for i in [1, 2, 3]
|
||||
} | {
|
||||
f'C{i}': sockets.PhysicalAreaSocketDef(
|
||||
label=f'C{i}', default_unit=spu.um**2
|
||||
)
|
||||
f'C{i}': sockets.PhysicalAreaSocketDef(label=f'C{i}', default_unit=spu.um**2)
|
||||
for i in [1, 2, 3]
|
||||
}
|
||||
output_sockets = {
|
||||
|
|
@ -62,7 +60,7 @@ class TripleSellmeierMediumNode(base.MaxwellSimTreeNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket('medium')
|
||||
@events.computes_output_socket('medium')
|
||||
def compute_medium(self: contracts.NodeTypeProtocol) -> td.Sellmeier:
|
||||
## Retrieval
|
||||
# B1 = self.compute_input("B1")
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ from .....utils import analyze_geonodes, logger
|
|||
from .....utils import extra_sympy_units as spux
|
||||
from ... import contracts as ct
|
||||
from ... import managed_objs, sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
log = logger.get(__name__)
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ class EHFieldMonitorNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Sockets
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Monitor',
|
||||
input_sockets={
|
||||
'Rec Start',
|
||||
|
|
@ -129,7 +129,7 @@ class EHFieldMonitorNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Preview - Changes to Input Sockets
|
||||
####################
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
socket_name={'Center', 'Size'},
|
||||
input_sockets={'Center', 'Size'},
|
||||
managed_objs={'monitor_box'},
|
||||
|
|
@ -164,7 +164,7 @@ class EHFieldMonitorNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Preview - Show Preview
|
||||
####################
|
||||
@base.on_show_preview(
|
||||
@events.on_show_preview(
|
||||
managed_objs={'monitor_box'},
|
||||
)
|
||||
def on_show_preview(
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import sympy as sp
|
||||
import sympy.physics.units as spu
|
||||
|
|
@ -8,7 +7,7 @@ from .....utils import analyze_geonodes
|
|||
from .....utils import extra_sympy_units as spux
|
||||
from ... import contracts as ct
|
||||
from ... import managed_objs, sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
GEONODES_MONITOR_BOX = 'monitor_flux_box'
|
||||
|
||||
|
|
@ -37,9 +36,7 @@ class FieldPowerFluxMonitorNode(base.MaxwellSimNode):
|
|||
},
|
||||
'Time Domain': {
|
||||
'Rec Start': sockets.PhysicalTimeSocketDef(),
|
||||
'Rec Stop': sockets.PhysicalTimeSocketDef(
|
||||
default_value=200 * spux.fs
|
||||
),
|
||||
'Rec Stop': sockets.PhysicalTimeSocketDef(default_value=200 * spux.fs),
|
||||
'Samples/Time': sockets.IntegerNumberSocketDef(
|
||||
default_value=100,
|
||||
),
|
||||
|
|
@ -72,7 +69,7 @@ class FieldPowerFluxMonitorNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Sockets
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Monitor',
|
||||
input_sockets={
|
||||
'Rec Start',
|
||||
|
|
@ -86,9 +83,7 @@ class FieldPowerFluxMonitorNode(base.MaxwellSimNode):
|
|||
},
|
||||
props={'active_socket_set', 'sim_node_name'},
|
||||
)
|
||||
def compute_monitor(
|
||||
self, input_sockets: dict, props: dict
|
||||
) -> td.FieldTimeMonitor:
|
||||
def compute_monitor(self, input_sockets: dict, props: dict) -> td.FieldTimeMonitor:
|
||||
_center = input_sockets['Center']
|
||||
_size = input_sockets['Size']
|
||||
_samples_space = input_sockets['Samples/Space']
|
||||
|
|
@ -108,8 +103,7 @@ class FieldPowerFluxMonitorNode(base.MaxwellSimNode):
|
|||
name=props['sim_node_name'],
|
||||
interval_space=samples_space,
|
||||
freqs=[
|
||||
float(spu.convert_to(freq, spu.hertz) / spu.hertz)
|
||||
for freq in freqs
|
||||
float(spu.convert_to(freq, spu.hertz) / spu.hertz) for freq in freqs
|
||||
],
|
||||
normal_dir=direction,
|
||||
)
|
||||
|
|
@ -134,7 +128,7 @@ class FieldPowerFluxMonitorNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Preview - Changes to Input Sockets
|
||||
####################
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
socket_name={'Center', 'Size'},
|
||||
input_sockets={'Center', 'Size', 'Direction'},
|
||||
managed_objs={'monitor_box'},
|
||||
|
|
@ -145,30 +139,22 @@ class FieldPowerFluxMonitorNode(base.MaxwellSimNode):
|
|||
managed_objs: dict[str, ct.schemas.ManagedObj],
|
||||
):
|
||||
_center = input_sockets['Center']
|
||||
center = tuple(
|
||||
[float(el) for el in spu.convert_to(_center, spu.um) / spu.um]
|
||||
)
|
||||
center = tuple([float(el) for el in spu.convert_to(_center, spu.um) / spu.um])
|
||||
|
||||
_size = input_sockets['Size']
|
||||
size = tuple(
|
||||
[float(el) for el in spu.convert_to(_size, spu.um) / spu.um]
|
||||
)
|
||||
size = tuple([float(el) for el in spu.convert_to(_size, spu.um) / spu.um])
|
||||
## TODO: Preview unit system?? Presume um for now
|
||||
|
||||
# Retrieve Hard-Coded GeoNodes and Analyze Input
|
||||
geo_nodes = bpy.data.node_groups[GEONODES_MONITOR_BOX]
|
||||
geonodes_interface = analyze_geonodes.interface(
|
||||
geo_nodes, direc='INPUT'
|
||||
)
|
||||
geonodes_interface = analyze_geonodes.interface(geo_nodes, direc='INPUT')
|
||||
|
||||
# Sync Modifier Inputs
|
||||
managed_objs['monitor_box'].sync_geonodes_modifier(
|
||||
geonodes_node_group=geo_nodes,
|
||||
geonodes_identifier_to_value={
|
||||
geonodes_interface['Size'].identifier: size,
|
||||
geonodes_interface['Direction'].identifier: input_sockets[
|
||||
'Direction'
|
||||
],
|
||||
geonodes_interface['Direction'].identifier: input_sockets['Direction'],
|
||||
## TODO: Use 'bl_socket_map.value_to_bl`!
|
||||
## - This accounts for auto-conversion, unit systems, etc. .
|
||||
## - We could keep it in the node base class...
|
||||
|
|
@ -182,7 +168,7 @@ class FieldPowerFluxMonitorNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Preview - Show Preview
|
||||
####################
|
||||
@base.on_show_preview(
|
||||
@events.on_show_preview(
|
||||
managed_objs={'monitor_box'},
|
||||
)
|
||||
def on_show_preview(
|
||||
|
|
@ -199,6 +185,4 @@ class FieldPowerFluxMonitorNode(base.MaxwellSimNode):
|
|||
BL_REGISTER = [
|
||||
FieldPowerFluxMonitorNode,
|
||||
]
|
||||
BL_NODES = {
|
||||
ct.NodeType.FieldPowerFluxMonitor: (ct.NodeCategory.MAXWELLSIM_MONITORS)
|
||||
}
|
||||
BL_NODES = {ct.NodeType.FieldPowerFluxMonitor: (ct.NodeCategory.MAXWELLSIM_MONITORS)}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import pydantic as pyd
|
|||
|
||||
from .... import contracts as ct
|
||||
from .... import sockets
|
||||
from ... import base
|
||||
from ... import base, events
|
||||
|
||||
|
||||
####################
|
||||
|
|
@ -38,9 +38,7 @@ class JSONFileExporterNode(base.MaxwellSimNode):
|
|||
|
||||
input_sockets = {
|
||||
'Data': sockets.AnySocketDef(),
|
||||
'JSON Path': sockets.FilePathSocketDef(
|
||||
default_path=Path('simulation.json')
|
||||
),
|
||||
'JSON Path': sockets.FilePathSocketDef(default_path=Path('simulation.json')),
|
||||
'JSON Indent': sockets.IntegerNumberSocketDef(
|
||||
default_value=4,
|
||||
),
|
||||
|
|
@ -72,13 +70,11 @@ class JSONFileExporterNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Sockets
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'JSON String',
|
||||
input_sockets={'Data'},
|
||||
)
|
||||
def compute_json_string(
|
||||
self, input_sockets: dict[str, typ.Any]
|
||||
) -> str | None:
|
||||
def compute_json_string(self, input_sockets: dict[str, typ.Any]) -> str | None:
|
||||
if not (data := input_sockets['Data']):
|
||||
return None
|
||||
|
||||
|
|
@ -102,7 +98,5 @@ BL_REGISTER = [
|
|||
JSONFileExporterNode,
|
||||
]
|
||||
BL_NODES = {
|
||||
ct.NodeType.JSONFileExporter: (
|
||||
ct.NodeCategory.MAXWELLSIM_OUTPUTS_EXPORTERS
|
||||
)
|
||||
ct.NodeType.JSONFileExporter: (ct.NodeCategory.MAXWELLSIM_OUTPUTS_EXPORTERS)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import bpy
|
|||
from ......services import tdcloud
|
||||
from .... import contracts as ct
|
||||
from .... import sockets
|
||||
from ... import base
|
||||
from ... import base, events
|
||||
|
||||
|
||||
####################
|
||||
|
|
@ -77,9 +77,7 @@ class ReloadTrackedTask(bpy.types.Operator):
|
|||
|
||||
def execute(self, context):
|
||||
node = context.node
|
||||
if (
|
||||
cloud_task := tdcloud.TidyCloudTasks.task(node.tracked_task_id)
|
||||
) is None:
|
||||
if (cloud_task := tdcloud.TidyCloudTasks.task(node.tracked_task_id)) is None:
|
||||
msg = "Tried to reload tracked task, but it doesn't exist"
|
||||
raise RuntimeError(msg)
|
||||
|
||||
|
|
@ -105,13 +103,9 @@ class EstCostTrackedTask(bpy.types.Operator):
|
|||
def execute(self, context):
|
||||
node = context.node
|
||||
if (
|
||||
task_info := tdcloud.TidyCloudTasks.task_info(
|
||||
context.node.tracked_task_id
|
||||
)
|
||||
task_info := tdcloud.TidyCloudTasks.task_info(context.node.tracked_task_id)
|
||||
) is None:
|
||||
msg = (
|
||||
"Tried to estimate cost of tracked task, but it doesn't exist"
|
||||
)
|
||||
msg = "Tried to estimate cost of tracked task, but it doesn't exist"
|
||||
raise RuntimeError(msg)
|
||||
|
||||
node.cache_est_cost = task_info.cost_est()
|
||||
|
|
@ -235,13 +229,13 @@ class Tidy3DWebExporterNode(base.MaxwellSimNode):
|
|||
msg = 'Tried to upload simulation, but none is attached'
|
||||
raise ValueError(msg)
|
||||
|
||||
if (
|
||||
new_task := self._compute_input('Cloud Task')
|
||||
) is None or isinstance(
|
||||
if (new_task := self._compute_input('Cloud Task')) is None or isinstance(
|
||||
new_task,
|
||||
tdcloud.CloudTask,
|
||||
):
|
||||
msg = 'Tried to upload simulation to new task, but existing task was selected'
|
||||
msg = (
|
||||
'Tried to upload simulation to new task, but existing task was selected'
|
||||
)
|
||||
raise ValueError(msg)
|
||||
|
||||
# Create Cloud Task
|
||||
|
|
@ -262,9 +256,7 @@ class Tidy3DWebExporterNode(base.MaxwellSimNode):
|
|||
self.tracked_task_id = cloud_task.task_id
|
||||
|
||||
def run_tracked_task(self):
|
||||
if (
|
||||
cloud_task := tdcloud.TidyCloudTasks.task(self.tracked_task_id)
|
||||
) is None:
|
||||
if (cloud_task := tdcloud.TidyCloudTasks.task(self.tracked_task_id)) is None:
|
||||
msg = "Tried to run tracked task, but it doesn't exist"
|
||||
raise RuntimeError(msg)
|
||||
|
||||
|
|
@ -302,9 +294,7 @@ class Tidy3DWebExporterNode(base.MaxwellSimNode):
|
|||
|
||||
def draw_info(self, context, layout):
|
||||
# Connection Info
|
||||
auth_icon = (
|
||||
'CHECKBOX_HLT' if tdcloud.IS_AUTHENTICATED else 'CHECKBOX_DEHLT'
|
||||
)
|
||||
auth_icon = 'CHECKBOX_HLT' if tdcloud.IS_AUTHENTICATED else 'CHECKBOX_DEHLT'
|
||||
conn_icon = 'CHECKBOX_HLT' if tdcloud.IS_ONLINE else 'CHECKBOX_DEHLT'
|
||||
|
||||
row = layout.row()
|
||||
|
|
@ -338,9 +328,7 @@ class Tidy3DWebExporterNode(base.MaxwellSimNode):
|
|||
## Split: Right Column
|
||||
col = split.column(align=False)
|
||||
col.alignment = 'RIGHT'
|
||||
col.label(
|
||||
text=f'{self.cache_total_monitor_data / 1_000_000:.2f}MB'
|
||||
)
|
||||
col.label(text=f'{self.cache_total_monitor_data / 1_000_000:.2f}MB')
|
||||
|
||||
# Cloud Task Info
|
||||
if self.tracked_task_id and tdcloud.IS_AUTHENTICATED:
|
||||
|
|
@ -383,9 +371,7 @@ class Tidy3DWebExporterNode(base.MaxwellSimNode):
|
|||
|
||||
## Split: Right Column
|
||||
cost_est = (
|
||||
f'{self.cache_est_cost:.2f}'
|
||||
if self.cache_est_cost >= 0
|
||||
else 'TBD'
|
||||
f'{self.cache_est_cost:.2f}' if self.cache_est_cost >= 0 else 'TBD'
|
||||
)
|
||||
cost_real = (
|
||||
f'{task_info.cost_real:.2f}'
|
||||
|
|
@ -404,16 +390,12 @@ class Tidy3DWebExporterNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Methods
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Cloud Task',
|
||||
input_sockets={'Cloud Task'},
|
||||
)
|
||||
def compute_cloud_task(
|
||||
self, input_sockets: dict
|
||||
) -> tdcloud.CloudTask | None:
|
||||
if isinstance(
|
||||
cloud_task := input_sockets['Cloud Task'], tdcloud.CloudTask
|
||||
):
|
||||
def compute_cloud_task(self, input_sockets: dict) -> tdcloud.CloudTask | None:
|
||||
if isinstance(cloud_task := input_sockets['Cloud Task'], tdcloud.CloudTask):
|
||||
return cloud_task
|
||||
|
||||
return None
|
||||
|
|
@ -421,7 +403,7 @@ class Tidy3DWebExporterNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Methods
|
||||
####################
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
socket_name='FDTD Sim',
|
||||
input_sockets={'FDTD Sim'},
|
||||
)
|
||||
|
|
@ -446,7 +428,5 @@ BL_REGISTER = [
|
|||
Tidy3DWebExporterNode,
|
||||
]
|
||||
BL_NODES = {
|
||||
ct.NodeType.Tidy3DWebExporter: (
|
||||
ct.NodeCategory.MAXWELLSIM_OUTPUTS_EXPORTERS
|
||||
)
|
||||
ct.NodeType.Tidy3DWebExporter: (ct.NodeCategory.MAXWELLSIM_OUTPUTS_EXPORTERS)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ from .....utils import logger
|
|||
from ... import contracts as ct
|
||||
from ... import sockets
|
||||
from ...managed_objs import managed_bl_object
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
log = logger.get(__name__)
|
||||
console = logger.OUTPUT_CONSOLE
|
||||
|
|
@ -113,7 +113,7 @@ class ViewerNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Updates
|
||||
####################
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
socket_name='Data',
|
||||
props={'auto_3d_preview'},
|
||||
)
|
||||
|
|
@ -135,7 +135,7 @@ class ViewerNode(base.MaxwellSimNode):
|
|||
if props['auto_3d_preview']:
|
||||
self.trigger_action('show_preview')
|
||||
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
prop_name='auto_3d_preview',
|
||||
props={'auto_3d_preview'},
|
||||
)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import tidy3d as td
|
|||
|
||||
from ... import contracts as ct
|
||||
from ... import sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
|
||||
class FDTDSimNode(base.MaxwellSimNode):
|
||||
|
|
@ -33,7 +33,7 @@ class FDTDSimNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'FDTD Sim',
|
||||
kind=ct.DataFlowKind.Value,
|
||||
input_sockets={'Sources', 'Structures', 'Domain', 'BCs', 'Monitors'},
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import sympy.physics.units as spu
|
|||
from .....utils import analyze_geonodes
|
||||
from ... import contracts as ct
|
||||
from ... import managed_objs, sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
GEONODES_DOMAIN_BOX = 'simdomain_box'
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ class SimDomainNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Callbacks
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Domain',
|
||||
input_sockets={'Duration', 'Center', 'Size', 'Grid', 'Ambient Medium'},
|
||||
)
|
||||
|
|
@ -66,7 +66,7 @@ class SimDomainNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Preview
|
||||
####################
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
socket_name={'Center', 'Size'},
|
||||
input_sockets={'Center', 'Size'},
|
||||
managed_objs={'domain_box'},
|
||||
|
|
@ -77,21 +77,15 @@ class SimDomainNode(base.MaxwellSimNode):
|
|||
managed_objs: dict[str, ct.schemas.ManagedObj],
|
||||
):
|
||||
_center = input_sockets['Center']
|
||||
center = tuple(
|
||||
[float(el) for el in spu.convert_to(_center, spu.um) / spu.um]
|
||||
)
|
||||
center = tuple([float(el) for el in spu.convert_to(_center, spu.um) / spu.um])
|
||||
|
||||
_size = input_sockets['Size']
|
||||
size = tuple(
|
||||
[float(el) for el in spu.convert_to(_size, spu.um) / spu.um]
|
||||
)
|
||||
size = tuple([float(el) for el in spu.convert_to(_size, spu.um) / spu.um])
|
||||
## TODO: Preview unit system?? Presume um for now
|
||||
|
||||
# Retrieve Hard-Coded GeoNodes and Analyze Input
|
||||
geo_nodes = bpy.data.node_groups[GEONODES_DOMAIN_BOX]
|
||||
geonodes_interface = analyze_geonodes.interface(
|
||||
geo_nodes, direc='INPUT'
|
||||
)
|
||||
geonodes_interface = analyze_geonodes.interface(geo_nodes, direc='INPUT')
|
||||
|
||||
# Sync Modifier Inputs
|
||||
managed_objs['domain_box'].sync_geonodes_modifier(
|
||||
|
|
@ -108,7 +102,7 @@ class SimDomainNode(base.MaxwellSimNode):
|
|||
# Sync Object Position
|
||||
managed_objs['domain_box'].bl_object('MESH').location = center
|
||||
|
||||
@base.on_show_preview(
|
||||
@events.on_show_preview(
|
||||
managed_objs={'domain_box'},
|
||||
)
|
||||
def on_show_preview(
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import tidy3d as td
|
|||
from .....utils import analyze_geonodes
|
||||
from ... import contracts as ct
|
||||
from ... import managed_objs, sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
GEONODES_PLANE_WAVE = 'source_plane_wave'
|
||||
|
||||
|
|
@ -53,9 +53,7 @@ class PlaneWaveSourceNode(base.MaxwellSimNode):
|
|||
input_sockets = {
|
||||
'Temporal Shape': sockets.MaxwellTemporalShapeSocketDef(),
|
||||
'Center': sockets.PhysicalPoint3DSocketDef(),
|
||||
'Direction': sockets.Real3DVectorSocketDef(
|
||||
default_value=sp.Matrix([0, 0, -1])
|
||||
),
|
||||
'Direction': sockets.Real3DVectorSocketDef(default_value=sp.Matrix([0, 0, -1])),
|
||||
'Pol Angle': sockets.PhysicalAngleSocketDef(),
|
||||
}
|
||||
output_sockets = {
|
||||
|
|
@ -72,7 +70,7 @@ class PlaneWaveSourceNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Source',
|
||||
input_sockets={'Temporal Shape', 'Center', 'Direction', 'Pol Angle'},
|
||||
)
|
||||
|
|
@ -82,9 +80,7 @@ class PlaneWaveSourceNode(base.MaxwellSimNode):
|
|||
direction = input_sockets['Direction']
|
||||
pol_angle = input_sockets['Pol Angle']
|
||||
|
||||
injection_axis, dir_sgn, theta, phi = convert_vector_to_spherical(
|
||||
direction
|
||||
)
|
||||
injection_axis, dir_sgn, theta, phi = convert_vector_to_spherical(direction)
|
||||
|
||||
size = {
|
||||
'x': (0, math.inf, math.inf),
|
||||
|
|
@ -107,7 +103,7 @@ class PlaneWaveSourceNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Preview
|
||||
####################
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
socket_name={'Center', 'Direction'},
|
||||
input_sockets={'Center', 'Direction'},
|
||||
managed_objs={'plane_wave_source'},
|
||||
|
|
@ -118,9 +114,7 @@ class PlaneWaveSourceNode(base.MaxwellSimNode):
|
|||
managed_objs: dict[str, ct.schemas.ManagedObj],
|
||||
):
|
||||
_center = input_sockets['Center']
|
||||
center = tuple(
|
||||
[float(el) for el in spu.convert_to(_center, spu.um) / spu.um]
|
||||
)
|
||||
center = tuple([float(el) for el in spu.convert_to(_center, spu.um) / spu.um])
|
||||
|
||||
_direction = input_sockets['Direction']
|
||||
direction = tuple([float(el) for el in _direction])
|
||||
|
|
@ -128,9 +122,7 @@ class PlaneWaveSourceNode(base.MaxwellSimNode):
|
|||
|
||||
# Retrieve Hard-Coded GeoNodes and Analyze Input
|
||||
geo_nodes = bpy.data.node_groups[GEONODES_PLANE_WAVE]
|
||||
geonodes_interface = analyze_geonodes.interface(
|
||||
geo_nodes, direc='INPUT'
|
||||
)
|
||||
geonodes_interface = analyze_geonodes.interface(geo_nodes, direc='INPUT')
|
||||
|
||||
# Sync Modifier Inputs
|
||||
managed_objs['plane_wave_source'].sync_geonodes_modifier(
|
||||
|
|
@ -147,7 +139,7 @@ class PlaneWaveSourceNode(base.MaxwellSimNode):
|
|||
# Sync Object Position
|
||||
managed_objs['plane_wave_source'].bl_object('MESH').location = center
|
||||
|
||||
@base.on_show_preview(
|
||||
@events.on_show_preview(
|
||||
managed_objs={'plane_wave_source'},
|
||||
)
|
||||
def on_show_preview(
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import tidy3d as td
|
|||
|
||||
from ... import contracts as ct
|
||||
from ... import managed_objs, sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
|
||||
class PointDipoleSourceNode(base.MaxwellSimNode):
|
||||
|
|
@ -64,7 +64,7 @@ class PointDipoleSourceNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Source',
|
||||
input_sockets={'Temporal Shape', 'Center', 'Interpolate'},
|
||||
props={'pol_axis'},
|
||||
|
|
@ -95,7 +95,7 @@ class PointDipoleSourceNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Preview
|
||||
####################
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
socket_name='Center',
|
||||
input_sockets={'Center'},
|
||||
managed_objs={'sphere_empty'},
|
||||
|
|
@ -113,7 +113,7 @@ class PointDipoleSourceNode(base.MaxwellSimNode):
|
|||
bl_object = mobj.bl_object('EMPTY')
|
||||
bl_object.location = center # tuple([float(el) for el in center])
|
||||
|
||||
@base.on_show_preview(
|
||||
@events.on_show_preview(
|
||||
managed_objs={'sphere_empty'},
|
||||
)
|
||||
def on_show_preview(
|
||||
|
|
@ -124,9 +124,7 @@ class PointDipoleSourceNode(base.MaxwellSimNode):
|
|||
'EMPTY',
|
||||
empty_display_type='SPHERE',
|
||||
)
|
||||
managed_objs['sphere_empty'].bl_object(
|
||||
'EMPTY'
|
||||
).empty_display_size = 0.2
|
||||
managed_objs['sphere_empty'].bl_object('EMPTY').empty_display_size = 0.2
|
||||
|
||||
|
||||
####################
|
||||
|
|
@ -135,6 +133,4 @@ class PointDipoleSourceNode(base.MaxwellSimNode):
|
|||
BL_REGISTER = [
|
||||
PointDipoleSourceNode,
|
||||
]
|
||||
BL_NODES = {
|
||||
ct.NodeType.PointDipoleSource: (ct.NodeCategory.MAXWELLSIM_SOURCES)
|
||||
}
|
||||
BL_NODES = {ct.NodeType.PointDipoleSource: (ct.NodeCategory.MAXWELLSIM_SOURCES)}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import sympy.physics.units as spu
|
|||
import tidy3d as td
|
||||
|
||||
from .... import contracts, sockets
|
||||
from ... import base
|
||||
from ... import base, events
|
||||
|
||||
|
||||
class ContinuousWaveTemporalShapeNode(base.MaxwellSimTreeNode):
|
||||
|
|
@ -41,7 +41,7 @@ class ContinuousWaveTemporalShapeNode(base.MaxwellSimTreeNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket('temporal_shape')
|
||||
@events.computes_output_socket('temporal_shape')
|
||||
def compute_source(self: contracts.NodeTypeProtocol) -> td.PointDipole:
|
||||
_phase = self.compute_input('phase')
|
||||
_freq_center = self.compute_input('freq_center')
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import tidy3d as td
|
|||
from ......utils import extra_sympy_units as spuex
|
||||
from .... import contracts as ct
|
||||
from .... import managed_objs, sockets
|
||||
from ... import base
|
||||
from ... import base, events
|
||||
|
||||
|
||||
class GaussianPulseTemporalShapeNode(base.MaxwellSimNode):
|
||||
|
|
@ -55,17 +55,13 @@ class GaussianPulseTemporalShapeNode(base.MaxwellSimNode):
|
|||
name='Plot Time Start (ps)',
|
||||
description='The instance ID of a particular MaxwellSimNode instance, used to index caches',
|
||||
default=0.0,
|
||||
update=(
|
||||
lambda self, context: self.sync_prop('plot_time_start', context)
|
||||
),
|
||||
update=(lambda self, context: self.sync_prop('plot_time_start', context)),
|
||||
)
|
||||
plot_time_end: bpy.props.FloatProperty(
|
||||
name='Plot Time End (ps)',
|
||||
description='The instance ID of a particular MaxwellSimNode instance, used to index caches',
|
||||
default=5,
|
||||
update=(
|
||||
lambda self, context: self.sync_prop('plot_time_start', context)
|
||||
),
|
||||
update=(lambda self, context: self.sync_prop('plot_time_start', context)),
|
||||
)
|
||||
|
||||
####################
|
||||
|
|
@ -85,7 +81,7 @@ class GaussianPulseTemporalShapeNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Temporal Shape',
|
||||
input_sockets={
|
||||
'Freq Center',
|
||||
|
|
@ -100,8 +96,7 @@ class GaussianPulseTemporalShapeNode(base.MaxwellSimNode):
|
|||
(_freq_center := input_sockets['Freq Center']) is None
|
||||
or (_freq_std := input_sockets['Freq Std.']) is None
|
||||
or (_phase := input_sockets['Phase']) is None
|
||||
or (time_delay_rel_ang_freq := input_sockets['Delay rel. AngFreq'])
|
||||
is None
|
||||
or (time_delay_rel_ang_freq := input_sockets['Delay rel. AngFreq']) is None
|
||||
or (remove_dc_component := input_sockets['Remove DC']) is None
|
||||
):
|
||||
raise ValueError('Inputs not defined')
|
||||
|
|
@ -120,7 +115,7 @@ class GaussianPulseTemporalShapeNode(base.MaxwellSimNode):
|
|||
remove_dc_component=remove_dc_component,
|
||||
)
|
||||
|
||||
@base.on_show_plot(
|
||||
@events.on_show_plot(
|
||||
managed_objs={'amp_time'},
|
||||
props={'plot_time_start', 'plot_time_end'},
|
||||
output_sockets={'Temporal Shape'},
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import tidy3d as td
|
|||
from .....utils import analyze_geonodes, logger
|
||||
from ... import bl_socket_map, managed_objs, sockets
|
||||
from ... import contracts as ct
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
log = logger.get(__name__)
|
||||
|
||||
|
|
@ -39,7 +39,7 @@ class GeoNodesStructureNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Event Methods
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Structure',
|
||||
input_sockets={'Medium'},
|
||||
managed_objs={'geometry'},
|
||||
|
|
@ -67,7 +67,7 @@ class GeoNodesStructureNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Event Methods
|
||||
####################
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
socket_name='GeoNodes',
|
||||
prop_name='preview_active',
|
||||
any_loose_input_socket=True,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import numpy as np
|
|||
import tidy3d as td
|
||||
|
||||
from ... import contracts, sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
|
||||
class ObjectStructureNode(base.MaxwellSimTreeNode):
|
||||
|
|
@ -32,7 +32,7 @@ class ObjectStructureNode(base.MaxwellSimTreeNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket('structure')
|
||||
@events.computes_output_socket('structure')
|
||||
def compute_structure(self: contracts.NodeTypeProtocol) -> td.Structure:
|
||||
# Extract the Blender Object
|
||||
bl_object = self.compute_input('object')
|
||||
|
|
@ -54,9 +54,7 @@ class ObjectStructureNode(base.MaxwellSimTreeNode):
|
|||
|
||||
# Extract Vertices and Faces
|
||||
vertices = np.array([vert.co for vert in mesh.vertices])
|
||||
faces = np.array(
|
||||
[[vert for vert in poly.vertices] for poly in mesh.polygons]
|
||||
)
|
||||
faces = np.array([[vert for vert in poly.vertices] for poly in mesh.polygons])
|
||||
|
||||
# Remove Temporary Mesh
|
||||
bpy.data.meshes.remove(mesh)
|
||||
|
|
@ -74,7 +72,5 @@ BL_REGISTER = [
|
|||
ObjectStructureNode,
|
||||
]
|
||||
BL_NODES = {
|
||||
contracts.NodeType.ObjectStructure: (
|
||||
contracts.NodeCategory.MAXWELLSIM_STRUCTURES
|
||||
)
|
||||
contracts.NodeType.ObjectStructure: (contracts.NodeCategory.MAXWELLSIM_STRUCTURES)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import tidy3d as td
|
|||
from .....assets.import_geonodes import import_geonodes
|
||||
from .... import contracts as ct
|
||||
from .... import managed_objs, sockets
|
||||
from ... import base
|
||||
from ... import base, events
|
||||
|
||||
GEONODES_BOX = 'box'
|
||||
|
||||
|
|
@ -43,7 +43,7 @@ class BoxStructureNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Event Methods
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Structure',
|
||||
input_sockets={'Medium', 'Center', 'Size'},
|
||||
unit_systems={'Tidy3DUnits': ct.UNITS_TIDY3D},
|
||||
|
|
@ -61,7 +61,7 @@ class BoxStructureNode(base.MaxwellSimNode):
|
|||
medium=input_sockets['Medium'],
|
||||
)
|
||||
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
socket_name={'Center', 'Size'},
|
||||
prop_name='preview_active',
|
||||
# Method Data
|
||||
|
|
@ -96,7 +96,7 @@ class BoxStructureNode(base.MaxwellSimNode):
|
|||
if props['preview_active']:
|
||||
managed_objs['mesh'].show_preview()
|
||||
|
||||
@base.on_init()
|
||||
@events.on_init()
|
||||
def on_init(self):
|
||||
self.on_input_change()
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import sympy.physics.units as spu
|
|||
import tidy3d as td
|
||||
|
||||
from .... import contracts, sockets
|
||||
from ... import base
|
||||
from ... import base, events
|
||||
|
||||
|
||||
class CylinderStructureNode(base.MaxwellSimTreeNode):
|
||||
|
|
@ -36,7 +36,7 @@ class CylinderStructureNode(base.MaxwellSimTreeNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket('structure')
|
||||
@events.computes_output_socket('structure')
|
||||
def compute_simulation(self: contracts.NodeTypeProtocol) -> td.Box:
|
||||
medium = self.compute_input('medium')
|
||||
_center = self.compute_input('center')
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import tidy3d as td
|
|||
from ......utils import analyze_geonodes
|
||||
from .... import contracts as ct
|
||||
from .... import managed_objs, sockets
|
||||
from ... import base
|
||||
from ... import base, events
|
||||
|
||||
GEONODES_STRUCTURE_SPHERE = 'structure_sphere'
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ class SphereStructureNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Structure',
|
||||
input_sockets={'Center', 'Radius', 'Medium'},
|
||||
)
|
||||
|
|
@ -61,7 +61,7 @@ class SphereStructureNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Preview - Changes to Input Sockets
|
||||
####################
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
socket_name={'Center', 'Radius'},
|
||||
input_sockets={'Center', 'Radius'},
|
||||
managed_objs={'structure_sphere'},
|
||||
|
|
@ -72,9 +72,7 @@ class SphereStructureNode(base.MaxwellSimNode):
|
|||
managed_objs: dict[str, ct.schemas.ManagedObj],
|
||||
):
|
||||
_center = input_sockets['Center']
|
||||
center = tuple(
|
||||
[float(el) for el in spu.convert_to(_center, spu.um) / spu.um]
|
||||
)
|
||||
center = tuple([float(el) for el in spu.convert_to(_center, spu.um) / spu.um])
|
||||
|
||||
_radius = input_sockets['Radius']
|
||||
radius = float(spu.convert_to(_radius, spu.um) / spu.um)
|
||||
|
|
@ -82,9 +80,7 @@ class SphereStructureNode(base.MaxwellSimNode):
|
|||
|
||||
# Retrieve Hard-Coded GeoNodes and Analyze Input
|
||||
geo_nodes = bpy.data.node_groups[GEONODES_STRUCTURE_SPHERE]
|
||||
geonodes_interface = analyze_geonodes.interface(
|
||||
geo_nodes, direc='INPUT'
|
||||
)
|
||||
geonodes_interface = analyze_geonodes.interface(geo_nodes, direc='INPUT')
|
||||
|
||||
# Sync Modifier Inputs
|
||||
managed_objs['structure_sphere'].sync_geonodes_modifier(
|
||||
|
|
@ -104,7 +100,7 @@ class SphereStructureNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Preview - Show Preview
|
||||
####################
|
||||
@base.on_show_preview(
|
||||
@events.on_show_preview(
|
||||
managed_objs={'structure_sphere'},
|
||||
)
|
||||
def on_show_preview(
|
||||
|
|
@ -122,7 +118,5 @@ BL_REGISTER = [
|
|||
SphereStructureNode,
|
||||
]
|
||||
BL_NODES = {
|
||||
ct.NodeType.SphereStructure: (
|
||||
ct.NodeCategory.MAXWELLSIM_STRUCTURES_PRIMITIVES
|
||||
)
|
||||
ct.NodeType.SphereStructure: (ct.NodeCategory.MAXWELLSIM_STRUCTURES_PRIMITIVES)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import sympy as sp
|
|||
|
||||
from ... import contracts as ct
|
||||
from ... import sockets
|
||||
from .. import base
|
||||
from .. import base, events
|
||||
|
||||
MAX_AMOUNT = 20
|
||||
|
||||
|
|
@ -20,9 +20,7 @@ class CombineNode(base.MaxwellSimNode):
|
|||
'Maxwell Sources': {},
|
||||
'Maxwell Structures': {},
|
||||
'Maxwell Monitors': {},
|
||||
'Real 3D Vector': {
|
||||
f'x_{i}': sockets.RealNumberSocketDef() for i in range(3)
|
||||
},
|
||||
'Real 3D Vector': {f'x_{i}': sockets.RealNumberSocketDef() for i in range(3)},
|
||||
# "Point 3D": {
|
||||
# axis: sockets.PhysicalLengthSocketDef()
|
||||
# for i, axis in zip(
|
||||
|
|
@ -84,13 +82,13 @@ class CombineNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Real 3D Vector', input_sockets={'x_0', 'x_1', 'x_2'}
|
||||
)
|
||||
def compute_real_3d_vector(self, input_sockets) -> sp.Expr:
|
||||
return sp.Matrix([input_sockets[f'x_{i}'] for i in range(3)])
|
||||
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Sources',
|
||||
input_sockets={f'Source #{i}' for i in range(MAX_AMOUNT)},
|
||||
props={'amount'},
|
||||
|
|
@ -98,17 +96,15 @@ class CombineNode(base.MaxwellSimNode):
|
|||
def compute_sources(self, input_sockets, props) -> sp.Expr:
|
||||
return [input_sockets[f'Source #{i}'] for i in range(props['amount'])]
|
||||
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Structures',
|
||||
input_sockets={f'Structure #{i}' for i in range(MAX_AMOUNT)},
|
||||
props={'amount'},
|
||||
)
|
||||
def compute_structures(self, input_sockets, props) -> sp.Expr:
|
||||
return [
|
||||
input_sockets[f'Structure #{i}'] for i in range(props['amount'])
|
||||
]
|
||||
return [input_sockets[f'Structure #{i}'] for i in range(props['amount'])]
|
||||
|
||||
@base.computes_output_socket(
|
||||
@events.computes_output_socket(
|
||||
'Monitors',
|
||||
input_sockets={f'Monitor #{i}' for i in range(MAX_AMOUNT)},
|
||||
props={'amount'},
|
||||
|
|
@ -119,7 +115,7 @@ class CombineNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Input Socket Compilation
|
||||
####################
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
prop_name='active_socket_set',
|
||||
props={'active_socket_set', 'amount'},
|
||||
)
|
||||
|
|
@ -142,13 +138,13 @@ class CombineNode(base.MaxwellSimNode):
|
|||
else:
|
||||
self.loose_input_sockets = {}
|
||||
|
||||
@base.on_value_changed(
|
||||
@events.on_value_changed(
|
||||
prop_name='amount',
|
||||
)
|
||||
def on_value_changed__amount(self):
|
||||
self.on_value_changed__active_socket_set()
|
||||
|
||||
@base.on_init()
|
||||
@events.on_init()
|
||||
def on_init(self):
|
||||
self.on_value_changed__active_socket_set()
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import sympy as sp
|
|||
import sympy.physics.units as spu
|
||||
|
||||
from .... import contracts, sockets
|
||||
from ... import base
|
||||
from ... import base, events
|
||||
|
||||
|
||||
class WaveConverterNode(base.MaxwellSimTreeNode):
|
||||
|
|
@ -44,11 +44,9 @@ class WaveConverterNode(base.MaxwellSimTreeNode):
|
|||
####################
|
||||
# - Output Socket Computation
|
||||
####################
|
||||
@base.computes_output_socket('freq')
|
||||
@events.computes_output_socket('freq')
|
||||
def compute_freq(self: contracts.NodeTypeProtocol) -> sp.Expr:
|
||||
vac_speed_of_light = (
|
||||
sc.constants.speed_of_light * spu.meter / spu.second
|
||||
)
|
||||
vac_speed_of_light = sc.constants.speed_of_light * spu.meter / spu.second
|
||||
|
||||
vacwl = self.compute_input('vacwl')
|
||||
|
||||
|
|
@ -57,11 +55,9 @@ class WaveConverterNode(base.MaxwellSimTreeNode):
|
|||
spu.hertz,
|
||||
)
|
||||
|
||||
@base.computes_output_socket('vacwl')
|
||||
@events.computes_output_socket('vacwl')
|
||||
def compute_vacwl(self: contracts.NodeTypeProtocol) -> sp.Expr:
|
||||
vac_speed_of_light = (
|
||||
sc.constants.speed_of_light * spu.meter / spu.second
|
||||
)
|
||||
vac_speed_of_light = sc.constants.speed_of_light * spu.meter / spu.second
|
||||
|
||||
freq = self.compute_input('freq')
|
||||
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@ class FDTDSimDataVizNode(base.MaxwellSimNode):
|
|||
####################
|
||||
# - Sockets
|
||||
####################
|
||||
input_sockets = {
|
||||
input_sockets: typ.ClassVar = {
|
||||
'FDTD Sim Data': sockets.MaxwellFDTDSimDataSocketDef(),
|
||||
}
|
||||
output_sockets = {'Preview': sockets.AnySocketDef()}
|
||||
output_sockets: typ.ClassVar = {'Preview': sockets.AnySocketDef()}
|
||||
|
||||
managed_obj_defs = {
|
||||
managed_obj_defs: typ.ClassVar = {
|
||||
'viz_plot': ct.schemas.ManagedObjDef(
|
||||
mk=lambda name: managed_objs.ManagedBLImage(name),
|
||||
name_prefix='',
|
||||
|
|
@ -63,9 +63,7 @@ class FDTDSimDataVizNode(base.MaxwellSimNode):
|
|||
# ("Hz", "Hz", "Hz"),
|
||||
],
|
||||
default='E',
|
||||
update=lambda self, context: self.sync_prop(
|
||||
'field_viz_component', context
|
||||
),
|
||||
update=lambda self, context: self.sync_prop('field_viz_component', context),
|
||||
)
|
||||
field_viz_part: bpy.props.EnumProperty(
|
||||
name='Field Part',
|
||||
|
|
@ -88,9 +86,7 @@ class FDTDSimDataVizNode(base.MaxwellSimNode):
|
|||
('dB', 'Log (dB)', 'Logarithmic (dB) Scale'),
|
||||
],
|
||||
default='lin',
|
||||
update=lambda self, context: self.sync_prop(
|
||||
'field_viz_scale', context
|
||||
),
|
||||
update=lambda self, context: self.sync_prop('field_viz_scale', context),
|
||||
)
|
||||
field_viz_structure_visibility: bpy.props.FloatProperty(
|
||||
name='Field Viz Plot: Structure Visibility',
|
||||
|
|
@ -98,75 +94,57 @@ class FDTDSimDataVizNode(base.MaxwellSimNode):
|
|||
default=0.2,
|
||||
min=0.0,
|
||||
max=1.0,
|
||||
update=lambda self, context: self.sync_prop(
|
||||
'field_viz_plot_fixed_f', context
|
||||
),
|
||||
update=lambda self, context: self.sync_prop('field_viz_plot_fixed_f', context),
|
||||
)
|
||||
|
||||
field_viz_plot_fix_x: bpy.props.BoolProperty(
|
||||
name='Field Viz Plot: Fix X',
|
||||
description='Fix the x-coordinate on the plot',
|
||||
default=False,
|
||||
update=lambda self, context: self.sync_prop(
|
||||
'field_viz_plot_fix_x', context
|
||||
),
|
||||
update=lambda self, context: self.sync_prop('field_viz_plot_fix_x', context),
|
||||
)
|
||||
field_viz_plot_fix_y: bpy.props.BoolProperty(
|
||||
name='Field Viz Plot: Fix Y',
|
||||
description='Fix the y coordinate on the plot',
|
||||
default=False,
|
||||
update=lambda self, context: self.sync_prop(
|
||||
'field_viz_plot_fix_y', context
|
||||
),
|
||||
update=lambda self, context: self.sync_prop('field_viz_plot_fix_y', context),
|
||||
)
|
||||
field_viz_plot_fix_z: bpy.props.BoolProperty(
|
||||
name='Field Viz Plot: Fix Z',
|
||||
description='Fix the z coordinate on the plot',
|
||||
default=False,
|
||||
update=lambda self, context: self.sync_prop(
|
||||
'field_viz_plot_fix_z', context
|
||||
),
|
||||
update=lambda self, context: self.sync_prop('field_viz_plot_fix_z', context),
|
||||
)
|
||||
field_viz_plot_fix_f: bpy.props.BoolProperty(
|
||||
name='Field Viz Plot: Fix Freq',
|
||||
description='Fix the frequency coordinate on the plot',
|
||||
default=False,
|
||||
update=lambda self, context: self.sync_prop(
|
||||
'field_viz_plot_fix_f', context
|
||||
),
|
||||
update=lambda self, context: self.sync_prop('field_viz_plot_fix_f', context),
|
||||
)
|
||||
|
||||
field_viz_plot_fixed_x: bpy.props.FloatProperty(
|
||||
name='Field Viz Plot: Fix X',
|
||||
description='Fix the x-coordinate on the plot',
|
||||
default=0.0,
|
||||
update=lambda self, context: self.sync_prop(
|
||||
'field_viz_plot_fixed_x', context
|
||||
),
|
||||
update=lambda self, context: self.sync_prop('field_viz_plot_fixed_x', context),
|
||||
)
|
||||
field_viz_plot_fixed_y: bpy.props.FloatProperty(
|
||||
name='Field Viz Plot: Fixed Y',
|
||||
description='Fix the y coordinate on the plot',
|
||||
default=0.0,
|
||||
update=lambda self, context: self.sync_prop(
|
||||
'field_viz_plot_fixed_y', context
|
||||
),
|
||||
update=lambda self, context: self.sync_prop('field_viz_plot_fixed_y', context),
|
||||
)
|
||||
field_viz_plot_fixed_z: bpy.props.FloatProperty(
|
||||
name='Field Viz Plot: Fixed Z',
|
||||
description='Fix the z coordinate on the plot',
|
||||
default=0.0,
|
||||
update=lambda self, context: self.sync_prop(
|
||||
'field_viz_plot_fixed_z', context
|
||||
),
|
||||
update=lambda self, context: self.sync_prop('field_viz_plot_fixed_z', context),
|
||||
)
|
||||
field_viz_plot_fixed_f: bpy.props.FloatProperty(
|
||||
name='Field Viz Plot: Fixed Freq (Thz)',
|
||||
description='Fix the frequency coordinate on the plot',
|
||||
default=0.0,
|
||||
update=lambda self, context: self.sync_prop(
|
||||
'field_viz_plot_fixed_f', context
|
||||
),
|
||||
update=lambda self, context: self.sync_prop('field_viz_plot_fixed_f', context),
|
||||
)
|
||||
|
||||
####################
|
||||
|
|
@ -176,9 +154,7 @@ class FDTDSimDataVizNode(base.MaxwellSimNode):
|
|||
if (sim_data := self._compute_input('FDTD Sim Data')) is None:
|
||||
return
|
||||
|
||||
self.cache_viz_monitor_type = sim_data.monitor_data[
|
||||
self.viz_monitor_name
|
||||
].type
|
||||
self.cache_viz_monitor_type = sim_data.monitor_data[self.viz_monitor_name].type
|
||||
self.sync_prop('viz_monitor_name', context)
|
||||
|
||||
def retrieve_monitors(self, context) -> list[tuple]:
|
||||
|
|
@ -260,9 +236,7 @@ class FDTDSimDataVizNode(base.MaxwellSimNode):
|
|||
CACHE.pop(self.instance_id, None)
|
||||
return
|
||||
|
||||
CACHE[self.instance_id] = {
|
||||
'monitors': list(sim_data.monitor_data.keys())
|
||||
}
|
||||
CACHE[self.instance_id] = {'monitors': list(sim_data.monitor_data.keys())}
|
||||
|
||||
####################
|
||||
# - Plotting
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import pydantic as pyd
|
||||
|
||||
from ... import contracts as ct
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
|
||||
|
|
@ -26,9 +25,7 @@ class BoolBLSocket(base.MaxwellSimSocket):
|
|||
####################
|
||||
# - Socket UI
|
||||
####################
|
||||
def draw_label_row(
|
||||
self, label_col_row: bpy.types.UILayout, text: str
|
||||
) -> None:
|
||||
def draw_label_row(self, label_col_row: bpy.types.UILayout, text: str) -> None:
|
||||
label_col_row.label(text=text)
|
||||
label_col_row.prop(self, 'raw_value', text='')
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
|
||||
|
|
@ -26,9 +25,7 @@ class StringBLSocket(base.MaxwellSimSocket):
|
|||
####################
|
||||
# - Socket UI
|
||||
####################
|
||||
def draw_label_row(
|
||||
self, label_col_row: bpy.types.UILayout, text: str
|
||||
) -> None:
|
||||
def draw_label_row(self, label_col_row: bpy.types.UILayout, text: str) -> None:
|
||||
label_col_row.prop(self, 'raw_value', text=text)
|
||||
|
||||
####################
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
|
||||
|
|
|
|||
|
|
@ -24,9 +24,7 @@ class MaxwellBoundCondBLSocket(base.MaxwellSimSocket):
|
|||
('PERIODIC', 'Periodic', 'Infinitely periodic layer'),
|
||||
],
|
||||
default='PML',
|
||||
update=(
|
||||
lambda self, context: self.sync_prop('default_choice', context)
|
||||
),
|
||||
update=(lambda self, context: self.sync_prop('default_choice', context)),
|
||||
)
|
||||
|
||||
####################
|
||||
|
|
@ -48,9 +46,7 @@ class MaxwellBoundCondBLSocket(base.MaxwellSimSocket):
|
|||
}[self.default_choice]
|
||||
|
||||
@value.setter
|
||||
def value(
|
||||
self, value: typx.Literal['PML', 'PEC', 'PMC', 'PERIODIC']
|
||||
) -> None:
|
||||
def value(self, value: typx.Literal['PML', 'PEC', 'PMC', 'PERIODIC']) -> None:
|
||||
self.default_choice = value
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import tidy3d as td
|
||||
|
|
@ -31,9 +30,7 @@ class MaxwellBoundCondsBLSocket(base.MaxwellSimSocket):
|
|||
name='Show Bounds Definition',
|
||||
description='Toggle to show bound faces',
|
||||
default=False,
|
||||
update=(
|
||||
lambda self, context: self.sync_prop('show_definition', context)
|
||||
),
|
||||
update=(lambda self, context: self.sync_prop('show_definition', context)),
|
||||
)
|
||||
|
||||
x_pos: bpy.props.EnumProperty(
|
||||
|
|
@ -84,9 +81,7 @@ class MaxwellBoundCondsBLSocket(base.MaxwellSimSocket):
|
|||
####################
|
||||
def draw_label_row(self, row: bpy.types.UILayout, text) -> None:
|
||||
row.label(text=text)
|
||||
row.prop(
|
||||
self, 'show_definition', toggle=True, text='', icon='MOD_LENGTH'
|
||||
)
|
||||
row.prop(self, 'show_definition', toggle=True, text='', icon='MOD_LENGTH')
|
||||
|
||||
def draw_value(self, col: bpy.types.UILayout) -> None:
|
||||
if not self.show_definition:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import pydantic as pyd
|
||||
|
||||
from ... import contracts as ct
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import pydantic as pyd
|
||||
|
||||
from ... import contracts as ct
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import scipy as sc
|
||||
|
|
@ -35,9 +34,7 @@ class MaxwellMediumBLSocket(base.MaxwellSimSocket):
|
|||
size=2,
|
||||
default=(1.0, 0.0),
|
||||
precision=2,
|
||||
update=(
|
||||
lambda self, context: self.sync_prop('rel_permittivity', context)
|
||||
),
|
||||
update=(lambda self, context: self.sync_prop('rel_permittivity', context)),
|
||||
)
|
||||
|
||||
####################
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import pydantic as pyd
|
||||
|
||||
from ... import contracts as ct
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import pydantic as pyd
|
||||
|
||||
from ... import contracts as ct
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import pydantic as pyd
|
||||
|
||||
from ... import contracts as ct
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import tidy3d as td
|
||||
|
|
@ -21,9 +20,7 @@ class MaxwellSimGridBLSocket(base.MaxwellSimSocket):
|
|||
min=0.01,
|
||||
# step=10,
|
||||
precision=2,
|
||||
update=(
|
||||
lambda self, context: self.sync_prop('min_steps_per_wl', context)
|
||||
),
|
||||
update=(lambda self, context: self.sync_prop('min_steps_per_wl', context)),
|
||||
)
|
||||
|
||||
####################
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import pydantic as pyd
|
||||
|
||||
from ... import contracts as ct
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import pydantic as pyd
|
||||
|
||||
from ... import contracts as ct
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import pydantic as pyd
|
||||
|
||||
from ... import contracts as ct
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import pydantic as pyd
|
||||
|
||||
from ... import contracts as ct
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import sympy as sp
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import sympy.physics.units as spu
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import sympy.physics.units as spu
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import sympy.physics.units as spu
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import numpy as np
|
||||
import pydantic as pyd
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import numpy as np
|
||||
import pydantic as pyd
|
||||
|
|
@ -74,8 +73,7 @@ class PhysicalLengthBLSocket(base.MaxwellSimSocket):
|
|||
@property
|
||||
def value_list(self) -> list[SympyExpr]:
|
||||
return [
|
||||
el * self.unit
|
||||
for el in np.linspace(self.min_len, self.max_len, self.steps)
|
||||
el * self.unit for el in np.linspace(self.min_len, self.max_len, self.steps)
|
||||
]
|
||||
|
||||
@value_list.setter
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import sympy.physics.units as spu
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import sympy as sp
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import sympy as sp
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import sympy.physics.units as spu
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import sympy.physics.units as spu
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
import types
|
||||
import typing as typ
|
||||
|
||||
from .. import contracts as ct
|
||||
|
||||
|
||||
def scan_for_socket_defs(
|
||||
sockets_module: types.ModuleType,
|
||||
) -> dict[ct.SocketType, typ.Type[ct.schemas.SocketDef]]:
|
||||
) -> dict[ct.SocketType, type[ct.schemas.SocketDef]]:
|
||||
return {
|
||||
socket_type: getattr(
|
||||
sockets_module,
|
||||
|
|
@ -18,4 +17,5 @@ def scan_for_socket_defs(
|
|||
)
|
||||
}
|
||||
|
||||
|
||||
## TODO: Function for globals() filling too.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import pydantic as pyd
|
||||
|
||||
from ... import contracts as ct
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import pydantic as pyd
|
||||
|
||||
from ... import contracts as ct
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import sympy as sp
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import sympy as sp
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
import bpy
|
||||
import pydantic as pyd
|
||||
import sympy as sp
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ LOG_LEVEL_MAP: dict[str, LogLevel] = {
|
|||
|
||||
SIMPLE_LOGGER_PREFIX = 'simple::'
|
||||
|
||||
STREAM_LOG_FORMAT = 11*' ' + '%(levelname)-8s %(message)s (%(name)s)'
|
||||
STREAM_LOG_FORMAT = 11 * ' ' + '%(levelname)-8s %(message)s (%(name)s)'
|
||||
FILE_LOG_FORMAT = STREAM_LOG_FORMAT
|
||||
|
||||
####################
|
||||
|
|
@ -122,7 +122,7 @@ def sync_bootstrap_logging(
|
|||
file_path=file_path,
|
||||
file_level=file_level,
|
||||
)
|
||||
logger_logger.info("Bootstrapped Logging w/Settings %s", str(CACHE))
|
||||
logger_logger.info('Bootstrapped Logging w/Settings %s', str(CACHE))
|
||||
|
||||
|
||||
def sync_loggers(
|
||||
|
|
@ -153,9 +153,7 @@ def sync_loggers(
|
|||
# - Logger Iteration
|
||||
####################
|
||||
def loggers():
|
||||
return [
|
||||
logging.getLogger(name) for name in logging.root.manager.loggerDict
|
||||
]
|
||||
return [logging.getLogger(name) for name in logging.root.manager.loggerDict]
|
||||
|
||||
|
||||
def simple_loggers():
|
||||
|
|
|
|||
|
|
@ -9,8 +9,7 @@ class BlenderTypeEnum(str, enum.Enum):
|
|||
def append_cls_name_to_values(cls):
|
||||
# Construct Set w/Modified Member Names
|
||||
new_members = {
|
||||
name: f'{name}{cls.__name__}'
|
||||
for name, member in cls.__members__.items()
|
||||
name: f'{name}{cls.__name__}' for name, member in cls.__members__.items()
|
||||
}
|
||||
|
||||
# Dynamically Declare New Enum Class w/Modified Members
|
||||
|
|
@ -24,8 +23,7 @@ def append_cls_name_to_values(cls):
|
|||
def wrap_values_in_MT(cls):
|
||||
# Construct Set w/Modified Member Names
|
||||
new_members = {
|
||||
name: f'BLENDER_MAXWELL_MT_{name}'
|
||||
for name, member in cls.__members__.items()
|
||||
name: f'BLENDER_MAXWELL_MT_{name}' for name, member in cls.__members__.items()
|
||||
}
|
||||
|
||||
# Dynamically Declare New Enum Class w/Modified Members
|
||||
|
|
|
|||
|
|
@ -104,6 +104,7 @@ def scale_to_unit(expr: sp.Expr, unit: spu.Quantity) -> typ.Any:
|
|||
msg = f'Expression "{expr}" was scaled to the unit "{unit}" with the expectation that the result would be unitless, but the result "{unitless_expr}" has units "{get_units(unitless_expr)}"'
|
||||
raise ValueError(msg)
|
||||
|
||||
|
||||
####################
|
||||
# - Sympy <-> Scalars
|
||||
####################
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ OUTPUT_CONSOLE = rich.console.Console(
|
|||
## TODO: color_system should be 'auto'; bl_run.py hijinks are interfering
|
||||
)
|
||||
ERROR_CONSOLE = rich.console.Console(
|
||||
color_system='truecolor', stderr=True
|
||||
color_system='truecolor',
|
||||
stderr=True,
|
||||
## TODO: color_system should be 'auto'; bl_run.py hijinks are interfering
|
||||
)
|
||||
rich.traceback.install(show_locals=True, console=ERROR_CONSOLE)
|
||||
|
|
|
|||
|
|
@ -51,12 +51,8 @@ class _SympyExpr:
|
|||
|
||||
sympy_expr_schema = pyd_core_schema.chain_schema(
|
||||
[
|
||||
pyd_core_schema.no_info_plain_validator_function(
|
||||
validate_from_str
|
||||
),
|
||||
pyd_core_schema.no_info_plain_validator_function(
|
||||
validate_from_expr
|
||||
),
|
||||
pyd_core_schema.no_info_plain_validator_function(validate_from_str),
|
||||
pyd_core_schema.no_info_plain_validator_function(validate_from_expr),
|
||||
pyd_core_schema.is_instance_schema(AllowedSympyExprs),
|
||||
]
|
||||
)
|
||||
|
|
@ -108,9 +104,7 @@ def ConstrSympyExpr(
|
|||
f'allow_variables={allow_variables} does not match expression {expr}.'
|
||||
)
|
||||
if (not allow_units) and spux.uses_units(expr):
|
||||
msgs.add(
|
||||
f'allow_units={allow_units} does not match expression {expr}.'
|
||||
)
|
||||
msgs.add(f'allow_units={allow_units} does not match expression {expr}.')
|
||||
|
||||
# Validate Structure Class
|
||||
if (
|
||||
|
|
@ -150,9 +144,7 @@ def ConstrSympyExpr(
|
|||
f'allowed_symbols={allowed_symbols} does not match expression {expr}'
|
||||
)
|
||||
if allowed_units and spux.get_units(expr).issubset(allowed_units):
|
||||
msgs.add(
|
||||
f'allowed_units={allowed_units} does not match expression {expr}'
|
||||
)
|
||||
msgs.add(f'allowed_units={allowed_units} does not match expression {expr}')
|
||||
|
||||
# Validate Shape Class
|
||||
if (
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import scipy as sc
|
||||
import sympy.physics.units as spu
|
||||
|
||||
#from . import extra_sympy_units as spux
|
||||
# from . import extra_sympy_units as spux
|
||||
|
||||
vac_speed_of_light = sc.constants.speed_of_light * spu.meter / spu.second
|
||||
|
|
|
|||
|
|
@ -54,5 +54,6 @@ def main():
|
|||
elif return_code != 0:
|
||||
print(''.join(output)) # noqa: T201
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
|
|||
|
|
@ -35,9 +35,7 @@ ADDON_VERSION = PROJ_SPEC['project']['version']
|
|||
# - Packaging Information
|
||||
####################
|
||||
PATH_ADDON_PKG = PATH_ROOT / 'src' / ADDON_NAME
|
||||
PATH_ADDON_ZIP = (
|
||||
PATH_ROOT / 'build' / (ADDON_NAME + '__' + ADDON_VERSION + '.zip')
|
||||
)
|
||||
PATH_ADDON_ZIP = PATH_ROOT / 'build' / (ADDON_NAME + '__' + ADDON_VERSION + '.zip')
|
||||
|
||||
PATH_ADDON_BLEND_STARTER = PATH_ADDON_PKG / 'blenders' / 'starter.blend'
|
||||
|
||||
|
|
|
|||
|
|
@ -69,9 +69,7 @@ def zipped_addon( # noqa: PLR0913
|
|||
|
||||
# Write File to Zip
|
||||
else:
|
||||
f_zip.write(
|
||||
file_to_zip, file_to_zip.relative_to(path_addon_pkg.parent)
|
||||
)
|
||||
f_zip.write(file_to_zip, file_to_zip.relative_to(path_addon_pkg.parent))
|
||||
|
||||
# Install pyproject.toml @ /pyproject.toml of Addon
|
||||
f_zip.write(
|
||||
|
|
@ -114,5 +112,6 @@ def main():
|
|||
# TODO: GPG signature for distribution
|
||||
pass
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
|
|||
Loading…
Reference in New Issue