pyedb 0.13.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

pyedb/__init__.py

@@ -44,7 +44,7 @@ deprecation_warning()
 #
 
 pyedb_path = os.path.dirname(__file__)
-__version__ = "0.13.0"
+__version__ = "0.14.0"
 version = __version__
 
 #

pyedb/configuration/cfg_common.py

@@ -21,15 +21,11 @@
 # SOFTWARE.
 
 
-from pyedb.generic.general_methods import pyedb_function_handler
-
-
 class CfgBase:
     @property
     def protected_attributes(self):
         return []
 
-    @pyedb_function_handler
     def get_attributes(self, exclude=None):
         attrs = {i: j for i, j in self.__dict__.items() if i not in self.protected_attributes}
         if exclude is not None:
@@ -39,7 +35,6 @@ class CfgBase:
         attrs = {i: j for i, j in attrs.items() if j is not None}
         return attrs
 
-    @pyedb_function_handler
     def set_attributes(self, pedb_object):
         attrs = self.get_attributes()
         for attr, value in attrs.items():

pyedb/configuration/cfg_components.py

@@ -21,7 +21,6 @@
 # SOFTWARE.
 
 from pyedb.configuration.cfg_common import CfgBase
-from pyedb.generic.general_methods import pyedb_function_handler
 
 
 class CfgPortProperties(CfgBase):
@@ -76,7 +75,6 @@ class CfgComponents:
         self._pedb = pedb
         self.components = [CfgComponent(**comp) for comp in data]
 
-    @pyedb_function_handler
     def apply(self):
         comps_in_db = self._pedb.components
         for comp in self.components:

pyedb/configuration/cfg_operations.py

@@ -21,7 +21,6 @@
 # SOFTWARE.
 
 from pyedb.configuration.cfg_common import CfgBase
-from pyedb.generic.general_methods import pyedb_function_handler
 
 
 class CfgCutout(CfgBase):
@@ -56,7 +55,6 @@ class CfgOperations(CfgBase):
         self._pedb = pedb
         self.op_cutout = CfgCutout(**data["cutout"]) if "cutout" in data else None
 
-    @pyedb_function_handler
     def apply(self):
         """Imports operation information from JSON."""
         if self.op_cutout:

pyedb/configuration/cfg_package_definition.py

@@ -22,7 +22,6 @@
 
 from pyedb.configuration.cfg_common import CfgBase
 from pyedb.dotnet.edb_core.definition.package_def import PackageDef
-from pyedb.generic.general_methods import pyedb_function_handler
 
 
 class CfgPackage(CfgBase):
@@ -104,7 +103,6 @@ class CfgPackageDefinitions:
             for _, i in comp_list.items():
                 i.package_def = pkg.name
 
-    @pyedb_function_handler
     def get_data_from_db(self):
         package_definitions = []
 

pyedb/configuration/cfg_ports_sources.py

@@ -20,8 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from pyedb.generic.general_methods import pyedb_function_handler
-
 
 class CfgCircuitElement:
     @property
@@ -29,7 +27,6 @@ class CfgCircuitElement:
         """Edb."""
         return self._pdata._pedb
 
-    @pyedb_function_handler
     def __init__(self, pdata, **kwargs):
         self._pdata = pdata
         self._data = kwargs
@@ -40,17 +37,22 @@ class CfgCircuitElement:
         self.pos_term_info = kwargs.get("positive_terminal", None)  # {"pin" : "A1"}
         self.neg_term_info = kwargs.get("negative_terminal", None)
 
-    @pyedb_function_handler
     def _create_terminals(self):
         """Create step 1. Collect positive and negative terminals."""
         pos_term_info = self.pos_term_info
         if pos_term_info:
             pos_type, pos_value = [[i, j] for i, j in pos_term_info.items()][0]
             pos_objs = dict()
+            pos_coor_terminal = dict()
             if self.type == "coax":
                 pins = self._get_pins(pos_type, pos_value)
                 pins = {f"{self.name}_{self.reference_designator}": i for _, i in pins.items()}
                 pos_objs.update(pins)
+            elif pos_type == "coordinates":
+                layer = pos_value["layer"]
+                point = pos_value["point"]
+                net_name = pos_value["net"]
+                pos_coor_terminal[self.name] = self.pedb.get_point_terminal(self.name, net_name, point, layer)
             elif pos_type == "pin_group":
                 pos_objs[pos_value] = self.pedb.siwave.pin_groups[pos_value]
             elif not self.distributed:
@@ -66,12 +68,19 @@ class CfgCircuitElement:
                 self._elem_num = len(pos_objs)
 
             self.pos_terminals = {i: j.create_terminal(i) for i, j in pos_objs.items()}
+            self.pos_terminals.update(pos_coor_terminal)
 
         neg_term_info = self.neg_term_info
         self.neg_terminal = None
         if neg_term_info:
             neg_type, neg_value = [[i, j] for i, j in neg_term_info.items()][0]
-            if neg_type == "nearest_pin":
+
+            if neg_type == "coordinates":
+                layer = neg_value["layer"]
+                point = neg_value["point"]
+                net_name = neg_value["net"]
+                self.neg_terminal = self.pedb.get_point_terminal(self.name + "_ref", net_name, point, layer)
+            elif neg_type == "nearest_pin":
                 ref_net = neg_value.get("reference_net", "GND")
                 search_radius = neg_value.get("search_radius", "5e-3")
                 temp = dict()
@@ -92,7 +101,6 @@ class CfgCircuitElement:
                     j.create_terminal(i) if not j.terminal else j.terminal for i, j in pin_group.items()
                 ][0]
 
-    @pyedb_function_handler
     def _get_pins(self, terminal_type, terminal_value):
         terminal_value = terminal_value if isinstance(terminal_value, list) else [terminal_value]
 
@@ -112,7 +120,6 @@ class CfgCircuitElement:
             pins.update({f"{self.reference_designator}_{terminal_value[0]}_{i}": j for i, j in temp.items()})
         return pins
 
-    @pyedb_function_handler
     def _create_pin_group(self, pins, is_ref=False):
         if is_ref:
             pg_name = f"pg_{self.name}_{self.reference_designator}_ref"
@@ -128,11 +135,9 @@ class CfgPort(CfgCircuitElement):
 
     CFG_PORT_TYPE = {"circuit": [str], "coax": [str]}
 
-    @pyedb_function_handler
     def __init__(self, pdata, **kwargs):
         super().__init__(pdata, **kwargs)
 
-    @pyedb_function_handler
     def create(self):
         """Create port."""
         self._create_terminals()
@@ -152,13 +157,11 @@ class CfgPort(CfgCircuitElement):
 class CfgSources(CfgCircuitElement):
     CFG_SOURCE_TYPE = {"current": [int, float], "voltage": [int, float]}
 
-    @pyedb_function_handler
     def __init__(self, pdata, **kwargs):
         super().__init__(pdata, **kwargs)
 
         self.magnitude = kwargs.get("magnitude", 0.001)
 
-    @pyedb_function_handler
     def create(self):
         """Create sources."""
         self._create_terminals()

pyedb/configuration/cfg_stackup.py

@@ -21,7 +21,6 @@
 # SOFTWARE.
 
 from pyedb.configuration.cfg_common import CfgBase
-from pyedb.generic.general_methods import pyedb_function_handler
 
 
 class CfgMaterial(CfgBase):
@@ -54,7 +53,6 @@ class CfgStackup:
         self.materials = [CfgMaterial(**mat) for mat in data.get("materials", [])]
         self.layers = [CfgLayer(**lay) for lay in data.get("layers", [])]
 
-    @pyedb_function_handler
     def apply(self):
         """Apply configuration settings to the current design"""
         if len(self.materials):
@@ -77,7 +75,6 @@ class CfgStackup:
             attrs = l_attrs.get_attributes()
             self._pedb.stackup.add_layer_bottom(**attrs)
 
-    @pyedb_function_handler
     def __apply_layers(self):
         """Apply layer settings to the current design"""
         layers = list()
@@ -120,7 +117,6 @@ class CfgStackup:
             elif l.type == "signal":
                 prev_layer_clone = self._pedb.stackup.layers[l.name]
 
-    @pyedb_function_handler
     def __apply_materials(self):
         """Apply material settings to the current design"""
         materials_in_db = {i.lower(): i for i, _ in self._pedb.materials.materials.items()}
@@ -131,7 +127,6 @@ class CfgStackup:
             attrs = mat_in_cfg.get_attributes()
             mat = self._pedb.materials.add_material(**attrs)
 
-    @pyedb_function_handler
     def __get_materials_from_db(self):
         materials = []
         for name, p in self._pedb.materials.materials.items():
@@ -141,7 +136,6 @@ class CfgStackup:
             materials.append(mat)
         return materials
 
-    @pyedb_function_handler
     def __get_layers_from_db(self):
         layers = []
         for name, obj in self._pedb.stackup.all_layers.items():
@@ -153,7 +147,6 @@ class CfgStackup:
             layers.append(layer)
         return layers
 
-    @pyedb_function_handler
     def get_data_from_db(self):
         """Get configuration data from layout.
 

pyedb/configuration/configuration.py

@@ -28,7 +28,6 @@ import toml
 
 from pyedb.configuration.cfg_data import CfgData
 from pyedb.dotnet.edb_core.definition.package_def import PackageDef
-from pyedb.generic.general_methods import pyedb_function_handler
 
 
 class Configuration:
@@ -42,7 +41,6 @@ class Configuration:
         self._spice_model_library = ""
         self.cfg_data = CfgData(self._pedb)
 
-    @pyedb_function_handler
     def load(self, config_file, append=True, apply_file=False, output_file=None, open_at_the_end=True):
         """Import configuration settings from a configure file.
 
@@ -103,7 +101,6 @@ class Configuration:
                 self._pedb.open_edb()
         return self.cfg_data
 
-    @pyedb_function_handler()
     def run(self):
         """Apply configuration settings to the current design"""
 
@@ -157,7 +154,6 @@ class Configuration:
 
         return True
 
-    @pyedb_function_handler
     def _load_stackup(self):
         """Imports stackup information from json."""
         data = self.data["stackup"]
@@ -214,7 +210,6 @@ class Configuration:
                 elif l["type"] == "signal":
                     prev_layer_clone = self._pedb.stackup.layers[l["name"]]
 
-    @pyedb_function_handler
     def _load_package_def(self):
         """Imports package definition information from JSON."""
         comps = self._pedb.components.components
@@ -277,7 +272,6 @@ class Configuration:
 
         return data
 
-    @pyedb_function_handler
     def export(self, file_path, stackup=True, package_definitions=True):
         """Export the configuration data from layout to a file.
 

pyedb/dotnet/application/Variables.py

@@ -54,7 +54,6 @@ from pyedb.generic.general_methods import (
     is_array,
     is_number,
     open_file,
-    pyedb_function_handler,
 )
 
 
@@ -173,7 +172,6 @@ class CSVDataset:
 
         pass
 
-    @pyedb_function_handler()
     def __getitem__(self, item):  # pragma: no cover
         variable_list = item.split(",")
         data_out = CSVDataset()
@@ -188,7 +186,6 @@ class CSVDataset:
             data_out._header.append(variable)
         return data_out
 
-    @pyedb_function_handler()
     def __add__(self, other):  # pragma: no cover
         assert self.number_of_columns == other.number_of_columns, "Inconsistent number of columns"
         # Create a new object to return, avoiding changing the original inputs
@@ -258,7 +255,6 @@ class CSVDataset:
         return self.__next__()
 
 
-@pyedb_function_handler()
 def _find_units_in_dependent_variables(variable_value, full_variables={}):  # pragma: no cover
     m2 = re.findall(r"[0-9.]+ *([a-z_A-Z]+)", variable_value)
     if len(m2) > 0:
@@ -277,7 +273,6 @@ def _find_units_in_dependent_variables(variable_value, full_variables={}):  # pr
     return ""
 
 
-@pyedb_function_handler()
 def decompose_variable_value(variable_value, full_variables={}):  # pragma: no cover
     """Decompose a variable value.
 
@@ -320,7 +315,6 @@ def decompose_variable_value(variable_value, full_variables={}):  # pragma: no c
     return float_value, units
 
 
-@pyedb_function_handler()
 def _generate_property_validation_errors(property_name, expected, actual):  # pragma: no cover
     expected_value, expected_unit = decompose_variable_value(expected)
     actual_value, actual_unit = decompose_variable_value(actual)
@@ -335,7 +329,6 @@ def _generate_property_validation_errors(property_name, expected, actual):  # pr
             yield "Error {0}: Expected {1}, got {2}".format(property_name, expected, actual)
 
 
-@pyedb_function_handler()
 def generate_validation_errors(property_names, expected_settings, actual_settings):  # pragma: no cover
     """From the given property names, expected settings and actual settings, return a list of validation errors.
     If no errors are found, an empty list is returned. The validation of values such as "10mm"
@@ -481,7 +474,6 @@ class VariableManager(object):
         """
         return self._variable_dict([self._odesign, self._oproject])
 
-    @pyedb_function_handler()
     def decompose(self, variable_value):  # pragma: no cover
         """Decompose a variable string to a floating with its unit.
 
@@ -833,21 +825,17 @@ class VariableManager(object):
         all.update(self._dependent_variables)
         return all
 
-    @pyedb_function_handler()
     def __delitem__(self, key):  # pragma: no cover
         """Implement del with array name or index."""
         self.delete_variable(key)
 
-    @pyedb_function_handler()
     def __getitem__(self, variable_name):  # pragma: no cover
         return self.variables[variable_name]
 
-    @pyedb_function_handler()
     def __setitem__(self, variable, value):  # pragma: no cover
         self.set_variable(variable, value)
         return True
 
-    @pyedb_function_handler()
     def _cleanup_variables(self):  # pragma: no cover
         variables = self._get_var_list_from_aedt(self._app.odesign) + self._get_var_list_from_aedt(self._app.oproject)
         all_dicts = [
@@ -861,7 +849,6 @@ class VariableManager(object):
                 if var_name not in variables:
                     del dict_var[var_name]
 
-    @pyedb_function_handler()
     def _variable_dict(self, object_list, dependent=True, independent=True):  # pragma: no cover
         """Retrieve the variable dictionary.
 
@@ -917,7 +904,7 @@ class VariableManager(object):
         return vars_to_output
 
     # TODO: Should be renamed to "evaluate"
-    @pyedb_function_handler()
+
     def get_expression(self, variable_name):  # pragma: no cover
         """Retrieve the variable value of a project or design variable as a string.
 
@@ -936,7 +923,6 @@ class VariableManager(object):
         else:
             return False
 
-    @pyedb_function_handler()
     def aedt_object(self, variable):  # pragma: no cover
         """Retrieve an AEDT object.
 
@@ -951,7 +937,6 @@ class VariableManager(object):
         else:
             return self._odesign
 
-    @pyedb_function_handler()
     def set_variable(
         self,
         variable_name,
@@ -1180,7 +1165,6 @@ class VariableManager(object):
             return False
         return True
 
-    @pyedb_function_handler()
     def delete_separator(self, separator_name):  # pragma: no cover
         """Delete a separator from either the active project or design.
 
@@ -1221,7 +1205,6 @@ class VariableManager(object):
                 pass
         return False
 
-    @pyedb_function_handler()
     def delete_variable(self, var_name):  # pragma: no cover
         """Delete a variable.
 
@@ -1265,7 +1248,6 @@ class VariableManager(object):
                 return True
         return False
 
-    @pyedb_function_handler()
     def _get_var_list_from_aedt(self, desktop_object):  # pragma: no cover
         var_list = []
         if self._app._is_object_oriented_enabled() and self._app.design_type != "Maxwell Circuit":
@@ -1384,7 +1366,6 @@ class Variable(object):
             return self._app._odesign
         return None
 
-    @pyedb_function_handler()
     def _update_var(self):  # pragma: no cover
         if self._app:
             return self._app.variable_manager.set_variable(
@@ -1398,7 +1379,6 @@ class Variable(object):
             )
         return False
 
-    @pyedb_function_handler()
     def _set_prop_val(self, prop, val, n_times=10):  # pragma: no cover
         if self._app.design_type == "Maxwell Circuit":
             return
@@ -1430,7 +1410,6 @@ class Variable(object):
         except:
             pass
 
-    @pyedb_function_handler()
     def _get_prop_val(self, prop):  # pragma: no cover
         if self._app.design_type == "Maxwell Circuit":
             return
@@ -1712,7 +1691,6 @@ class Variable(object):
         """
         return ("{}{}").format(self.numeric_value, self._units)
 
-    @pyedb_function_handler()
     def decompose(self):  # pragma: no cover
         """Decompose a variable value to a floating with its unit.
 
@@ -1731,7 +1709,6 @@ class Variable(object):
         """
         return decompose_variable_value(self.evaluated_value)
 
-    @pyedb_function_handler()
     def rescale_to(self, units):  # pragma: no cover
         """Rescale the expression to a new unit within the current unit system.
 
@@ -1759,7 +1736,6 @@ class Variable(object):
         self._units = units
         return self
 
-    @pyedb_function_handler()
     def format(self, format):  # pragma: no cover
         """Retrieve the string value with the specified numerical formatting.
 
@@ -1786,7 +1762,6 @@ class Variable(object):
         """
         return ("{0:" + format + "}{1}").format(self.numeric_value, self._units)
 
-    @pyedb_function_handler()
     def __mul__(self, other):  # pragma: no cover
         """Multiply the variable with a number or another variable and return a new object.
 
@@ -1845,7 +1820,6 @@ class Variable(object):
 
     __rmul__ = __mul__
 
-    @pyedb_function_handler()
     def __add__(self, other):  # pragma: no cover
         """Add the variable to another variable to return a new object.
 
@@ -1886,7 +1860,6 @@ class Variable(object):
 
         return result_variable
 
-    @pyedb_function_handler()
     def __sub__(self, other):  # pragma: no cover
         """Subtract another variable from the variable to return a new object.
 
@@ -1929,7 +1902,7 @@ class Variable(object):
         return result_variable
 
     # Python 3.x version
-    @pyedb_function_handler()
+
     def __truediv__(self, other):  # pragma: no cover
         """Divide the variable by a number or another variable to return a new object.
 
@@ -1969,11 +1942,10 @@ class Variable(object):
         return Variable("{}{}".format(result_value, result_units))
 
     # Python 2.7 version
-    @pyedb_function_handler()
+
     def __div__(self, other):  # pragma: no cover
         return self.__truediv__(other)
 
-    @pyedb_function_handler()
     def __rtruediv__(self, other):  # pragma: no cover
         """Divide another object by this object.
 
@@ -2012,7 +1984,7 @@ class Variable(object):
         return Variable("{}{}".format(result_value, result_units))
 
     # # Python 2.7 version
-    # @pyedb_function_handler()
+    #
     # def __div__(self, other):
     #     return self.__rtruediv__(other)
 
@@ -2056,7 +2028,6 @@ class DataSet(object):
         self.zunit = zunit
         self.vunit = vunit
 
-    @pyedb_function_handler()
     def _args(self):  # pragma: no cover
         """Retrieve arguments."""
         arg = []
@@ -2096,7 +2067,6 @@ class DataSet(object):
         arg.append(arg2)
         return arg
 
-    @pyedb_function_handler()
     def create(self):  # pragma: no cover
         """Create a dataset.
 
@@ -2117,7 +2087,6 @@ class DataSet(object):
             self._app._odesign.AddDataset(self._args())
         return True
 
-    @pyedb_function_handler()
     def add_point(self, x, y, z=None, v=None):  # pragma: no cover
         """Add a point to the dataset.
 
@@ -2151,7 +2120,6 @@ class DataSet(object):
 
         return self.update()
 
-    @pyedb_function_handler()
     def remove_point_from_x(self, x):  # pragma: no cover
         """Remove a point from an X-axis value.
 
@@ -2176,7 +2144,6 @@ class DataSet(object):
         id_to_remove = self.x.index(x)
         return self.remove_point_from_index(id_to_remove)
 
-    @pyedb_function_handler()
     def remove_point_from_index(self, id_to_remove):  # pragma: no cover
         """Remove a point from an index.
 
@@ -2206,7 +2173,6 @@ class DataSet(object):
         self._app.logger.error("cannot Remove {} index.".format(id_to_remove))
         return False
 
-    @pyedb_function_handler()
     def update(self):  # pragma: no cover
         """Update the dataset.
 
@@ -2230,7 +2196,6 @@ class DataSet(object):
             self._app._odesign.EditDataset(self.name, self._args())
         return True
 
-    @pyedb_function_handler()
     def delete(self):  # pragma: no cover
         """Delete the dataset.
 
@@ -2253,7 +2218,6 @@ class DataSet(object):
             del self._app.project_datasets[self.name]
         return True
 
-    @pyedb_function_handler()
     def export(self, dataset_path=None):  # pragma: no cover
         """Export the dataset.