Merge pull request #72 from mpsonntag/createDelete

Add setter methods for Block and Source

Author: asobolev

nix_mx.cc

@@ -118,7 +118,10 @@ void mexFunction(int            nlhs,
             .reg("deleteDataArray", REMOVER(nix::DataArray, nix::Block, deleteDataArray))
             .reg("deleteSource", REMOVER(nix::Source, nix::Block, deleteSource))
             .reg("deleteTag", REMOVER(nix::Tag, nix::Block, deleteTag))
-            .reg("deleteMultiTag", REMOVER(nix::MultiTag, nix::Block, deleteMultiTag));
+            .reg("deleteMultiTag", REMOVER(nix::MultiTag, nix::Block, deleteMultiTag))
+            .reg("set_type", SETTER(const std::string&, nix::Block, type))
+            .reg("set_definition", SETTER(const std::string&, nix::Block, definition))
+            .reg("set_none_definition", SETTER(const boost::none_t, nix::Block, definition));
         methods->add("Block::createDataArray", nixblock::create_data_array);
         methods->add("Block::createMultiTag", nixblock::create_multi_tag);
 
@@ -138,7 +141,10 @@ void mexFunction(int            nlhs,
             .reg("deleteSource", REMOVER(nix::Source, nix::Source, deleteSource))
             .reg("sources", &nix::Source::sources)
             .reg("openSource", GETBYSTR(nix::Source, nix::Source, getSource))
-            .reg("openMetadataSection", GETCONTENT(nix::Section, nix::Source, metadata));
+            .reg("openMetadataSection", GETCONTENT(nix::Section, nix::Source, metadata))
+            .reg("set_type", SETTER(const std::string&, nix::Source, type))
+            .reg("set_definition", SETTER(const std::string&, nix::Source, definition))
+            .reg("set_none_definition", SETTER(const boost::none_t, nix::Source, definition));
 
         classdef<nix::Tag>("Tag", methods)
             .desc(&nixtag::describe)

tests/TestBlock.m

@@ -29,11 +29,20 @@
 function [] = test_attrs( varargin )
 %% Test: Access Attributes
     f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
-    b = f.createBlock('tagtest', 'nixBlock');
+    b = f.createBlock('tagtest', 'test nixBlock');
 
     assert(~isempty(b.id));
     assert(strcmp(b.name, 'tagtest'));
+    assert(strcmp(b.type, 'test nixBlock'));
+    
+    b.type = 'nixBlock';
     assert(strcmp(b.type, 'nixBlock'));
+    
+    assert(isempty(b.definition));
+    b.definition = 'block definition';
+    assert(strcmp(b.definition, 'block definition'));
+
+    b.definition = '';
     assert(isempty(b.definition));
 end
 

tests/TestSource.m

@@ -5,6 +5,7 @@
     funcs = {};
     funcs{end+1} = @test_create_source;
     funcs{end+1} = @test_delete_source;
+    funcs{end+1} = @test_attrs;
     funcs{end+1} = @test_fetch_sources;
     funcs{end+1} = @test_open_source;
     funcs{end+1} = @test_open_metadata;
@@ -83,3 +84,24 @@
     assert(~getSource.delete_source('I do not exist'));
     assert(isempty(getSource.sources));
 end
+
+function [] = test_attrs( varargin )
+%% Test: Access Attributes
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.createBlock('tagtest', 'test nixBlock');
+    s = b.create_source('sourcetest', 'test nixSource');
+
+    assert(~isempty(s.id));
+    assert(strcmp(s.name, 'sourcetest'));
+    assert(strcmp(s.type, 'test nixSource'));
+    
+    s.type = 'nixSource';
+    assert(strcmp(s.type, 'nixSource'));
+    
+    assert(isempty(s.definition));
+    s.definition = 'source definition';
+    assert(strcmp(s.definition, 'source definition'));
+
+    s.definition = '';
+    assert(isempty(s.definition));
+end