refactor update values

Author: mpsonntag

+nix/Property.m

@@ -30,6 +30,23 @@
         end
 
         function [] = set.values(obj, val)
+
+            %-- when an update occurs, check, if the datatype of the
+            %-- data within a normal array is consistent with the
+            %-- datatype of the property
+            checkDType = obj.datatype;
+            if(~iscell(val) && ~isstruct(val) && ~isempty(val))
+                checkDType = strrep(strrep(class(val),'char','string'),'logical','bool');
+                %-- convert any values to cell array
+                val = num2cell(val);
+            elseif (iscell(val) && ~isstruct(val{1}))
+                checkDType = strrep(strrep(class(val{1}),'char','string'),'logical','bool');
+            end;
+
+            if(isempty(find(strcmpi(checkDType, obj.datatype),1)))
+                error('Values do not match property data type!');
+            end;
+
             nix_mx('Property::updateValues', obj.nix_handle, val);
             obj.valuesCache.lastUpdate = 0;
 

src/nixproperty.cc

@@ -55,7 +55,27 @@ namespace nixproperty {
     {
         nix::Property prop = input.entity<nix::Property>(1);
         prop.deleteValues();
-        std::vector<nix::Value> getVals = input.extractFromStruct(2);
+
+        std::vector<nix::Value> getVals;
+
+        mxClassID currID = input.class_id(2);
+        if (currID == mxCELL_CLASS)
+        {
+            const mxArray *cell_element_ptr = input.cellElemPtr(2, 0);
+            if (mxGetClassID(cell_element_ptr) == mxSTRUCT_CLASS)
+            {
+                getVals = input.extractFromStruct(2);
+            }
+            else
+            {
+                getVals = input.vec(2);
+            }
+        }
+        else
+        {
+            mexPrintf("Unsupported data type\n");
+        }
+
         prop.values(getVals);
     }
 

tests/TestProperty.m

@@ -78,4 +78,26 @@
     assert(updateDouble.values{1}.value == 2);
     updateDouble.values{1}.value = 2.2;
     assert(updateDouble.values{1}.value == 2.2);
+    
+    %-- test remove values from property
+    delValues = s.open_property(s.allProperties{3}.id);
+    assert(size(delValues.values, 1) == 4);
+    delValues.values = '';
+    assert(size(delValues.values, 1) == 0);
+    clear delValues;
+    
+    %-- test add new values to empty value property
+    newValues = s.open_property(s.allProperties{3}.id);
+    newValues.values = [1,2,3,4,5];
+    assert(newValues.values{5}.value == 5);
+    newValues.values = '';
+    newValues.values = {6,7,8};
+    assert(newValues.values{3}.value == 8);
+    
+    %-- test add new values by value structure
+    val1 = newValues.values{1};
+    val2 = newValues.values{2};
+    updateNewDouble = s.create_property('doubleProperty2', nix.DataType.Double);
+    updateNewDouble.values = {val1, val2};
+    assert(s.open_property(s.allProperties{end}.id).values{2}.value == val2.value);
 end