Mercurial > pytave

comparison oct-py-types.cc @ 320:c2aa34730dc9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Convert scalar struct into Python dict (fixes issue #57) * oct-py-types.cc, oct-py-types.h: New files for conversion of objects between Octave and Python APIs. * Makefile.am (COMMON_SOURCE_FILES, PYTAVE_HEADER_FILES): Include new files. * octave_to_python.cc (pytave::octvalue_to_pyobj): Add case to handle scalar struct instead of struct array. * @pyobject/pyobject.m: Add %!tests for pyobject from scalar struct and %!error tests for failure with struct array.
author Mike Miller <mtmiller@octave.org>
date Thu, 11 Aug 2016 16:12:35 -0700
parents
children fd5881d48238
comparison
equal deleted inserted replaced
319:1231dc878600 320:c2aa34730dc9
1 /*
2
3 Copyright (C) 2016 Mike Miller
4
5 This file is part of Pytave.
6
7 Pytave is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the
9 Free Software Foundation; either version 3 of the License, or (at your
10 option) any later version.
11
12 Pytave is distributed in the hope that it will be useful, but WITHOUT
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 for more details.
16
17 You should have received a copy of the GNU General Public License
18 along with Pytave; see the file COPYING. If not, see
19 <http://www.gnu.org/licenses/>.
20
21 */
22
23 #if defined (HAVE_CONFIG_H)
24 # include <config.h>
25 #endif
26
27 #include <octave/oct-map.h>
28 #include <octave/quit.h>
29
30 #include "oct-py-types.h"
31
32 // FIXME: only here to bootstrap nested conversions needed in this file
33 #include "octave_to_python.h"
34
35 namespace pytave
36 {
37
38 inline PyObject *
39 wrap_octvalue_to_pyobj (const octave_value& value)
40 {
41 boost::python::object obj;
42 octvalue_to_pyobj (obj, value);
43 PyObject *ptr = obj.ptr ();
44 Py_INCREF (ptr);
45 return ptr;
46 }
47
48 PyObject *
49 make_py_dict (const octave_scalar_map& map)
50 {
51 PyObject *dict = PyDict_New ();
52 if (! dict)
53 octave_throw_bad_alloc ();
54
55 for (auto p = map.begin (); p != map.end (); ++p)
56 {
57 PyObject *key = wrap_octvalue_to_pyobj (map.key (p));
58 PyObject *item = wrap_octvalue_to_pyobj (map.contents (p));
59
60 if (PyDict_SetItem (dict, key, item) < 0)
61 throw boost::python::error_already_set ();
62 }
63
64 return dict;
65 }
66
67 }