completify: add missing Feature functions and tests

Author: mpsonntag

+nix/Feature.m

@@ -21,12 +21,23 @@
         end;
 
         function linkType = get.linkType(obj)
-            linkType = obj.info.linkType;
+            linkType = nix_mx('Feature::getLinkType', obj.nix_handle);
+        end;
+
+        function [] = set.linkType(obj, linkType)
+            nix_mx('Feature::setLinkType', obj.nix_handle, linkType);
         end;
 
         function dataArray = open_data(obj)
            dataArray = nix.DataArray(nix_mx('Feature::openData', obj.nix_handle));
         end;
+        
+        function [] = set_data(obj, setData)
+            if(strcmp(class(setData), 'nix.DataArray'))
+                setData = setData.id;
+            end;
+            nix_mx('Feature::setData', obj.nix_handle, setData);
+        end;
     end;
 
-end
+end

nix_mx.cc

@@ -290,7 +290,10 @@ void mexFunction(int            nlhs,
 
         classdef<nix::Feature>("Feature", methods)
             .desc(&nixfeature::describe)
-            .reg("openData", GETCONTENT(nix::DataArray, nix::Feature, data));
+            .reg("openData", GETCONTENT(nix::DataArray, nix::Feature, data))
+            .reg("setData", SETTER(const std::string&, nix::Feature, data))
+            .reg("getLinkType", GETCONTENT(nix::LinkType, nix::Feature, linkType));
+        methods->add("Feature::setLinkType", nixfeature::set_link_type);
 
         classdef<nix::Property>("Property", methods)
             .desc(&nixproperty::describe)
@@ -361,4 +364,3 @@ void mexFunction(int            nlhs,
         mexErrMsgIdAndTxt("nix:arg:dispatch", "Unkown command");
     }
 }
-

src/nixfeature.cc

@@ -18,4 +18,11 @@ namespace nixfeature {
         return sb.array();
     }
 
-} // namespace nixfeature
+    void set_link_type(const extractor &input, infusor &output)
+    {
+        nix::Feature feat = input.entity<nix::Feature>(1);
+
+        feat.linkType(input.ltype(2));
+    }
+
+} // namespace nixfeature

src/nixfeature.h

@@ -7,6 +7,8 @@ namespace nixfeature {
 
     mxArray *describe(const nix::Feature &feat);
 
+    void set_link_type(const extractor &input, infusor &output);
+
 } // namespace nixfeature
 
-#endif
+#endif

tests/TestFeature.m

@@ -4,6 +4,8 @@
 
     funcs = {};
     funcs{end+1} = @test_open_data;
+    funcs{end+1} = @test_get_set_link_type;
+    funcs{end+1} = @test_set_data;
 end
 
 %% Test: Open data from feature
@@ -17,3 +19,69 @@
     getFeature = getTag.features{1};
     assert(~isempty(getFeature.open_data));
 end
+
+%% Test: Get and set nix.LinkType
+function [] = test_get_set_link_type ( varargin )
+    fileName = 'testRW.h5';
+    f = nix.File(fullfile(pwd, 'tests', fileName), nix.FileMode.Overwrite);
+    b = f.createBlock('featureTest', 'nixBlock');
+    da = b.create_data_array('featureTestDataArray', 'nixDataArray', 'double', [1 2 3 4 5 6]);
+    t = b.create_tag('featureTest', 'nixTag', [1, 2]);
+    feat = t.add_feature(b.dataArrays{1}, nix.LinkType.Tagged);
+    
+    try
+        feat.linkType = '';
+    catch ME
+        assert(strcmp(ME.identifier, 'nix:arg:inval'));
+    end;
+    try
+        feat.linkType = {};
+    catch ME
+        assert(strcmp(ME.identifier, 'nix:arg:inval'));
+    end;
+    try
+        feat.linkType = 1;
+    catch ME
+        assert(strcmp(ME.identifier, 'nix:arg:inval'));
+    end;
+    assert(f.blocks{1}.tags{1}.features{1}.linkType == 0);
+
+    feat.linkType = nix.LinkType.Untagged;
+    assert(f.blocks{1}.tags{1}.features{1}.linkType == 1);
+
+    feat.linkType = nix.LinkType.Indexed;
+    
+    clear feat t da b f;
+    f = nix.File(fullfile(pwd, 'tests', fileName), nix.FileMode.ReadOnly);
+    assert(f.blocks{1}.tags{1}.features{1}.linkType == 2);
+end
+
+%% Test: Set data by entity, ID and name
+function [] = test_set_data ( varargin )
+    fileName = 'testRW.h5';
+    daName1 = 'featTestDA1';
+    daName2 = 'featTestDA2';
+    daName3 = 'featTestDA3';
+    daName4 = 'featTestDA4';
+    daType = 'nixDataArray';
+    daData = [1 2 3 4 5 6];
+    f = nix.File(fullfile(pwd, 'tests', fileName), nix.FileMode.Overwrite);
+    b = f.createBlock('featureTest', 'nixBlock');
+    da1 = b.create_data_array(daName1, daType, 'double', daData);
+    da2 = b.create_data_array(daName2, daType, 'double', daData);
+    da3 = b.create_data_array(daName3, daType, 'double', daData);
+    da4 = b.create_data_array(daName4, daType, 'double', daData);
+    t = b.create_tag('featureTest', 'nixTag', [1, 2]);
+    feat = t.add_feature(b.dataArrays{1}, nix.LinkType.Tagged);
+    
+    assert(strcmp(feat.open_data.name, daName1));
+    feat.set_data(da2);
+    assert(strcmp(f.blocks{1}.tags{1}.features{1}.open_data.name, daName2));
+    feat.set_data(da3.id);
+    assert(strcmp(f.blocks{1}.tags{1}.features{1}.open_data.name, daName3));
+    feat.set_data(da4.name);
+    
+    clear feat t da4 da3 da2 da1 b f;
+    f = nix.File(fullfile(pwd, 'tests', fileName), nix.FileMode.ReadOnly);
+    assert(strcmp(f.blocks{1}.tags{1}.features{1}.open_data.name, daName4));
+end