diff options
| author | Daniel M. Pelt <D.M.Pelt@cwi.nl> | 2015-06-24 20:28:46 +0200 |
|---|---|---|
| committer | Daniel M. Pelt <D.M.Pelt@cwi.nl> | 2015-06-24 20:28:46 +0200 |
| commit | 63d78fbaafa7d247347f9052db86f575d89260b7 (patch) | |
| tree | eb097d65aa41e61d2c34541c5d8ff819cc95ab02 | |
| parent | 8ad46dc9cb28067047838e06770707cf86ef6e56 (diff) | |
| download | astra-63d78fbaafa7d247347f9052db86f575d89260b7.tar.gz astra-63d78fbaafa7d247347f9052db86f575d89260b7.tar.bz2 astra-63d78fbaafa7d247347f9052db86f575d89260b7.tar.xz astra-63d78fbaafa7d247347f9052db86f575d89260b7.zip | |
Fix config to struct/dict translation for array options
| -rw-r--r-- | matlab/mex/mexHelpFunctions.cpp | 6 | ||||
| -rw-r--r-- | python/astra/utils.pyx | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/matlab/mex/mexHelpFunctions.cpp b/matlab/mex/mexHelpFunctions.cpp index 87a9672..58e84d2 100644 --- a/matlab/mex/mexHelpFunctions.cpp +++ b/matlab/mex/mexHelpFunctions.cpp @@ -336,7 +336,11 @@ mxArray* XMLNodeToStruct(astra::XMLNode node) // option if (subnode.getName() == "Option") { - mOptions[subnode.getAttribute("key")] = stringToMxArray(subnode.getAttribute("value")); + if(subnode.hasAttribute("value")){ + mOptions[subnode.getAttribute("key")] = stringToMxArray(subnode.getAttribute("value")); + }else{ + mOptions[subnode.getAttribute("key")] = stringToMxArray(subnode.getContent()); + } } // regular content diff --git a/python/astra/utils.pyx b/python/astra/utils.pyx index a8e9e4e..260c308 100644 --- a/python/astra/utils.pyx +++ b/python/astra/utils.pyx @@ -204,7 +204,10 @@ cdef XMLNode2dict(XMLNode node): while it != nodes.end(): subnode = deref(it) if castString(subnode.getName())=="Option": - opts[castString(subnode.getAttribute('key'))] = stringToPythonValue(subnode.getAttribute('value')) + if subnode.hasAttribute('value'): + opts[castString(subnode.getAttribute('key'))] = stringToPythonValue(subnode.getAttribute('value')) + else: + opts[castString(subnode.getAttribute('key'))] = stringToPythonValue(subnode.getContent()) else: dct[castString(subnode.getName())] = stringToPythonValue(subnode.getContent()) inc(it) |