Skip to content

Commit 5b5e39f

Browse files
committed
[Matlab] Consistently use nix.Utils.createEntity
Use function throughout bindings to avoid creating an entity with an empty handle.
1 parent 7d6affc commit 5b5e39f

File tree

7 files changed

+24
-21
lines changed

7 files changed

+24
-21
lines changed

+nix/Block.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
function r = create_group(obj, name, nixtype)
4040
fname = strcat(obj.alias, '::createGroup');
4141
h = nix_mx(fname, obj.nix_handle, name, nixtype);
42-
r = nix.Group(h);
42+
r = nix.Utils.createEntity(h, @nix.Group);
4343
end
4444

4545
function r = has_group(obj, id_or_name)
@@ -105,7 +105,7 @@
105105
else
106106
fname = strcat(obj.alias, '::createDataArray');
107107
h = nix_mx(fname, obj.nix_handle, name, nixtype, lower(datatype.char), shape);
108-
r = nix.DataArray(h);
108+
r = nix.Utils.createEntity(h, @nix.DataArray);
109109
end
110110
end
111111

@@ -228,7 +228,7 @@
228228
function r = create_tag(obj, name, type, position)
229229
fname = strcat(obj.alias, '::createTag');
230230
h = nix_mx(fname, obj.nix_handle, name, type, position);
231-
r = nix.Tag(h);
231+
r = nix.Utils.createEntity(h, @nix.Tag);
232232
end
233233

234234
function r = delete_tag(obj, del)

+nix/DataArray.m

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,14 @@
4343
for i = 1:length(currList)
4444
switch currList(i).dtype
4545
case 'set'
46-
dimensions{i} = nix.SetDimension(currList(i).dimension);
46+
dimensions{i} = nix.Utils.createEntity(currList(i).dimension, ...
47+
@nix.SetDimension);
4748
case 'sample'
48-
dimensions{i} = nix.SampledDimension(currList(i).dimension);
49+
dimensions{i} = nix.Utils.createEntity(currList(i).dimension, ...
50+
@nix.SampledDimension);
4951
case 'range'
50-
dimensions{i} = nix.RangeDimension(currList(i).dimension);
52+
dimensions{i} = nix.Utils.createEntity(currList(i).dimension, ...
53+
@nix.RangeDimension);
5154
otherwise
5255
disp('some dimension type is unknown! skip')
5356
end
@@ -57,25 +60,25 @@
5760
function r = append_set_dimension(obj)
5861
fname = strcat(obj.alias, '::appendSetDimension');
5962
h = nix_mx(fname, obj.nix_handle);
60-
r = nix.SetDimension(h);
63+
r = nix.Utils.createEntity(h, @nix.SetDimension);
6164
end
6265

6366
function r = append_sampled_dimension(obj, interval)
6467
fname = strcat(obj.alias, '::appendSampledDimension');
6568
h = nix_mx(fname, obj.nix_handle, interval);
66-
r = nix.SampledDimension(h);
69+
r = nix.Utils.createEntity(h, @nix.SampledDimension);
6770
end
6871

6972
function r = append_range_dimension(obj, ticks)
7073
fname = strcat(obj.alias, '::appendRangeDimension');
7174
h = nix_mx(fname, obj.nix_handle, ticks);
72-
r = nix.RangeDimension(h);
75+
r = nix.Utils.createEntity(h, @nix.RangeDimension);
7376
end
7477

7578
function r = append_alias_range_dimension(obj)
7679
fname = strcat(obj.alias, '::appendAliasRangeDimension');
7780
h = nix_mx(fname, obj.nix_handle);
78-
r = nix.RangeDimension(h);
81+
r = nix.Utils.createEntity(h, @nix.RangeDimension);
7982
end
8083

8184
function r = open_dimension_idx(obj, idx)
@@ -85,11 +88,11 @@
8588
dim = nix_mx(fname, obj.nix_handle, idx);
8689
switch (dim.dimension_type)
8790
case 'set'
88-
r = nix.SetDimension(dim.handle);
91+
r = nix.Utils.createEntity(dim.handle, @nix.SetDimension);
8992
case 'sampled'
90-
r = nix.SampledDimension(dim.handle);
93+
r = nix.Utils.createEntity(dim.handle, @nix.SampledDimension);
9194
case 'range'
92-
r = nix.RangeDimension(dim.handle);
95+
r = nix.Utils.createEntity(dim.handle, @nix.RangeDimension);
9396
end
9497
end
9598

+nix/Feature.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
function r = open_data(obj)
4242
fname = strcat(obj.alias, '::openData');
4343
h = nix_mx(fname, obj.nix_handle);
44-
r = nix.DataArray(h);
44+
r = nix.Utils.createEntity(h, @nix.DataArray);
4545
end
4646

4747
function [] = set_data(obj, setData)

+nix/File.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
function r = create_block(obj, name, type)
5151
fname = strcat(obj.alias, '::createBlock');
5252
h = nix_mx(fname, obj.nix_handle, name, type);
53-
r = nix.Block(h);
53+
r = nix.Utils.createEntity(h, @nix.Block);
5454
end
5555

5656
function r = block_count(obj)
@@ -90,7 +90,7 @@
9090
function r = create_section(obj, name, type)
9191
fname = strcat(obj.alias, '::createSection');
9292
h = nix_mx(fname, obj.nix_handle, name, type);
93-
r = nix.Section(h);
93+
r = nix.Utils.createEntity(h, @nix.Section);
9494
end
9595

9696
function r = section_count(obj)

+nix/Section.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
function r = create_section(obj, name, type)
6565
fname = strcat(obj.alias, '::createSection');
6666
h = nix_mx(fname, obj.nix_handle, name, type);
67-
r = nix.Section(h);
67+
r = nix.Utils.createEntity(h, @nix.Section);
6868
end
6969

7070
function r = delete_section(obj, del)
@@ -127,7 +127,7 @@
127127
else
128128
fname = strcat(obj.alias, '::createProperty');
129129
h = nix_mx(fname, obj.nix_handle, name, lower(datatype.char));
130-
r = nix.Property(h);
130+
r = nix.Utils.createEntity(h, @nix.Property);
131131
end
132132
end
133133

@@ -137,7 +137,7 @@
137137
end
138138
fname = strcat(obj.alias, '::createPropertyWithValue');
139139
h = nix_mx(fname, obj.nix_handle, name, val);
140-
r = nix.Property(h);
140+
r = nix.Utils.createEntity(h, @nix.Property);
141141
end
142142

143143
function r = delete_property(obj, del)

+nix/Source.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
function r = create_source(obj, name, type)
3636
fname = strcat(obj.alias, '::createSource');
3737
h = nix_mx(fname, obj.nix_handle, name, type);
38-
r = nix.Source(h);
38+
r = nix.Utils.createEntity(h, @nix.Source);
3939
end
4040

4141
function r = has_source(obj, id_or_name)

+nix/Utils.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
function r = createEntityArray(list, objConstructor)
3333
r = cell(length(list), 1);
3434
for i = 1:length(list)
35-
r{i} = objConstructor(list{i});
35+
r{i} = nix.Utils.createEntity(list{i}, objConstructor);
3636
end
3737
end
3838

0 commit comments

Comments
 (0)