include nix::string_to_data_type

Author: mpsonntag

+nix/Block.m

@@ -27,9 +27,11 @@
                 'Block::openDataArray', id_or_name, @nix.DataArray);
         end;
 
-        function da = create_data_array(obj, name, nixtype, dtype, shape)
+        %-- As "datatype" provide one of the nix.DataTypes. Alternatively
+        %-- a string stating one of the datatypes supported by nix can be provided.
+        function da = create_data_array(obj, name, nixtype, datatype, shape)
             handle = nix_mx('Block::createDataArray', obj.nix_handle, ...
-                name, nixtype, dtype, shape);
+                name, nixtype, datatype, shape);
             da = nix.DataArray(handle);
             obj.dataArraysCache.lastUpdate = 0;
         end

+nix/DataType.m

@@ -1,11 +1,20 @@
 classdef DataType
-    %DATATYPE three of the datatypes used in nix
-    
+    %DATATYPE datatypes supported by nix
+
     properties (Constant)
-        Boolean = uint8(0);
-        String = uint8(1);
-        Double = uint8(2);
+        Boolean = 'bool';
+        String = 'string';
+        Double = 'double';
+        Char = 'char';
+        Float = 'float';
+        Int8 = 'int8';
+        Int16 = 'int16';
+        Int32 = 'int32';
+        Int64 = 'int64';
+        UInt8 = 'uint8';
+        UInt16 = 'uint16';
+        UInt32 = 'uint32';
+        UInt64 = 'uint64';
     end
-    
-end
 
+end

+nix/Section.m

@@ -87,8 +87,11 @@
         % Property methods
         % ----------------
 
-        function p = create_property_data_type(obj, name, dtype)
-            p = nix.Property(nix_mx('Section::createPropertyDataType', obj.nix_handle, name, dtype));
+        %-- As "datatype" provide one of the nix.DataTypes. Alternatively
+        %-- a string stating one of the datatypes supported by nix can be provided.
+        function p = create_property_data_type(obj, name, datatype)
+            p = nix.Property(nix_mx('Section::createPropertyDataType', ...
+                obj.nix_handle, name, datatype));
             obj.propsCache.lastUpdate = 0;
         end;
 

src/nixblock.cc

@@ -28,7 +28,7 @@ namespace nixblock {
 
         std::string name = input.str(2);
         std::string type = input.str(3);
-        nix::DataType dtype = nix::DataType::Double; // FIXME nix::string_to_data_type(input.str(3));
+        nix::DataType dtype = nix::string_to_data_type(input.str(4));
         nix::NDSize size = input.ndsize(5);
 
         nix::DataArray dt = block.createDataArray(name, type, dtype, size);

src/nixsection.cc

@@ -63,13 +63,7 @@ void create_property_data_type(const extractor &input, infusor &output)
 {
     nix::Section currObj = input.entity<nix::Section>(1);
 
-    nix::DataType dtype;
-
-    switch (input.num<uint8_t>(3)) {
-    case 0: dtype = nix::DataType::Bool;
-    case 1: dtype = nix::DataType::String;
-    case 2: dtype = nix::DataType::Double;
-    }
+    nix::DataType dtype = nix::string_to_data_type(input.str(3));
 
     nix::Property p = currObj.createProperty(input.str(2), dtype);
     output.set(0, handle(p));

tests/TestBlock.m

@@ -90,7 +90,7 @@
     f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
     b = f.createBlock('arraytest', 'nixBlock');
     tmp = b.create_data_array('dataArrayTest1', 'nixDataArray', 'double', [1 2]);
-    tmp = b.create_data_array('dataArrayTest2', 'nixDataArray', 'double', [3 4]);
+    tmp = b.create_data_array('dataArrayTest2', 'nixDataArray', nix.DataType.Double, [3 4]);
 
     assert(size(b.dataArrays, 1) == 2);
     assert(b.delete_data_array(b.dataArrays{2}.id));

tests/TestSection.m

@@ -146,7 +146,10 @@
     tmp = s.create_property_data_type('newProperty1', nix.DataType.Double);
     tmp = s.create_property_data_type('newProperty2', nix.DataType.Boolean);
     tmp = s.create_property_data_type('newProperty3', nix.DataType.String);
-    assert(size(s.allProperties, 1) == 3);
+    tmp = s.create_property_data_type('newProperty4', 'double');
+    tmp = s.create_property_data_type('newProperty5', 'bool');
+    tmp = s.create_property_data_type('newProperty6', 'string');
+    assert(size(s.allProperties, 1) == 6);
     assert(strcmp(s.allProperties{1}.name, 'newProperty1'));
 end