Skip to content

Commit dc7acb7

Browse files
committed
[Matlab] Refactor Group index use
1 parent 504cd4b commit dc7acb7

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

+nix/Group.m

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@
4242
r = nix.Utils.open_entity(obj, 'getDataArray', id_or_name, @nix.DataArray);
4343
end
4444

45-
function r = open_data_array_idx(obj, idx)
45+
function r = open_data_array_idx(obj, index)
46+
idx = nix.Utils.handle_index(index);
4647
r = nix.Utils.open_entity(obj, 'openDataArrayIdx', idx, @nix.DataArray);
4748
end
4849

@@ -82,7 +83,8 @@
8283
r = nix.Utils.open_entity(obj, 'getTag', id_or_name, @nix.Tag);
8384
end
8485

85-
function r = open_tag_idx(obj, idx)
86+
function r = open_tag_idx(obj, index)
87+
idx = nix.Utils.handle_index(index);
8688
r = nix.Utils.open_entity(obj, 'openTagIdx', idx, @nix.Tag);
8789
end
8890

@@ -118,7 +120,8 @@
118120
r = nix.Utils.open_entity(obj, 'getMultiTag', id_or_name, @nix.MultiTag);
119121
end
120122

121-
function r = open_multi_tag_idx(obj, idx)
123+
function r = open_multi_tag_idx(obj, index)
124+
idx = nix.Utils.handle_index(index);
122125
r = nix.Utils.open_entity(obj, 'openMultiTagIdx', idx, @nix.MultiTag);
123126
end
124127

tests/TestGroup.m

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -802,9 +802,9 @@
802802
g.add_data_array(d2);
803803
g.add_data_array(d3);
804804

805-
assert(strcmp(f.blocks{1}.groups{1}.open_data_array_idx(0).name, d1.name));
806-
assert(strcmp(f.blocks{1}.groups{1}.open_data_array_idx(1).name, d2.name));
807-
assert(strcmp(f.blocks{1}.groups{1}.open_data_array_idx(2).name, d3.name));
805+
assert(strcmp(f.blocks{1}.groups{1}.open_data_array_idx(1).name, d1.name));
806+
assert(strcmp(f.blocks{1}.groups{1}.open_data_array_idx(2).name, d2.name));
807+
assert(strcmp(f.blocks{1}.groups{1}.open_data_array_idx(3).name, d3.name));
808808
end
809809

810810
function [] = test_open_tag_idx( varargin )
@@ -819,9 +819,9 @@
819819
g.add_tag(t2);
820820
g.add_tag(t3);
821821

822-
assert(strcmp(f.blocks{1}.groups{1}.open_tag_idx(0).name, t1.name));
823-
assert(strcmp(f.blocks{1}.groups{1}.open_tag_idx(1).name, t2.name));
824-
assert(strcmp(f.blocks{1}.groups{1}.open_tag_idx(2).name, t3.name));
822+
assert(strcmp(f.blocks{1}.groups{1}.open_tag_idx(1).name, t1.name));
823+
assert(strcmp(f.blocks{1}.groups{1}.open_tag_idx(2).name, t2.name));
824+
assert(strcmp(f.blocks{1}.groups{1}.open_tag_idx(3).name, t3.name));
825825
end
826826

827827
function [] = test_open_multi_tag_idx( varargin )
@@ -837,9 +837,9 @@
837837
g.add_multi_tag(t2);
838838
g.add_multi_tag(t3);
839839

840-
assert(strcmp(f.blocks{1}.groups{1}.open_multi_tag_idx(0).name, t1.name));
841-
assert(strcmp(f.blocks{1}.groups{1}.open_multi_tag_idx(1).name, t2.name));
842-
assert(strcmp(f.blocks{1}.groups{1}.open_multi_tag_idx(2).name, t3.name));
840+
assert(strcmp(f.blocks{1}.groups{1}.open_multi_tag_idx(1).name, t1.name));
841+
assert(strcmp(f.blocks{1}.groups{1}.open_multi_tag_idx(2).name, t2.name));
842+
assert(strcmp(f.blocks{1}.groups{1}.open_multi_tag_idx(3).name, t3.name));
843843
end
844844

845845
function [] = test_open_source_idx( varargin )

0 commit comments

Comments
 (0)