Skip to content

Commit 9f42035

Browse files
committed
[c++/m] Support DataArray expansionOrigin
Adds the set and setNone methods as well as the get method via the description method on the c++ side. Adds the dynamic attribute on the matlab side and updates the attribute test function accordingly.
1 parent 9626ffd commit 9f42035

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

+nix/DataArray.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
nix.Dynamic.add_dyn_attr(obj, 'label', 'rw');
2929
nix.Dynamic.add_dyn_attr(obj, 'unit', 'rw');
3030
nix.Dynamic.add_dyn_attr(obj, 'expansionOrigin', 'rw');
31-
nix.Dynamic.add_dyn_attr(obj, 'polynom_coefficients', 'rw');
31+
nix.Dynamic.add_dyn_attr(obj, 'polynomCoefficients', 'rw');
3232
nix.Dynamic.add_dyn_attr(obj, 'shape', 'rw');
3333
end;
3434

nix_mx.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,8 @@ void mexFunction(int nlhs,
209209
.reg("setNoneLabel", SETTER(const boost::none_t, nix::DataArray, label))
210210
.reg("setUnit", SETTER(const std::string&, nix::DataArray, unit))
211211
.reg("setNoneUnit", SETTER(const boost::none_t, nix::DataArray, unit))
212+
.reg("setExpansionOrigin", SETTER(double, nix::DataArray, expansionOrigin))
213+
.reg("setNoneExpansionOrigin", SETTER(boost::none_t, nix::DataArray, expansionOrigin))
212214
.reg("dimensions", FILTER(std::vector<nix::Dimension>, nix::DataArray, , dimensions))
213215
.reg("appendSetDimension", &nix::DataArray::appendSetDimension)
214216
.reg("appendRangeDimension", &nix::DataArray::appendRangeDimension)

src/nixdataarray.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace nixdataarray {
2121

2222
mxArray *describe(const nix::DataArray &da) {
2323
struct_builder sb({ 1 }, { "id", "type", "name", "definition", "label",
24-
"shape", "unit", "polynom_coefficients" });
24+
"shape", "unit", "expansionOrigin", "polynom_coefficients" });
2525

2626
sb.set(da.id());
2727
sb.set(da.type());
@@ -30,6 +30,7 @@ namespace nixdataarray {
3030
sb.set(da.label());
3131
sb.set(da.dataExtent());
3232
sb.set(da.unit());
33+
sb.set(da.expansionOrigin());
3334
sb.set(da.polynomCoefficients());
3435

3536
return sb.array();

tests/TestDataArray.m

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@
6363

6464
da.label = '';
6565
assert(isempty(da.label));
66+
67+
assert(isempty(da.expansionOrigin));
68+
da.expansionOrigin = 2.5;
69+
assert(da.expansionOrigin == 2.5)
70+
71+
da.expansionOrigin = '';
72+
assert(isempty(da.expansionOrigin));
6673
end
6774

6875
%% Test: Read all data from DataArray

0 commit comments

Comments
 (0)