Skip to content

Commit 5741668

Browse files
committed
unify function naming scheme
1 parent 9b9490d commit 5741668

28 files changed

+189
-190
lines changed

+nix/DataArray.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,27 @@
5454
end;
5555

5656
function dim = append_set_dimension(obj)
57-
func_name = strcat(obj.alias, '::append_set_dimension');
57+
func_name = strcat(obj.alias, '::appendSetDimension');
5858
dim = nix.SetDimension(nix_mx(func_name, obj.nix_handle));
5959
end
6060

6161
function dim = append_sampled_dimension(obj, interval)
62-
func_name = strcat(obj.alias, '::append_sampled_dimension');
62+
func_name = strcat(obj.alias, '::appendSampledDimension');
6363
dim = nix.SampledDimension(nix_mx(func_name, obj.nix_handle, interval));
6464
end
6565

6666
function dim = append_range_dimension(obj, ticks)
67-
func_name = strcat(obj.alias, '::append_range_dimension');
67+
func_name = strcat(obj.alias, '::appendRangeDimension');
6868
dim = nix.RangeDimension(nix_mx(func_name, obj.nix_handle, ticks));
6969
end
7070

7171
function dim = append_alias_range_dimension(obj)
72-
func_name = strcat(obj.alias, '::append_alias_range_dimension');
72+
func_name = strcat(obj.alias, '::appendAliasRangeDimension');
7373
dim = nix.RangeDimension(nix_mx(func_name, obj.nix_handle));
7474
end
7575

7676
function delCheck = delete_dimensions(obj)
77-
func_name = strcat(obj.alias, '::delete_dimensions');
77+
func_name = strcat(obj.alias, '::deleteDimensions');
7878
delCheck = nix_mx(func_name, obj.nix_handle);
7979
end;
8080

+nix/Dynamic.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ function set_method(obj, val)
3232
end
3333

3434
if (isempty(val))
35-
nix_mx(strcat(obj.alias, '::set_none_', prop), obj.nix_handle, 0);
35+
nix_mx(strcat(obj.alias, '::setNone', upper(prop(1)), prop(2:end)), obj.nix_handle, 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.
3939
ME = MException('MATLAB:class:SetProhibited', sprintf(...
4040
'This value only supports cells.'));
4141
throwAsCaller(ME);
4242
else
43-
nix_mx(strcat(obj.alias, '::set_', prop), obj.nix_handle, val);
43+
nix_mx(strcat(obj.alias, '::set', upper(prop(1)), prop(2:end)), obj.nix_handle, val);
4444
end
4545
obj.info = nix_mx(strcat(obj.alias, '::describe'), obj.nix_handle);
4646
end

+nix/MetadataMixIn.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525

2626
function set_metadata(obj, val)
2727
if (isempty(val))
28-
nix_mx(strcat(obj.alias, '::set_none_metadata'), ...
28+
nix_mx(strcat(obj.alias, '::setNoneMetadata'), ...
2929
obj.nix_handle, val);
3030
else
3131
nix.Utils.add_entity(obj, val, 'nix.Section', ...
32-
strcat(obj.alias, '::set_metadata'));
32+
strcat(obj.alias, '::setMetadata'));
3333
end;
3434
end;
3535
end;

+nix/MultiTag.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,14 @@
143143

144144
function [] = set_extents(obj, add_this)
145145
if(isempty(add_this))
146-
nix_mx('MultiTag::set_none_extents', obj.nix_handle, 0);
146+
nix_mx('MultiTag::setNoneExtents', obj.nix_handle, 0);
147147
else
148148
if(strcmp(class(add_this), 'nix.DataArray'))
149149
addID = add_this.id;
150150
else
151151
addID = add_this;
152152
end;
153-
nix_mx('MultiTag::set_extents', obj.nix_handle, addID);
153+
nix_mx('MultiTag::setExtents', obj.nix_handle, addID);
154154
end;
155155
end;
156156

+nix/RangeDimension.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
if index > 0
3131
index = index - 1;
3232
end
33-
func_name = strcat(obj.alias, '::tick_at');
33+
func_name = strcat(obj.alias, '::tickAt');
3434
tickAt = nix_mx(func_name, obj.nix_handle, index);
3535
end
3636

3737
function indexOf = index_of(obj, position)
38-
func_name = strcat(obj.alias, '::index_of');
38+
func_name = strcat(obj.alias, '::indexOf');
3939
indexOf = nix_mx(func_name, obj.nix_handle, position);
4040
end
4141

+nix/SampledDimension.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
end
2828

2929
function indexOf = index_of(obj, position)
30-
func_name = strcat(obj.alias, '::index_of');
30+
func_name = strcat(obj.alias, '::indexOf');
3131
indexOf = nix_mx(func_name, obj.nix_handle, position);
3232
end
3333

3434
function posAt = position_at(obj, index)
3535
if index > 0
3636
index = index - 1;
3737
end
38-
func_name = strcat(obj.alias, '::position_at');
38+
func_name = strcat(obj.alias, '::positionAt');
3939
posAt = nix_mx(func_name, obj.nix_handle, index);
4040
end
4141

+nix/Section.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@
4646

4747
function [] = set_link(obj, val)
4848
if (isempty(val))
49-
nix_mx('Section::set_none_link', obj.nix_handle);
49+
nix_mx('Section::setNoneLink', obj.nix_handle);
5050
else
5151
if(strcmp(class(val), 'nix.Section'))
5252
addID = val.id;
5353
else
5454
addID = val;
5555
end;
56-
nix_mx('Section::set_link', obj.nix_handle, addID);
56+
nix_mx('Section::setLink', obj.nix_handle, addID);
5757
end;
5858
end;
5959

0 commit comments

Comments
 (0)