"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer1/Setting.h" between
pymol-v2.1.0.tar.bz2 and pymol-open-source-2.2.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.

Setting.h  (pymol-v2.1.0.tar.bz2)	:	Setting.h  (pymol-open-source-2.2.0)
skipping to change at line 133		skipping to change at line 133
void SettingUniqueDetachChain(PyMOLGlobals * G, int index);		void SettingUniqueDetachChain(PyMOLGlobals * G, int index);
/* New API		/* New API
* NOTE: get commands are not range-checked, so be careful		* NOTE: get commands are not range-checked, so be careful
* in contrast, set commands expand the current list		* in contrast, set commands expand the current list
*/		*/
int SettingUniqueSetTypedValue(PyMOLGlobals * G, int unique_id, int setting_id,		int SettingUniqueSetTypedValue(PyMOLGlobals * G, int unique_id, int setting_id,
int setting_type, const void *value);		int setting_type, const void *value);
		/*
		* bool overload
		*/
		inline
		int SettingUniqueSetTypedValue(PyMOLGlobals * G, int unique_id, int setting_id,
		int setting_type, const bool *value) {
		int i = *value;
		return SettingUniqueSetTypedValue(G, unique_id, setting_id, setting_type, &i);
		}
		bool SettingUniqueUnset(PyMOLGlobals * G, int unique_id, int setting_id);
#ifndef _PYMOL_NOPY		#ifndef _PYMOL_NOPY
bool SettingUniqueSetPyObject(PyMOLGlobals * G, int unique_id, int setting_id, P yObject *value);		bool SettingUniqueSetPyObject(PyMOLGlobals * G, int unique_id, int setting_id, P yObject *value);
#endif		#endif
int SettingUniqueCheck(PyMOLGlobals * G, int unique_id, int setting_id);		int SettingUniqueCheck(PyMOLGlobals * G, int unique_id, int setting_id);
PyObject *SettingUniqueGetPyObject(PyMOLGlobals * G, int unique_id, int index);		PyObject *SettingUniqueGetPyObject(PyMOLGlobals * G, int unique_id, int index);
void SettingUniqueResetAll(PyMOLGlobals * G);		void SettingUniqueResetAll(PyMOLGlobals * G);
PyObject *SettingUniqueAsPyList(PyMOLGlobals * G);		PyObject *SettingUniqueAsPyList(PyMOLGlobals * G);
int SettingUniqueFromPyList(PyMOLGlobals * G, PyObject * list, int partial_resto re);		int SettingUniqueFromPyList(PyMOLGlobals * G, PyObject * list, int partial_resto re);
skipping to change at line 211		skipping to change at line 224
int *value);		int *value);
#ifndef _PYMOL_NOPY		#ifndef _PYMOL_NOPY
int SettingSetFromTuple(PyMOLGlobals * G, CSetting * I, int index, PyObject * tu ple);		int SettingSetFromTuple(PyMOLGlobals * G, CSetting * I, int index, PyObject * tu ple);
PyObject *SettingGetPyObject(PyMOLGlobals * G, const CSetting * set1, const CSet ting * set2, int index);		PyObject *SettingGetPyObject(PyMOLGlobals * G, const CSetting * set1, const CSet ting * set2, int index);
PyObject *SettingGetTuple(PyMOLGlobals * G, const CSetting * set1, const CSettin g * set2, int index); /* (type,(value,)) */		PyObject *SettingGetTuple(PyMOLGlobals * G, const CSetting * set1, const CSettin g * set2, int index); /* (type,(value,)) */
PyObject *SettingGetSettingIndices();		PyObject *SettingGetSettingIndices();
PyObject *SettingUniqueGetIndicesAsPyList(PyMOLGlobals * G, int unique_id);		PyObject *SettingUniqueGetIndicesAsPyList(PyMOLGlobals * G, int unique_id);
#endif		#endif
std::vector<int> SettingGetUpdateList(PyMOLGlobals * G, const char *, int);		std::vector<int> SettingGetUpdateList(PyMOLGlobals * G, const char * name="", in t state=0);
void SettingGenerateSideEffects(PyMOLGlobals * G, int index, const char *sele, i nt state, int quiet);		void SettingGenerateSideEffects(PyMOLGlobals * G, int index, const char *sele, i nt state, int quiet);
int SettingGetIndex(PyMOLGlobals * G, const char *name);		int SettingGetIndex(PyMOLGlobals * G, const char *name);
int SettingGetName(PyMOLGlobals * G, int index, SettingName name);		int SettingGetName(PyMOLGlobals * G, int index, SettingName name);
const char * SettingGetName(int index);		const char * SettingGetName(int index);
PyObject *SettingAsPyList(CSetting * I, bool incl_blacklisted=false);		PyObject *SettingAsPyList(CSetting * I, bool incl_blacklisted=false);
int SettingFromPyList(CSetting * I, PyObject * list);		int SettingFromPyList(CSetting * I, PyObject * list);
int SettingSetGlobalsFromPyList(PyMOLGlobals * G, PyObject * list);		int SettingSetGlobalsFromPyList(PyMOLGlobals * G, PyObject * list);
PyObject *SettingGetGlobalsAsPyList(PyMOLGlobals * G);		PyObject *SettingGetGlobalsAsPyList(PyMOLGlobals * G);
CSetting *SettingNewFromPyList(PyMOLGlobals * G, PyObject * list);		CSetting *SettingNewFromPyList(PyMOLGlobals * G, PyObject * list);
		int SettingCheckFontID(PyMOLGlobals * G, CSetting * set1, CSetting * set2, int f
		ont_id);
// The following defines the enum with all cSetting_<settingname> indices		// The following defines the enum with all cSetting_<settingname> indices
#include "SettingInfo.h"		#include "SettingInfo.h"
#define cStereo_default 0 /* stereo_mode=0 only used for startup * /		#define cStereo_default 0 /* stereo_mode=0 only used for startup * /
#define cStereo_quadbuffer 1		#define cStereo_quadbuffer 1
#define cStereo_crosseye 2		#define cStereo_crosseye 2
#define cStereo_walleye 3		#define cStereo_walleye 3
#define cStereo_geowall 4		#define cStereo_geowall 4
#define cStereo_sidebyside 5		#define cStereo_sidebyside 5
#define cStereo_stencil_by_row 6		#define cStereo_stencil_by_row 6
skipping to change at line 385		skipping to change at line 400
#define SettingGetIfDefined_i(G, s, i, o) SettingGetIfDefined(s, i, o)		#define SettingGetIfDefined_i(G, s, i, o) SettingGetIfDefined(s, i, o)
/*		/*
* templatted unique settings		* templatted unique settings
*/		*/
bool SettingUniqueGetTypedValuePtr(PyMOLGlobals * G, int unique_id, int index,		bool SettingUniqueGetTypedValuePtr(PyMOLGlobals * G, int unique_id, int index,
int setting_type, void * out);		int setting_type, void * out);
/*		/*
		* bool overload
		*/
		inline
		bool SettingUniqueGetTypedValuePtr(PyMOLGlobals * G, int unique_id, int index,
		int setting_type, bool * out) {
		int i = *out;
		bool r = SettingUniqueGetTypedValuePtr(G, unique_id, index, setting_type, &i);
		*out = i;
		return r;
		}
		/*
* `SettingGetIfDefined` equivalent for unique settings.		* `SettingGetIfDefined` equivalent for unique settings.
*/		*/
template <typename V>		template <typename V>
bool SettingUniqueGetIfDefined(PyMOLGlobals * G, int unique_id, int index, V * o ut) {		bool SettingUniqueGetIfDefined(PyMOLGlobals * G, int unique_id, int index, V * o ut) {
return SettingUniqueGetTypedValuePtr(G, unique_id, index,		return SettingUniqueGetTypedValuePtr(G, unique_id, index,
SettingGetType<V>(), out);		SettingGetType<V>(), out);
}		}
#endif		#endif
End of changes. 4 change blocks.
1 lines changed or deleted		29 lines changed or added

---