Skip to content

Commit c4219c2

Browse files
jgrewejgrewe
authored
Merge pull request #159 from mpsonntag/cleanUp
lgtm
2 parents d1b4cbb + d6f8652 commit c4219c2

24 files changed

+499
-652
lines changed

‎+nix/Block.m‎

Lines changed: 57 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -32,80 +32,71 @@
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)
4039
fname = strcat(obj.alias, '::createGroup');
4140
h = nix_mx(fname, obj.nix_handle, name, nixtype);
42-
r = nix.Group(h);
41+
r = nix.Utils.createEntity(h, @nix.Group);
4342
end
4443

4544
function r = has_group(obj, id_or_name)
46-
fname = strcat(obj.alias, '::hasGroup');
47-
r = nix_mx(fname, obj.nix_handle, id_or_name);
45+
r = nix.Utils.fetchHasEntity(obj, 'hasGroup', id_or_name);
4846
end
4947

5048
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);
49+
r = nix.Utils.open_entity(obj, 'getGroup', id_or_name, @nix.Group);
5350
end
5451

5552
function r = open_group_idx(obj, idx)
56-
fname = strcat(obj.alias, '::openGroupIdx');
57-
r = nix.Utils.open_entity(obj, fname, idx, @nix.Group);
53+
r = nix.Utils.open_entity(obj, 'openGroupIdx', idx, @nix.Group);
5854
end
5955

60-
function r = delete_group(obj, del)
61-
fname = strcat(obj.alias, '::deleteGroup');
62-
r = nix.Utils.delete_entity(obj, del, 'nix.Group', fname);
56+
function r = delete_group(obj, idNameEntity)
57+
r = nix.Utils.delete_entity(obj, 'deleteGroup', idNameEntity, 'nix.Group');
6358
end
6459

6560
function r = filter_groups(obj, filter, val)
66-
fname = strcat(obj.alias, '::groupsFiltered');
67-
r = nix.Utils.filter(obj, filter, val, fname, @nix.Group);
61+
r = nix.Utils.filter(obj, 'groupsFiltered', filter, val, @nix.Group);
6862
end
6963

7064
% -----------------
7165
% DataArray methods
7266
% -----------------
7367

7468
function r = data_array_count(obj)
75-
fname = strcat(obj.alias, '::dataArrayCount');
76-
r = nix_mx(fname, obj.nix_handle);
69+
r = nix.Utils.fetchEntityCount(obj, 'dataArrayCount');
7770
end
7871

7972
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);
73+
r = nix.Utils.open_entity(obj, 'openDataArray', id_or_name, @nix.DataArray);
8274
end
8375

8476
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);
77+
r = nix.Utils.open_entity(obj, 'openDataArrayIdx', idx, @nix.DataArray);
8778
end
8879

8980
function r = create_data_array(obj, name, nixtype, datatype, shape)
9081
%-- Quick fix to enable alias range dimension with
9182
%-- 1D data arrays created with this function.
9283
%-- e.g. size([1 2 3]) returns shape [1 3], which would not
9384
%-- be accepted when trying to add an alias range dimension.
94-
if(shape(1) == 1)
85+
if (shape(1) == 1)
9586
shape(2:size(shape, 2));
9687
end
9788

98-
errorStruct.identifier = 'Block:unsupportedDataType';
99-
if(~isa(datatype, 'nix.DataType'))
100-
errorStruct.message = 'Please provide a valid nix.DataType';
101-
error(errorStruct);
102-
elseif(isequal(datatype, nix.DataType.String))
103-
errorStruct.message = 'Writing Strings to DataArrays is not supported as of yet.';
104-
error(errorStruct);
89+
err.identifier = 'NIXMX:UnsupportedDataType';
90+
if (~isa(datatype, 'nix.DataType'))
91+
err.message = 'Please provide a valid nix.DataType';
92+
error(err);
93+
elseif (isequal(datatype, nix.DataType.String))
94+
err.message = 'Writing char/string DataArrays is currently not supported.';
95+
error(err);
10596
else
10697
fname = strcat(obj.alias, '::createDataArray');
10798
h = nix_mx(fname, obj.nix_handle, name, nixtype, lower(datatype.char), shape);
108-
r = nix.DataArray(h);
99+
r = nix.Utils.createEntity(h, @nix.DataArray);
109100
end
110101
end
111102

@@ -115,79 +106,71 @@
115106
%-- 1D data arrays created with this function.
116107
%-- e.g. size([1 2 3]) returns shape [1 3], which would not
117108
%-- be accepted when trying to add an alias range dimension.
118-
if(shape(1) == 1)
109+
if (shape(1) == 1)
119110
shape = size(data, 2);
120111
end
121112

122-
errorStruct.identifier = 'Block:unsupportedDataType';
123-
if(ischar(data))
124-
errorStruct.message = 'Writing Strings to DataArrays is not supported as of yet.';
125-
error(errorStruct);
126-
elseif(islogical(data))
113+
err.identifier = 'NIXMX:UnsupportedDataType';
114+
if (ischar(data))
115+
err.message = 'Writing char/string DataArrays is currently not supported.';
116+
error(err);
117+
elseif (islogical(data))
127118
dtype = nix.DataType.Bool;
128-
elseif(isnumeric(data))
119+
elseif (isnumeric(data))
129120
dtype = nix.DataType.Double;
130121
else
131-
errorStruct.message = 'DataType of provided data is not supported.';
132-
error(errorStruct);
122+
err.message = 'DataType of provided data is not supported.';
123+
error(err);
133124
end
134125

135126
r = obj.create_data_array(name, nixtype, dtype, shape);
136127
r.write_all(data);
137128
end
138129

139130
function r = has_data_array(obj, id_or_name)
140-
fname = strcat(obj.alias, '::hasDataArray');
141-
r = nix_mx(fname, obj.nix_handle, id_or_name);
131+
r = nix.Utils.fetchHasEntity(obj, 'hasDataArray', id_or_name);
142132
end
143133

144134
function r = delete_data_array(obj, del)
145-
fname = strcat(obj.alias, '::deleteDataArray');
146-
r = nix.Utils.delete_entity(obj, del, 'nix.DataArray', fname);
135+
r = nix.Utils.delete_entity(obj, 'deleteDataArray', del, 'nix.DataArray');
147136
end
148137

149138
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);
139+
r = nix.Utils.filter(obj, 'dataArraysFiltered', filter, val, @nix.DataArray);
152140
end
153141

154142
% -----------------
155143
% Sources methods
156144
% -----------------
157145

158146
function r = source_count(obj)
159-
fname = strcat(obj.alias, '::sourceCount');
160-
r = nix_mx(fname, obj.nix_handle);
147+
r = nix.Utils.fetchEntityCount(obj, 'sourceCount');
161148
end
162149

163150
function r = create_source(obj, name, type)
164151
fname = strcat(obj.alias, '::createSource');
165-
r = nix.Source(nix_mx(fname, obj.nix_handle, name, type));
152+
h = nix_mx(fname, obj.nix_handle, name, type);
153+
r = nix.Utils.createEntity(h, @nix.Source);
166154
end
167155

168156
function r = has_source(obj, id_or_name)
169-
fname = strcat(obj.alias, '::hasSource');
170-
r = nix_mx(fname, obj.nix_handle, id_or_name);
157+
r = nix.Utils.fetchHasEntity(obj, 'hasSource', id_or_name);
171158
end
172159

173160
function r = delete_source(obj, del)
174-
fname = strcat(obj.alias, '::deleteSource');
175-
r = nix.Utils.delete_entity(obj, del, 'nix.Source', fname);
161+
r = nix.Utils.delete_entity(obj, 'deleteSource', del, 'nix.Source');
176162
end
177163

178164
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);
165+
r = nix.Utils.open_entity(obj, 'openSource', id_or_name, @nix.Source);
181166
end
182167

183168
function r = open_source_idx(obj, idx)
184-
fname = strcat(obj.alias, '::openSourceIdx');
185-
r = nix.Utils.open_entity(obj, fname, idx, @nix.Source);
169+
r = nix.Utils.open_entity(obj, 'openSourceIdx', idx, @nix.Source);
186170
end
187171

188172
function r = filter_sources(obj, filter, val)
189-
fname = strcat(obj.alias, '::sourcesFiltered');
190-
r = nix.Utils.filter(obj, filter, val, fname, @nix.Source);
173+
r = nix.Utils.filter(obj, 'sourcesFiltered', filter, val, @nix.Source);
191174
end
192175

193176
% maxdepth is an index
@@ -197,95 +180,77 @@
197180

198181
% maxdepth is an index
199182
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);
183+
r = nix.Utils.find(obj, 'findSources', max_depth, filter, val, @nix.Source);
202184
end
203185

204186
% -----------------
205187
% Tags methods
206188
% -----------------
207189

208190
function r = tag_count(obj)
209-
fname = strcat(obj.alias, '::tagCount');
210-
r = nix_mx(fname, obj.nix_handle);
191+
r = nix.Utils.fetchEntityCount(obj, 'tagCount');
211192
end
212193

213194
function r = has_tag(obj, id_or_name)
214-
fname = strcat(obj.alias, '::hasTag');
215-
r = nix_mx(fname, obj.nix_handle, id_or_name);
195+
r = nix.Utils.fetchHasEntity(obj, 'hasTag', id_or_name);
216196
end
217197

218198
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);
199+
r = nix.Utils.open_entity(obj, 'openTag', id_or_name, @nix.Tag);
221200
end
222201

223202
function r = open_tag_idx(obj, idx)
224-
fname = strcat(obj.alias, '::openTagIdx');
225-
r = nix.Utils.open_entity(obj, fname, idx, @nix.Tag);
203+
r = nix.Utils.open_entity(obj, 'openTagIdx', idx, @nix.Tag);
226204
end
227205

228206
function r = create_tag(obj, name, type, position)
229207
fname = strcat(obj.alias, '::createTag');
230208
h = nix_mx(fname, obj.nix_handle, name, type, position);
231-
r = nix.Tag(h);
209+
r = nix.Utils.createEntity(h, @nix.Tag);
232210
end
233211

234212
function r = delete_tag(obj, del)
235-
fname = strcat(obj.alias, '::deleteTag');
236-
r = nix.Utils.delete_entity(obj, del, 'nix.Tag', fname);
213+
r = nix.Utils.delete_entity(obj, 'deleteTag', del, 'nix.Tag');
237214
end
238215

239216
function r = filter_tags(obj, filter, val)
240-
fname = strcat(obj.alias, '::tagsFiltered');
241-
r = nix.Utils.filter(obj, filter, val, fname, @nix.Tag);
217+
r = nix.Utils.filter(obj, 'tagsFiltered', filter, val, @nix.Tag);
242218
end
243219

244220
% -----------------
245221
% MultiTag methods
246222
% -----------------
247223

248224
function r = multi_tag_count(obj)
249-
fname = strcat(obj.alias, '::multiTagCount');
250-
r = nix_mx(fname, obj.nix_handle);
225+
r = nix.Utils.fetchEntityCount(obj, 'multiTagCount');
251226
end
252227

253228
function r = has_multi_tag(obj, id_or_name)
254-
fname = strcat(obj.alias, '::hasMultiTag');
255-
r = nix_mx(fname, obj.nix_handle, id_or_name);
229+
r = nix.Utils.fetchHasEntity(obj, 'hasMultiTag', id_or_name);
256230
end
257231

258232
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);
233+
r = nix.Utils.open_entity(obj, 'openMultiTag', id_or_name, @nix.MultiTag);
261234
end
262235

263236
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);
237+
r = nix.Utils.open_entity(obj, 'openMultiTagIdx', idx, @nix.MultiTag);
266238
end
267239

268240
%-- Creating a multitag requires an already existing data array
269241
function r = create_multi_tag(obj, name, type, add_data_array)
270-
if(strcmp(class(add_data_array), 'nix.DataArray'))
271-
addID = add_data_array.id;
272-
else
273-
addID = add_data_array;
274-
end
275-
276242
fname = strcat(obj.alias, '::createMultiTag');
277-
h = nix_mx(fname, obj.nix_handle, name, type, addID);
278-
r = nix.MultiTag(h);
243+
id = nix.Utils.parseEntityId(add_data_array, 'nix.DataArray');
244+
h = nix_mx(fname, obj.nix_handle, name, type, id);
245+
r = nix.Utils.createEntity(h, @nix.MultiTag);
279246
end
280247

281248
function r = delete_multi_tag(obj, del)
282-
fname = strcat(obj.alias, '::deleteMultiTag');
283-
r = nix.Utils.delete_entity(obj, del, 'nix.MultiTag', fname);
249+
r = nix.Utils.delete_entity(obj, 'deleteMultiTag', del, 'nix.MultiTag');
284250
end
285251

286252
function r = filter_multi_tags(obj, filter, val)
287-
fname = strcat(obj.alias, '::multiTagsFiltered');
288-
r = nix.Utils.filter(obj, filter, val, fname, @nix.MultiTag);
253+
r = nix.Utils.filter(obj, 'multiTagsFiltered', filter, val, @nix.MultiTag);
289254
end
290255
end
291256

0 commit comments

Comments
 (0)