add/remove source from dataarray

Author: mpsonntag

+nix/DataArray.m

@@ -93,6 +93,16 @@ function write_all(obj, data)  % TODO add (optional) offset
         % Sources methods
         % -----------------
 
+        function [] = add_source(obj, add_this)
+            obj.sourcesCache = nix.Utils.add_entity(obj, ...
+                add_this, 'nix.Source', 'DataArray::addSource', obj.sourcesCache);
+        end;
+
+        function delCheck = remove_source(obj, del)
+            [delCheck, obj.sourcesCache] = nix.Utils.delete_entity(obj, ...
+                del, 'nix.Source', 'DataArray::removeSource', obj.sourcesCache);
+        end;
+
         function sources = get.sources(obj)
             [obj.sourcesCache, sources] = nix.Utils.fetchObjList(obj.updatedAt, ...
                 'DataArray::sources', obj.nix_handle, obj.sourcesCache, @nix.Source);

nix_mx.cc

@@ -128,6 +128,9 @@ void mexFunction(int            nlhs,
             .reg("openMetadataSection", GETMETADATA(IDataArray));
         methods->add("DataArray::readAll", nixdataarray::read_all);
         methods->add("DataArray::writeAll", nixdataarray::write_all);
+        methods->add("DataArray::addSource", nixdataarray::add_source);
+        // REMOVER for DataArray.removeSource leads to an error, therefore use method->add for now
+        methods->add("DataArray::removeSource", nixdataarray::remove_source);
 
         classdef<nix::Source>("Source", methods)
             .desc(&nixsource::describe)

src/nixdataarray.cc

@@ -54,6 +54,18 @@ namespace nixdataarray {
         return sb.array();
     }
 
+    void add_source(const extractor &input, infusor &output)
+    {
+        nix::DataArray currObj = input.entity<nix::DataArray>(1);
+        currObj.addSource(input.str(2));
+    }
+
+    void remove_source(const extractor &input, infusor &output)
+    {
+        nix::DataArray currObj = input.entity<nix::DataArray>(1);
+        output.set(0, currObj.removeSource(input.str(2)));
+    }
+
     void read_all(const extractor &input, infusor &output)
     {
         nix::DataArray da = input.entity<nix::DataArray>(1);

src/nixdataarray.h

@@ -7,6 +7,10 @@ namespace nixdataarray {
 
     mxArray *describe(const nix::DataArray &da);
 
+    void add_source(const extractor &input, infusor &output);
+
+    void remove_source(const extractor &input, infusor &output);
+
     void read_all(const extractor &input, infusor &output);
 
     void write_all(const extractor &input, infusor &output);

tests/TestDataArray.m

@@ -7,6 +7,8 @@
     funcs{end+1} = @test_open_metadata;
     funcs{end+1} = @test_list_sources;
     funcs{end+1} = @test_set_data;
+    funcs{end+1} = @test_add_source;
+    funcs{end+1} = @test_remove_source;
 end
 
 %% Test: Read all data from DataArray
@@ -56,3 +58,37 @@
     assert(isequal(d1.read_all(), data));
 end
 
+%% Test: Add sources by entity and id
+function [] = test_add_source ( varargin )
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.createBlock('sourceTest', 'nixBlock');
+    getSource = b.create_source('sourceTest', 'nixSource');
+    tmp = getSource.create_source('nestedSource1', 'nixSource');
+    tmp = getSource.create_source('nestedSource2', 'nixSource');
+    getDataArray = b.create_data_array('sourceTestDataArray', 'nixDataArray', 'double', [1 2]);
+
+    assert(isempty(getDataArray.sources));
+    getDataArray.add_source(getSource.sources{1}.id);
+    getDataArray.add_source(getSource.sources{2});
+    assert(size(getDataArray.sources, 1) == 2);
+end
+
+%% Test: Remove sources by entity and id
+function [] = test_remove_source ( varargin )
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = f.createBlock('sourceTest', 'nixBlock');
+    getSource = b.create_source('sourceTest', 'nixSource');
+    tmp = getSource.create_source('nestedSource1', 'nixSource');
+    tmp = getSource.create_source('nestedSource2', 'nixSource');
+    getDataArray = b.create_data_array('sourceTestDataArray', 'nixDataArray', 'double', [1 2]);
+
+    getDataArray.add_source(getSource.sources{1}.id);
+    getDataArray.add_source(getSource.sources{2});
+
+    assert(getDataArray.remove_source(getSource.sources{2}));
+    assert(getDataArray.remove_source(getSource.sources{1}.id));
+    assert(isempty(getDataArray.sources));
+
+    assert(getDataArray.remove_source('I do not exist'));
+    assert(size(getSource.sources, 1) == 2);
+end