Merge pull request #112 from jgrewe/axis

fix dimension.axis methods

LGTM

Author: gicmo

+nix/RangeDimension.m

@@ -19,8 +19,11 @@
         end
 
         function tickAt = tick_at(obj, index)
+            if index > 0
+                index = index - 1;
+            end
             func_name = strcat(obj.alias, '::tick_at');
-            tickAt = nix_mx(func_name, obj.nix_handle, index);
+            tickAt = nix_mx(func_name, obj.nix_handle, uint64(index));
         end
 
         function indexOf = index_of(obj, position)
@@ -32,9 +35,12 @@
             if nargin < 3
                 startIndex = 0;
             end
+            if(startIndex > 0)
+                startIndex = startIndex - 1;
+            end
 
             func_name = strcat(obj.alias, '::axis');
-            axis = nix_mx(func_name, obj.nix_handle, count, startIndex);
+            axis = nix_mx(func_name, obj.nix_handle, uint64(count), uint64(startIndex));
         end
 
     end

+nix/SampledDimension.m

@@ -24,18 +24,23 @@
         end
 
         function posAt = position_at(obj, index)
+            if index > 0
+                index = index - 1;
+            end
             func_name = strcat(obj.alias, '::position_at');
-            posAt = nix_mx(func_name, obj.nix_handle, index);
+            posAt = nix_mx(func_name, obj.nix_handle, uint64(index));
         end
 
         function axis = axis(obj, count, startIndex)
             if nargin < 3
                 startIndex = 0;
             end
-            
+            if startIndex > 0
+                startIndex = startIndex - 1;
+            end
             func_name = strcat(obj.alias, '::axis');
-            axis = nix_mx(func_name, obj.nix_handle, count, startIndex);
+            axis = nix_mx(func_name, obj.nix_handle, uint64(count), uint64(startIndex));
         end
     end
 end
-   
+   

tests/TestDimensions.m

@@ -41,7 +41,12 @@
     assert(isempty(d1.unit));
     assert(d1.samplingInterval == 200);
     assert(isempty(d1.offset));
-    
+
+    axis = d1.axis(10, 0);
+    assert(axis(1) == 0);
+    assert(length(axis) == 10);
+    assert(axis(end) == (length(axis) - 1) * d1.samplingInterval);
+
     d1.label = 'foo';
     d1.unit = 'mV';
     d1.samplingInterval = 325;
@@ -52,6 +57,14 @@
     assert(d1.samplingInterval == 325);
     assert(d1.offset == 500);
 
+    axis = d1.axis(10, 0);
+    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(10) == d1.offset + 9 * d1.samplingInterval);
+
     d1.label = '';
     d1.unit = '';
     d1.offset = 0;
@@ -60,6 +73,13 @@
     assert(isempty(d1.unit));
     assert(d1.samplingInterval == 325);
     assert(d1.offset == 0);
+
+    axis = d1.axis(10, 0);
+    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(10) == d1.offset + 9 * d1.samplingInterval);
 end
 
 function [] = test_range_dimension( varargin )
@@ -75,7 +95,15 @@
     assert(isempty(d1.label));
     assert(isempty(d1.unit));
     assert(isequal(d1.ticks, ticks));
-    
+
+    axis = d1.axis(3, 0);
+    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(3) == ticks(3));
+
     new_ticks = [5 6 7 8];
     d1.label = 'foo';
     d1.unit = 'mV';