emsutil 0.2.1__tar.gz → 0.2.2__tar.gz

{emsutil-0.2.1 → emsutil-0.2.2}/.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "0.2.1"
+current_version = "0.2.2"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

{emsutil-0.2.1 → emsutil-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: emsutil
-Version: 0.2.1
+Version: 0.2.2
 Summary: Common utilities for Emerge projects EMerge, Optycal and Heavi
 Project-URL: Homepage, https://github.com/FennisRobert/emsutil
 Project-URL: Issues, https://github.com/FennisRobert/emsutil/issues

{emsutil-0.2.1 → emsutil-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ allow-direct-references = true
 
 [project]
 name = "emsutil"
-version = "0.2.1"
+version = "0.2.2"
 description = "Common utilities for Emerge projects EMerge, Optycal and Heavi"
 readme = "README.md"
 requires-python = ">=3.10"

emsutil-0.2.2/src/emsutil/inexport/ffdata.py

@@ -0,0 +1,58 @@
+import numpy as np
+from .strutil import arry_to_line, matrix_to_lines, arry_to_fwl
+from ..emdata import EHFieldFF
+
+def export_ffdata(filename: str, 
+                  thetas: np.ndarray,
+                  phis: np.ndarray,
+                  frequencies: np.ndarray,
+                  fields: list[EHFieldFF],
+                  precision: int = 4) -> None:
+    
+    lines = []
+    lines.append('% Theta (deg)')
+    lines.append(arry_to_line(thetas, precision=precision))
+    lines.append('% Phi (deg)')
+    lines.append(arry_to_line(phis, precision=precision))
+    lines.append('')
+    nF = frequencies.shape[0]
+    
+    actual_frequencies = []
+    blocks = []
+    
+    T, P = np.meshgrid(thetas, phis, indexing='ij')
+    
+    thetal = T.flatten()
+    phil = P.flatten()
+    
+    for iF in range(nF):
+        freq = frequencies[iF]
+        actual_frequencies.append(freq)
+        
+        farfield = fields[iF]._E
+        Fx = farfield[0,:,:].squeeze().flatten()
+        Fy = farfield[1,:,:].squeeze().flatten()
+        Fz = farfield[2,:,:].squeeze().flatten()
+        
+        block_lines = []
+        
+        block_lines.append(f'# {freq} (Hz)')
+        block_lines.append('$ Theta(deg); Phi(deg); E_x[re](V/m); E_x[im](V/m); E_y[re](V/m); E_y[im](V/m); E_z[re](V/m); E_z[im](V/m)')
+        positions = (0, 14, 24, 38, 52, 66, 80, 94)
+        for th, ph, ex, ey, ez in zip(thetal, phil, Fx, Fy, Fz):
+            re_ex = np.real(ex)
+            im_ex = np.imag(ex)
+            re_ey = np.real(ey)
+            im_ey = np.imag(ey)
+            re_ez = np.real(ez)
+            im_ez = np.imag(ez)
+            line_values = np.array([th, ph, re_ex, im_ex, re_ey, im_ey, re_ez, im_ez])
+            line = arry_to_fwl(line_values, positions, precision=precision)
+            block_lines.append(line)
+
+        lines.extend(block_lines)
+        lines.extend('')
+    
+    text = '\n'.join(lines)
+    with open(filename, 'w') as f:
+        f.write(text)

emsutil-0.2.2/src/emsutil/inexport/strutil.py

@@ -0,0 +1,22 @@
+import numpy as np
+
+def arry_to_line(array: np.ndarray, separator: str = ' ', precision: int = 4) -> str:
+    return separator.join([f"{x:.{precision}f}" for x in array.squeeze()])
+
+def arry_to_fwl(array: np.ndarray, start_positions: list[int], precision: int = 4) -> str:
+    # Place the numbers at the starting position indices provided by the start-positions list
+    line_length = max(start_positions) + 10  # Extra space for number
+    line = [' ']*line_length
+    for i, pos in enumerate(start_positions):
+        num_str = f"{array[i]:.{precision}f}"
+        for j, ch in enumerate(num_str):
+            if pos + j < line_length:
+                line[pos + j] = ch
+    return ''.join(line)
+
+def matrix_to_lines(matrix: np.ndarray, separator: str = ',', precision: int = 4) -> str:
+    lines = []
+    for row in matrix:
+        line = arry_to_line(row, separator, precision)
+        lines.append(line)
+    return '\n'.join(lines)

{emsutil-0.2.1 → emsutil-0.2.2}/src/emsutil/pyvista/display.py

@@ -413,7 +413,7 @@ class EMergeDisplay:
             # Turn off directional lighting
             self._plot.remove_all_lights()
         
-        if self.set.theme.draw_pvgrid:
+        if self.set.theme.draw_pvgrid and not self._bwdrawing:
             pv.set_plot_theme('dark')
             bounds = self._bounds
             extra_factor = 0.1
@@ -439,6 +439,10 @@ class EMergeDisplay:
         else:
             self._plot.disable_anti_aliasing()
         self._plot.title = 'EMerge'
+        if self._bwdrawing:
+            self._plot.set_background('white', top='white') # type: ignore
+        else:
+            self._plot.set_background(self.set.theme.backgroung_grad_1, top=self.set.theme.backgroung_grad_2) # type: ignore
             
     def _reset(self):
         self._plot.close()
@@ -1369,7 +1373,7 @@ class EMergeDisplay:
             light.set_direction_angle(*self.set.light_angle) # type: ignore
             self._plot.add_light(light)
 
-        self._plot.set_background(self.set.theme.backgroung_grad_1, top=self.set.theme.backgroung_grad_2) # type: ignore
+        
         self._plot.add_axes(color=self.set.theme.text_color,
                             x_color=col_x,
                             y_color=col_y,

{emsutil-0.2.1 → emsutil-0.2.2}/uv.lock

@@ -279,7 +279,7 @@ wheels = [
 
 [[package]]
 name = "emsutil"
-version = "0.2.1"
+version = "0.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "loguru" },