Merge pull request #116 from mpsonntag/fixSetDim

Fix Matlab crash when setting SetDim Labels

Author: jgrewe

+nix/Dynamic.m

@@ -25,11 +25,11 @@ function set_method(obj, val)
 
                 if (isempty(val))
                     nix_mx(strcat(obj.alias, '::set_none_', prop), obj.nix_handle, 0);
-                elseif(strcmp(prop, 'units') && (~iscell(val)))
-                %-- BUGFIX: Matlab crashes, if units in Tags and MultiTags 
-                %-- are set using anything else than a cell.
+                elseif((strcmp(prop, 'units') || strcmp(prop, 'labels')) && (~iscell(val)))
+                %-- BUGFIX: Matlab crashes, if units in Tags and MultiTags
+                %-- or labels of SetDimension are set using anything else than a cell.
                     ME = MException('MATLAB:class:SetProhibited', sprintf(...
-                      'Units can be only set by using cells.'));
+                      'This value only supports cells.'));
                     throwAsCaller(ME);
                 else
                     nix_mx(strcat(obj.alias, '::set_', prop), obj.nix_handle, val);

tests/TestDimensions.m

@@ -23,9 +23,24 @@
     assert(strcmp(d1.labels{1}, 'foo'));
     assert(strcmp(d1.labels{2}, 'bar'));
 
-    % fix this in NIX
-    %d1.labels = {};
-    %assert(isempty(d1.labels));
+    d1.labels = {};
+    assert(isempty(d1.labels));
+    
+    try
+        d1.labels = 'mV';
+    catch ME
+        assert(strcmp(ME.identifier, 'MATLAB:class:SetProhibited'));
+    end;
+    try
+        d1.labels = ['mV', 'uA'];
+    catch ME
+        assert(strcmp(ME.identifier, 'MATLAB:class:SetProhibited'));
+    end;
+    try
+        d1.labels = 1;
+    catch ME
+        assert(strcmp(ME.identifier, 'MATLAB:class:SetProhibited'));
+    end;
 end
 
 function [] = test_sample_dimension( varargin )