Merge branch 'main' into ability_to_connect_components

Author: bryankaylor

src/ansys/aedt/core/emit_core/nodes/emit_node.py

@@ -272,7 +272,7 @@ def _string_to_value_units(value) -> tuple[float, str]:
                 dec_val = float(value[:i])
                 units = value[i:]
                 return dec_val, units
-        raise ValueError(f"{value} are not valid units for this property.")
+        raise ValueError(f"{value} is not valid for this property.")
 
     def _convert_to_internal_units(self, value: float | str, unit_system: str) -> float:
         """Takes a value and converts to internal EMIT units used for storing values.
@@ -365,8 +365,7 @@ def _rename(self, requested_name: str) -> str:
         return new_name
 
     def _duplicate(self, new_name):
-        # TODO (maybe needs to be custom?)
-        pass
+        raise NotImplementedError("This method is not implemented yet.")
 
     def _import(self, file_path: str, import_type: str):
         """Imports a file into an Emit node.

src/ansys/aedt/core/emit_core/nodes/generated/__init__.py

@@ -49,6 +49,17 @@
 from .profile_trace_node import ProfileTraceNode
 from .propagation_loss_coupling_node import PropagationLossCouplingNode
 from .radio_node import RadioNode
+from .result_plot_node import ResultPlotNode
+from .rx_meas_node import RxMeasNode
+from .rx_mixer_product_node import RxMixerProductNode
+from .rx_saturation_node import RxSaturationNode
+from .rx_selectivity_node import RxSelectivityNode
+from .rx_spur_node import RxSpurNode
+from .rx_susceptibility_prof_node import RxSusceptibilityProfNode
+from .sampling_node import SamplingNode
+from .scene_group_node import SceneGroupNode
+from .solution_coupling_node import SolutionCouplingNode
+from .solutions_node import SolutionsNode
 from .terminator import Terminator
 from .top_level_simulation import TopLevelSimulation
 from .touchstone_coupling_node import TouchstoneCouplingNode

src/ansys/aedt/core/emit_core/results/results.py

@@ -81,16 +81,14 @@ def _add_revision(self, name=None):
         """
         self.aedt_version = int(self.emit_project.aedt_version_id[-3:])
         if self.aedt_version > 251 and name is None:
-            # Return the current revision. Only create it if it isn't already there.
             current_revision = None
             current_revisions = [revision for revision in self.revisions if revision.name == "Current"]
-            # Do we need to delete the existing Current revisions? Or can we just return it?
+
+            # Remove existing Current revisions
             for revision in current_revisions:
                 self.delete_revision("Current")
-            # if len(current_revisions) > 0:
-            #     current_revision = current_revisions[0]
-            #     current_revision._load_revision()
-            #     # current_revision.revision_loaded = True
+
+            # Create and return an updated Current revision
             current_revision = Revision(self, self.emit_project, name)
             self.revisions.append(current_revision)
             return current_revision

src/ansys/aedt/core/emit_core/results/revision.py

@@ -113,9 +113,6 @@ def __init__(self, parent_results, emit_obj, name=None):
 
                 self.name = name
                 """Name of the revision."""
-
-            # Get the SimulationNodeID for the specified result
-            # self._sim_node_id = self._emit_com.GetTopLevelNodeID(self.results_index, "Simulation")
         else:
             if not name:
                 name = emit_obj.odesign.GetCurrentResult()

src/ansys/aedt/core/modeler/circuits/primitives_emit.py

@@ -447,9 +447,6 @@ def __init__(self, components, component_name):
         self.root_prop_node = None
         """Root node of the component."""
 
-        self.units = components._parent.get_units()
-        """Units for the component."""
-
     @property
     def composed_name(self):
         """Component name. Needed for compatibility."""
@@ -745,7 +742,7 @@ def get_position(self, units=""):
 
         # Check the units specified are a valid EMIT length
         if not units or units not in emit_consts.EMIT_VALID_UNITS["Length"]:
-            units = self.units["Length"]
+            units = "meter"
         position = (
             consts.unit_converter(float(parts[0]), "Length", "meter", units),
             consts.unit_converter(float(parts[1]), "Length", "meter", units),
@@ -817,14 +814,14 @@ def band_start_frequency(self, band_node, units=""):
         ----------
         band_node : Instance of the band node.
         units : str, optional
-            If ``None`` specified, global units are used.
+            If ``None`` specified, SI units (Hz) are used.
 
         Returns
         -------
         Float
             Start frequency of the band node."""
         if not units or units not in emit_consts.EMIT_VALID_UNITS["Frequency"]:
-            units = self.units["Frequency"]
+            units = "Hz"
         return consts.unit_converter(float(band_node.props["StartFrequency"]), "Freq", "Hz", units)
 
     def band_stop_frequency(self, band_node, units=""):
@@ -834,14 +831,14 @@ def band_stop_frequency(self, band_node, units=""):
         ----------
         band_node : Instance of the band node.
         units : str, optional
-            If ``None`` specified, global units are used.
+            If ``None`` specified, SI units (Hz) are used.
 
         Returns
         -------
         Float
             Stop frequency of the band node."""
         if not units or units not in emit_consts.EMIT_VALID_UNITS["Frequency"]:
-            units = self.units["Frequency"]
+            units = "Hz"
         return consts.unit_converter(float(band_node.props["StopFrequency"]), "Freq", "Hz", units)
 
     def set_band_start_frequency(self, band_node, band_start_freq, units=""):
@@ -934,69 +931,21 @@ def set_band_stop_frequency(self, band_node, band_stop_freq, units=""):
         prop_list = {"StopFrequency": freq_string}
         band_node._set_prop_value(prop_list)
 
-    # def duplicate_band(self, band_node_to_duplicate):
-    #     """
-    #     [Incomplete 10/19/2023]
-    #     Parameters
-    #     ----------
-    #     band_node_to_duplicate
-    #
-    #     Returns
-    #     -------
-    #
-    #     """
-    #     # append number to the name of the band to duplicate.
-    #     print('Duplicating...')
-    #
-    #
-    #     # return band node
-    # def convert_channels_to_multi_bands(self, band_node):
-    #     """
-    #     [Incomplete 10/19/2023]
-    #     Parameters
-    #     ----------
-    #     band_node
-    #
-    #     Returns
-    #     -------
-    #
-    #     """
-    #     # get the channels. Say returns 10 channels in the band_node
-    #     # Name = r.bands()[0].children[0].props['Name']
-    #     # band_node.props['Name']
-    #     # Start = r.bands()[0].props['StartFrequency']
-    #     band_start_frequency = float(band_node.props['StartFrequency'])
-    #     # Stop = r.bands()[0].props['StopFrequency']
-    #     band_stop_frequency = float(band_node.props['StopFrequency'])
-    #     # Spacing = r.bands()[0].props['ChannelSpacing']
-    #     channel_spacing = float(band_node.props['ChannelSpacing'])
-    #     # for each channel
-    #     # 1) create a band (duplicate original one)
-    #     # 2) set band start and stop frequencies
-    #     for channel in list(range(int(band_start_frequency), int(band_stop_frequency), int(channel_spacing))):
-    #         baby_band_start = channel
-    #         baby_band_stop = channel+channel_spacing
-    #         baby_band_node = self.duplicate_band(band_node) # return band name or some handle to it
-    #         self.set_band_start_frequency(baby_band_node, baby_band_start)
-    #         self.set_band_stop_frequency(baby_band_node, baby_band_stop)
-    #         # set start and stop freq for that band name
-    #     # to be
-
     def band_channel_bandwidth(self, band_node, units=""):
         """Get the channel bandwidth of the band node.
 
         Parameters
         ----------
         band_node : Instance of the band node.
         units : str, optional
-            If ``None`` specified, global units are used.
+            If ``None`` specified, SI units (Hz) are used.
 
         Returns
         -------
         Float
             Channel bandwidth of the band node."""
         if not units or units not in emit_consts.EMIT_VALID_UNITS["Frequency"]:
-            units = self.units["Frequency"]
+            units = "Hz"
         return consts.unit_converter(float(band_node.props["ChannelBandwidth"]), "Freq", "Hz", units)
 
     def band_tx_power(self, band_node, units=""):
@@ -1006,14 +955,15 @@ def band_tx_power(self, band_node, units=""):
         ----------
         band_node : Instance of the band node.
         units : str
-            Units to use for the tx power.
+            Units to use for the tx power. If none specified,
+            SI units (W) are used
 
         Returns
         -------
         Float
             Transmit power of the band node."""
         if not units or units not in emit_consts.EMIT_VALID_UNITS["Power"]:
-            units = self.units["Power"]
+            units = "W"
         for child in band_node.children:
             if child.props["Type"] == "TxSpectralProfNode":
                 return consts.unit_converter(float(child.props["FundamentalAmplitude"]), "Power", "dBm", units)
@@ -1142,7 +1092,7 @@ def set_band_power_level(self, power, units=""):
         power : float
             Peak amplitude of the fundamental [dBm].
         units : str, optional
-            Units of the input power. If None specified, global units are used.
+            Units of the input power. If None specified, SI units (W) are used.
 
         Return
         ------
@@ -1170,7 +1120,7 @@ def get_band_power_level(self, units=""):
         Parameters
         ----------
         units : str, optional
-            Units to use for the power. If None specified, global units are used.
+            Units to use for the power. If None specified, SI units (W) are used.
 
         Return
         ------
@@ -1181,7 +1131,7 @@ def get_band_power_level(self, units=""):
             raise TypeError(f"{self.node_name} must be a band.")
         # Power is stored in dBm, convert to desired units
         if not units or units not in emit_consts.EMIT_VALID_UNITS["Power"]:
-            units = self.parent_component.units["Power"]
+            units = "W"
         for child in self.children:
             if child.props["Type"] == "TxSpectralProfNode":
                 power = child.props["FundamentalAmplitude"]