Skip to content

Commit e5ef74c

Browse files
committed
[Matlab] Add nix.Utils.fetchEntityCount function
1 parent 8d255a4 commit e5ef74c

File tree

11 files changed

+25
-40
lines changed

11 files changed

+25
-40
lines changed

+nix/Block.m

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
% -----------------
3333

3434
function r = group_count(obj)
35-
fname = strcat(obj.alias, '::groupCount');
36-
r = nix_mx(fname, obj.nix_handle);
35+
r = nix.Utils.fetchEntityCount(obj, 'groupCount');
3736
end
3837

3938
function r = create_group(obj, name, nixtype)
@@ -68,8 +67,7 @@
6867
% -----------------
6968

7069
function r = data_array_count(obj)
71-
fname = strcat(obj.alias, '::dataArrayCount');
72-
r = nix_mx(fname, obj.nix_handle);
70+
r = nix.Utils.fetchEntityCount(obj, 'dataArrayCount');
7371
end
7472

7573
function r = data_array(obj, id_or_name)
@@ -148,8 +146,7 @@
148146
% -----------------
149147

150148
function r = source_count(obj)
151-
fname = strcat(obj.alias, '::sourceCount');
152-
r = nix_mx(fname, obj.nix_handle);
149+
r = nix.Utils.fetchEntityCount(obj, 'sourceCount');
153150
end
154151

155152
function r = create_source(obj, name, type)
@@ -194,8 +191,7 @@
194191
% -----------------
195192

196193
function r = tag_count(obj)
197-
fname = strcat(obj.alias, '::tagCount');
198-
r = nix_mx(fname, obj.nix_handle);
194+
r = nix.Utils.fetchEntityCount(obj, 'tagCount');
199195
end
200196

201197
function r = has_tag(obj, id_or_name)
@@ -230,8 +226,7 @@
230226
% -----------------
231227

232228
function r = multi_tag_count(obj)
233-
fname = strcat(obj.alias, '::multiTagCount');
234-
r = nix_mx(fname, obj.nix_handle);
229+
r = nix.Utils.fetchEntityCount(obj, 'multiTagCount');
235230
end
236231

237232
function r = has_multi_tag(obj, id_or_name)

+nix/DataArray.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@
102102
end
103103

104104
function r = dimension_count(obj)
105-
fname = strcat(obj.alias, '::dimensionCount');
106-
r = nix_mx(fname, obj.nix_handle);
105+
r = nix.Utils.fetchEntityCount(obj, 'dimensionCount');
107106
end
108107

109108
% -----------------

+nix/File.m

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454
end
5555

5656
function r = block_count(obj)
57-
fname = strcat(obj.alias, '::blockCount');
58-
r = nix_mx(fname, obj.nix_handle);
57+
r = nix.Utils.fetchEntityCount(obj, 'blockCount');
5958
end
6059

6160
function r = has_block(obj, id_or_name)
@@ -90,8 +89,7 @@
9089
end
9190

9291
function r = section_count(obj)
93-
fname = strcat(obj.alias, '::sectionCount');
94-
r = nix_mx(fname, obj.nix_handle);
92+
r = nix.Utils.fetchEntityCount(obj, 'sectionCount');
9593
end
9694

9795
function r = has_section(obj, id_or_name)

+nix/Group.m

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
% -----------------
3232

3333
function r = data_array_count(obj)
34-
fname = strcat(obj.alias, '::dataArrayCount');
35-
r = nix_mx(fname, obj.nix_handle);
34+
r = nix.Utils.fetchEntityCount(obj, 'dataArrayCount');
3635
end
3736

3837
function r = has_data_array(obj, id_or_name)
@@ -94,8 +93,7 @@
9493
end
9594

9695
function r = tag_count(obj)
97-
fname = strcat(obj.alias, '::tagCount');
98-
r = nix_mx(fname, obj.nix_handle);
96+
r = nix.Utils.fetchEntityCount(obj, 'tagCount');
9997
end
10098

10199
function r = filter_tags(obj, filter, val)
@@ -132,8 +130,7 @@
132130
end
133131

134132
function r = multi_tag_count(obj)
135-
fname = strcat(obj.alias, '::multiTagCount');
136-
r = nix_mx(fname, obj.nix_handle);
133+
r = nix.Utils.fetchEntityCount(obj, 'multiTagCount');
137134
end
138135

139136
function r = filter_multi_tags(obj, filter, val)

+nix/MultiTag.m

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@
7070
end
7171

7272
function r = reference_count(obj)
73-
fname = strcat(obj.alias, '::referenceCount');
74-
r = nix_mx(fname, obj.nix_handle);
73+
r = nix.Utils.fetchEntityCount(obj, 'referenceCount');
7574
end
7675

7776
function r = filter_references(obj, filter, val)
@@ -119,8 +118,7 @@
119118
end
120119

121120
function r = feature_count(obj)
122-
fname = strcat(obj.alias, '::featureCount');
123-
r = nix_mx(fname, obj.nix_handle);
121+
r = nix.Utils.fetchEntityCount(obj, 'featureCount');
124122
end
125123

126124
function r = filter_features(obj, filter, val)

+nix/Property.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@
5757
end
5858

5959
function r = value_count(obj)
60-
fname = strcat(obj.alias, '::valueCount');
61-
r = nix_mx(fname, obj.nix_handle);
60+
r = nix.Utils.fetchEntityCount(obj, 'valueCount');
6261
end
6362

6463
function [] = values_delete(obj)

+nix/Section.m

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
end
8282

8383
function r = section_count(obj)
84-
fname = strcat(obj.alias, '::sectionCount');
85-
r = nix_mx(fname, obj.nix_handle);
84+
r = nix.Utils.fetchEntityCount(obj, 'sectionCount');
8685
end
8786

8887
function r = filter_sections(obj, filter, val)
@@ -150,8 +149,7 @@
150149
end
151150

152151
function r = property_count(obj)
153-
fname = strcat(obj.alias, '::propertyCount');
154-
r = nix_mx(fname, obj.nix_handle);
152+
r = nix.Utils.fetchEntityCount(obj, 'propertyCount');
155153
end
156154

157155
function r = filter_properties(obj, filter, val)

+nix/Source.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
% ------------------
2929

3030
function r = source_count(obj)
31-
fname = strcat(obj.alias, '::sourceCount');
32-
r = nix_mx(fname, obj.nix_handle);
31+
r = nix.Utils.fetchEntityCount(obj, 'sourceCount');
3332
end
3433

3534
function r = create_source(obj, name, type)

+nix/SourcesMixIn.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
end
2121

2222
function r = source_count(obj)
23-
fname = strcat(obj.alias, '::sourceCount');
24-
r = nix_mx(fname, obj.nix_handle);
23+
r = nix.Utils.fetchEntityCount(obj, 'sourceCount');
2524
end
2625

2726
% has_source supports only check by id, not by name

+nix/Tag.m

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,7 @@
7272
end
7373

7474
function r = reference_count(obj)
75-
fname = strcat(obj.alias, '::referenceCount');
76-
r = nix_mx(fname, obj.nix_handle);
75+
r = nix.Utils.fetchEntityCount(obj, 'referenceCount');
7776
end
7877

7978
function r = filter_references(obj, filter, val)
@@ -121,8 +120,7 @@
121120
end
122121

123122
function r = feature_count(obj)
124-
fname = strcat(obj.alias, '::featureCount');
125-
r = nix_mx(fname, obj.nix_handle);
123+
r = nix.Utils.fetchEntityCount(obj, 'featureCount');
126124
end
127125

128126
function r = filter_features(obj, filter, val)

0 commit comments

Comments
 (0)