diff --git a/src/asammdf/gui/widgets/channel_group_info.py b/src/asammdf/gui/widgets/channel_group_info.py index 90961ff8a..547865c37 100644 --- a/src/asammdf/gui/widgets/channel_group_info.py +++ b/src/asammdf/gui/widgets/channel_group_info.py @@ -79,7 +79,8 @@ def _display(self, position): record_count = record_end - record_offset data = b"".join( - e[0] for e in self.mdf._load_data(self.group, record_offset=record_offset, record_count=record_count) + fragment.data + for fragment in self.mdf._load_data(self.group, record_offset=record_offset, record_count=record_count) ) data = pd.Series(list(np.frombuffer(data, dtype=f"({self.record_size},)u1"))) diff --git a/src/asammdf/gui/widgets/file.py b/src/asammdf/gui/widgets/file.py index 8abce53ee..3cb0db7c0 100644 --- a/src/asammdf/gui/widgets/file.py +++ b/src/asammdf/gui/widgets/file.py @@ -1268,7 +1268,7 @@ def load_channel_list(self, event=None, file_name=None, manually=False, show_pro self.functions.update(info.get("functions", {})) self.global_variables = f'{self.global_variables}\n{info.get("global_variables", "")}' - self.global_variables = '\n'.join([line for line in self.global_variables.splitlines() if line]) + self.global_variables = "\n".join([line for line in self.global_variables.splitlines() if line]) if channels: iterator = QtWidgets.QTreeWidgetItemIterator(self.channels_tree) diff --git a/src/asammdf/mdf.py b/src/asammdf/mdf.py index 2f8cae7a7..1ce75b35f 100644 --- a/src/asammdf/mdf.py +++ b/src/asammdf/mdf.py @@ -203,6 +203,11 @@ class MDF: .. versionadded:: 7.0.0 + process_bus_logging (\*\*kwargs) : bool + controls if the bus processing of MDF v4 files is done when the file is loaded. Default True + + .. versionadded:: 8.0.0 + Examples -------- >>> mdf = MDF(version='3.30') # new MDF object with version 3.30 @@ -2245,6 +2250,11 @@ def concatenate( use_display_names (False) : bool + process_bus_logging (True) : bool + controls if the bus processing of MDF v4 files is done when the file is loaded. Default True + + .. versionadded:: 8.1.0 + Examples -------- >>> conc = MDF.concatenate( @@ -2646,7 +2656,8 @@ def concatenate( first_mdf.close() try: - merged._process_bus_logging() + if kwargs.get("process_bus_logging", True): + merged._process_bus_logging() except: pass @@ -2680,6 +2691,11 @@ def stack( use_display_names (False) : bool + process_bus_logging (True) : bool + controls if the bus processing of MDF v4 files is done when the file is loaded. Default True + + .. versionadded:: 8.1.0 + Examples -------- >>> stacked = MDF.stack( @@ -2834,7 +2850,8 @@ def stack( return TERMINATED try: - stacked._process_bus_logging() + if kwargs.get("process_bus_logging", True): + stacked._process_bus_logging() except: pass