Merge pull request #73 from mpsonntag/createDelete

setters for DataArray part I

Author: asobolev

nix_mx.cc

@@ -128,7 +128,15 @@ void mexFunction(int            nlhs,
         classdef<nix::DataArray>("DataArray", methods)
             .desc(&nixdataarray::describe)
             .reg("sources", GETSOURCES(IDataArray))
-            .reg("openMetadataSection", GETMETADATA(IDataArray));
+            .reg("openMetadataSection", GETMETADATA(IDataArray))
+            // the following setter lead to an error
+            //.reg("set_type", SETTER(const std::string&, nix::DataArray, type))
+            //.reg("set_definition", SETTER(const std::string&, nix::DataArray, definition))
+            //.reg("set_none_definition", SETTER(const boost::none_t, nix::DataArray, definition))
+            .reg("set_label", SETTER(const std::string&, nix::DataArray, label))
+            .reg("set_none_label", SETTER(const boost::none_t, nix::DataArray, label))
+            .reg("set_unit", SETTER(const std::string&, nix::DataArray, unit))
+            .reg("set_none_unit", SETTER(const boost::none_t, nix::DataArray, unit));
         methods->add("DataArray::readAll", nixdataarray::read_all);
         methods->add("DataArray::writeAll", nixdataarray::write_all);
         methods->add("DataArray::addSource", nixdataarray::add_source);

tests/TestDataArray.m

@@ -3,6 +3,7 @@
 %   Detailed explanation goes here
 
     funcs = {};
+    funcs{end+1} = @test_attrs;
     funcs{end+1} = @test_open_data;
     funcs{end+1} = @test_open_metadata;
     funcs{end+1} = @test_list_sources;
@@ -11,6 +12,42 @@
     funcs{end+1} = @test_remove_source;
 end
 
+function [] = test_attrs( varargin )
+%% Test: Access Attributes
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.createBlock('daTestBlock', 'test nixBlock');
+    da = b.create_data_array('daTest', 'test nixDataArray', 'double', [1 2]);
+
+    assert(~isempty(da.id));
+    assert(strcmp(da.name, 'daTest'));
+    assert(strcmp(da.type, 'test nixDataArray'));
+
+    %-- TODO does not work at the moment on the c++ side
+    %da.type = 'nixDataArray';
+    %assert(strcmp(da.type, 'nixDataArray'));
+
+    %assert(isempty(da.definition));
+    %b.definition = 'data array definition';
+    %assert(strcmp(da.definition, 'data array definition'));
+
+    %da.definition = '';
+    %assert(isempty(da.definition));
+
+    assert(isempty(da.unit));
+    da.unit = 'ms';
+    assert(strcmp(da.unit, 'ms'));
+
+    da.unit = '';
+    assert(isempty(da.unit));
+
+    assert(isempty(da.label));
+    da.label = 'data array label';
+    assert(strcmp(da.label, 'data array label'));
+
+    da.label = '';
+    assert(isempty(da.label));
+end
+
 %% Test: Read all data from DataArray
 function [] = test_open_data( varargin )
     test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);