"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer4/Cmd.cpp" between
pymol-v1.8.6.0.tar.bz2 and pymol-v2.1.0.tar.bz2

About: PyMOL 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.

Cmd.cpp  (pymol-v1.8.6.0.tar.bz2):Cmd.cpp  (pymol-v2.1.0.tar.bz2)
skipping to change at line 112 skipping to change at line 112
#endif #endif
#ifdef _PYMOL_WX_GLUT #ifdef _PYMOL_WX_GLUT
#ifndef _PYMOL_OLD_ACTIVEX #ifndef _PYMOL_OLD_ACTIVEX
#ifndef _PYMOL_EMBEDDED #ifndef _PYMOL_EMBEDDED
static int run_only_once = true; static int run_only_once = true;
#endif #endif
#endif #endif
#endif #endif
#define API_SETUP_PYMOL_GLOBALS \ #define API_SETUP_PYMOL_GLOBALS \
G = _api_get_pymol_globals(self)
/*
* Start a headless singleton instance in the current thread.
*
* Unlike when calling `pymol.finish_launching()`, there is no event loop,
* so animations, continuous sculpting and modal draw are not supported.
*
* After calling this, SingletonPyMOLGlobals will be available.
*/
static void launch_library_singleton() {
PyRun_SimpleString(
"print(' PyMOL not running, entering library mode (experimental)')\n"
"import pymol.invocation, pymol2\n"
"pymol.invocation.parse_args(['pymol', '-cqk'])\n"
"pymol2.SingletonPyMOL().start()");
}
/*
* Get the PyMOLGlobals pointer from the `self` object (_self._COb in Python).
*
* If _COb is None, launch a headless singleton ("library mode").
*/
static PyMOLGlobals * _api_get_pymol_globals(PyObject * self) {
if(self == Py_None) {
launch_library_singleton();
return SingletonPyMOLGlobals;
}
if(self && PyCObject_Check(self)) { \ if(self && PyCObject_Check(self)) { \
PyMOLGlobals **G_handle = (PyMOLGlobals**)PyCObject_AsVoidPtr(self); \ PyMOLGlobals **G_handle = (PyMOLGlobals**)PyCObject_AsVoidPtr(self); \
if(G_handle) { \ if(G_handle) { \
G = *G_handle; \ return *G_handle;
} \ } \
} }
return NULL;
}
#define API_HANDLE_ERROR \ #define API_HANDLE_ERROR \
fprintf(stderr,"API-Error: in %s line %d.\n",__FILE__,__LINE__); fprintf(stderr,"API-Error: in %s line %d.\n",__FILE__,__LINE__);
/* NOTE: the glut_thread_keep_out variable can only be changed by the thread /* NOTE: the glut_thread_keep_out variable can only be changed by the thread
holding the API lock, therefore this is safe even through increment holding the API lock, therefore this is safe even through increment
isn't (necessarily) atomic. */ isn't (necessarily) atomic. */
static void APIEnter(PyMOLGlobals * G) static void APIEnter(PyMOLGlobals * G)
{ /* assumes API is locked */ { /* assumes API is locked */
PRINTFD(G, FB_API) PRINTFD(G, FB_API)
skipping to change at line 2609 skipping to change at line 2641
if(ok && (ok = APIEnterNotModal(G))) { if(ok && (ok = APIEnterNotModal(G))) {
ok = ExecutiveGetType(G, str1, type); ok = ExecutiveGetType(G, str1, type);
APIExit(G); APIExit(G);
} }
if(ok) if(ok)
return (Py_BuildValue("s", type)); return (Py_BuildValue("s", type));
else else
return APIResultOk(ok); return APIResultOk(ok);
} }
static PyObject *CmdGetObjectSettings(PyObject * self, PyObject * args)
{
PyMOLGlobals *G = NULL;
CObject *obj = NULL;
PyObject *result = NULL;
const char *oname;
int state = -1;
if (!PyArg_ParseTuple(args, "Os|i", &self, &oname, &state)) {
API_HANDLE_ERROR;
ok_raise(1);
}
API_SETUP_PYMOL_GLOBALS;
ok_assert(1, G && APIEnterNotModal(G));
obj = ExecutiveFindObjectByName(G, oname);
if(!obj) {
ErrMessage(G, "GetObjectSettings", "named object not found.");
} else if (obj->fGetSettingHandle) {
auto handle = obj->fGetSettingHandle(obj, -1);
if (state != -1) {
auto handle_state = obj->fGetSettingHandle(obj, state);
// only accept handle if different from object-level settings
handle = (handle_state == handle) ? NULL : handle_state;
}
if (handle) {
result = SettingAsPyList(*handle, true);
}
}
APIExit(G);
ok_except1:
return APIAutoNone(result);
}
static PyObject *CmdGetUnusedName(PyObject * self, PyObject * args) static PyObject *CmdGetUnusedName(PyObject * self, PyObject * args)
{ {
PyMOLGlobals *G = NULL; PyMOLGlobals *G = NULL;
char * prefix = NULL; char * prefix = NULL;
int alwaysnumber = false; int alwaysnumber = false;
int ok = false; int ok = false;
ok = PyArg_ParseTuple(args, "Osi", &self, &prefix, &alwaysnumber); ok = PyArg_ParseTuple(args, "Osi", &self, &prefix, &alwaysnumber);
if(ok) { if(ok) {
API_SETUP_PYMOL_GLOBALS; API_SETUP_PYMOL_GLOBALS;
ok = (G != NULL); ok = (G != NULL);
skipping to change at line 2677 skipping to change at line 2749
ok = PyArg_ParseTuple(args, "Os", &self, &str0); ok = PyArg_ParseTuple(args, "Os", &self, &str0);
if(ok) { if(ok) {
API_SETUP_PYMOL_GLOBALS; API_SETUP_PYMOL_GLOBALS;
ok = (G != NULL); ok = (G != NULL);
} else { } else {
API_HANDLE_ERROR; API_HANDLE_ERROR;
} }
if(ok) { if(ok) {
APIEnter(G); APIEnter(G);
UtilNCopy(name, str0, sizeof(WordType)); UtilNCopy(name, str0, sizeof(WordType));
ObjectMakeValidName(name); ObjectMakeValidName(G, name);
APIExit(G); APIExit(G);
result = PyString_FromString(name); result = PyString_FromString(name);
} }
return (APIAutoNone(result)); return (APIAutoNone(result));
} }
static PyObject *CmdGetNames(PyObject * self, PyObject * args) static PyObject *CmdGetNames(PyObject * self, PyObject * args)
{ {
PyMOLGlobals *G = NULL; PyMOLGlobals *G = NULL;
int int1, int2; int int1, int2;
skipping to change at line 3017 skipping to change at line 3089
} }
} }
} }
return APIAutoNone(result); return APIAutoNone(result);
} }
static PyObject *CmdPaste(PyObject * self, PyObject * args) static PyObject *CmdPaste(PyObject * self, PyObject * args)
{ {
PyMOLGlobals *G = NULL; PyMOLGlobals *G = NULL;
PyObject *list, *str; PyObject *list, *str;
char *st; const char *st;
int l, a; int l, a;
int ok = false; int ok = false;
ok = PyArg_ParseTuple(args, "OO", &self, &list); ok = PyArg_ParseTuple(args, "OO", &self, &list);
if(ok) { if(ok) {
API_SETUP_PYMOL_GLOBALS; API_SETUP_PYMOL_GLOBALS;
ok = (G != NULL); ok = (G != NULL);
} else { } else {
API_HANDLE_ERROR; API_HANDLE_ERROR;
} }
if(ok) { if(ok) {
skipping to change at line 4113 skipping to change at line 4185
ExecutiveMemoryDump(G); ExecutiveMemoryDump(G);
} }
return APISuccess(); return APISuccess();
} }
static PyObject *Cmd_GetGlobalCObject(PyObject * self, PyObject * args) static PyObject *Cmd_GetGlobalCObject(PyObject * self, PyObject * args)
{ {
return PyCObject_FromVoidPtr((void *) &SingletonPyMOLGlobals, NULL); return PyCObject_FromVoidPtr((void *) &SingletonPyMOLGlobals, NULL);
} }
/*
* Simple `glViewport` wrapper to call from Python without depending on
* the heavy PyOpenGL module.
*/
static PyObject *Cmd_glViewport(PyObject * self, PyObject * args)
{
int x, y, width, height;
if(!PyArg_ParseTuple(args, "iiii", &x, &y, &width, &height)) {
API_HANDLE_ERROR;
} else {
glViewport(x, y, width, height);
}
return APIIncRef(Py_None);
}
static PyObject *Cmd_New(PyObject * self, PyObject * args) static PyObject *Cmd_New(PyObject * self, PyObject * args)
{ {
PyObject *result = NULL; PyObject *result = NULL;
PyObject *pymol = NULL; /* pymol object instance */ PyObject *pymol = NULL; /* pymol object instance */
CPyMOLOptions *options = PyMOLOptions_New(); CPyMOLOptions *options = PyMOLOptions_New();
if(options) { if(options) {
{ {
int ok = true; int ok = true;
PyObject *pyoptions = NULL; PyObject *pyoptions = NULL;
skipping to change at line 4137 skipping to change at line 4226
PConvertOptions(options, pyoptions); PConvertOptions(options, pyoptions);
} }
{ {
CPyMOL *I = PyMOL_NewWithOptions(options); CPyMOL *I = PyMOL_NewWithOptions(options);
PyMOLGlobals *G = PyMOL_GetGlobals(I); PyMOLGlobals *G = PyMOL_GetGlobals(I);
if(I) { if(I) {
G->P_inst = Calloc(CP_inst, 1); G->P_inst = Calloc(CP_inst, 1);
G->P_inst->obj = pymol; G->P_inst->obj = pymol;
G->P_inst->dict = PyObject_GetAttrString(pymol, "__dict__"); G->P_inst->dict = PyObject_GetAttrString(pymol, "__dict__");
Py_DECREF(G->P_inst->dict); // borrow reference
{ {
/* store the PyMOL struct as a CObject */ /* store the PyMOL struct as a CObject */
PyObject *tmp = PyCObject_FromVoidPtr(I, NULL); PyObject *tmp = PyCObject_FromVoidPtr(I, NULL);
PyObject_SetAttrString(pymol, "__pymol__", tmp); PyObject_SetAttrString(pymol, "__pymol__", tmp);
Py_DECREF(tmp); Py_DECREF(tmp);
} }
{ {
int a; int a;
SavedThreadRec *str = G->P_inst->savedThread; SavedThreadRec *str = G->P_inst->savedThread;
for(a = 0; a < MAX_SAVED_THREAD; a++) { for(a = 0; a < MAX_SAVED_THREAD; a++) {
(str++)->id = -1; (str++)->id = -1;
} }
} }
result = PyCObject_FromVoidPtr((void *) PyMOL_GetGlobalsHandle(I), NUL L); result = PyCObject_FromVoidPtr((void *) PyMOL_GetGlobalsHandle(I), NUL L);
} }
} }
} }
PyMOLOptions_Free(options);
} }
return APIAutoNone(result); return APIAutoNone(result);
} }
static PyObject *Cmd_Del(PyObject * self, PyObject * args) static PyObject *Cmd_Del(PyObject * self, PyObject * args)
{ {
PyMOLGlobals *G = NULL; PyMOLGlobals *G = NULL;
int ok = true; int ok = true;
ok = PyArg_ParseTuple(args, "O", &self); ok = PyArg_ParseTuple(args, "O", &self);
if(ok) { if(ok) {
skipping to change at line 4824 skipping to change at line 4915
ok = (SelectorGetTmp(G, str1, s1) >= 0); ok = (SelectorGetTmp(G, str1, s1) >= 0);
if(ok) if(ok)
result = ExecutiveSeleToChemPyModel(G, s1, state, ref_object, ref_state) ; result = ExecutiveSeleToChemPyModel(G, s1, state, ref_object, ref_state) ;
SelectorFreeTmp(G, s1); SelectorFreeTmp(G, s1);
APIExitBlocked(G); APIExitBlocked(G);
} }
} }
return (APIAutoNone(result)); return (APIAutoNone(result));
} }
static PyObject *CmdGetBonds(PyObject * self, PyObject * args)
{
PyMOLGlobals *G = NULL;
PyObject *result = NULL;
char *sele;
int state;
ok_assert(1, PyArg_ParseTuple(args, "Osi", &self, &sele, &state));
API_SETUP_PYMOL_GLOBALS;
ok_assert(1, G && APIEnterNotModal(G));
result = MoleculeExporterGetPyBonds(G, sele, state);
APIExit(G);
if (0) {
ok_except1:
API_HANDLE_ERROR;
}
return APIAutoNone(result);
}
static PyObject *CmdCreate(PyObject * self, PyObject * args) static PyObject *CmdCreate(PyObject * self, PyObject * args)
{ {
PyMOLGlobals *G = NULL; PyMOLGlobals *G = NULL;
char *str1, *str2; char *str1, *str2;
int target, source, discrete, quiet; int target, source, discrete, quiet;
int singletons; int singletons;
int copy_properties; int copy_properties;
int ok = false; int ok = false;
int zoom; int zoom;
ok = PyArg_ParseTuple(args, "Ossiiiiii", &self, &str1, &str2, &source, ok = PyArg_ParseTuple(args, "Ossiiiiii", &self, &str1, &str2, &source,
skipping to change at line 5998 skipping to change at line 6111
} else { } else {
API_HANDLE_ERROR; API_HANDLE_ERROR;
} }
if(ok && (ok = APIEnterNotModal(G))) { if(ok && (ok = APIEnterNotModal(G))) {
MovieAppendSequence(G, str1, start_from,freeze); MovieAppendSequence(G, str1, start_from,freeze);
SceneCountFrames(G); SceneCountFrames(G);
APIExit(G); APIExit(G);
} }
// fix for PYMOL-1465 // fix for PYMOL-1465
// force GUI update for movie panel
if(G->HaveGUI)
OrthoReshape(G, -1, -1, false); OrthoReshape(G, -1, -1, false);
return APIResultOk(ok); return APIResultOk(ok);
} }
static PyObject *CmdMModify(PyObject * self, PyObject * args) static PyObject *CmdMModify(PyObject * self, PyObject * args)
{ {
PyMOLGlobals *G = NULL; PyMOLGlobals *G = NULL;
char *object; char *object;
int ok = false; int ok = false;
skipping to change at line 6084 skipping to change at line 6199
} }
} }
if((w > 0) && (h > 0)) { if((w > 0) && (h > 0)) {
if(w < 10) if(w < 10)
w = 10; w = 10;
if(h < 10) if(h < 10)
h = 10; h = 10;
if(SettingGetGlobal_b(G, cSetting_internal_gui)) { if(SettingGetGlobal_b(G, cSetting_internal_gui)) {
w += SettingGetGlobal_i(G, cSetting_internal_gui_width); w += DIP2PIXEL(SettingGetGlobal_i(G, cSetting_internal_gui_width));
} }
if(SettingGetGlobal_i(G, cSetting_internal_feedback)) { if(SettingGetGlobal_i(G, cSetting_internal_feedback)) {
h += (SettingGetGlobal_i(G, cSetting_internal_feedback) - 1) * cOrth oLineHeight + h += (SettingGetGlobal_i(G, cSetting_internal_feedback) - 1) * cOrth oLineHeight +
cOrthoBottomSceneMargin; cOrthoBottomSceneMargin;
} }
h += MovieGetPanelHeight(G); h += MovieGetPanelHeight(G);
} else { } else {
w = -1; w = -1;
h = -1; h = -1;
} }
} else {
w = 0;
h = 0;
}
#ifndef _PYMOL_NO_MAIN #ifndef _PYMOL_NO_MAIN
if(G->Main) { if(G->Main) {
MainDoReshape(w, h); /* should be moved into Executive */ MainDoReshape(w, h); /* should be moved into Executive */
} }
#else else
PyMOL_NeedReshape(G->PyMOL, 2, 0, 0, w, h);
#endif
} else {
#ifndef _PYMOL_NO_MAIN
if(G->Main) {
MainDoReshape(0, 0); /* should be moved into Executive */
}
#else
PyMOL_NeedReshape(G->PyMOL, 2, 0, 0, 0, 0);
#endif #endif
{
PyMOL_NeedReshape(G->PyMOL, 2, 0, 0, w, h);
} }
APIExit(G); APIExit(G);
} }
} }
return APIResultOk(ok); return APIResultOk(ok);
} }
static PyObject *CmdFlag(PyObject * self, PyObject * args) static PyObject *CmdFlag(PyObject * self, PyObject * args)
{ {
skipping to change at line 6576 skipping to change at line 6687
ExecutiveCartoon(G, type, s1); /* TODO STATUS */ ExecutiveCartoon(G, type, s1); /* TODO STATUS */
SelectorFreeTmp(G, s1); SelectorFreeTmp(G, s1);
APIExit(G); APIExit(G);
} }
return APIResultOk(ok); return APIResultOk(ok);
} }
static PyObject *CmdShowHide(PyObject * self, PyObject * args) static PyObject *CmdShowHide(PyObject * self, PyObject * args)
{ {
PyMOLGlobals *G = NULL; PyMOLGlobals *G = NULL;
char *sname; const char *sname;
int rep; int rep;
int state; int state;
OrthoLineType s1; OrthoLineType s1;
int ok = false; int ok = false;
ok = PyArg_ParseTuple(args, "Osii", &self, &sname, &rep, &state); ok = PyArg_ParseTuple(args, "Osii", &self, &sname, &rep, &state);
if(ok) { if(ok) {
API_SETUP_PYMOL_GLOBALS; API_SETUP_PYMOL_GLOBALS;
ok = (G != NULL); ok = (G != NULL);
} else { } else {
API_HANDLE_ERROR; API_HANDLE_ERROR;
} }
if(ok && (ok = APIEnterNotModal(G))) { /* TODO STATUS */ if(ok && (ok = APIEnterNotModal(G))) { /* TODO STATUS */
if(sname[0] == '@') { if(sname[0] == '@') {
ExecutiveSetAllVisib(G, state); // DEPRECATED
} else { sname = cKeywordAll;
rep = cRepBitmask;
}
{
ok = (SelectorGetTmp2(G, sname, s1) >= 0); ok = (SelectorGetTmp2(G, sname, s1) >= 0);
ExecutiveSetRepVisib(G, s1, rep, state); ExecutiveSetRepVisMask(G, s1, rep, state);
SelectorFreeTmp(G, s1); SelectorFreeTmp(G, s1);
} }
APIExit(G); APIExit(G);
} }
return APIResultOk(ok); return APIResultOk(ok);
} }
static PyObject *CmdOnOffBySele(PyObject * self, PyObject * args) static PyObject *CmdOnOffBySele(PyObject * self, PyObject * args)
{ {
PyMOLGlobals *G = NULL; PyMOLGlobals *G = NULL;
skipping to change at line 6840 skipping to change at line 6954
ok = PyArg_ParseTuple(args, "OsOiiiiii", &self, &oname, &model, &frame, &type, ok = PyArg_ParseTuple(args, "OsOiiiiii", &self, &oname, &model, &frame, &type,
&finish, &discrete, &quiet, &zoom); &finish, &discrete, &quiet, &zoom);
if(ok) { if(ok) {
API_SETUP_PYMOL_GLOBALS; API_SETUP_PYMOL_GLOBALS;
ok = (G != NULL); ok = (G != NULL);
} else { } else {
API_HANDLE_ERROR; API_HANDLE_ERROR;
} }
if(ok && (ok = APIEnterNotModal(G))) { if(ok && (ok = APIEnterNotModal(G))) {
ObjectNameType valid_name = ""; ObjectNameType valid_name = "";
int isTmp;
buf[0] = 0; buf[0] = 0;
ExecutiveProcessObjectName(G, oname, valid_name); ExecutiveProcessObjectName(G, oname, valid_name);
isTmp = valid_name[0] == '_';
origObj = ExecutiveFindObjectByName(G, valid_name); origObj = ExecutiveFindObjectByName(G, valid_name);
/* TODO check for existing object of wrong type */ /* TODO check for existing object of wrong type */
switch (type) { switch (type) {
case cLoadTypeChemPyModel: case cLoadTypeChemPyModel:
if(origObj){ if(origObj){
if(origObj->type != cObjectMolecule) { if(origObj->type != cObjectMolecule) {
ExecutiveDelete(G, valid_name); ExecutiveDelete(G, valid_name);
skipping to change at line 7450 skipping to change at line 7562
else else
return PyFloat_FromDouble((double) result); return PyFloat_FromDouble((double) result);
} }
static PyObject *CmdHAdd(PyObject * self, PyObject * args) static PyObject *CmdHAdd(PyObject * self, PyObject * args)
{ {
PyMOLGlobals *G = NULL; PyMOLGlobals *G = NULL;
char *str1; char *str1;
int quiet; int quiet;
int ok = false; int ok = false;
ok = PyArg_ParseTuple(args, "Osi", &self, &str1, &quiet); int state;
int legacy;
ok = PyArg_ParseTuple(args, "Osiii", &self, &str1, &quiet, &state, &legacy);
if(ok) { if(ok) {
API_SETUP_PYMOL_GLOBALS; API_SETUP_PYMOL_GLOBALS;
ok = (G != NULL); ok = (G != NULL);
} else { } else {
API_HANDLE_ERROR; API_HANDLE_ERROR;
} }
if(ok && (ok = APIEnterNotModal(G))) { if(ok && (ok = APIEnterNotModal(G))) {
ExecutiveAddHydrogens(G, str1, quiet); #ifndef _PYMOL_NO_UNDO
#endif
ExecutiveAddHydrogens(G, str1, quiet, state, legacy);
#ifndef _PYMOL_NO_UNDO
#endif
APIExit(G); APIExit(G);
} }
return APIResultOk(ok); return APIResultOk(ok);
} }
static PyObject *CmdSetObjectColor(PyObject * self, PyObject * args) static PyObject *CmdSetObjectColor(PyObject * self, PyObject * args)
{ {
PyMOLGlobals *G = NULL; PyMOLGlobals *G = NULL;
char *name, *color; char *name, *color;
int result = -1;
int quiet; int quiet;
int ok = false; int ok = false;
ok = PyArg_ParseTuple(args, "Ossi", &self, &name, &color, &quiet); ok = PyArg_ParseTuple(args, "Ossi", &self, &name, &color, &quiet);
if(ok) { if(ok) {
API_SETUP_PYMOL_GLOBALS; API_SETUP_PYMOL_GLOBALS;
ok = (G != NULL); ok = (G != NULL);
} else { } else {
API_HANDLE_ERROR; API_HANDLE_ERROR;
} }
if(ok && (ok = APIEnterNotModal(G))) { if(ok && (ok = APIEnterNotModal(G))) {
result = ExecutiveSetObjectColor(G, name, color, quiet); ok = ExecutiveSetObjectColor(G, name, color, quiet);
APIExit(G); APIExit(G);
} }
return (APIResultOk(ok)); return (APIResultOk(ok));
} }
static PyObject *CmdGetObjectColorIndex(PyObject * self, PyObject * args) static PyObject *CmdGetObjectColorIndex(PyObject * self, PyObject * args)
{ {
PyMOLGlobals *G = NULL; PyMOLGlobals *G = NULL;
char *str1; char *str1;
int result = -1; int result = -1;
skipping to change at line 7841 skipping to change at line 7958
PyMOLGlobals *G = NULL; PyMOLGlobals *G = NULL;
int int1, x, y, width, height; int int1, x, y, width, height;
int ok = false; int ok = false;
ok = PyArg_ParseTuple(args, "Oiiiii", &self, &int1, &x, &y, &width, &height); ok = PyArg_ParseTuple(args, "Oiiiii", &self, &int1, &x, &y, &width, &height);
if(ok) { if(ok) {
API_SETUP_PYMOL_GLOBALS; API_SETUP_PYMOL_GLOBALS;
ok = (G != NULL); ok = (G != NULL);
} else { } else {
API_HANDLE_ERROR; API_HANDLE_ERROR;
} }
if(ok && (ok = APIEnterNotModal(G))) { if(G->HaveGUI && ok && (ok = APIEnterNotModal(G))) {
switch (int1) { switch (int1) {
#ifndef _PYMOL_NO_MAIN #ifndef _PYMOL_NO_MAIN
case 0: case 0:
case 1: case 1:
if(G->Main) if(G->Main)
MainSetWindowVisibility(int1); MainSetWindowVisibility(int1);
break; break;
case 2: /* position */ case 2: /* position */
if(G->Main) if(G->Main)
MainSetWindowPosition(G, x, y); MainSetWindowPosition(G, x, y);
skipping to change at line 8191 skipping to change at line 8308
return APIAutoNone(ret); return APIAutoNone(ret);
ok_except1: ok_except1:
API_HANDLE_ERROR; API_HANDLE_ERROR;
return APIAutoNone(NULL); return APIAutoNone(NULL);
} }
static PyMethodDef Cmd_methods[] = { static PyMethodDef Cmd_methods[] = {
{"_get_c_threading_api", CmdGetCThreadingAPI, METH_VARARGS}, {"_get_c_threading_api", CmdGetCThreadingAPI, METH_VARARGS},
{"_del", Cmd_Del, METH_VARARGS}, {"_del", Cmd_Del, METH_VARARGS},
{"_get_global_C_object", Cmd_GetGlobalCObject, METH_VARARGS}, {"_get_global_C_object", Cmd_GetGlobalCObject, METH_VARARGS},
{"glViewport", Cmd_glViewport, METH_VARARGS},
{"_new", Cmd_New, METH_VARARGS}, {"_new", Cmd_New, METH_VARARGS},
{"_start", Cmd_Start, METH_VARARGS}, {"_start", Cmd_Start, METH_VARARGS},
{"_stop", Cmd_Stop, METH_VARARGS}, {"_stop", Cmd_Stop, METH_VARARGS},
{"_idle", Cmd_Idle, METH_VARARGS}, {"_idle", Cmd_Idle, METH_VARARGS},
{"_reshape", Cmd_Reshape, METH_VARARGS}, {"_reshape", Cmd_Reshape, METH_VARARGS},
{"_getRedisplay", Cmd_GetRedisplay, METH_VARARGS}, {"_getRedisplay", Cmd_GetRedisplay, METH_VARARGS},
{"_draw", Cmd_Draw, METH_VARARGS}, {"_draw", Cmd_Draw, METH_VARARGS},
{"_button", Cmd_Button, METH_VARARGS}, {"_button", Cmd_Button, METH_VARARGS},
{"_drag", Cmd_Drag, METH_VARARGS}, {"_drag", Cmd_Drag, METH_VARARGS},
{"_sdof", Cmd_Sdof, METH_VARARGS}, {"_sdof", Cmd_Sdof, METH_VARARGS},
skipping to change at line 8285 skipping to change at line 8403
{"get_drag_object_name", CmdGetDragObjectName, METH_VARARGS}, {"get_drag_object_name", CmdGetDragObjectName, METH_VARARGS},
{"get_editor_scheme", CmdGetEditorScheme, METH_VARARGS}, {"get_editor_scheme", CmdGetEditorScheme, METH_VARARGS},
{"get_frame", CmdGetFrame, METH_VARARGS}, {"get_frame", CmdGetFrame, METH_VARARGS},
{"get_feedback", CmdGetFeedback, METH_VARARGS}, {"get_feedback", CmdGetFeedback, METH_VARARGS},
{"get_idtf", CmdGetIdtf, METH_VARARGS}, {"get_idtf", CmdGetIdtf, METH_VARARGS},
{"get_legal_name", CmdGetLegalName, METH_VARARGS}, {"get_legal_name", CmdGetLegalName, METH_VARARGS},
{"get_matrix", CmdGetMatrix, METH_VARARGS}, {"get_matrix", CmdGetMatrix, METH_VARARGS},
{"get_min_max", CmdGetMinMax, METH_VARARGS}, {"get_min_max", CmdGetMinMax, METH_VARARGS},
{"get_mtl_obj", CmdGetMtlObj, METH_VARARGS}, {"get_mtl_obj", CmdGetMtlObj, METH_VARARGS},
{"get_model", CmdGetModel, METH_VARARGS}, {"get_model", CmdGetModel, METH_VARARGS},
{"get_bonds", CmdGetBonds, METH_VARARGS},
{"get_modal_draw", CmdGetModalDraw, METH_VARARGS}, {"get_modal_draw", CmdGetModalDraw, METH_VARARGS},
{"get_moment", CmdGetMoment, METH_VARARGS}, {"get_moment", CmdGetMoment, METH_VARARGS},
{"get_movie_length", CmdGetMovieLength, METH_VARARGS}, {"get_movie_length", CmdGetMovieLength, METH_VARARGS},
{"get_movie_locked", CmdGetMovieLocked, METH_VARARGS}, {"get_movie_locked", CmdGetMovieLocked, METH_VARARGS},
{"get_movie_playing", CmdGetMoviePlaying, METH_VARARGS}, {"get_movie_playing", CmdGetMoviePlaying, METH_VARARGS},
{"get_names", CmdGetNames, METH_VARARGS}, {"get_names", CmdGetNames, METH_VARARGS},
{"get_object_color_index", CmdGetObjectColorIndex, METH_VARARGS}, {"get_object_color_index", CmdGetObjectColorIndex, METH_VARARGS},
{"get_object_matrix", CmdGetObjectMatrix, METH_VARARGS}, {"get_object_matrix", CmdGetObjectMatrix, METH_VARARGS},
{"get_object_ttt", CmdGetObjectTTT, METH_VARARGS}, {"get_object_ttt", CmdGetObjectTTT, METH_VARARGS},
{"get_object_settings", CmdGetObjectSettings, METH_VARARGS},
{"get_origin", CmdGetOrigin, METH_VARARGS}, {"get_origin", CmdGetOrigin, METH_VARARGS},
{"get_position", CmdGetPosition, METH_VARARGS}, {"get_position", CmdGetPosition, METH_VARARGS},
{"get_povray", CmdGetPovRay, METH_VARARGS}, {"get_povray", CmdGetPovRay, METH_VARARGS},
{"get_progress", CmdGetProgress, METH_VARARGS}, {"get_progress", CmdGetProgress, METH_VARARGS},
{"get_pdb", CmdGetPDB, METH_VARARGS}, {"get_pdb", CmdGetPDB, METH_VARARGS},
{"get_phipsi", CmdGetPhiPsi, METH_VARARGS}, {"get_phipsi", CmdGetPhiPsi, METH_VARARGS},
{"get_renderer", CmdGetRenderer, METH_VARARGS}, {"get_renderer", CmdGetRenderer, METH_VARARGS},
{"get_raw_alignment", CmdGetRawAlignment, METH_VARARGS}, {"get_raw_alignment", CmdGetRawAlignment, METH_VARARGS},
{"get_seq_align_str", CmdGetSeqAlignStr, METH_VARARGS}, {"get_seq_align_str", CmdGetSeqAlignStr, METH_VARARGS},
{"get_session", CmdGetSession, METH_VARARGS}, {"get_session", CmdGetSession, METH_VARARGS},
 End of changes. 28 change blocks. 
26 lines changed or deleted 146 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)