Skip to content

Commit b3764df

Browse files
committed
make sure that the name and value columns are always visible in the plto window; fix concatenate with shuffled groups that do not have a channel group source
1 parent 304837c commit b3764df

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

src/asammdf/gui/widgets/tree.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,6 +1839,8 @@ def set_header_columns_visibility(self, visibility):
18391839
col = getattr(self, name, -1)
18401840
if col == -1:
18411841
continue
1842+
elif name in ("NameColumn", "ValueColumn"):
1843+
is_visible = True
18421844

18431845
self.setColumnHidden(col, not is_visible)
18441846

@@ -1847,6 +1849,8 @@ def set_header_sizes(self, sizes):
18471849
col = getattr(self, name, -1)
18481850
if col == -1:
18491851
continue
1852+
elif name in ("NameColumn", "ValueColumn"):
1853+
size = max(size, 50)
18501854

18511855
self.setColumnWidth(col, size)
18521856

src/asammdf/mdf.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3263,9 +3263,14 @@ def concatenate(
32633263
new_group_source = new_group.channel_group.acq_source
32643264
if (
32653265
new_group.channel_group.acq_name == org_group.channel_group.acq_name
3266-
and (new_group_source and org_group_source)
3267-
and new_group_source.name == org_group_source.name
3268-
and new_group_source.path == org_group_source.path
3266+
and (
3267+
((new_group_source and org_group_source)
3268+
and new_group_source.name == org_group_source.name
3269+
and new_group_source.path == org_group_source.path
3270+
)
3271+
or (new_group_source is None and org_group_source is None)
3272+
)
3273+
32693274
and new_group.channel_group.samples_byte_nr
32703275
== org_group.channel_group.samples_byte_nr
32713276
):

0 commit comments

Comments
 (0)