added SetDimension in matlab + some removed unused methods

Author: asobolev

+nix/DataArray.m

@@ -4,8 +4,9 @@
     properties (Hidden)
         % namespace reference for nix-mx functions
         alias = 'DataArray'
+        dimsCache
     end
-   
+
     properties(Dependent)
         dimensions % should not be dynamic due to complex set operation
     end;
@@ -22,10 +23,21 @@
             nix.Dynamic.add_dyn_attr(obj, 'expansionOrigin', 'rw');
             nix.Dynamic.add_dyn_attr(obj, 'polynom_coefficients', 'rw');
             nix.Dynamic.add_dyn_attr(obj, 'shape', 'rw');
+            
+            obj.dimsCache = nix.CacheStruct();
         end;
 
         function dimensions = get.dimensions(obj)
-           dimensions = obj.info.dimensions;
+            if obj.dimsCache.lastUpdate ~= obj.updatedAt
+                currList = nix_mx('DataArray::dimensions', obj.nix_handle);
+                obj.dimsCache.data = cell(length(currList), 1);
+                for i = 1:length(currList)
+                    % TODO convert to a proper type 
+                	obj.dimsCache.data{i} = nix.SetDimension(currList{i});
+                end;
+                obj.dimsCache.lastUpdate = obj.updatedAt;
+            end;
+            dimensions = obj.dimsCache.data;
         end;
 
         % -----------------

+nix/SetDimension.m

@@ -0,0 +1,19 @@
+classdef SetDimension < nix.Entity
+    %SetDimension nix SetDimension object
+    
+    properties (Hidden)
+        % namespace reference for nix-mx functions
+        alias = 'SetDimension'
+    end
+    
+    methods
+        function obj = SetDimension(h)
+            [email protected](h);
+        end
+        
+        function ua = updatedAt(obj)
+            ua = 0;
+        end;
+    end
+end
+   

src/nixdataarray.cc

@@ -15,7 +15,7 @@ namespace nixdataarray {
     mxArray *describe(const nix::DataArray &da)
     {
         struct_builder sb({ 1 }, { "id", "type", "name", "definition", "label",
-            "shape", "unit", "dimensions", "polynom_coefficients" });
+            "shape", "unit", "polynom_coefficients" });
 
         sb.set(da.id());
         sb.set(da.type());
@@ -24,31 +24,6 @@ namespace nixdataarray {
         sb.set(da.label());
         sb.set(da.dataExtent());
         sb.set(da.unit());
-
-        size_t ndims = da.dimensionCount();
-
-        mxArray *dims = mxCreateCellMatrix(1, ndims);
-        std::vector<nix::Dimension> da_dims = da.dimensions();
-
-        for (size_t i = 0; i < ndims; i++) {
-            mxArray *ca;
-
-            switch (da_dims[i].dimensionType()) {
-            case nix::DimensionType::Set:
-                ca = dim_to_struct(da_dims[i].asSetDimension());
-                break;
-            case nix::DimensionType::Range:
-                ca = dim_to_struct(da_dims[i].asRangeDimension());
-                break;
-            case nix::DimensionType::Sample:
-                ca = dim_to_struct(da_dims[i].asSampledDimension());
-                break;
-            }
-
-            mxSetCell(dims, i, ca);
-        }
-
-        sb.set(dims);
         sb.set(da.polynomCoefficients());
 
         return sb.array();

src/utils/nix2mx.cc

@@ -25,42 +25,6 @@ mxArray *nmCreateScalar(uint32_t val) {
     return arr;
 }
 
-mxArray *dim_to_struct(nix::SetDimension dim) {
-
-    struct_builder sb({ 1 }, { "type", "type_id", "labels" });
-
-    sb.set("set");
-    sb.set(1);
-    sb.set(dim.labels());
-
-    return sb.array();
-}
-
-mxArray *dim_to_struct(nix::SampledDimension dim) {
-
-    struct_builder sb({ 1 }, { "type", "type_id", "interval", "label", "unit" });
-
-    sb.set("sampled");
-    sb.set(2);
-    sb.set(dim.samplingInterval());
-    sb.set(dim.label());
-    sb.set(dim.unit());
-
-    return sb.array();
-}
-
-mxArray *dim_to_struct(nix::RangeDimension dim) {
-
-    struct_builder sb({ 1 }, { "type", "type_id", "ticks", "unit" });
-
-    sb.set("range");
-    sb.set(3);
-    sb.set(dim.ticks());
-    sb.set(dim.unit());
-
-    return sb.array();
-}
-
 nix::NDSize mx_array_to_ndsize(const mxArray *arr) {
 
     size_t m = mxGetM(arr);

src/utils/nix2mx.h

@@ -20,10 +20,4 @@ nix::Value mx_array_to_value(const mxArray *arr);
 
 mxArray *nmCreateScalar(uint32_t val);
 
-mxArray *dim_to_struct(nix::SetDimension dim);
-
-mxArray *dim_to_struct(nix::SampledDimension dim);
-
-mxArray *dim_to_struct(nix::RangeDimension dim);
-
 #endif