Skip to content

Commit a7e8f43

Browse files
committed
aliasRangeDim: add
1 parent ad54241 commit a7e8f43

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

+nix/DataArray.m

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,13 @@
7171
obj.dimsCache.lastUpdate = 0;
7272
end
7373

74+
function dim = append_alias_range_dimension(obj)
75+
func_name = strcat(obj.alias, '::append_alias_range_dimension');
76+
dim = nix.RangeDimension(nix_mx(func_name, obj.nix_handle));
77+
%-- TODO purge once merged into removeCache branch.
78+
obj.dimsCache.lastUpdate = 0;
79+
end
80+
7481
function delCheck = delete_dimension(obj, index)
7582
func_name = strcat(obj.alias, '::delete_dimension');
7683
delCheck = nix_mx(func_name, obj.nix_handle, index);

+nix/RangeDimension.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
% assign dynamic properties
1414
nix.Dynamic.add_dyn_attr(obj, 'dimensionType', 'r');
15+
nix.Dynamic.add_dyn_attr(obj, 'isAlias', 'r');
1516
nix.Dynamic.add_dyn_attr(obj, 'label', 'rw');
1617
nix.Dynamic.add_dyn_attr(obj, 'unit', 'rw');
1718
nix.Dynamic.add_dyn_attr(obj, 'ticks', 'rw');
@@ -35,6 +36,6 @@
3536
func_name = strcat(obj.alias, '::axis');
3637
axis = nix_mx(func_name, obj.nix_handle, count, startIndex);
3738
end
39+
3840
end
3941
end
40-

nix_mx.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,11 @@ void mexFunction(int nlhs,
178178
.reg("dimensions", FILTER(std::vector<nix::Dimension>, nix::DataArray, , dimensions))
179179
.reg("append_set_dimension", &nix::DataArray::appendSetDimension)
180180
.reg("append_range_dimension", &nix::DataArray::appendRangeDimension)
181+
.reg("append_alias_range_dimension", &nix::DataArray::appendAliasRangeDimension)
181182
.reg("append_sampled_dimension", &nix::DataArray::appendSampledDimension)
182183
.reg("create_set_dimension", &nix::DataArray::createSetDimension)
183184
.reg("create_range_dimension", &nix::DataArray::createRangeDimension)
185+
.reg("create_alias_range_dimension", &nix::DataArray::createAliasRangeDimension)
184186
.reg("create_sampled_dimension", &nix::DataArray::createSampledDimension);
185187
methods->add("DataArray::delete_dimension", nixdataarray::delete_dimension);
186188
methods->add("DataArray::readAll", nixdataarray::read_all);
@@ -333,7 +335,8 @@ void mexFunction(int nlhs,
333335
.reg("set_ticks", SETTER(const std::vector<double>&, nix::RangeDimension, ticks))
334336
.reg("index_of", &nix::RangeDimension::indexOf)
335337
.reg("tick_at", &nix::RangeDimension::tickAt)
336-
.reg("axis", &nix::RangeDimension::axis);
338+
.reg("axis", &nix::RangeDimension::axis)
339+
.reg("alias", &nix::RangeDimension::alias);
337340

338341
mexAtExit(on_exit);
339342
});

src/nixdimensions.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ namespace nixdimensions {
3030

3131
mxArray *describe(const nix::RangeDimension &dim)
3232
{
33-
struct_builder sb({ 1 }, { "dimensionType", "label", "unit", "ticks" });
33+
struct_builder sb({ 1 }, { "dimensionType", "isAlias", "label", "unit", "ticks" });
3434

3535
sb.set(dim.dimensionType());
36+
sb.set(dim.alias());
3637
sb.set(dim.label());
3738
sb.set(dim.unit());
3839
sb.set(dim.ticks());
3940

4041
return sb.array();
4142
}
42-
} // namespace nixtag
43+
} // namespace nixdimensions

0 commit comments

Comments
 (0)