Skip to content

Commit 4b31bf2

Browse files
mpsonntagmpsonntag
committed
[Matlab] Refactor nix.Dynamic function names
- Refactors all nix.Dynamic function names to CamelCase, renames 'add_dyn_attr' to 'addProperty' and 'add_dyn_relations' to 'addGetChildEntities'. - Refactors all usages of nix.Dynamic functions. - Removes obsolete name/value mapping of child entities from 'addGetChildEntities'.
1 parent 7d1d905 commit 4b31bf2

15 files changed

+54
-68
lines changed

‎+nix/Block.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
[email protected]();
2121

2222
% assign relations
23-
nix.Dynamic.add_dyn_relation(obj, 'groups', @nix.Group);
24-
nix.Dynamic.add_dyn_relation(obj, 'dataArrays', @nix.DataArray);
25-
nix.Dynamic.add_dyn_relation(obj, 'sources', @nix.Source);
26-
nix.Dynamic.add_dyn_relation(obj, 'tags', @nix.Tag);
27-
nix.Dynamic.add_dyn_relation(obj, 'multiTags', @nix.MultiTag);
23+
nix.Dynamic.addGetChildEntities(obj, 'groups', @nix.Group);
24+
nix.Dynamic.addGetChildEntities(obj, 'dataArrays', @nix.DataArray);
25+
nix.Dynamic.addGetChildEntities(obj, 'sources', @nix.Source);
26+
nix.Dynamic.addGetChildEntities(obj, 'tags', @nix.Tag);
27+
nix.Dynamic.addGetChildEntities(obj, 'multiTags', @nix.MultiTag);
2828
end
2929

3030
% -----------------

‎+nix/DataArray.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
[email protected]();
2626

2727
% assign dynamic properties
28-
nix.Dynamic.add_dyn_attr(obj, 'label', 'rw');
29-
nix.Dynamic.add_dyn_attr(obj, 'unit', 'rw');
30-
nix.Dynamic.add_dyn_attr(obj, 'expansionOrigin', 'rw');
31-
nix.Dynamic.add_dyn_attr(obj, 'polynomCoefficients', 'rw');
32-
nix.Dynamic.add_dyn_attr(obj, 'dataExtent', 'rw');
28+
nix.Dynamic.addProperty(obj, 'label', 'rw');
29+
nix.Dynamic.addProperty(obj, 'unit', 'rw');
30+
nix.Dynamic.addProperty(obj, 'expansionOrigin', 'rw');
31+
nix.Dynamic.addProperty(obj, 'polynomCoefficients', 'rw');
32+
nix.Dynamic.addProperty(obj, 'dataExtent', 'rw');
3333
end
3434

3535
% -----------------

‎+nix/Dynamic.m‎

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
% implements methods to dynamically assigns properties
1212

1313
methods (Static)
14-
function add_dyn_attr(obj, prop, mode)
14+
function addProperty(obj, prop, mode)
1515
if (nargin < 3)
1616
mode = 'r';
1717
end
@@ -20,10 +20,10 @@ function add_dyn_attr(obj, prop, mode)
2020
p = addprop(obj, prop);
2121

2222
% define property accessor methods
23-
p.GetMethod = @get_method;
24-
p.SetMethod = @set_method;
23+
p.GetMethod = @getMethod;
24+
p.SetMethod = @setMethod;
2525

26-
function set_method(obj, val)
26+
function setMethod(obj, val)
2727
if (strcmp(mode, 'r'))
2828
msg = 'You cannot set the read-only property ''%s'' of %s';
2929
ME = MException('MATLAB:class:SetProhibited', msg, prop, class(obj));
@@ -45,39 +45,25 @@ function set_method(obj, val)
4545
end
4646
end
4747

48-
function val = get_method(obj)
48+
function val = getMethod(obj)
4949
val = obj.info.(prop);
5050
end
5151
end
5252

53-
function add_dyn_relation(obj, name, constructor)
53+
function addGetChildEntities(obj, name, constructor)
5454
dataAttr = strcat(name, 'Data');
5555
data = addprop(obj, dataAttr);
5656
data.Hidden = true;
5757
obj.(dataAttr) = {};
5858

5959
% adds a proxy property
6060
rel = addprop(obj, name);
61-
rel.GetMethod = @get_method;
61+
rel.GetMethod = @getMethod;
6262

63-
% same property but returns Map
64-
rel_map = addprop(obj, strcat(name, 'Map'));
65-
rel_map.GetMethod = @get_as_map;
66-
rel_map.Hidden = true;
67-
68-
function val = get_method(obj)
63+
function val = getMethod(obj)
6964
obj.(dataAttr) = nix.Utils.fetchObjList(obj, name, constructor);
7065
val = obj.(dataAttr);
7166
end
72-
73-
function val = get_as_map(obj)
74-
val = containers.Map();
75-
props = obj.(name);
76-
77-
for i = 1:length(props)
78-
val(props{i}.name) = cell2mat(props{i}.values);
79-
end
80-
end
8167
end
8268
end
8369

‎+nix/File.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
[email protected](h);
2424

2525
% assign relations
26-
nix.Dynamic.add_dyn_relation(obj, 'blocks', @nix.Block);
27-
nix.Dynamic.add_dyn_relation(obj, 'sections', @nix.Section);
26+
nix.Dynamic.addGetChildEntities(obj, 'blocks', @nix.Block);
27+
nix.Dynamic.addGetChildEntities(obj, 'sections', @nix.Section);
2828
end
2929

3030
% braindead...

‎+nix/Group.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
[email protected]();
2222

2323
% assign relations
24-
nix.Dynamic.add_dyn_relation(obj, 'dataArrays', @nix.DataArray);
25-
nix.Dynamic.add_dyn_relation(obj, 'tags', @nix.Tag);
26-
nix.Dynamic.add_dyn_relation(obj, 'multiTags', @nix.MultiTag);
24+
nix.Dynamic.addGetChildEntities(obj, 'dataArrays', @nix.DataArray);
25+
nix.Dynamic.addGetChildEntities(obj, 'tags', @nix.Tag);
26+
nix.Dynamic.addGetChildEntities(obj, 'multiTags', @nix.MultiTag);
2727
end
2828

2929
% -----------------

‎+nix/MultiTag.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
[email protected]();
2222

2323
% assign dynamic properties
24-
nix.Dynamic.add_dyn_attr(obj, 'units', 'rw');
24+
nix.Dynamic.addProperty(obj, 'units', 'rw');
2525

2626
% assign relations
27-
nix.Dynamic.add_dyn_relation(obj, 'references', @nix.DataArray);
28-
nix.Dynamic.add_dyn_relation(obj, 'features', @nix.Feature);
27+
nix.Dynamic.addGetChildEntities(obj, 'references', @nix.DataArray);
28+
nix.Dynamic.addGetChildEntities(obj, 'features', @nix.Feature);
2929
end
3030

3131
% ------------------

‎+nix/NamedEntity.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
obj = [email protected](h);
1616

1717
% assign dynamic properties
18-
nix.Dynamic.add_dyn_attr(obj, 'id', 'r');
19-
nix.Dynamic.add_dyn_attr(obj, 'name', 'r');
20-
nix.Dynamic.add_dyn_attr(obj, 'type', 'rw');
21-
nix.Dynamic.add_dyn_attr(obj, 'definition', 'rw');
18+
nix.Dynamic.addProperty(obj, 'id', 'r');
19+
nix.Dynamic.addProperty(obj, 'name', 'r');
20+
nix.Dynamic.addProperty(obj, 'type', 'rw');
21+
nix.Dynamic.addProperty(obj, 'definition', 'rw');
2222
end
2323

2424
function r = compare(obj, entity)

‎+nix/Property.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
[email protected](h);
2525

2626
% assign dynamic properties
27-
nix.Dynamic.add_dyn_attr(obj, 'unit', 'rw');
28-
nix.Dynamic.add_dyn_attr(obj, 'datatype', 'r');
27+
nix.Dynamic.addProperty(obj, 'unit', 'rw');
28+
nix.Dynamic.addProperty(obj, 'datatype', 'r');
2929
end
3030

3131
function r = get.values(obj)

‎+nix/RangeDimension.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
[email protected](h);
2020

2121
% assign dynamic properties
22-
nix.Dynamic.add_dyn_attr(obj, 'dimensionType', 'r');
23-
nix.Dynamic.add_dyn_attr(obj, 'isAlias', 'r');
24-
nix.Dynamic.add_dyn_attr(obj, 'label', 'rw');
25-
nix.Dynamic.add_dyn_attr(obj, 'unit', 'rw');
26-
nix.Dynamic.add_dyn_attr(obj, 'ticks', 'rw');
22+
nix.Dynamic.addProperty(obj, 'dimensionType', 'r');
23+
nix.Dynamic.addProperty(obj, 'isAlias', 'r');
24+
nix.Dynamic.addProperty(obj, 'label', 'rw');
25+
nix.Dynamic.addProperty(obj, 'unit', 'rw');
26+
nix.Dynamic.addProperty(obj, 'ticks', 'rw');
2727
end
2828

2929
function r = tickAt(obj, index)

‎+nix/SampledDimension.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
[email protected](h);
2020

2121
% assign dynamic properties
22-
nix.Dynamic.add_dyn_attr(obj, 'dimensionType', 'r');
23-
nix.Dynamic.add_dyn_attr(obj, 'label', 'rw');
24-
nix.Dynamic.add_dyn_attr(obj, 'unit', 'rw');
25-
nix.Dynamic.add_dyn_attr(obj, 'samplingInterval', 'rw');
26-
nix.Dynamic.add_dyn_attr(obj, 'offset', 'rw');
22+
nix.Dynamic.addProperty(obj, 'dimensionType', 'r');
23+
nix.Dynamic.addProperty(obj, 'label', 'rw');
24+
nix.Dynamic.addProperty(obj, 'unit', 'rw');
25+
nix.Dynamic.addProperty(obj, 'samplingInterval', 'rw');
26+
nix.Dynamic.addProperty(obj, 'offset', 'rw');
2727
end
2828

2929
function r = indexOf(obj, position)

0 commit comments

Comments
 (0)