"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer2/AtomInfoHistory.h" between
pymol-open-source-2.2.0.tar.gz and pymol-open-source-2.3.0.tar.gz

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.

AtomInfoHistory.h  (pymol-open-source-2.2.0)	:	AtomInfoHistory.h  (pymol-open-source-2.3.0)
skipping to change at line 187		skipping to change at line 187
return resi[i];		return resi[i];
return '\0';		return '\0';
}		}
} AtomInfoType_1_7_7;		} AtomInfoType_1_7_7;
/*		/*
* This is not identical to the 1.8.2 AtomInfoType, it's missing all members		* This is not identical to the 1.8.2 AtomInfoType, it's missing all members
* which are not relevant or unsupported with pse_binary_dump (anisou,		* which are not relevant or unsupported with pse_binary_dump (anisou,
* selEntry, temp1, oldid, prop_id, deleteFlag)		* selEntry, temp1, oldid, prop_id, deleteFlag)
*/		*/
		typedef int lexidx_int_t;
struct AtomInfoType_1_8_1 {		struct AtomInfoType_1_8_1 {
// contiguous memory instead of pointer ("short" matches PDB precision)		// contiguous memory instead of pointer ("short" matches PDB precision)
short anisou[6];		short anisou[6];
lexidx_t segi;		lexidx_int_t segi;
lexidx_t chain;		lexidx_int_t chain;
lexidx_t resn;		lexidx_int_t resn;
lexidx_t name;		lexidx_int_t name;
lexidx_t textType;		lexidx_int_t textType;
lexidx_t custom;		lexidx_int_t custom;
lexidx_t label;		lexidx_int_t label;
int resv;		int resv;
int customType;		int customType;
int priority;		int priority;
float b, q, vdw, partialCharge;		float b, q, vdw, partialCharge;
int color;		int color;
int id; // PDB ID		int id; // PDB ID
unsigned int flags;		unsigned int flags;
int unique_id; /* introduced in version 0.77 */		int unique_id; /* introduced in version 0.77 */
int discrete_state; /* state+1 for atoms in discrete objects */		int discrete_state; /* state+1 for atoms in discrete objects */
skipping to change at line 266		skipping to change at line 267
PyMOLGlobals * G;		PyMOLGlobals * G;
int NAtom;		int NAtom;
template <typename D, typename S> void copy1(D *dest, const S *src);		template <typename D, typename S> void copy1(D *dest, const S *src);
template <typename D, typename S> void copyN(D *dest, const S *src);		template <typename D, typename S> void copyN(D *dest, const S *src);
template <typename D> D * allocCopy(const AtomInfoType *src);		template <typename D> D * allocCopy(const AtomInfoType *src);
public:		public:
AtomInfoTypeConverter(PyMOLGlobals * G_, int natom) : G(G_), NAtom(natom) {}		AtomInfoTypeConverter(PyMOLGlobals * G_, int natom) : G(G_), NAtom(natom) {}
std::map<int, int> lexidxmap;		std::map<lexidx_int_t, lexidx_t> lexidxmap;
		lexidx_int_t to_lexidx_int(const lexidx_t& idx) {
		return idx;
		}
void copy(AtomInfoType * dest, const void *src, int srcversion);		void copy(AtomInfoType * dest, const void *src, int srcversion);
void * allocCopy(int destversion, const AtomInfoType * src);		void * allocCopy(int destversion, const AtomInfoType * src);
/*		/*
* For copying Lex strings		* For copying Lex strings
*/		*/
inline void copy_attr_s(lexidx_t& dest, lexidx_t src) {		inline void copy_attr_s(lexidx_t& dest, lexidx_t src) {
if (!lexidxmap.empty())		if (!lexidxmap.empty())
src = lexidxmap[src];		src = lexidxmap[src];
End of changes. 3 change blocks.
8 lines changed or deleted		13 lines changed or added

---