"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer1/P.h" 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.

P.h  (pymol-v1.8.6.0.tar.bz2)	:	P.h  (pymol-v2.1.0.tar.bz2)
skipping to change at line 50		skipping to change at line 50
#define cPType_char_as_type 6		#define cPType_char_as_type 6
#define cPType_model 7		#define cPType_model 7
#define cPType_index 8		#define cPType_index 8
#define cPType_int_custom_type 9		#define cPType_int_custom_type 9
#define cPType_xyz_float 10		#define cPType_xyz_float 10
#define cPType_settings 11		#define cPType_settings 11
#define cPType_properties 12		#define cPType_properties 12
#define cPType_state 13		#define cPType_state 13
#define cPType_schar 14		#define cPType_schar 14
#define NUM_ATOM_PROPERTIES 40		#define NUM_ATOM_PROPERTIES 41
#define cPRunType_alter 1		#define cPRunType_alter 1
#define cPRunType_alter_state 2		#define cPRunType_alter_state 2
#define cPRunType_label 3		#define cPRunType_label 3
int PLabelExprUsesVariable(PyMOLGlobals * G, const char *expr, const char *var);		int PLabelExprUsesVariable(PyMOLGlobals * G, const char *expr, const char *var);
int PLabelAtomAlt(PyMOLGlobals * G, AtomInfoType * at, const char *model, const char *expr,		int PLabelAtomAlt(PyMOLGlobals * G, AtomInfoType * at, const char *model, const char *expr,
int index);		int index);
skipping to change at line 110		skipping to change at line 110
#define PSGIStereo(G,a)		#define PSGIStereo(G,a)
#define PPovrayRender(a,b,c,d,e,f,g) 0		#define PPovrayRender(a,b,c,d,e,f,g) 0
#define PTruthCallStr(a,b,c)		#define PTruthCallStr(a,b,c)
#define PSleep(G,a)		#define PSleep(G,a)
#define PSleepWhileBusy(G,a)		#define PSleepWhileBusy(G,a)
#define PSleepUnlocked(G,a)		#define PSleepUnlocked(G,a)
#define PFree()		#define PFree(G)
#define PInit(G,a)		#define PInit(G,a)
#define PSetupEmbedded(G,a,b)		#define PSetupEmbedded(G,a,b)
#define PConvertOptions(a,b)		#define PConvertOptions(a,b)
#define PGetOptions(a)		#define PGetOptions(a)
#define PAlterAtom(G,a,b,c,d,e,f,g,h) 0		#define PAlterAtom(G,a,b,c,d,e,f,g,h) 0
#define PLabelAtom(G,a,b,c,d,e,f) 0		#define PLabelAtom(G,a,b,c,d,e,f) 0
#define PAlterAtomState(G,a,b,c,d,e,f,g,h,i,j,k) 0		#define PAlterAtomState(G,a,b,c,d,e,f,g,h,i,j,k) 0
skipping to change at line 136		skipping to change at line 136
PyObject * input);		PyObject * input);
void PInit(PyMOLGlobals * G, int global_instance);		void PInit(PyMOLGlobals * G, int global_instance);
void PSetupEmbedded(PyMOLGlobals * G, int argc, char **argv);		void PSetupEmbedded(PyMOLGlobals * G, int argc, char **argv);
struct PyMOLOptionRec;		struct PyMOLOptionRec;
void PConvertOptions(CPyMOLOptions * rec, PyObject * options);		void PConvertOptions(CPyMOLOptions * rec, PyObject * options);
void PGetOptions(CPyMOLOptions * rec);		void PGetOptions(CPyMOLOptions * rec);
void PFree(void);		void PFree(PyMOLGlobals * G);
void PExit(PyMOLGlobals * G, int code);		void PExit(PyMOLGlobals * G, int code);
void PParse(PyMOLGlobals * G, const char *str); /* only accepts one comman d */		void PParse(PyMOLGlobals * G, const char *str); /* only accepts one comman d */
void PDo(PyMOLGlobals * G, const char *str); /* accepts multple commands sepera ted by newlines */		void PDo(PyMOLGlobals * G, const char *str); /* accepts multple commands sepera ted by newlines */
int PAlterAtom(PyMOLGlobals * G, ObjectMolecule *obj, CoordSet *cs, PyCodeObject *expr_co,		int PAlterAtom(PyMOLGlobals * G, ObjectMolecule *obj, CoordSet *cs, PyCodeObject *expr_co,
int read_only, int atm, PyObject * space);		int read_only, int atm, PyObject * space);
int PLabelAtom(PyMOLGlobals * G, ObjectMolecule *obj, CoordSet *cs, PyCodeObject *expr_co, int atm);		int PLabelAtom(PyMOLGlobals * G, ObjectMolecule *obj, CoordSet *cs, PyCodeObject *expr_co, int atm);
int PAlterAtomState(PyMOLGlobals * G, PyCodeObject *expr_co, int read_only,		int PAlterAtomState(PyMOLGlobals * G, PyCodeObject *expr_co, int read_only,
ObjectMolecule *obj, CoordSet *cs, int atm, int idx,		ObjectMolecule *obj, CoordSet *cs, int atm, int idx,
int state, PyObject * space);		int state, PyObject * space);
skipping to change at line 245		skipping to change at line 245
struct _CP_inst {		struct _CP_inst {
/* instance-specific storage */		/* instance-specific storage */
PyObject *obj;		PyObject *obj;
PyObject *dict;		PyObject *dict;
PyObject *exec;		PyObject *exec;
PyObject *cmd;		PyObject *cmd;
PyObject *parse; /* parse closure */		PyObject *parse; /* parse closure */
PyObject *complete; /* complete partial command / TAB action */		PyObject *complete; /* complete partial command / TAB action */
PyObject *cmd_do;		PyObject *cmd_do;
		PyObject *colortype; /* backwards compatible iterate/alter color type */
PyObject *cache;		PyObject *cache;
/* locks and threads */		/* locks and threads */
PyObject *lock; /* API locks */		PyObject *lock; /* API locks */
PyObject *lock_attempt;		PyObject *lock_attempt;
PyObject *unlock;		PyObject *unlock;
PyObject *lock_c; /* C locks */		PyObject *lock_c; /* C locks */
skipping to change at line 289		skipping to change at line 290
extern PyObject *P_models; /* used by Selector for construction of models * /		extern PyObject *P_models; /* used by Selector for construction of models * /
extern PyObject *P_setting; /* used by Setting.c */		extern PyObject *P_setting; /* used by Setting.c */
extern PyTypeObject *P_wrapper; /* used by P.c for lazy-loading settings/pro perties/attributes */		extern PyTypeObject *P_wrapper; /* used by P.c for lazy-loading settings/pro perties/attributes */
#endif		#endif
#ifndef _PYMOL_NOPY		#ifndef _PYMOL_NOPY
void PSetAtomPropertyInfo(PyMOLGlobals * G, int propid, short pt, int off);		void PSetAtomPropertyInfo(PyMOLGlobals * G, int propid, short pt, int off);
#endif		#endif
char convertStereoToChar(int stereo);
int convertCharToStereo(char stereo);
#endif		#endif
End of changes. 5 change blocks.
6 lines changed or deleted		4 lines changed or added

---