Skip to content

Commit 8d255a4

Browse files
mpsonntagmpsonntag
committed
[Matlab] Refactor nix.Utils functions
- consolidate function arguments - move mxMethod name concatenation to Utils functions
1 parent 5b5e39f commit 8d255a4

File tree

11 files changed

+133
-228
lines changed

11 files changed

+133
-228
lines changed

‎+nix/Block.m‎

Lines changed: 24 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,19 @@
4848
end
4949

5050
function r = get_group(obj, id_or_name)
51-
fname = strcat(obj.alias, '::getGroup');
52-
r = nix.Utils.open_entity(obj, fname, id_or_name, @nix.Group);
51+
r = nix.Utils.open_entity(obj, 'getGroup', id_or_name, @nix.Group);
5352
end
5453

5554
function r = open_group_idx(obj, idx)
56-
fname = strcat(obj.alias, '::openGroupIdx');
57-
r = nix.Utils.open_entity(obj, fname, idx, @nix.Group);
55+
r = nix.Utils.open_entity(obj, 'openGroupIdx', idx, @nix.Group);
5856
end
5957

60-
function r = delete_group(obj, del)
61-
fname = strcat(obj.alias, '::deleteGroup');
62-
r = nix.Utils.delete_entity(obj, del, 'nix.Group', fname);
58+
function r = delete_group(obj, idNameEntity)
59+
r = nix.Utils.delete_entity(obj, 'deleteGroup', idNameEntity, 'nix.Group');
6360
end
6461

6562
function r = filter_groups(obj, filter, val)
66-
fname = strcat(obj.alias, '::groupsFiltered');
67-
r = nix.Utils.filter(obj, filter, val, fname, @nix.Group);
63+
r = nix.Utils.filter(obj, 'groupsFiltered', filter, val, @nix.Group);
6864
end
6965

7066
% -----------------
@@ -77,13 +73,11 @@
7773
end
7874

7975
function r = data_array(obj, id_or_name)
80-
fname = strcat(obj.alias, '::openDataArray');
81-
r = nix.Utils.open_entity(obj, fname, id_or_name, @nix.DataArray);
76+
r = nix.Utils.open_entity(obj, 'openDataArray', id_or_name, @nix.DataArray);
8277
end
8378

8479
function r = open_data_array_idx(obj, idx)
85-
fname = strcat(obj.alias, '::openDataArrayIdx');
86-
r = nix.Utils.open_entity(obj, fname, idx, @nix.DataArray);
80+
r = nix.Utils.open_entity(obj, 'openDataArrayIdx', idx, @nix.DataArray);
8781
end
8882

8983
function r = create_data_array(obj, name, nixtype, datatype, shape)
@@ -142,13 +136,11 @@
142136
end
143137

144138
function r = delete_data_array(obj, del)
145-
fname = strcat(obj.alias, '::deleteDataArray');
146-
r = nix.Utils.delete_entity(obj, del, 'nix.DataArray', fname);
139+
r = nix.Utils.delete_entity(obj, 'deleteDataArray', del, 'nix.DataArray');
147140
end
148141

149142
function r = filter_data_arrays(obj, filter, val)
150-
fname = strcat(obj.alias, '::dataArraysFiltered');
151-
r = nix.Utils.filter(obj, filter, val, fname, @nix.DataArray);
143+
r = nix.Utils.filter(obj, 'dataArraysFiltered', filter, val, @nix.DataArray);
152144
end
153145

154146
% -----------------
@@ -162,7 +154,8 @@
162154

163155
function r = create_source(obj, name, type)
164156
fname = strcat(obj.alias, '::createSource');
165-
r = nix.Source(nix_mx(fname, obj.nix_handle, name, type));
157+
h = nix_mx(fname, obj.nix_handle, name, type);
158+
r = nix.Utils.createEntity(h, @nix.Source);
166159
end
167160

168161
function r = has_source(obj, id_or_name)
@@ -171,23 +164,19 @@
171164
end
172165

173166
function r = delete_source(obj, del)
174-
fname = strcat(obj.alias, '::deleteSource');
175-
r = nix.Utils.delete_entity(obj, del, 'nix.Source', fname);
167+
r = nix.Utils.delete_entity(obj, 'deleteSource', del, 'nix.Source');
176168
end
177169

178170
function r = open_source(obj, id_or_name)
179-
fname = strcat(obj.alias, '::openSource');
180-
r = nix.Utils.open_entity(obj, fname, id_or_name, @nix.Source);
171+
r = nix.Utils.open_entity(obj, 'openSource', id_or_name, @nix.Source);
181172
end
182173

183174
function r = open_source_idx(obj, idx)
184-
fname = strcat(obj.alias, '::openSourceIdx');
185-
r = nix.Utils.open_entity(obj, fname, idx, @nix.Source);
175+
r = nix.Utils.open_entity(obj, 'openSourceIdx', idx, @nix.Source);
186176
end
187177

188178
function r = filter_sources(obj, filter, val)
189-
fname = strcat(obj.alias, '::sourcesFiltered');
190-
r = nix.Utils.filter(obj, filter, val, fname, @nix.Source);
179+
r = nix.Utils.filter(obj, 'sourcesFiltered', filter, val, @nix.Source);
191180
end
192181

193182
% maxdepth is an index
@@ -197,8 +186,7 @@
197186

198187
% maxdepth is an index
199188
function r = find_filtered_sources(obj, max_depth, filter, val)
200-
fname = strcat(obj.alias, '::findSources');
201-
r = nix.Utils.find(obj, max_depth, filter, val, fname, @nix.Source);
189+
r = nix.Utils.find(obj, 'findSources', max_depth, filter, val, @nix.Source);
202190
end
203191

204192
% -----------------
@@ -216,13 +204,11 @@
216204
end
217205

218206
function r = open_tag(obj, id_or_name)
219-
fname = strcat(obj.alias, '::openTag');
220-
r = nix.Utils.open_entity(obj, fname, id_or_name, @nix.Tag);
207+
r = nix.Utils.open_entity(obj, 'openTag', id_or_name, @nix.Tag);
221208
end
222209

223210
function r = open_tag_idx(obj, idx)
224-
fname = strcat(obj.alias, '::openTagIdx');
225-
r = nix.Utils.open_entity(obj, fname, idx, @nix.Tag);
211+
r = nix.Utils.open_entity(obj, 'openTagIdx', idx, @nix.Tag);
226212
end
227213

228214
function r = create_tag(obj, name, type, position)
@@ -232,13 +218,11 @@
232218
end
233219

234220
function r = delete_tag(obj, del)
235-
fname = strcat(obj.alias, '::deleteTag');
236-
r = nix.Utils.delete_entity(obj, del, 'nix.Tag', fname);
221+
r = nix.Utils.delete_entity(obj, 'deleteTag', del, 'nix.Tag');
237222
end
238223

239224
function r = filter_tags(obj, filter, val)
240-
fname = strcat(obj.alias, '::tagsFiltered');
241-
r = nix.Utils.filter(obj, filter, val, fname, @nix.Tag);
225+
r = nix.Utils.filter(obj, 'tagsFiltered', filter, val, @nix.Tag);
242226
end
243227

244228
% -----------------
@@ -256,13 +240,11 @@
256240
end
257241

258242
function r = open_multi_tag(obj, id_or_name)
259-
fname = strcat(obj.alias, '::openMultiTag');
260-
r = nix.Utils.open_entity(obj, fname, id_or_name, @nix.MultiTag);
243+
r = nix.Utils.open_entity(obj, 'openMultiTag', id_or_name, @nix.MultiTag);
261244
end
262245

263246
function r = open_multi_tag_idx(obj, idx)
264-
fname = strcat(obj.alias, '::openMultiTagIdx');
265-
r = nix.Utils.open_entity(obj, fname, idx, @nix.MultiTag);
247+
r = nix.Utils.open_entity(obj, 'openMultiTagIdx', idx, @nix.MultiTag);
266248
end
267249

268250
%-- Creating a multitag requires an already existing data array
@@ -274,13 +256,11 @@
274256
end
275257

276258
function r = delete_multi_tag(obj, del)
277-
fname = strcat(obj.alias, '::deleteMultiTag');
278-
r = nix.Utils.delete_entity(obj, del, 'nix.MultiTag', fname);
259+
r = nix.Utils.delete_entity(obj, 'deleteMultiTag', del, 'nix.MultiTag');
279260
end
280261

281262
function r = filter_multi_tags(obj, filter, val)
282-
fname = strcat(obj.alias, '::multiTagsFiltered');
283-
r = nix.Utils.filter(obj, filter, val, fname, @nix.MultiTag);
263+
r = nix.Utils.filter(obj, 'multiTagsFiltered', filter, val, @nix.MultiTag);
284264
end
285265
end
286266

‎+nix/Dynamic.m‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@ function add_dyn_relation(obj, name, constructor)
6767
rel_map.Hidden = true;
6868

6969
function val = get_method(obj)
70-
obj.(dataAttr) = nix.Utils.fetchObjList(...
71-
strcat(obj.alias, '::', name), obj.nix_handle, ...
72-
constructor);
70+
obj.(dataAttr) = nix.Utils.fetchObjList(obj, name, constructor);
7371
val = obj.(dataAttr);
7472
end
7573

‎+nix/File.m‎

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,19 @@
6464
end
6565

6666
function r = open_block(obj, id_or_name)
67-
fname = strcat(obj.alias, '::openBlock');
68-
r = nix.Utils.open_entity(obj, fname, id_or_name, @nix.Block);
67+
r = nix.Utils.open_entity(obj, 'openBlock', id_or_name, @nix.Block);
6968
end
7069

7170
function r = open_block_idx(obj, idx)
72-
fname = strcat(obj.alias, '::openBlockIdx');
73-
r = nix.Utils.open_entity(obj, fname, idx, @nix.Block);
71+
r = nix.Utils.open_entity(obj, 'openBlockIdx', idx, @nix.Block);
7472
end
7573

7674
function r = delete_block(obj, del)
77-
fname = strcat(obj.alias, '::deleteBlock');
78-
r = nix.Utils.delete_entity(obj, del, 'nix.Block', fname);
75+
r = nix.Utils.delete_entity(obj, 'deleteBlock', del, 'nix.Block');
7976
end
8077

8178
function r = filter_blocks(obj, filter, val)
82-
fname = strcat(obj.alias, '::blocksFiltered');
83-
r = nix.Utils.filter(obj, filter, val, fname, @nix.Block);
79+
r = nix.Utils.filter(obj, 'blocksFiltered', filter, val, @nix.Block);
8480
end
8581

8682
% ----------------
@@ -104,23 +100,19 @@
104100
end
105101

106102
function r = open_section(obj, id_or_name)
107-
fname = strcat(obj.alias, '::openSection');
108-
r = nix.Utils.open_entity(obj, fname, id_or_name, @nix.Section);
103+
r = nix.Utils.open_entity(obj, 'openSection', id_or_name, @nix.Section);
109104
end
110105

111106
function r = open_section_idx(obj, idx)
112-
fname = strcat(obj.alias, '::openSectionIdx');
113-
r = nix.Utils.open_entity(obj, fname, idx, @nix.Section);
107+
r = nix.Utils.open_entity(obj, 'openSectionIdx', idx, @nix.Section);
114108
end
115109

116110
function r = delete_section(obj, del)
117-
fname = strcat(obj.alias, '::deleteSection');
118-
r = nix.Utils.delete_entity(obj, del, 'nix.Section', fname);
111+
r = nix.Utils.delete_entity(obj, 'deleteSection', del, 'nix.Section');
119112
end
120113

121114
function r = filter_sections(obj, filter, val)
122-
fname = strcat(obj.alias, '::sectionsFiltered');
123-
r = nix.Utils.filter(obj, filter, val, fname, @nix.Section);
115+
r = nix.Utils.filter(obj, 'sectionsFiltered', filter, val, @nix.Section);
124116
end
125117

126118
% maxdepth is an index
@@ -130,8 +122,7 @@
130122

131123
% maxdepth is an index
132124
function r = find_filtered_sections(obj, max_depth, filter, val)
133-
fname = strcat(obj.alias, '::findSections');
134-
r = nix.Utils.find(obj, max_depth, filter, val, fname, @nix.Section);
125+
r = nix.Utils.find(obj, 'findSections', max_depth, filter, val, @nix.Section);
135126
end
136127
end
137128

‎+nix/Group.m‎

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -41,47 +41,39 @@
4141
end
4242

4343
function r = get_data_array(obj, id_or_name)
44-
fname = strcat(obj.alias, '::getDataArray');
45-
r = nix.Utils.open_entity(obj, fname, id_or_name, @nix.DataArray);
44+
r = nix.Utils.open_entity(obj, 'getDataArray', id_or_name, @nix.DataArray);
4645
end
4746

4847
function r = open_data_array_idx(obj, idx)
49-
fname = strcat(obj.alias, '::openDataArrayIdx');
50-
r = nix.Utils.open_entity(obj, fname, idx, @nix.DataArray);
48+
r = nix.Utils.open_entity(obj, 'openDataArrayIdx', idx, @nix.DataArray);
5149
end
5250

5351
function [] = add_data_array(obj, add_this)
54-
fname = strcat(obj.alias, '::addDataArray');
55-
nix.Utils.add_entity(obj, add_this, 'nix.DataArray', fname);
52+
nix.Utils.add_entity(obj, 'addDataArray', add_this, 'nix.DataArray');
5653
end
5754

5855
function [] = add_data_arrays(obj, add_cell_array)
59-
fname = strcat(obj.alias, '::addDataArrays');
60-
nix.Utils.add_entity_array(obj, add_cell_array, 'nix.DataArray', fname);
56+
nix.Utils.add_entity_array(obj, 'addDataArrays', add_cell_array, 'nix.DataArray');
6157
end
6258

6359
function r = remove_data_array(obj, del)
64-
fname = strcat(obj.alias, '::removeDataArray');
65-
r = nix.Utils.delete_entity(obj, del, 'nix.DataArray', fname);
60+
r = nix.Utils.delete_entity(obj, 'removeDataArray', del, 'nix.DataArray');
6661
end
6762

6863
function r = filter_data_arrays(obj, filter, val)
69-
fname = strcat(obj.alias, '::dataArraysFiltered');
70-
r = nix.Utils.filter(obj, filter, val, fname, @nix.DataArray);
64+
r = nix.Utils.filter(obj, 'dataArraysFiltered', filter, val, @nix.DataArray);
7165
end
7266

7367
% -----------------
7468
% Tags methods
7569
% -----------------
7670

7771
function [] = add_tag(obj, add_this)
78-
fname = strcat(obj.alias, '::addTag');
79-
nix.Utils.add_entity(obj, add_this, 'nix.Tag', fname);
72+
nix.Utils.add_entity(obj, 'addTag', add_this, 'nix.Tag');
8073
end
8174

8275
function [] = add_tags(obj, add_cell_array)
83-
fname = strcat(obj.alias, '::addTags');
84-
nix.Utils.add_entity_array(obj, add_cell_array, 'nix.Tag', fname);
76+
nix.Utils.add_entity_array(obj, 'addTags', add_cell_array, 'nix.Tag');
8577
end
8678

8779
function r = has_tag(obj, id_or_name)
@@ -90,18 +82,15 @@
9082
end
9183

9284
function r = get_tag(obj, id_or_name)
93-
fname = strcat(obj.alias, '::getTag');
94-
r = nix.Utils.open_entity(obj, fname, id_or_name, @nix.Tag);
85+
r = nix.Utils.open_entity(obj, 'getTag', id_or_name, @nix.Tag);
9586
end
9687

9788
function r = open_tag_idx(obj, idx)
98-
fname = strcat(obj.alias, '::openTagIdx');
99-
r = nix.Utils.open_entity(obj, fname, idx, @nix.Tag);
89+
r = nix.Utils.open_entity(obj, 'openTagIdx', idx, @nix.Tag);
10090
end
10191

10292
function r = remove_tag(obj, del)
103-
fname = strcat(obj.alias, '::removeTag');
104-
r = nix.Utils.delete_entity(obj, del, 'nix.Tag', fname);
93+
r = nix.Utils.delete_entity(obj, 'removeTag', del, 'nix.Tag');
10594
end
10695

10796
function r = tag_count(obj)
@@ -110,22 +99,19 @@
11099
end
111100

112101
function r = filter_tags(obj, filter, val)
113-
fname = strcat(obj.alias, '::tagsFiltered');
114-
r = nix.Utils.filter(obj, filter, val, fname, @nix.Tag);
102+
r = nix.Utils.filter(obj, 'tagsFiltered', filter, val, @nix.Tag);
115103
end
116104

117105
% -----------------
118106
% MultiTag methods
119107
% -----------------
120108

121109
function [] = add_multi_tag(obj, add_this)
122-
fname = strcat(obj.alias, '::addMultiTag');
123-
nix.Utils.add_entity(obj, add_this, 'nix.MultiTag', fname);
110+
nix.Utils.add_entity(obj, 'addMultiTag', add_this, 'nix.MultiTag');
124111
end
125112

126113
function [] = add_multi_tags(obj, add_cell_array)
127-
fname = strcat(obj.alias, '::addMultiTags');
128-
nix.Utils.add_entity_array(obj, add_cell_array, 'nix.MultiTag', fname);
114+
nix.Utils.add_entity_array(obj, 'addMultiTags', add_cell_array, 'nix.MultiTag');
129115
end
130116

131117
function r = has_multi_tag(obj, id_or_name)
@@ -134,18 +120,15 @@
134120
end
135121

136122
function r = get_multi_tag(obj, id_or_name)
137-
fname = strcat(obj.alias, '::getMultiTag');
138-
r = nix.Utils.open_entity(obj, fname, id_or_name, @nix.MultiTag);
123+
r = nix.Utils.open_entity(obj, 'getMultiTag', id_or_name, @nix.MultiTag);
139124
end
140125

141126
function r = open_multi_tag_idx(obj, idx)
142-
fname = strcat(obj.alias, '::openMultiTagIdx');
143-
r = nix.Utils.open_entity(obj, fname, idx, @nix.MultiTag);
127+
r = nix.Utils.open_entity(obj, 'openMultiTagIdx', idx, @nix.MultiTag);
144128
end
145129

146130
function r = remove_multi_tag(obj, del)
147-
fname = strcat(obj.alias, '::removeMultiTag');
148-
r = nix.Utils.delete_entity(obj, del, 'nix.MultiTag', fname);
131+
r = nix.Utils.delete_entity(obj, 'removeMultiTag', del, 'nix.MultiTag');
149132
end
150133

151134
function r = multi_tag_count(obj)
@@ -154,8 +137,7 @@
154137
end
155138

156139
function r = filter_multi_tags(obj, filter, val)
157-
fname = strcat(obj.alias, '::multiTagsFiltered');
158-
r = nix.Utils.filter(obj, filter, val, fname, @nix.MultiTag);
140+
r = nix.Utils.filter(obj, 'multiTagsFiltered', filter, val, @nix.MultiTag);
159141
end
160142
end
161143

0 commit comments

Comments
 (0)