Skip to content

Commit 20d4a0e

Browse files
mpsonntagmpsonntag
committed
[Matlab] Refactor Enitity function names
- Refactors all Entity function names to CamelCase. - Refactors all code occurrences.
1 parent 4b31bf2 commit 20d4a0e

16 files changed

+74
-74
lines changed

‎+nix/Block.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
function r = createGroup(obj, name, nixtype)
3939
fname = strcat(obj.alias, '::createGroup');
40-
h = nix_mx(fname, obj.nix_handle, name, nixtype);
40+
h = nix_mx(fname, obj.nixhandle, name, nixtype);
4141
r = nix.Utils.createEntity(h, @nix.Group);
4242
end
4343

@@ -97,7 +97,7 @@
9797
error(err);
9898
else
9999
fname = strcat(obj.alias, '::createDataArray');
100-
h = nix_mx(fname, obj.nix_handle, name, nixtype, lower(datatype.char), shape);
100+
h = nix_mx(fname, obj.nixhandle, name, nixtype, lower(datatype.char), shape);
101101
r = nix.Utils.createEntity(h, @nix.DataArray);
102102
end
103103
end
@@ -151,7 +151,7 @@
151151

152152
function r = createSource(obj, name, type)
153153
fname = strcat(obj.alias, '::createSource');
154-
h = nix_mx(fname, obj.nix_handle, name, type);
154+
h = nix_mx(fname, obj.nixhandle, name, type);
155155
r = nix.Utils.createEntity(h, @nix.Source);
156156
end
157157

@@ -209,7 +209,7 @@
209209

210210
function r = createTag(obj, name, type, position)
211211
fname = strcat(obj.alias, '::createTag');
212-
h = nix_mx(fname, obj.nix_handle, name, type, position);
212+
h = nix_mx(fname, obj.nixhandle, name, type, position);
213213
r = nix.Utils.createEntity(h, @nix.Tag);
214214
end
215215

@@ -246,7 +246,7 @@
246246
function r = createMultiTag(obj, name, type, refDataArray)
247247
fname = strcat(obj.alias, '::createMultiTag');
248248
id = nix.Utils.parseEntityId(refDataArray, 'nix.DataArray');
249-
h = nix_mx(fname, obj.nix_handle, name, type, id);
249+
h = nix_mx(fname, obj.nixhandle, name, type, id);
250250
r = nix.Utils.createEntity(h, @nix.MultiTag);
251251
end
252252

‎+nix/DataArray.m

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
function dimensions = get.dimensions(obj)
4040
dimensions = {};
4141
fname = strcat(obj.alias, '::dimensions');
42-
currList = nix_mx(fname, obj.nix_handle);
42+
currList = nix_mx(fname, obj.nixhandle);
4343
for i = 1:length(currList)
4444
switch currList(i).dtype
4545
case 'set'
@@ -59,33 +59,33 @@
5959

6060
function r = appendSetDimension(obj)
6161
fname = strcat(obj.alias, '::appendSetDimension');
62-
h = nix_mx(fname, obj.nix_handle);
62+
h = nix_mx(fname, obj.nixhandle);
6363
r = nix.Utils.createEntity(h, @nix.SetDimension);
6464
end
6565

6666
function r = appendSampledDimension(obj, interval)
6767
fname = strcat(obj.alias, '::appendSampledDimension');
68-
h = nix_mx(fname, obj.nix_handle, interval);
68+
h = nix_mx(fname, obj.nixhandle, interval);
6969
r = nix.Utils.createEntity(h, @nix.SampledDimension);
7070
end
7171

7272
function r = appendRangeDimension(obj, ticks)
7373
fname = strcat(obj.alias, '::appendRangeDimension');
74-
h = nix_mx(fname, obj.nix_handle, ticks);
74+
h = nix_mx(fname, obj.nixhandle, ticks);
7575
r = nix.Utils.createEntity(h, @nix.RangeDimension);
7676
end
7777

7878
function r = appendAliasRangeDimension(obj)
7979
fname = strcat(obj.alias, '::appendAliasRangeDimension');
80-
h = nix_mx(fname, obj.nix_handle);
80+
h = nix_mx(fname, obj.nixhandle);
8181
r = nix.Utils.createEntity(h, @nix.RangeDimension);
8282
end
8383

8484
function r = openDimensionIdx(obj, idx)
8585
% Getting the dimension by index starts with 1
8686
% instead of 0 compared to all other index functions.
8787
fname = strcat(obj.alias, '::openDimensionIdx');
88-
dim = nix_mx(fname, obj.nix_handle, idx);
88+
dim = nix_mx(fname, obj.nixhandle, idx);
8989
switch (dim.dimension_type)
9090
case 'set'
9191
r = nix.Utils.createEntity(dim.handle, @nix.SetDimension);
@@ -98,7 +98,7 @@
9898

9999
function r = deleteDimensions(obj)
100100
fname = strcat(obj.alias, '::deleteDimensions');
101-
r = nix_mx(fname, obj.nix_handle);
101+
r = nix_mx(fname, obj.nixhandle);
102102
end
103103

104104
function r = dimensionCount(obj)
@@ -111,7 +111,7 @@
111111

112112
function r = readAllData(obj)
113113
fname = strcat(obj.alias, '::readAll');
114-
data = nix_mx(fname, obj.nix_handle);
114+
data = nix_mx(fname, obj.nixhandle);
115115
r = nix.Utils.transposeArray(data);
116116
end
117117

@@ -143,12 +143,12 @@
143143
end
144144

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

149149
function r = datatype(obj)
150150
fname = strcat(obj.alias, '::dataType');
151-
r = nix_mx(fname, obj.nix_handle);
151+
r = nix_mx(fname, obj.nixhandle);
152152
end
153153

154154
% Set data extent enables to increase the original size
@@ -162,7 +162,7 @@
162162
% will be lost!
163163
function [] = setDataExtent(obj, extent)
164164
fname = strcat(obj.alias, '::setDataExtent');
165-
nix_mx(fname, obj.nix_handle, extent);
165+
nix_mx(fname, obj.nixhandle, extent);
166166
end
167167
end
168168

‎+nix/Dynamic.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function setMethod(obj, val)
3232

3333
if (isempty(val))
3434
fname = strcat(obj.alias, '::setNone', upper(prop(1)), prop(2:end));
35-
nix_mx(fname, obj.nix_handle, 0);
35+
nix_mx(fname, obj.nixhandle, 0);
3636
elseif ((strcmp(prop, 'units') || strcmp(prop, 'labels')) && (~iscell(val)))
3737
%-- BUGFIX: Matlab crashes, if units in Tags and MultiTags
3838
%-- or labels of SetDimension are set using anything else than a cell.
@@ -41,7 +41,7 @@ function setMethod(obj, val)
4141
throwAsCaller(ME);
4242
else
4343
fname = strcat(obj.alias, '::set', upper(prop(1)), prop(2:end));
44-
nix_mx(fname, obj.nix_handle, val);
44+
nix_mx(fname, obj.nixhandle, val);
4545
end
4646
end
4747

‎+nix/Entity.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
% handles object lifetime
1212

1313
properties (Hidden)
14-
nix_handle
14+
nixhandle
1515
end
1616

1717
properties (SetAccess=private, GetAccess=public, Hidden)
@@ -24,20 +24,20 @@
2424

2525
methods
2626
function obj = Entity(h)
27-
obj.nix_handle = h;
27+
obj.nixhandle = h;
2828
end
2929

3030
function [] = delete(obj)
31-
nix_mx('Entity::destroy', obj.nix_handle);
31+
nix_mx('Entity::destroy', obj.nixhandle);
3232
end
3333

3434
function r = updatedAt(obj)
35-
r = nix_mx('Entity::updatedAt', obj.nix_handle);
35+
r = nix_mx('Entity::updatedAt', obj.nixhandle);
3636
end
3737

3838
function r = get.info(obj)
3939
fname = strcat(obj.alias, '::describe');
40-
r = nix_mx(fname, obj.nix_handle);
40+
r = nix_mx(fname, obj.nixhandle);
4141
end
4242
end
4343

‎+nix/Feature.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,24 @@
3030

3131
function r = get.linkType(obj)
3232
fname = strcat(obj.alias, '::getLinkType');
33-
r = nix_mx(fname, obj.nix_handle);
33+
r = nix_mx(fname, obj.nixhandle);
3434
end
3535

3636
function [] = set.linkType(obj, linkType)
3737
fname = strcat(obj.alias, '::setLinkType');
38-
nix_mx(fname, obj.nix_handle, linkType);
38+
nix_mx(fname, obj.nixhandle, linkType);
3939
end
4040

4141
function r = openData(obj)
4242
fname = strcat(obj.alias, '::openData');
43-
h = nix_mx(fname, obj.nix_handle);
43+
h = nix_mx(fname, obj.nixhandle);
4444
r = nix.Utils.createEntity(h, @nix.DataArray);
4545
end
4646

4747
function [] = setData(obj, data)
4848
id = nix.Utils.parseEntityId(data, 'nix.DataArray');
4949
fname = strcat(obj.alias, '::setData');
50-
nix_mx(fname, obj.nix_handle, id);
50+
nix_mx(fname, obj.nixhandle, id);
5151
end
5252
end
5353

‎+nix/File.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
% braindead...
3131
function r = isOpen(obj)
3232
fname = strcat(obj.alias, '::isOpen');
33-
r = nix_mx(fname, obj.nix_handle);
33+
r = nix_mx(fname, obj.nixhandle);
3434
end
3535

3636
function r = fileMode(obj)
3737
fname = strcat(obj.alias, '::fileMode');
38-
r = nix_mx(fname, obj.nix_handle);
38+
r = nix_mx(fname, obj.nixhandle);
3939
end
4040

4141
function r = validate(obj)
4242
fname = strcat(obj.alias, '::validate');
43-
r = nix_mx(fname, obj.nix_handle);
43+
r = nix_mx(fname, obj.nixhandle);
4444
end
4545

4646
% ----------------
@@ -49,7 +49,7 @@
4949

5050
function r = createBlock(obj, name, type)
5151
fname = strcat(obj.alias, '::createBlock');
52-
h = nix_mx(fname, obj.nix_handle, name, type);
52+
h = nix_mx(fname, obj.nixhandle, name, type);
5353
r = nix.Utils.createEntity(h, @nix.Block);
5454
end
5555

@@ -84,7 +84,7 @@
8484

8585
function r = createSection(obj, name, type)
8686
fname = strcat(obj.alias, '::createSection');
87-
h = nix_mx(fname, obj.nix_handle, name, type);
87+
h = nix_mx(fname, obj.nixhandle, name, type);
8888
r = nix.Utils.createEntity(h, @nix.Section);
8989
end
9090

‎+nix/MetadataMixIn.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
function [] = setMetadata(obj, val)
2525
if (isempty(val))
2626
fname = strcat(obj.alias, '::setNoneMetadata');
27-
nix_mx(fname, obj.nix_handle, val);
27+
nix_mx(fname, obj.nixhandle, val);
2828
else
2929
nix.Utils.addEntity(obj, 'setMetadata', val, 'nix.Section');
3030
end

‎+nix/MultiTag.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@
6060
function r = retrieveData(obj, positionIdx, idName)
6161
posIdx = nix.Utils.handleIndex(positionIdx);
6262
fname = strcat(obj.alias, '::retrieveData');
63-
data = nix_mx(fname, obj.nix_handle, posIdx, idName);
63+
data = nix_mx(fname, obj.nixhandle, posIdx, idName);
6464
r = nix.Utils.transposeArray(data);
6565
end
6666

6767
function r = retrieveDataIdx(obj, positionIdx, referenceIdx)
6868
posIdx = nix.Utils.handleIndex(positionIdx);
6969
refIdx = nix.Utils.handleIndex(referenceIdx);
7070
fname = strcat(obj.alias, '::retrieveDataIdx');
71-
data = nix_mx(fname, obj.nix_handle, posIdx, refIdx);
71+
data = nix_mx(fname, obj.nixhandle, posIdx, refIdx);
7272
r = nix.Utils.transposeArray(data);
7373
end
7474

@@ -87,7 +87,7 @@
8787
function r = addFeature(obj, entity, linkType)
8888
addId = nix.Utils.parseEntityId(entity, 'nix.DataArray');
8989
fname = strcat(obj.alias, '::createFeature');
90-
h = nix_mx(fname, obj.nix_handle, addId, linkType);
90+
h = nix_mx(fname, obj.nixhandle, addId, linkType);
9191
r = nix.Utils.createEntity(h, @nix.Feature);
9292
end
9393

@@ -111,15 +111,15 @@
111111
function r = retrieveFeatureData(obj, positionIdx, idName)
112112
posIdx = nix.Utils.handleIndex(positionIdx);
113113
fname = strcat(obj.alias, '::featureRetrieveData');
114-
data = nix_mx(fname, obj.nix_handle, posIdx, idName);
114+
data = nix_mx(fname, obj.nixhandle, posIdx, idName);
115115
r = nix.Utils.transposeArray(data);
116116
end
117117

118118
function r = retrieveFeatureDataIdx(obj, positionIdx, featureIdx)
119119
posIdx = nix.Utils.handleIndex(positionIdx);
120120
featIdx = nix.Utils.handleIndex(featureIdx);
121121
fname = strcat(obj.alias, '::featureRetrieveDataIdx');
122-
data = nix_mx(fname, obj.nix_handle, posIdx, featIdx);
122+
data = nix_mx(fname, obj.nixhandle, posIdx, featIdx);
123123
r = nix.Utils.transposeArray(data);
124124
end
125125

@@ -137,7 +137,7 @@
137137

138138
function r = hasPositions(obj)
139139
fname = strcat(obj.alias, '::hasPositions');
140-
r = nix_mx(fname, obj.nix_handle);
140+
r = nix_mx(fname, obj.nixhandle);
141141
end
142142

143143
function r = openPositions(obj)
@@ -159,7 +159,7 @@
159159
function [] = setExtents(obj, entity)
160160
if (isempty(entity))
161161
fname = strcat(obj.alias, '::setNoneExtents');
162-
nix_mx(fname, obj.nix_handle, 0);
162+
nix_mx(fname, obj.nixhandle, 0);
163163
else
164164
nix.Utils.addEntity(obj, 'setExtents', entity, 'nix.DataArray');
165165
end

‎+nix/NamedEntity.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
error(err);
3131
end
3232
fname = strcat(obj.alias, '::compare');
33-
r = nix_mx(fname, obj.nix_handle, entity.nix_handle);
33+
r = nix_mx(fname, obj.nixhandle, entity.nixhandle);
3434
end
3535
end
3636

‎+nix/Property.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
function r = get.values(obj)
3232
fname = strcat(obj.alias, '::values');
33-
r = nix_mx(fname, obj.nix_handle);
33+
r = nix_mx(fname, obj.nixhandle);
3434
end
3535

3636
function [] = set.values(obj, val)
@@ -54,7 +54,7 @@
5454
end
5555

5656
fname = strcat(obj.alias, '::updateValues');
57-
nix_mx(fname, obj.nix_handle, values);
57+
nix_mx(fname, obj.nixhandle, values);
5858
end
5959

6060
function r = valueCount(obj)
@@ -63,7 +63,7 @@
6363

6464
function [] = deleteValues(obj)
6565
fname = strcat(obj.alias, '::deleteValues');
66-
nix_mx(fname, obj.nix_handle);
66+
nix_mx(fname, obj.nixhandle);
6767
end
6868
end
6969

‎+nix/RangeDimension.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
function r = tickAt(obj, index)
3030
index = nix.Utils.handleIndex(index);
3131
fname = strcat(obj.alias, '::tickAt');
32-
r = nix_mx(fname, obj.nix_handle, index);
32+
r = nix_mx(fname, obj.nixhandle, index);
3333
end
3434

3535
function r = indexOf(obj, position)
3636
fname = strcat(obj.alias, '::indexOf');
37-
r = nix_mx(fname, obj.nix_handle, position);
37+
r = nix_mx(fname, obj.nixhandle, position);
3838
end
3939

4040
function r = axis(obj, count, startIndex)
@@ -45,7 +45,7 @@
4545
startIndex = nix.Utils.handleIndex(startIndex);
4646

4747
fname = strcat(obj.alias, '::axis');
48-
r = nix_mx(fname, obj.nix_handle, count, startIndex);
48+
r = nix_mx(fname, obj.nixhandle, count, startIndex);
4949
end
5050
end
5151

0 commit comments

Comments
 (0)