is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.
| ObjectGroup.cpp (pymol-v1.8.6.0.tar.bz2) | : | ObjectGroup.cpp (pymol-v2.1.0.tar.bz2) |
|---|
| | |
| skipping to change at line 32 | | skipping to change at line 32 |
|---|
| | |
| #include"OOMac.h" | | #include"OOMac.h" |
| #include"ObjectGroup.h" | | #include"ObjectGroup.h" |
| #include"Base.h" | | #include"Base.h" |
| #include"MemoryDebug.h" | | #include"MemoryDebug.h" |
| #include"PConv.h" | | #include"PConv.h" |
| | |
| int ObjectGroupNewFromPyList(PyMOLGlobals * G, PyObject * list, ObjectGroup ** r
esult, | | int ObjectGroupNewFromPyList(PyMOLGlobals * G, PyObject * list, ObjectGroup ** r
esult, |
| int version) | | int version) |
| { | | { |
|
| #ifdef _PYMOL_NOPY | | |
| return 0; | | |
| #else | | |
| int ok = true, ll = 0; | | int ok = true, ll = 0; |
| ObjectGroup *I = NULL; | | ObjectGroup *I = NULL; |
| (*result) = NULL; | | (*result) = NULL; |
| if(ok) | | if(ok) |
| ok = (list != Py_None); | | ok = (list != Py_None); |
| if(ok) | | if(ok) |
| ok = PyList_Check(list); | | ok = PyList_Check(list); |
| if(ok) | | if(ok) |
| ll = PyList_Size(list); | | ll = PyList_Size(list); |
| I = ObjectGroupNew(G); | | I = ObjectGroupNew(G); |
| | |
| skipping to change at line 59 | | skipping to change at line 56 |
|---|
| if(ok) | | if(ok) |
| ok = PConvPyIntToInt(PyList_GetItem(list, 1), &I->OpenOrClosed); | | ok = PConvPyIntToInt(PyList_GetItem(list, 1), &I->OpenOrClosed); |
| if(ok && (ll > 2)) | | if(ok && (ll > 2)) |
| ok = ObjectStateFromPyList(G, PyList_GetItem(list, 2), &I->State); | | ok = ObjectStateFromPyList(G, PyList_GetItem(list, 2), &I->State); |
| if(ok) { | | if(ok) { |
| *result = I; | | *result = I; |
| } else { | | } else { |
| /* to do: cleanup */ | | /* to do: cleanup */ |
| } | | } |
| return (ok); | | return (ok); |
|
| | | |
| #endif | | |
| } | | } |
| | |
| PyObject *ObjectGroupAsPyList(ObjectGroup * I) | | PyObject *ObjectGroupAsPyList(ObjectGroup * I) |
| { | | { |
|
| #ifdef _PYMOL_NOPY | | |
| return NULL; | | |
| #else | | |
| | | |
| PyObject *result = NULL; | | PyObject *result = NULL; |
| | |
| result = PyList_New(3); | | result = PyList_New(3); |
| PyList_SetItem(result, 0, ObjectAsPyList(&I->Obj)); | | PyList_SetItem(result, 0, ObjectAsPyList(&I->Obj)); |
| PyList_SetItem(result, 1, PyInt_FromLong(I->OpenOrClosed)); | | PyList_SetItem(result, 1, PyInt_FromLong(I->OpenOrClosed)); |
| PyList_SetItem(result, 2, ObjectStateAsPyList(&I->State)); | | PyList_SetItem(result, 2, ObjectStateAsPyList(&I->State)); |
| return (PConvAutoNone(result)); | | return (PConvAutoNone(result)); |
|
| #endif | | |
| } | | } |
| | |
| /*========================================================================*/ | | /*========================================================================*/ |
| | |
| static void ObjectGroupFree(ObjectGroup * I) | | static void ObjectGroupFree(ObjectGroup * I) |
| { | | { |
| ObjectStatePurge(&I->State); | | ObjectStatePurge(&I->State); |
| ObjectPurge(&I->Obj); | | ObjectPurge(&I->Obj); |
| OOFreeP(I); | | OOFreeP(I); |
| } | | } |
| | | |
| End of changes. 4 change blocks. |
|---|
| 10 lines changed or deleted | | 0 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 