Executive.h (pymol-v2.1.0.tar.bz2) | : | Executive.h (pymol-open-source-2.2.0) | ||
---|---|---|---|---|
skipping to change at line 163 | skipping to change at line 163 | |||
#define cExecutiveGroupOpen 3 | #define cExecutiveGroupOpen 3 | |||
#define cExecutiveGroupClose 4 | #define cExecutiveGroupClose 4 | |||
#define cExecutiveGroupToggle 5 | #define cExecutiveGroupToggle 5 | |||
#define cExecutiveGroupAuto 6 | #define cExecutiveGroupAuto 6 | |||
#define cExecutiveGroupUngroup 7 | #define cExecutiveGroupUngroup 7 | |||
#define cExecutiveGroupEmpty 8 | #define cExecutiveGroupEmpty 8 | |||
#define cExecutiveGroupPurge 9 | #define cExecutiveGroupPurge 9 | |||
#define cExecutiveGroupExcise 10 | #define cExecutiveGroupExcise 10 | |||
int ExecutiveGroup(PyMOLGlobals * G, const char *name, const char *members, int action, int quiet); | int ExecutiveGroup(PyMOLGlobals * G, const char *name, const char *members, int action, int quiet); | |||
int ExecutiveScrollTo(PyMOLGlobals * G, const char * name, int); | ||||
void ExecutiveInvalidateGroups(PyMOLGlobals * G, int force); | void ExecutiveInvalidateGroups(PyMOLGlobals * G, int force); | |||
void ExecutiveUpdateGroups(PyMOLGlobals * G, int force); | void ExecutiveUpdateGroups(PyMOLGlobals * G, int force); | |||
int *ExecutiveGetG3d(PyMOLGlobals * G); | int *ExecutiveGetG3d(PyMOLGlobals * G); | |||
int ExecutiveOrder(PyMOLGlobals * G, const char *s1, int sort, int location); | int ExecutiveOrder(PyMOLGlobals * G, const char *s1, int sort, int location); | |||
int ExecutiveFixChemistry(PyMOLGlobals * G, const char *s1, const char *s2, int invalidate, | int ExecutiveFixChemistry(PyMOLGlobals * G, const char *s1, const char *s2, int invalidate, | |||
int quiet); | int quiet); | |||
int ExecutiveGetAtomVertex(PyMOLGlobals * G, const char *s1, int state, int inde x, float *v); | int ExecutiveGetAtomVertex(PyMOLGlobals * G, const char *s1, int state, int inde x, float *v); | |||
int ExecutiveProcessPDBFile(PyMOLGlobals * G, CObject * origObj, | int ExecutiveProcessPDBFile(PyMOLGlobals * G, CObject * origObj, | |||
skipping to change at line 224 | skipping to change at line 225 | |||
float cutoff, int cycles, int quiet, | float cutoff, int cycles, int quiet, | |||
const char *oname, int state1, int state2, | const char *oname, int state1, int state2, | |||
ExecutiveRMSInfo * rms_info, int transform, int reset, | ExecutiveRMSInfo * rms_info, int transform, int reset, | |||
float seq_wt, float radius, float scale, float base, | float seq_wt, float radius, float scale, float base, | |||
float coord_wt, float expect, int window, float ante); | float coord_wt, float expect, int window, float ante); | |||
void ExecutiveUpdateColorDepends(PyMOLGlobals * G, ObjectMolecule * mol); | void ExecutiveUpdateColorDepends(PyMOLGlobals * G, ObjectMolecule * mol); | |||
void ExecutiveUpdateCoordDepends(PyMOLGlobals * G, ObjectMolecule * mol); | void ExecutiveUpdateCoordDepends(PyMOLGlobals * G, ObjectMolecule * mol); | |||
int ExecutiveDist(PyMOLGlobals * G, float *result, | int ExecutiveDist(PyMOLGlobals * G, float *result, | |||
const char *nam, const char *s1, const char *s2, int mode, | const char *nam, const char *s1, const char *s2, int mode, | |||
float cutoff, int labels, int quiet, int reset, int state, int | float cutoff, int labels, int quiet, int reset, int state, int | |||
zoom); | zoom, | |||
int state1=-4, int state2=-4); | ||||
int ExecutiveBond(PyMOLGlobals * G, const char *s1, const char *s2, int order, i nt mode, int quiet); | int ExecutiveBond(PyMOLGlobals * G, const char *s1, const char *s2, int order, i nt mode, int quiet); | |||
int ExecutiveRevalence(PyMOLGlobals * G, const char *s1, const char *s2, const c har *src, | int ExecutiveRevalence(PyMOLGlobals * G, const char *s1, const char *s2, const c har *src, | |||
int target_state, int source_state, int reset, int quiet) ; | int target_state, int source_state, int reset, int quiet) ; | |||
int ExecutiveVdwFit(PyMOLGlobals * G, const char *s1, int state1, const char *s2 , int state2, | int ExecutiveVdwFit(PyMOLGlobals * G, const char *s1, int state1, const char *s2 , int state2, | |||
float buffer, int quiet); | float buffer, int quiet); | |||
#ifdef _WEBGL | #ifdef _WEBGL | |||
#else | #else | |||
int ExecutiveIterate(PyMOLGlobals * G, const char *str1, const char *expr, int r ead_only, int quiet, | int ExecutiveIterate(PyMOLGlobals * G, const char *str1, const char *expr, int r ead_only, int quiet, | |||
PyObject * space); | PyObject * space); | |||
#endif | #endif | |||
skipping to change at line 336 | skipping to change at line 338 | |||
float *pos, int quiet); | float *pos, int quiet); | |||
void ExecutiveDoZoom(PyMOLGlobals * G, CObject * obj, int is_new, int zoom, int quiet); | void ExecutiveDoZoom(PyMOLGlobals * G, CObject * obj, int is_new, int zoom, int quiet); | |||
int ExecutiveWindowZoom(PyMOLGlobals * G, const char *name, float buffer, | int ExecutiveWindowZoom(PyMOLGlobals * G, const char *name, float buffer, | |||
int state, int inclusive, float animate, int quiet); | int state, int inclusive, float animate, int quiet); | |||
int ExecutiveGetMoment(PyMOLGlobals * G, const char *name, double *mi, int state ); | int ExecutiveGetMoment(PyMOLGlobals * G, const char *name, double *mi, int state ); | |||
const char **ExecutiveGetChains(PyMOLGlobals * G, const char *sele, int state); | const char **ExecutiveGetChains(PyMOLGlobals * G, const char *sele, int state); | |||
void ExecutiveOrient(PyMOLGlobals * G, const char *sele, double *mi, | void ExecutiveOrient(PyMOLGlobals * G, const char *sele, double *mi, | |||
int state, float animate, int complete, float buffer, int q uiet); | int state, float animate, int complete, float buffer, int q uiet); | |||
char *ExecutiveSeleToPDBStr(PyMOLGlobals * G, const char *s1, int state, int con | ||||
ectFlag, | ||||
int mode, const char *ref_object, int ref_state, | ||||
ObjectMolecule * single_object, int quiet); | ||||
char *ExecutiveNameToSeqAlignStrVLA(PyMOLGlobals * G, const char *name, int stat e, int format, | char *ExecutiveNameToSeqAlignStrVLA(PyMOLGlobals * G, const char *name, int stat e, int format, | |||
int quiet); | int quiet); | |||
int ExecutiveStereo(PyMOLGlobals * G, int flag); | int ExecutiveStereo(PyMOLGlobals * G, int flag); | |||
void ExecutiveCopy(PyMOLGlobals * G, const char *src, const char *dst, int zoom) ; | void ExecutiveCopy(PyMOLGlobals * G, const char *src, const char *dst, int zoom) ; | |||
float ExecutiveOverlap(PyMOLGlobals * G, const char *s1, int state1, const char *s2, int state2, | float ExecutiveOverlap(PyMOLGlobals * G, const char *s1, int state1, const char *s2, int state2, | |||
float adjust); | float adjust); | |||
int ExecutiveCountStates(PyMOLGlobals * G, const char *s1); | int ExecutiveCountStates(PyMOLGlobals * G, const char *s1); | |||
void ExecutiveSymExp(PyMOLGlobals * G, const char *name, const char *obj, const char *sele, float cutoff, | void ExecutiveSymExp(PyMOLGlobals * G, const char *name, const char *obj, const char *sele, float cutoff, | |||
int segi, int quiet); | int segi, int quiet); | |||
skipping to change at line 503 | skipping to change at line 502 | |||
int ExecutiveGetObjectColorIndex(PyMOLGlobals * G, const char *name); | int ExecutiveGetObjectColorIndex(PyMOLGlobals * G, const char *name); | |||
int ExecutiveSetOnOffBySele(PyMOLGlobals * G, const char *name, int onoff); | int ExecutiveSetOnOffBySele(PyMOLGlobals * G, const char *name, int onoff); | |||
int ExecutiveSetName(PyMOLGlobals * G, const char *old_name, const char *new_nam e); | int ExecutiveSetName(PyMOLGlobals * G, const char *old_name, const char *new_nam e); | |||
int ExecutiveSetDrag(PyMOLGlobals * G, const char *name, int quiet,int mode); | int ExecutiveSetDrag(PyMOLGlobals * G, const char *name, int quiet,int mode); | |||
int ExecutiveGetActiveSeleName(PyMOLGlobals * G, char *name, int create_new, int log); | int ExecutiveGetActiveSeleName(PyMOLGlobals * G, char *name, int create_new, int log); | |||
int ExecutiveGetActiveSele(PyMOLGlobals * G); | int ExecutiveGetActiveSele(PyMOLGlobals * G); | |||
int ExecutiveGetActiveAlignmentSele(PyMOLGlobals * G); | int ExecutiveGetActiveAlignmentSele(PyMOLGlobals * G); | |||
CObject *ExecutiveGetExistingCompatible(PyMOLGlobals * G, const char *oname, int type); | CObject *ExecutiveGetExistingCompatible(PyMOLGlobals * G, const char *oname, int type); | |||
int ExecutiveAngle(PyMOLGlobals * G, float *result, | int ExecutiveAngle(PyMOLGlobals * G, float *result, | |||
const char *nam, const char *s1, const char *s2, const char * s3, int mode, | const char *nam, const char *s1, const char *s2, const char * s3, int mode, | |||
int labels, int reset, int zoom, int quiet, int state); | int labels, int reset, int zoom, int quiet, int state, | |||
int state1=-4, int state2=-4, int state3=-4); | ||||
int ExecutiveDihedral(PyMOLGlobals * G, float *result, | int ExecutiveDihedral(PyMOLGlobals * G, float *result, | |||
const char *nam, const char *s1, const char *s2, const cha r *s3, const char *s4, int mode, | const char *nam, const char *s1, const char *s2, const cha r *s3, const char *s4, int mode, | |||
int labels, int reset, int zoom, int quiet, int state); | int labels, int reset, int zoom, int quiet, int state); | |||
int ExecutiveMatrixCopy2(PyMOLGlobals * G, | int ExecutiveMatrixCopy2(PyMOLGlobals * G, | |||
CObject * source_obj, CObject * target_obj, | CObject * source_obj, CObject * target_obj, | |||
int source_mode, int target_mode, | int source_mode, int target_mode, | |||
int source_state, int target_state, | int source_state, int target_state, | |||
int target_undo, int log, int quiet); | int target_undo, int log, int quiet); | |||
End of changes. 4 change blocks. | ||||
7 lines changed or deleted | 6 lines changed or added |