oscura 0.8.0__py3-none-any.whl → 0.11.0__py3-none-any.whl

oscura/hardware/acquisition/file.py

@@ -165,19 +165,12 @@ class FileSource:
             from oscura.core.types import IQTrace
 
             # Get sample count based on trace type
-            if isinstance(trace, IQTrace):
-                n_samples = len(trace.i_data)
-            else:
-                n_samples = len(trace.data)
+            n_samples = len(trace.data)
 
             for start in range(0, n_samples, chunk_size):
                 end = min(start + chunk_size, n_samples)
                 # Create chunk trace with sliced data
-                if isinstance(trace, IQTrace):
-                    # IQTrace doesn't have .data attribute
-                    chunk_data = None  # Will be handled separately below
-                else:
-                    chunk_data = trace.data[start:end]
+                chunk_data = trace.data[start:end]
 
                 # Import here to avoid circular dependency
                 from oscura.core.types import (
@@ -191,11 +184,7 @@ class FileSource:
                     sample_rate=trace.metadata.sample_rate,
                     vertical_scale=trace.metadata.vertical_scale,
                     vertical_offset=trace.metadata.vertical_offset,
-                    acquisition_time=trace.metadata.acquisition_time,
-                    trigger_info=trace.metadata.trigger_info,
-                    source_file=str(self.path),
-                    channel_name=trace.metadata.channel_name,
-                    calibration_info=trace.metadata.calibration_info,
+                    channel=trace.metadata.channel,
                 )
 
                 if isinstance(trace, WaveformTrace):
@@ -206,12 +195,9 @@ class FileSource:
                         metadata=chunk_metadata,
                     )
                 elif isinstance(trace, IQTrace):
-                    # Handle I/Q separately
-                    chunk_i = trace.i_data[start:end]
-                    chunk_q = trace.q_data[start:end]
+                    # Handle I/Q complex data
                     yield IQTrace(
-                        i_data=chunk_i,
-                        q_data=chunk_q,
+                        data=chunk_data,  # type: ignore[arg-type]
                         metadata=chunk_metadata,
                     )
 

oscura/hardware/acquisition/saleae.py

@@ -50,7 +50,7 @@ from typing import TYPE_CHECKING, Any
 try:
     import saleae
 except ImportError:
-    saleae = None  # type: ignore[assignment]
+    saleae = None
 
 if TYPE_CHECKING:
     from oscura.core.types import Trace
@@ -206,7 +206,7 @@ class SaleaeSource:
 
         from oscura.core.types import DigitalTrace, TraceMetadata, WaveformTrace
 
-        acquisition_start = datetime.now()
+        acquisition_time = datetime.now()
 
         # Start capture
         self.saleae.capture_start()
@@ -223,11 +223,15 @@ class SaleaeSource:
 
         n_samples = int(self.sample_rate * self.duration)
 
+        # Format channel list for display
+        channel_list = self.digital_channels or self.analog_channels
+        source_file = f"saleae://{self.device_id}" if self.device_id else "saleae://unknown"
+
         metadata = TraceMetadata(
             sample_rate=self.sample_rate,
-            acquisition_time=acquisition_start,
-            source_file=f"saleae://{self.device_id or 'auto'}",
-            channel_name=f"Saleae Ch{self.digital_channels or self.analog_channels}",
+            channel=f"Saleae Ch{channel_list}",
+            source_file=source_file,
+            acquisition_time=acquisition_time,
         )
 
         if self.digital_channels:
@@ -289,11 +293,7 @@ class SaleaeSource:
                 sample_rate=full_trace.metadata.sample_rate,
                 vertical_scale=full_trace.metadata.vertical_scale,
                 vertical_offset=full_trace.metadata.vertical_offset,
-                acquisition_time=full_trace.metadata.acquisition_time,
-                trigger_info=full_trace.metadata.trigger_info,
-                source_file=full_trace.metadata.source_file,
-                channel_name=full_trace.metadata.channel_name,
-                calibration_info=full_trace.metadata.calibration_info,
+                channel=full_trace.metadata.channel,
             )
 
             if isinstance(full_trace, DigitalTrace):

oscura/hardware/acquisition/socketcan.py

@@ -172,8 +172,7 @@ class SocketCANSource:
             metadata = TraceMetadata(
                 sample_rate=1.0,  # Placeholder
                 acquisition_time=acquisition_start,
-                source_file=f"socketcan://{self.interface}",
-                channel_name=f"CAN {self.interface}",
+                channel=f"CAN {self.interface}",
             )
             return DigitalTrace(data=np.array([], dtype=np.uint8), metadata=metadata)
 
@@ -189,7 +188,7 @@ class SocketCANSource:
             sample_rate=effective_rate,
             acquisition_time=acquisition_start,
             source_file=f"socketcan://{self.interface}",
-            channel_name=f"CAN {self.interface}",
+            channel=f"CAN {self.interface}",
         )
 
         # Store CAN IDs as digital data
@@ -249,7 +248,7 @@ class SocketCANSource:
                         sample_rate=effective_rate,
                         acquisition_time=acquisition_start,
                         source_file=f"socketcan://{self.interface}",
-                        channel_name=f"CAN {self.interface}",
+                        channel=f"CAN {self.interface}",
                     )
 
                     data_bytes = can_ids.view(np.uint8)
@@ -268,8 +267,7 @@ class SocketCANSource:
             metadata = TraceMetadata(
                 sample_rate=effective_rate,
                 acquisition_time=acquisition_start,
-                source_file=f"socketcan://{self.interface}",
-                channel_name=f"CAN {self.interface}",
+                channel=f"CAN {self.interface}",
             )
 
             data_bytes = can_ids.view(np.uint8)

oscura/hardware/acquisition/synthetic.py

@@ -176,11 +176,7 @@ class SyntheticSource:
                 sample_rate=trace.metadata.sample_rate,
                 vertical_scale=trace.metadata.vertical_scale,
                 vertical_offset=trace.metadata.vertical_offset,
-                acquisition_time=trace.metadata.acquisition_time,
-                trigger_info=trace.metadata.trigger_info,
-                source_file=trace.metadata.source_file,
-                channel_name=trace.metadata.channel_name,
-                calibration_info=trace.metadata.calibration_info,
+                channel=trace.metadata.channel,
             )
 
             if isinstance(trace, DigitalTrace):

oscura/hardware/acquisition/visa.py

@@ -256,7 +256,7 @@ class VISASource:
         if channel is None:
             channel = self.channels[0]
 
-        acquisition_start = datetime.now()
+        acquisition_time = datetime.now()
 
         try:
             # Single acquisition
@@ -296,7 +296,7 @@ class VISASource:
             except Exception:
                 idn = "Unknown Instrument"
 
-            calibration_info = CalibrationInfo(
+            calibration = CalibrationInfo(
                 instrument=idn,
                 coupling="DC",  # Default
                 vertical_resolution=8,  # Typical for oscilloscopes
@@ -305,10 +305,10 @@ class VISASource:
             metadata = TraceMetadata(
                 sample_rate=sample_rate,
                 vertical_scale=self.vertical_scale,
-                acquisition_time=acquisition_start,
-                source_file=f"visa://{self.resource}",
-                channel_name=f"CH{channel}",
-                calibration_info=calibration_info,
+                channel=f"CH{channel}",
+                source_file=f"visa://{self.resource}" if self.resource else "visa://unknown",
+                acquisition_time=acquisition_time,
+                calibration=calibration,
             )
 
             return WaveformTrace(data=data, metadata=metadata)