add create position/extent for multitag

Author: mpsonntag

+nix/MultiTag.m

@@ -102,7 +102,16 @@
                 retObj = nix.DataArray(handle);
             end;
         end;
-        
+
+        function [] = add_positions(obj, add_this)
+            if(strcmp(class(add_this), 'nix.DataArray'))
+                addID = add_this.id;
+            else
+                addID = add_this;
+            end;
+            nix_mx('MultiTag::addPositions', obj.nix_handle, addID);
+        end;
+
         % ------------------
         % Extents methods
         % ------------------
@@ -115,5 +124,14 @@
             end;
         end;
 
+        function [] = add_extents(obj, add_this)
+            if(strcmp(class(add_this), 'nix.DataArray'))
+                addID = add_this.id;
+            else
+                addID = add_this;
+            end;
+            nix_mx('MultiTag::addExtents', obj.nix_handle, addID);
+        end;
+
     end;
 end

nix_mx.cc

@@ -178,6 +178,8 @@ void mexFunction(int            nlhs,
         methods->add("MultiTag::addReference", nixmultitag::add_reference);
         methods->add("MultiTag::addSource", nixmultitag::add_source);
         methods->add("MultiTag::createFeature", nixmultitag::create_feature);
+        methods->add("MultiTag::addPositions", nixmultitag::add_positions);
+        methods->add("MultiTag::addExtents", nixmultitag::add_extents);
 
         classdef<nix::Section>("Section", methods)
             .desc(&nixsection::describe)

src/nixmultitag.cc

@@ -64,4 +64,18 @@ namespace nixmultitag {
         output.set(0, data);
     }
 
+    void add_positions(const extractor &input, infusor &output)
+    {
+        nix::MultiTag currObj = input.entity<nix::MultiTag>(1);
+        currObj.positions(input.str(2));
+    }
+
+    void add_extents(const extractor &input, infusor &output)
+    {
+        nix::MultiTag currObj = input.entity<nix::MultiTag>(1);
+        currObj.extents(input.str(2));
+    }
+
+    void remove_extents(const extractor &input, infusor &output);
+
 } // namespace nixmultitag

src/nixmultitag.h

@@ -17,6 +17,10 @@ namespace nixmultitag {
 
     void retrieve_feature_data(const extractor &input, infusor &output);
 
+    void add_positions(const extractor &input, infusor &output);
+
+    void add_extents(const extractor &input, infusor &output);
+
 } // namespace nixmultitag
 
 #endif

tests/TestMultiTag.m

@@ -15,8 +15,10 @@
     funcs{end+1} = @test_open_source;
     funcs{end+1} = @test_open_feature;
     funcs{end+1} = @test_open_reference;
+    funcs{end+1} = @test_add_positions;
     funcs{end+1} = @test_has_positions;
     funcs{end+1} = @test_open_positions;
+    funcs{end+1} = @test_add_extents;
     funcs{end+1} = @test_open_extents;
     funcs{end+1} = @test_open_metadata;
     funcs{end+1} = @test_retrieve_data;
@@ -244,6 +246,23 @@
     assert(isempty(getRef));
 end
 
+%% Test: Add positions by entity and id
+function [] = test_add_positions ( varargin )
+    test_file = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = test_file.createBlock('positionsTest', 'nixBlock');
+    tmp = b.create_data_array('positionsTestDataArray', 'nixDataArray', 'double', [1 2 3 4 5 6]);
+    getMTag = b.create_multi_tag('positionstest', 'nixMultiTag', b.dataArrays{1});
+
+    tmp = b.create_data_array('positionsTest1', 'nixDataArray', 'double', [0 1]);
+    tmp = b.create_data_array('positionsTest2', 'nixDataArray', 'double', [2 4]);
+
+    getMTag.add_positions(b.dataArrays{2}.id);
+    assert(strcmp(getMTag.open_positions.name, 'positionsTest1'));
+
+    getMTag.add_positions(b.dataArrays{3});
+    assert(strcmp(getMTag.open_positions.name, 'positionsTest2'));
+end
+
 %% Test: Has positions
 function [] = test_has_positions( varargin )
     test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
@@ -272,6 +291,29 @@
     assert(~isempty(getMultiTag.open_positions));
 end
 
+%% Test: Add extents by entity and id
+function [] = test_add_extents ( varargin )
+    test_file = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    b = test_file.createBlock('extentsTest', 'nixBlock');
+%    tmp = b.create_data_array('extentsTestDataArray', 'nixDataArray', 'double', [1 2 3 4 5 6; 1 2 3 4 5 6]);
+%    getMTag = b.create_multi_tag('extentstest', 'nixMultiTag', b.dataArrays{1});
+
+%    tmp = b.create_data_array('positionsTest1', 'nixDataArray', 'double', [1, 1]);
+%    tmp = b.create_data_array('positionsTest2', 'nixDataArray', 'double', [1, 3]);
+
+%    tmp = b.create_data_array('extentsTest1', 'nixDataArray', 'double', [1, 1]);
+%    tmp = b.create_data_array('extentsTest2', 'nixDataArray', 'double', [1, 1]);
+
+%    getMTag.add_positions(b.dataArrays{2});
+%    getMTag.add_extents(b.dataArrays{4}.id);
+%    assert(strcmp(getMTag.open_extents.name, 'extentsTest1'));
+
+%    getMTag.add_positions(b.dataArrays{3});
+%    getMTag.add_extents(b.dataArrays{5});
+%    assert(strcmp(getMTag.open_extents.name, 'extentsTest2'));
+    disp('Test MultiTag: add extents ... TODO (add dimensions required)');
+end
+
 %% Test: Open extents
 function [] = test_open_extents( varargin )
     test_file = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);