Skip to content

Commit cc3c617

Browse files
committed
[Matlab] Consistent use of nix.Utils.add_entity
Consistent use of nix.Utils.add_entity was added to - nix.MultiTag.add_positions - nix.MultiTag.set_extents - nix.Section.set_link
1 parent 5c19040 commit cc3c617

File tree

3 files changed

+15
-22
lines changed

3 files changed

+15
-22
lines changed

+nix/MultiTag.m

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,14 @@
9494
else
9595
addID = add_this;
9696
end
97+
9798
fname = strcat(obj.alias, '::createFeature');
98-
r = nix.Feature(nix_mx(fname, obj.nix_handle, addID, link_type));
99+
h = nix_mx(fname, obj.nix_handle, addID, link_type);
100+
101+
r = {};
102+
if (h ~= 0)
103+
r = nix.Feature(h);
104+
end
99105
end
100106

101107
function r = has_feature(obj, id_or_name)
@@ -155,14 +161,8 @@
155161
end
156162

157163
function [] = add_positions(obj, add_this)
158-
if(strcmp(class(add_this), 'nix.DataArray'))
159-
addID = add_this.id;
160-
else
161-
addID = add_this;
162-
end
163-
164164
fname = strcat(obj.alias, '::addPositions');
165-
nix_mx(fname, obj.nix_handle, addID)
165+
nix.Utils.add_entity(obj, add_this, 'nix.DataArray', fname);
166166
end
167167

168168
% ------------------
@@ -179,13 +179,8 @@
179179
fname = strcat(obj.alias, '::setNoneExtents');
180180
nix_mx(fname, obj.nix_handle, 0);
181181
else
182-
if(strcmp(class(add_this), 'nix.DataArray'))
183-
addID = add_this.id;
184-
else
185-
addID = add_this;
186-
end
187182
fname = strcat(obj.alias, '::setExtents');
188-
nix_mx(fname, obj.nix_handle, addID);
183+
nix.Utils.add_entity(obj, add_this, 'nix.DataArray', fname);
189184
end
190185
end
191186
end

+nix/Section.m

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,8 @@
4242
fname = strcat(obj.alias, '::setNoneLink');
4343
nix_mx(fname, obj.nix_handle);
4444
else
45-
if(strcmp(class(val), 'nix.Section'))
46-
addID = val.id;
47-
else
48-
addID = val;
49-
end
50-
5145
fname = strcat(obj.alias, '::setLink');
52-
nix_mx(fname, obj.nix_handle, addID);
46+
nix.Utils.add_entity(obj, val, 'nix.Section', fname);
5347
end
5448
end
5549

+nix/Tag.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,11 @@
9999

100100
fname = strcat(obj.alias, '::createFeature');
101101
h = nix_mx(fname, obj.nix_handle, addID, link_type);
102-
r = nix.Feature(h);
102+
103+
r = {};
104+
if (h ~= 0)
105+
r = nix.Feature(h);
106+
end
103107
end
104108

105109
function r = has_feature(obj, id_or_name)

0 commit comments

Comments
 (0)