add generic extract value function

Author: mpsonntag

+nix/Property.m

@@ -53,6 +53,9 @@
             dispStr = 'Note: nix only supports updating the actual value at the moment.';
             dispStr = [dispStr, char(10), 'Attributes like uncertainty or checksum cannot be set at the moment.'];
             disp(dispStr);
+            
+            %-- TODO: clearing existing values using obj.values = '' works,
+            %-- but is a hack. Refactor in good time.
         end
     end
 

src/nixgen.cc

@@ -39,4 +39,23 @@ mxArray *dataset_read_all(const nix::DataSet &da) {
     return data;
 }
 
+std::vector<nix::Value> extract_property_values(const extractor &input, int idx) {
+    std::vector<nix::Value> currVec;
+
+    mxClassID currID = input.class_id(idx);
+    if (currID == mxCELL_CLASS) {
+        const mxArray *cell_element_ptr = input.cellElemPtr(idx, 0);
+
+        if (mxGetClassID(cell_element_ptr) == mxSTRUCT_CLASS) {
+            currVec = input.extractFromStruct(idx);
+        } else {
+            currVec = input.vec(idx);
+        }
+    } else {
+        mexPrintf("Unsupported data type\n");
+    }
+
+    return currVec;
+}
+
 } // namespace nixgen

src/nixgen.h

@@ -8,6 +8,8 @@ namespace nixgen {
 
     mxArray *dataset_read_all(const nix::DataSet &da);
 
+    std::vector<nix::Value> extract_property_values(const extractor &input, int idx);
+
 } // namespace nixgen
 
 #endif

src/nixproperty.cc

@@ -1,4 +1,5 @@
 #include "nixproperty.h"
+#include "nixgen.h"
 
 #include "mex.h"
 
@@ -56,27 +57,7 @@ namespace nixproperty {
         nix::Property prop = input.entity<nix::Property>(1);
         prop.deleteValues();
 
-        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);
+        prop.values(nixgen::extract_property_values(input, 2));
     }
 
 } // namespace nixproperty

src/nixsection.cc

@@ -1,4 +1,5 @@
 #include "nixsection.h"
+#include "nixgen.h"
 
 #include "mex.h"
 #include <nix.hpp>
@@ -69,28 +70,7 @@ void create_property_with_value(const extractor &input, infusor &output)
 {
     nix::Section currObj = input.entity<nix::Section>(1);
 
-    std::vector<nix::Value> currVec;
-
-    mxClassID currID = input.class_id(3);
-    if (currID == mxCELL_CLASS)
-    {
-        const mxArray *cell_element_ptr = input.cellElemPtr(3, 0);
-
-        if (mxGetClassID(cell_element_ptr) == mxSTRUCT_CLASS)
-        {
-            currVec = input.extractFromStruct(3);
-        }
-        else
-        {
-            currVec = input.vec(3);
-        }
-    }
-    else
-    {
-        mexPrintf("Unsupported data type\n");
-    }
-
-    nix::Property p = currObj.createProperty(input.str(2), currVec);
+    nix::Property p = currObj.createProperty(input.str(2), nixgen::extract_property_values(input, 3));
     output.set(0, handle(p));
 }