fix sampled dim axis method

Author: mpsonntag

+nix/SampledDimension.m

@@ -39,7 +39,7 @@
                 startIndex = startIndex - 1;
             end
             func_name = strcat(obj.alias, '::axis');
-            axis = nix_mx(func_name, obj.nix_handle, uint64(count), uint64(startIndex));
+            axis = nix_mx(func_name, obj.nix_handle, count, startIndex);
         end
     end
 end

nix_mx.cc

@@ -323,9 +323,9 @@ void mexFunction(int            nlhs,
             .reg("set_offset", SETTER(double, nix::SampledDimension, offset))
             .reg("set_none_offset", SETTER(const boost::none_t, nix::SampledDimension, offset))
             .reg("index_of", &nix::SampledDimension::indexOf)
-            .reg("position_at", &nix::SampledDimension::positionAt)
-            .reg("axis", &nix::SampledDimension::axis);
-        
+            .reg("position_at", &nix::SampledDimension::positionAt);
+        methods->add("SampledDimension::axis", nixdimensions::sampled_axis);
+
         classdef<nix::RangeDimension>("RangeDimension", methods)
             .desc(&nixdimensions::describe)
             .reg("set_label", SETTER(const std::string&, nix::RangeDimension, label))

src/nixdimensions.cc

@@ -41,6 +41,18 @@ namespace nixdimensions {
         return sb.array();
     }
 
+    void sampled_axis(const extractor &input, infusor &output) {
+        nix::SampledDimension dim = input.entity<nix::SampledDimension>(1);
+        const mwSize count = static_cast<mwSize>(input.num<double>(2));
+        const mwSize startIndex = static_cast<mwSize>(input.num<double>(3));
+
+        std::vector<double> a = dim.axis(count, startIndex);
+        mxArray *axis = mxCreateDoubleMatrix(1, a.size(), mxREAL);
+        std::copy(a.begin(), a.end(), mxGetPr(axis));
+
+        output.set(0, axis);
+    }
+
     void range_tick_at(const extractor &input, infusor &output) {
         nix::RangeDimension dim = input.entity<nix::RangeDimension>(1);
         const mwSize index = static_cast<mwSize>(input.num<double>(2));

src/nixdimensions.h

@@ -11,6 +11,8 @@ namespace nixdimensions {
 
     mxArray *describe(const nix::RangeDimension &dim);
 
+    void sampled_axis(const extractor &input, infusor &output);
+
     void range_tick_at(const extractor &input, infusor &output);
 
     void range_axis(const extractor &input, infusor &output);