github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-02 16:22:40 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

bazaar: BoostPyTest: Callbacks improvements, CtrlCore / TopWindow export at 80%, virtual methods and eval examples, ValueMap export; ValueCtrl: ValueMap and ErrorValue editor

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3421 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
kohait 2011-05-16 12:47:16 +00:00
parent a5dd6dbe7b
commit ac648bbee1
10 changed files with 730 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

9
bazaar/CoreBoostPy/Value.cpp
View file

@ -15,6 +15,7 @@ struct Value_to_python
case DOUBLE_V: return incref(object(double(v)).ptr());
case STRING_V: return incref(object(String(v)).ptr());
case VALUEARRAY_V: return incref(object(ValueArray(v)).ptr());
case VALUEMAP_V: return incref(object(ValueMap(v)).ptr());
case COLOR_V: return incref(object(Color(v)).ptr());
case POINT_V: return incref(object(Point(v)).ptr());
case SIZE_V: return incref(object(Size(v)).ptr());
@ -35,8 +36,8 @@ struct Value_from_python
static void* convertible(PyObject* po)
{
if(po == Py_None) return po;
if(PyInt_Check(po)) return po;
if(PyBool_Check(po)) return po;
if(PyInt_Check(po)) return po;
if(PyLong_Check(po)) return po;
if(PyFloat_Check(po)) return po;
if(PyString_Check(po)) return po;
@ -232,10 +233,12 @@ struct ValueMap_from_python
Index<Value> k;
Vector<Value> vv;
dict dt(handle<>(borrowed(po)));
list lk = dt.keys();
list lv = dt.values();
for(int i = 0; i < len(dt); i++)
{
k.Add(Null); //FIXME
vv.Add(Null); //extract<Value>(dt[i]));
k.Add(extract<Value>(lk[i]));
vv.Add(extract<Value>(lv[i]));
}
new(d) ValueMap(k, vv);