Skip to content

Commit 7d1d905

Browse files
mpsonntagmpsonntag
committed
[Matlab] Refactor Util function names
- Refactors all Util function names to CamelCase. - Refactors all Util function usages.
1 parent 9315c53 commit 7d1d905

File tree

13 files changed

+137
-137
lines changed

13 files changed

+137
-137
lines changed

‎+nix/Block.m‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,16 @@
4646
end
4747

4848
function r = openGroup(obj, idName)
49-
r = nix.Utils.open_entity(obj, 'getGroup', idName, @nix.Group);
49+
r = nix.Utils.openEntity(obj, 'getGroup', idName, @nix.Group);
5050
end
5151

5252
function r = openGroupIdx(obj, index)
53-
idx = nix.Utils.handle_index(index);
54-
r = nix.Utils.open_entity(obj, 'openGroupIdx', idx, @nix.Group);
53+
idx = nix.Utils.handleIndex(index);
54+
r = nix.Utils.openEntity(obj, 'openGroupIdx', idx, @nix.Group);
5555
end
5656

5757
function r = deleteGroup(obj, idNameEntity)
58-
r = nix.Utils.delete_entity(obj, 'deleteGroup', idNameEntity, 'nix.Group');
58+
r = nix.Utils.deleteEntity(obj, 'deleteGroup', idNameEntity, 'nix.Group');
5959
end
6060

6161
function r = filterGroups(obj, filter, val)
@@ -71,12 +71,12 @@
7171
end
7272

7373
function r = openDataArray(obj, idName)
74-
r = nix.Utils.open_entity(obj, 'openDataArray', idName, @nix.DataArray);
74+
r = nix.Utils.openEntity(obj, 'openDataArray', idName, @nix.DataArray);
7575
end
7676

7777
function r = openDataArrayIdx(obj, index)
78-
idx = nix.Utils.handle_index(index);
79-
r = nix.Utils.open_entity(obj, 'openDataArrayIdx', idx, @nix.DataArray);
78+
idx = nix.Utils.handleIndex(index);
79+
r = nix.Utils.openEntity(obj, 'openDataArrayIdx', idx, @nix.DataArray);
8080
end
8181

8282
function r = createDataArray(obj, name, nixtype, datatype, shape)
@@ -134,7 +134,7 @@
134134
end
135135

136136
function r = deleteDataArray(obj, del)
137-
r = nix.Utils.delete_entity(obj, 'deleteDataArray', del, 'nix.DataArray');
137+
r = nix.Utils.deleteEntity(obj, 'deleteDataArray', del, 'nix.DataArray');
138138
end
139139

140140
function r = filterDataArrays(obj, filter, val)
@@ -160,16 +160,16 @@
160160
end
161161

162162
function r = deleteSource(obj, del)
163-
r = nix.Utils.delete_entity(obj, 'deleteSource', del, 'nix.Source');
163+
r = nix.Utils.deleteEntity(obj, 'deleteSource', del, 'nix.Source');
164164
end
165165

166166
function r = openSource(obj, idName)
167-
r = nix.Utils.open_entity(obj, 'openSource', idName, @nix.Source);
167+
r = nix.Utils.openEntity(obj, 'openSource', idName, @nix.Source);
168168
end
169169

170170
function r = openSourceIdx(obj, index)
171-
idx = nix.Utils.handle_index(index);
172-
r = nix.Utils.open_entity(obj, 'openSourceIdx', idx, @nix.Source);
171+
idx = nix.Utils.handleIndex(index);
172+
r = nix.Utils.openEntity(obj, 'openSourceIdx', idx, @nix.Source);
173173
end
174174

175175
function r = filterSources(obj, filter, val)
@@ -199,12 +199,12 @@
199199
end
200200

201201
function r = openTag(obj, idName)
202-
r = nix.Utils.open_entity(obj, 'openTag', idName, @nix.Tag);
202+
r = nix.Utils.openEntity(obj, 'openTag', idName, @nix.Tag);
203203
end
204204

205205
function r = openTagIdx(obj, index)
206-
idx = nix.Utils.handle_index(index);
207-
r = nix.Utils.open_entity(obj, 'openTagIdx', idx, @nix.Tag);
206+
idx = nix.Utils.handleIndex(index);
207+
r = nix.Utils.openEntity(obj, 'openTagIdx', idx, @nix.Tag);
208208
end
209209

210210
function r = createTag(obj, name, type, position)
@@ -214,7 +214,7 @@
214214
end
215215

216216
function r = deleteTag(obj, del)
217-
r = nix.Utils.delete_entity(obj, 'deleteTag', del, 'nix.Tag');
217+
r = nix.Utils.deleteEntity(obj, 'deleteTag', del, 'nix.Tag');
218218
end
219219

220220
function r = filterTags(obj, filter, val)
@@ -234,12 +234,12 @@
234234
end
235235

236236
function r = openMultiTag(obj, idName)
237-
r = nix.Utils.open_entity(obj, 'openMultiTag', idName, @nix.MultiTag);
237+
r = nix.Utils.openEntity(obj, 'openMultiTag', idName, @nix.MultiTag);
238238
end
239239

240240
function r = openMultiTagIdx(obj, index)
241-
idx = nix.Utils.handle_index(index);
242-
r = nix.Utils.open_entity(obj, 'openMultiTagIdx', idx, @nix.MultiTag);
241+
idx = nix.Utils.handleIndex(index);
242+
r = nix.Utils.openEntity(obj, 'openMultiTagIdx', idx, @nix.MultiTag);
243243
end
244244

245245
%-- Creating a multitag requires an already existing data array
@@ -251,7 +251,7 @@
251251
end
252252

253253
function r = deleteMultiTag(obj, del)
254-
r = nix.Utils.delete_entity(obj, 'deleteMultiTag', del, 'nix.MultiTag');
254+
r = nix.Utils.deleteEntity(obj, 'deleteMultiTag', del, 'nix.MultiTag');
255255
end
256256

257257
function r = filterMultiTags(obj, filter, val)

‎+nix/DataArray.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
function r = readAllData(obj)
113113
fname = strcat(obj.alias, '::readAll');
114114
data = nix_mx(fname, obj.nix_handle);
115-
r = nix.Utils.transpose_array(data);
115+
r = nix.Utils.transposeArray(data);
116116
end
117117

118118
%-- TODO add (optional) offset
@@ -143,7 +143,7 @@
143143
end
144144

145145
fname = strcat(obj.alias, '::writeAll');
146-
nix_mx(fname, obj.nix_handle, nix.Utils.transpose_array(data));
146+
nix_mx(fname, obj.nix_handle, nix.Utils.transposeArray(data));
147147
end
148148

149149
function r = datatype(obj)

‎+nix/File.m‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,16 @@
6262
end
6363

6464
function r = openBlock(obj, id_or_name)
65-
r = nix.Utils.open_entity(obj, 'openBlock', id_or_name, @nix.Block);
65+
r = nix.Utils.openEntity(obj, 'openBlock', id_or_name, @nix.Block);
6666
end
6767

6868
function r = openBlockIdx(obj, index)
69-
idx = nix.Utils.handle_index(index);
70-
r = nix.Utils.open_entity(obj, 'openBlockIdx', idx, @nix.Block);
69+
idx = nix.Utils.handleIndex(index);
70+
r = nix.Utils.openEntity(obj, 'openBlockIdx', idx, @nix.Block);
7171
end
7272

7373
function r = deleteBlock(obj, del)
74-
r = nix.Utils.delete_entity(obj, 'deleteBlock', del, 'nix.Block');
74+
r = nix.Utils.deleteEntity(obj, 'deleteBlock', del, 'nix.Block');
7575
end
7676

7777
function r = filterBlocks(obj, filter, val)
@@ -97,16 +97,16 @@
9797
end
9898

9999
function r = openSection(obj, id_or_name)
100-
r = nix.Utils.open_entity(obj, 'openSection', id_or_name, @nix.Section);
100+
r = nix.Utils.openEntity(obj, 'openSection', id_or_name, @nix.Section);
101101
end
102102

103103
function r = openSectionIdx(obj, index)
104-
idx = nix.Utils.handle_index(index);
105-
r = nix.Utils.open_entity(obj, 'openSectionIdx', idx, @nix.Section);
104+
idx = nix.Utils.handleIndex(index);
105+
r = nix.Utils.openEntity(obj, 'openSectionIdx', idx, @nix.Section);
106106
end
107107

108108
function r = deleteSection(obj, del)
109-
r = nix.Utils.delete_entity(obj, 'deleteSection', del, 'nix.Section');
109+
r = nix.Utils.deleteEntity(obj, 'deleteSection', del, 'nix.Section');
110110
end
111111

112112
function r = filterSections(obj, filter, val)

‎+nix/Group.m‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,24 @@
3939
end
4040

4141
function r = getDataArray(obj, idName)
42-
r = nix.Utils.open_entity(obj, 'getDataArray', idName, @nix.DataArray);
42+
r = nix.Utils.openEntity(obj, 'getDataArray', idName, @nix.DataArray);
4343
end
4444

4545
function r = openDataArrayIdx(obj, index)
46-
idx = nix.Utils.handle_index(index);
47-
r = nix.Utils.open_entity(obj, 'openDataArrayIdx', idx, @nix.DataArray);
46+
idx = nix.Utils.handleIndex(index);
47+
r = nix.Utils.openEntity(obj, 'openDataArrayIdx', idx, @nix.DataArray);
4848
end
4949

5050
function [] = addDataArray(obj, entity)
51-
nix.Utils.add_entity(obj, 'addDataArray', entity, 'nix.DataArray');
51+
nix.Utils.addEntity(obj, 'addDataArray', entity, 'nix.DataArray');
5252
end
5353

5454
function [] = addDataArrays(obj, entityArray)
55-
nix.Utils.add_entity_array(obj, 'addDataArrays', entityArray, 'nix.DataArray');
55+
nix.Utils.addEntityArray(obj, 'addDataArrays', entityArray, 'nix.DataArray');
5656
end
5757

5858
function r = removeDataArray(obj, del)
59-
r = nix.Utils.delete_entity(obj, 'removeDataArray', del, 'nix.DataArray');
59+
r = nix.Utils.deleteEntity(obj, 'removeDataArray', del, 'nix.DataArray');
6060
end
6161

6262
function r = filterDataArrays(obj, filter, val)
@@ -68,28 +68,28 @@
6868
% -----------------
6969

7070
function [] = addTag(obj, entity)
71-
nix.Utils.add_entity(obj, 'addTag', entity, 'nix.Tag');
71+
nix.Utils.addEntity(obj, 'addTag', entity, 'nix.Tag');
7272
end
7373

7474
function [] = addTags(obj, entityArray)
75-
nix.Utils.add_entity_array(obj, 'addTags', entityArray, 'nix.Tag');
75+
nix.Utils.addEntityArray(obj, 'addTags', entityArray, 'nix.Tag');
7676
end
7777

7878
function r = hasTag(obj, idName)
7979
r = nix.Utils.fetchHasEntity(obj, 'hasTag', idName);
8080
end
8181

8282
function r = getTag(obj, idName)
83-
r = nix.Utils.open_entity(obj, 'getTag', idName, @nix.Tag);
83+
r = nix.Utils.openEntity(obj, 'getTag', idName, @nix.Tag);
8484
end
8585

8686
function r = openTagIdx(obj, index)
87-
idx = nix.Utils.handle_index(index);
88-
r = nix.Utils.open_entity(obj, 'openTagIdx', idx, @nix.Tag);
87+
idx = nix.Utils.handleIndex(index);
88+
r = nix.Utils.openEntity(obj, 'openTagIdx', idx, @nix.Tag);
8989
end
9090

9191
function r = removeTag(obj, del)
92-
r = nix.Utils.delete_entity(obj, 'removeTag', del, 'nix.Tag');
92+
r = nix.Utils.deleteEntity(obj, 'removeTag', del, 'nix.Tag');
9393
end
9494

9595
function r = tagCount(obj)
@@ -105,28 +105,28 @@
105105
% -----------------
106106

107107
function [] = addMultiTag(obj, entity)
108-
nix.Utils.add_entity(obj, 'addMultiTag', entity, 'nix.MultiTag');
108+
nix.Utils.addEntity(obj, 'addMultiTag', entity, 'nix.MultiTag');
109109
end
110110

111111
function [] = addMultiTags(obj, entityArray)
112-
nix.Utils.add_entity_array(obj, 'addMultiTags', entityArray, 'nix.MultiTag');
112+
nix.Utils.addEntityArray(obj, 'addMultiTags', entityArray, 'nix.MultiTag');
113113
end
114114

115115
function r = hasMultiTag(obj, idName)
116116
r = nix.Utils.fetchHasEntity(obj, 'hasMultiTag', idName);
117117
end
118118

119119
function r = getMultiTag(obj, idName)
120-
r = nix.Utils.open_entity(obj, 'getMultiTag', idName, @nix.MultiTag);
120+
r = nix.Utils.openEntity(obj, 'getMultiTag', idName, @nix.MultiTag);
121121
end
122122

123123
function r = openMultiTagIdx(obj, index)
124-
idx = nix.Utils.handle_index(index);
125-
r = nix.Utils.open_entity(obj, 'openMultiTagIdx', idx, @nix.MultiTag);
124+
idx = nix.Utils.handleIndex(index);
125+
r = nix.Utils.openEntity(obj, 'openMultiTagIdx', idx, @nix.MultiTag);
126126
end
127127

128128
function r = removeMultiTag(obj, del)
129-
r = nix.Utils.delete_entity(obj, 'removeMultiTag', del, 'nix.MultiTag');
129+
r = nix.Utils.deleteEntity(obj, 'removeMultiTag', del, 'nix.MultiTag');
130130
end
131131

132132
function r = multiTagCount(obj)

‎+nix/MetadataMixIn.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
fname = strcat(obj.alias, '::setNoneMetadata');
2727
nix_mx(fname, obj.nix_handle, val);
2828
else
29-
nix.Utils.add_entity(obj, 'setMetadata', val, 'nix.Section');
29+
nix.Utils.addEntity(obj, 'setMetadata', val, 'nix.Section');
3030
end
3131
end
3232
end

0 commit comments

Comments
 (0)