Merge branch 'main' into fix/set_core_loss_coeff

Author: gmalinve

doc/changelog.d/5927.fixed.md

@@ -0,0 +1 @@
+Reduce number of units call from odesktop

doc/changelog.d/5935.fixed.md

@@ -0,0 +1 @@
+colormap names in folder settings

doc/source/Resources/pyaedt_settings.yaml

@@ -20,7 +20,7 @@ log:
   # Enable or disable the logging of methods' arguments at debug level
   enable_debug_methods_argument_logger: false
   # Enable or disable the logging to the AEDT message window
-  enable_desktop_logs: true
+  enable_desktop_logs: false
   # Enable or disable the logging to a file
   enable_file_logs: true
   # Enable or disable the global PyAEDT log file located in the global temp folder

src/ansys/aedt/core/application/aedt_units.py

@@ -46,6 +46,16 @@ def __init__(self, aedt_object=None):
         self._mass = self._get_model_unit("Mass")
         self._conductance = self._get_model_unit("Conductance")
         self._rescale_model = False
+        self._units_by_system = {}
+
+    def get_unit_by_system(self, unit_system):
+        if unit_system in self._units_by_system:
+            return self._units_by_system[unit_system]
+        val = self._get_model_unit(unit_system)
+        if val:
+            self._units_by_system[unit_system] = val
+            return self._units_by_system[unit_system]
+        return
 
     @property
     def rescale_model(self):
@@ -63,7 +73,10 @@ def rescale_model(self, val):
 
     def _get_model_unit(self, unit_system):
         if self.__app:
-            return self.__app._odesktop.GetDefaultUnit(unit_system)
+            try:
+                return self.__app._odesktop.GetDefaultUnit(unit_system)
+            except Exception:
+                return
 
     @property
     def frequency(self):

src/ansys/aedt/core/application/analysis.py

@@ -2255,16 +2255,10 @@ def value_with_units(
 
         if units is None:
             if units_system == "Length":
-                if "GetModelUnits" in dir(self.oeditor):
-                    units = self.oeditor.GetModelUnits()
-                elif "GetActiveUnits" in dir(self.oeditor):
-                    units = self.oeditor.GetActiveUnits()
-                else:
-                    units = self.odesktop.GetDefaultUnit(units_system)
+                units = self.units.length
             else:
-                try:
-                    units = self.odesktop.GetDefaultUnit(units_system)
-                except Exception:
+                units = self.units.get_unit_by_system(units_system)
+                if not units:
                     self.logger.warning("Defined unit system is incorrect.")
                     units = ""
 

src/ansys/aedt/core/generic/general_methods.py

@@ -201,8 +201,7 @@ def wrapper(*args, **kwargs):
         try:
             settings.time_tick = time.time()
             out = user_function(*args, **kwargs)
-            if settings.enable_debug_logger or settings.enable_debug_edb_logger:
-                _log_method(user_function, args, kwargs)
+            _log_method(user_function, args, kwargs)
             return out
         except MethodNotSupportedError as e:
             message = "This method is not supported in current AEDT design type."
@@ -284,6 +283,8 @@ def check_numeric_equivalence(a, b, relative_tolerance=1e-7):
 
 
 def _log_method(func, new_args, new_kwargs):
+    if not (settings.enable_debug_logger or settings.enable_debug_edb_logger):
+        return
     if not settings.enable_debug_internal_methods_logger and str(func.__name__)[0] == "_":
         return
     if not settings.enable_debug_geometry_operator_logger and "GeometryOperators" in str(func):

src/ansys/aedt/core/generic/settings.py

@@ -144,7 +144,7 @@ def __init__(self):
         # Settings related to logging
         self.__logger: Optional[logging.Logger] = None
         self.__enable_logger: bool = True
-        self.__enable_desktop_logs: bool = True
+        self.__enable_desktop_logs: bool = False
         self.__enable_screen_logs: bool = True
         self.__enable_file_logs: bool = True
         self.__logger_file_path: Optional[str] = None

src/ansys/aedt/core/visualization/post/field_data.py

@@ -156,6 +156,8 @@ def color(self, v):
         """
         if self.map_type == "Spectrum":
             self._validate_color_spectrum(v)
+            if v == "Magenta":
+                v = "Megenta"
             self._color_spectrum = v
         else:
             self._validate_color(v)
@@ -166,9 +168,9 @@ def color(self, v):
 
     @staticmethod
     def _validate_color_spectrum(value):
-        if value not in ["Magenta", "Rainbow", "Temperature", "Gray"]:
+        if value not in ["Magenta", "Rainbow", "Temperature", "Grayscale"]:
             raise ValueError(
-                f"{value} is not valid. Only 'Magenta', 'Rainbow', 'Temperature', and 'Gray' are accepted."
+                f"{value} is not valid. Only 'Magenta', 'Rainbow', 'Temperature', and 'Grayscale' are accepted."
             )
 
     @staticmethod

tests/system/general/test_98_Icepak.py

@@ -1916,7 +1916,7 @@ def test078__folder_settings(self, ipk):
         with pytest.raises(ValueError):
             fs.color_map_settings.color = "Hot"
         assert fs.color_map_settings.color == "Rainbow"
-        fs.color_map_settings.color = "Temperature"
+        fs.color_map_settings.color = "Magenta"
         assert isinstance(fs.color_map_settings.to_dict(), dict)
         assert isinstance(fs.to_dict(), dict)
         fs.update()