Merge pull request #86 from asobolev/master

nix2mx + extractors -> mknix refactoring + some fixes

Author: mpsonntag

+nix/Property.m

@@ -30,32 +30,29 @@
         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);
+            values = val;
+            if (~iscell(values))
+                values = num2cell(val);
+            end
+            
+            for i = 1:length(values)
+                if (isstruct(values{i}))
+                    curr = values{i}.value;
+                else
+                    curr = values{i};
+                end
+                
+                if (~strcmpi(class(curr), obj.datatype))
+                    error('Values do not match property data type!');
+                end
+            end
+            
+            nix_mx('Property::updateValues', obj.nix_handle, values);
             obj.valuesCache.lastUpdate = 0;
 
             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
 

nix_mx.cc

@@ -9,7 +9,7 @@
 #include "handle.h"
 #include "arguments.h"
 #include "struct.h"
-#include "nix2mx.h"
+#include "mknix.h"
 
 #include "nixfile.h"
 #include "nixsection.h"

src/nixdataarray.cc

@@ -1,14 +1,13 @@
 #include "nixdataarray.h"
-#include "nixgen.h"
-
+#include "mkarray.h"
 #include "mex.h"
 
 #include <nix.hpp>
 
 #include "handle.h"
 #include "arguments.h"
 #include "struct.h"
-#include "nix2mx.h"
+#include "mknix.h"
 
 namespace nixdataarray {
 
@@ -43,8 +42,10 @@ namespace nixdataarray {
 
     void read_all(const extractor &input, infusor &output)
     {
+        //nix::DataArray da = input.entity<nix::DataArray>(1);
+
         nix::DataArray da = input.entity<nix::DataArray>(1);
-        mxArray *data = nixgen::dataset_read_all(da);
+        mxArray *data = make_mx_array_from_ds(da);
         output.set(0, data);
     }
 

src/nixdimensions.cc

@@ -1,11 +1,5 @@
-#include "nixtag.h"
-#include "nixgen.h"
-
-#include "mex.h"
-
 #include <nix.hpp>
-
-#include "handle.h"
+#include "mex.h"
 #include "arguments.h"
 #include "struct.h"
 

src/nixgen.cc

@@ -1,5 +1,5 @@
 #include "nixmultitag.h"
-#include "nixgen.h"
+#include "mkarray.h"
 
 #include "mex.h"
 
@@ -49,7 +49,7 @@ namespace nixmultitag {
         double p_index = input.num<double>(2);
         double f_index = input.num<double>(3);
 
-        mxArray *data = nixgen::dataset_read_all(currObj.retrieveData(p_index, f_index));
+        mxArray *data = make_mx_array_from_ds(currObj.retrieveData(p_index, f_index));
         output.set(0, data);
     }
 
@@ -58,7 +58,7 @@ namespace nixmultitag {
         double p_index = input.num<double>(2);
         double f_index = input.num<double>(3);
 
-        mxArray *data = nixgen::dataset_read_all(currObj.retrieveFeatureData(p_index, f_index));
+        mxArray *data = make_mx_array_from_ds(currObj.retrieveFeatureData(p_index, f_index));
         output.set(0, data);
     }
 

src/nixgen.h

@@ -1,8 +1,6 @@
 #include "nixproperty.h"
-#include "nixgen.h"
-
 #include "mex.h"
-
+#include "datatypes.h"
 #include <nix.hpp>
 
 #include "handle.h"
@@ -20,7 +18,7 @@ namespace nixproperty {
         sb.set(prop.definition());
         sb.set(prop.unit());
         sb.set(prop.mapping());
-        sb.set(nix::data_type_to_string(prop.dataType()));
+        sb.set(string_nix2mex(prop.dataType()));
 
         return sb.array();
     }
@@ -57,7 +55,8 @@ namespace nixproperty {
         nix::Property prop = input.entity<nix::Property>(1);
         prop.deleteValues();
 
-        prop.values(nixgen::extract_property_values(input, 2));
+        std::vector<nix::Value> getVals = input.vec(2);
+        prop.values(getVals);
     }
 
 } // namespace nixproperty

src/nixmultitag.cc

@@ -1,13 +1,11 @@
 #include "nixsection.h"
-#include "nixgen.h"
-
 #include "mex.h"
 #include <nix.hpp>
 
 #include "handle.h"
 #include "arguments.h"
 #include "struct.h"
-#include "nix2mx.h"
+#include "mknix.h"
 
 
 namespace nixsection {
@@ -70,7 +68,8 @@ void create_property_with_value(const extractor &input, infusor &output)
 {
     nix::Section currObj = input.entity<nix::Section>(1);
 
-    nix::Property p = currObj.createProperty(input.str(2), nixgen::extract_property_values(input, 3));
+    std::vector<nix::Value> vals = input.vec(3);
+    nix::Property p = currObj.createProperty(input.str(2), vals);
     output.set(0, handle(p));
 }
 

src/nixproperty.cc

@@ -1,5 +1,5 @@
 #include "nixtag.h"
-#include "nixgen.h"
+#include "mkarray.h"
 
 #include "mex.h"
 
@@ -50,15 +50,15 @@ namespace nixtag {
         nix::Tag currObj = input.entity<nix::Tag>(1);
         double index = input.num<double>(2);
 
-        mxArray *data = nixgen::dataset_read_all(currObj.retrieveData(index));
+        mxArray *data = make_mx_array_from_ds(currObj.retrieveData(index));
         output.set(0, data);
     }
 
     void retrieve_feature_data(const extractor &input, infusor &output) {
         nix::Tag currObj = input.entity<nix::Tag>(1);
         double index = input.num<double>(2);
 
-        mxArray *data = nixgen::dataset_read_all(currObj.retrieveFeatureData(index));
+        mxArray *data = make_mx_array_from_ds(currObj.retrieveFeatureData(index));
         output.set(0, data);
     }