[Matlab] Refactor Dimensions index use

Author: mpsonntag

+nix/RangeDimension.m

@@ -27,9 +27,7 @@
         end
 
         function r = tick_at(obj, index)
-            if (index > 0)
-                index = index - 1;
-            end
+            index = nix.Utils.handle_index(index);
             fname = strcat(obj.alias, '::tickAt');
             r = nix_mx(fname, obj.nix_handle, index);
         end
@@ -41,12 +39,10 @@
 
         function r = axis(obj, count, startIndex)
             if (nargin < 3)
-                startIndex = 0;
+                startIndex = 1;
             end
 
-            if (startIndex > 0)
-                startIndex = startIndex - 1;
-            end
+            startIndex = nix.Utils.handle_index(startIndex);
 
             fname = strcat(obj.alias, '::axis');
             r = nix_mx(fname, obj.nix_handle, count, startIndex);

+nix/SampledDimension.m

@@ -32,23 +32,17 @@
         end
 
         function r = position_at(obj, index)
-            if (index > 0)
-                index = index - 1;
-            end
-
+            index = nix.Utils.handle_index(index);
             fname = strcat(obj.alias, '::positionAt');
             r = nix_mx(fname, obj.nix_handle, index);
         end
 
         function r = axis(obj, count, startIndex)
             if (nargin < 3)
-                startIndex = 0;
-            end
-
-            if (startIndex > 0)
-                startIndex = startIndex - 1;
+                startIndex = 1;
             end
 
+            startIndex = nix.Utils.handle_index(startIndex);
             fname = strcat(obj.alias, '::axis');
             r = nix_mx(fname, obj.nix_handle, count, startIndex);
         end

tests/TestDimensions.m

@@ -65,7 +65,7 @@
     assert(d1.samplingInterval == 200);
     assert(isempty(d1.offset));
 
-    axis = d1.axis(10, 0);
+    axis = d1.axis(10, 1);
     assert(axis(1) == 0);
     assert(length(axis) == 10);
     assert(axis(end) == (length(axis) - 1) * d1.samplingInterval);
@@ -80,12 +80,12 @@
     assert(d1.samplingInterval == 325);
     assert(d1.offset == 500);
 
-    axis = d1.axis(10, 0);
+    axis = d1.axis(10, 1);
     assert(axis(1) == d1.offset);
     assert(length(axis) == 10);
     assert(axis(end) == (length(axis) - 1) * d1.samplingInterval + d1.offset);
 
-    assert(d1.position_at(0) == d1.offset);
+    assert(d1.position_at(1) == d1.offset);
     assert(d1.position_at(10) == d1.offset + 9 * d1.samplingInterval);
 
     d1.label = '';
@@ -97,11 +97,11 @@
     assert(d1.samplingInterval == 325);
     assert(d1.offset == 0);
 
-    axis = d1.axis(10, 0);
+    axis = d1.axis(10, 1);
     assert(axis(1) == 0);
     assert(axis(end) == (length(axis) - 1) * d1.samplingInterval + d1.offset);
 
-    assert(d1.position_at(0) == d1.offset);
+    assert(d1.position_at(1) == d1.offset);
     assert(d1.position_at(10) == d1.offset + 9 * d1.samplingInterval);
 end
 
@@ -119,12 +119,12 @@
     assert(isempty(d1.unit));
     assert(isequal(d1.ticks, ticks));
 
-    axis = d1.axis(3, 0);
+    axis = d1.axis(3, 1);
     assert(axis(1) == ticks(1));
     assert(length(axis) == 3);
     assert(axis(end) == ticks(length(axis)));
 
-    assert(d1.tick_at(0) == ticks(1));
+    assert(d1.tick_at(1) == ticks(1));
     assert(d1.tick_at(3) == ticks(3));
 
     new_ticks = [5 6 7 8];