[Matlab] Refactor Block index use

Author: mpsonntag

+nix/Block.m

@@ -49,7 +49,8 @@
             r = nix.Utils.open_entity(obj, 'getGroup', id_or_name, @nix.Group);
         end
 
-        function r = open_group_idx(obj, idx)
+        function r = open_group_idx(obj, index)
+            idx = nix.Utils.handle_index(index);
             r = nix.Utils.open_entity(obj, 'openGroupIdx', idx, @nix.Group);
         end
 
@@ -73,7 +74,8 @@
             r = nix.Utils.open_entity(obj, 'openDataArray', id_or_name, @nix.DataArray);
         end
 
-        function r = open_data_array_idx(obj, idx)
+        function r = open_data_array_idx(obj, index)
+            idx = nix.Utils.handle_index(index);
             r = nix.Utils.open_entity(obj, 'openDataArrayIdx', idx, @nix.DataArray);
         end
 
@@ -165,7 +167,8 @@
             r = nix.Utils.open_entity(obj, 'openSource', id_or_name, @nix.Source);
         end
 
-        function r = open_source_idx(obj, idx)
+        function r = open_source_idx(obj, index)
+            idx = nix.Utils.handle_index(index);
             r = nix.Utils.open_entity(obj, 'openSourceIdx', idx, @nix.Source);
         end
 
@@ -199,7 +202,8 @@
             r = nix.Utils.open_entity(obj, 'openTag', id_or_name, @nix.Tag);
         end
 
-        function r = open_tag_idx(obj, idx)
+        function r = open_tag_idx(obj, index)
+            idx = nix.Utils.handle_index(index);
             r = nix.Utils.open_entity(obj, 'openTagIdx', idx, @nix.Tag);
         end
 
@@ -233,7 +237,8 @@
             r = nix.Utils.open_entity(obj, 'openMultiTag', id_or_name, @nix.MultiTag);
         end
 
-        function r = open_multi_tag_idx(obj, idx)
+        function r = open_multi_tag_idx(obj, index)
+            idx = nix.Utils.handle_index(index);
             r = nix.Utils.open_entity(obj, 'openMultiTagIdx', idx, @nix.MultiTag);
         end
 

tests/TestBlock.m

@@ -438,9 +438,9 @@
     g2 = b.create_group('testGroup2', 'nixGroup');
     g3 = b.create_group('testGroup3', 'nixGroup');
 
-    assert(strcmp(f.blocks{1}.open_group_idx(0).name, g1.name));
-    assert(strcmp(f.blocks{1}.open_group_idx(1).name, g2.name));
-    assert(strcmp(f.blocks{1}.open_group_idx(2).name, g3.name));
+    assert(strcmp(f.blocks{1}.open_group_idx(1).name, g1.name));
+    assert(strcmp(f.blocks{1}.open_group_idx(2).name, g2.name));
+    assert(strcmp(f.blocks{1}.open_group_idx(3).name, g3.name));
 end
 
 function [] = test_open_data_array_idx( varargin )
@@ -451,9 +451,9 @@
     d2 = b.create_data_array('testDataArray2', 'nixDataArray', nix.DataType.Double, [6 2]);
     d3 = b.create_data_array('testDataArray3', 'nixDataArray', nix.DataType.Double, [9 2]);
 
-    assert(strcmp(f.blocks{1}.open_data_array_idx(0).name, d1.name));
-    assert(strcmp(f.blocks{1}.open_data_array_idx(1).name, d2.name));
-    assert(strcmp(f.blocks{1}.open_data_array_idx(2).name, d3.name));
+    assert(strcmp(f.blocks{1}.open_data_array_idx(1).name, d1.name));
+    assert(strcmp(f.blocks{1}.open_data_array_idx(2).name, d2.name));
+    assert(strcmp(f.blocks{1}.open_data_array_idx(3).name, d3.name));
 end
 
 function [] = test_open_tag_idx( varargin )
@@ -464,9 +464,9 @@
     t2 = b.create_tag('testTag2', 'nixTag', [1 2]);
     t3 = b.create_tag('testTag3', 'nixTag', [1 2]);
 
-    assert(strcmp(f.blocks{1}.open_tag_idx(0).name, t1.name));
-    assert(strcmp(f.blocks{1}.open_tag_idx(1).name, t2.name));
-    assert(strcmp(f.blocks{1}.open_tag_idx(2).name, t3.name));
+    assert(strcmp(f.blocks{1}.open_tag_idx(1).name, t1.name));
+    assert(strcmp(f.blocks{1}.open_tag_idx(2).name, t2.name));
+    assert(strcmp(f.blocks{1}.open_tag_idx(3).name, t3.name));
 end
 
 function [] = test_open_multi_tag_idx( varargin )
@@ -478,9 +478,9 @@
     t2 = b.create_multi_tag('testMultiTag2', 'nixMultiTag', d);
     t3 = b.create_multi_tag('testMultiTag3', 'nixMultiTag', d);
 
-    assert(strcmp(f.blocks{1}.open_multi_tag_idx(0).name, t1.name));
-    assert(strcmp(f.blocks{1}.open_multi_tag_idx(1).name, t2.name));
-    assert(strcmp(f.blocks{1}.open_multi_tag_idx(2).name, t3.name));
+    assert(strcmp(f.blocks{1}.open_multi_tag_idx(1).name, t1.name));
+    assert(strcmp(f.blocks{1}.open_multi_tag_idx(2).name, t2.name));
+    assert(strcmp(f.blocks{1}.open_multi_tag_idx(3).name, t3.name));
 end
 
 function [] = test_open_source_idx( varargin )
@@ -491,9 +491,9 @@
     s2 = b.create_source('testSource2', 'nixSource');
     s3 = b.create_source('testSource3', 'nixSource');
 
-    assert(strcmp(f.blocks{1}.open_source_idx(0).name, s1.name));
-    assert(strcmp(f.blocks{1}.open_source_idx(1).name, s2.name));
-    assert(strcmp(f.blocks{1}.open_source_idx(2).name, s3.name));
+    assert(strcmp(f.blocks{1}.open_source_idx(1).name, s1.name));
+    assert(strcmp(f.blocks{1}.open_source_idx(2).name, s2.name));
+    assert(strcmp(f.blocks{1}.open_source_idx(3).name, s3.name));
 end
 
 function [] = test_has_multitag( varargin )
@@ -1165,9 +1165,9 @@
     sl44 = sl31.create_source('sourceLvl4_4', 'nixSource');
 
     % test find by id
-    filtered = b.find_filtered_sources(0, nix.Filter.id, sl41.id);
+    filtered = b.find_filtered_sources(1, nix.Filter.id, sl41.id);
     assert(isempty(filtered));
-    filtered = b.find_filtered_sources(3, nix.Filter.id, sl41.id);
+    filtered = b.find_filtered_sources(4, nix.Filter.id, sl41.id);
     assert(size(filtered, 1) == 1);
     assert(strcmp(filtered{1}.id, sl41.id));