"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "modules/pymol/viewing.py" 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.

viewing.py  (pymol-open-source-2.2.0)	:	viewing.py  (pymol-open-source-2.3.0)
skipping to change at line 17		skipping to change at line 17
#G* Please see the accompanying LICENSE file for further information.		#G* Please see the accompanying LICENSE file for further information.
#H* -------------------------------------------------------------------		#H* -------------------------------------------------------------------
#I* Additional authors of this source file include:		#I* Additional authors of this source file include:
#-* Filipe Maia (slicing code)		#-* Filipe Maia (slicing code)
#-*		#-*
#-*		#-*
#Z* -------------------------------------------------------------------		#Z* -------------------------------------------------------------------
from __future__ import print_function, absolute_import		from __future__ import print_function, absolute_import
if __name__=='pymol.viewing':		if True:
import sys		import sys
if sys.version_info[0] == 2:		if sys.version_info[0] == 2:
import thread		import thread
else:		else:
import _thread as thread		import _thread as thread
import threading		import threading
import types
import traceback		import traceback
import pymol		import pymol
from . import selector		from . import selector
import copy		import copy
from . import parsing		from . import parsing
import re		import re
cmd = sys.modules["pymol.cmd"]		cmd = sys.modules["pymol.cmd"]
from .cmd import _cmd,lock,unlock,Shortcut,QuietException,_raising, \		from .cmd import _cmd,lock,unlock,Shortcut,QuietException,_raising, \
_feedback,fb_module,fb_mask, \		_feedback,fb_module,fb_mask, \
skipping to change at line 1072		skipping to change at line 1071
scene		scene
'''		'''
location = location_sc.auto_err(location,'location')		location = location_sc.auto_err(location,'location')
if is_string(sort):		if is_string(sort):
sort=boolean_dict[boolean_sc.auto_err(sort,'sort option')]		sort=boolean_dict[boolean_sc.auto_err(sort,'sort option')]
with _self.lockcm:		with _self.lockcm:
return _cmd.scene_order(_self._COb, names, sort, location)		return _cmd.scene_order(_self._COb, names, sort, location)
		def _scene_get_current_message(_self=cmd):
		wiz = _self.get_wizard()
		return '\n'.join(wiz.message) if (wiz is not None
		and wiz.__class__.__name__ == 'Message'
		and hasattr(wiz, 'from_scene')) else None
def scene_recall_message(message, _self=cmd):		def scene_recall_message(message, _self=cmd):
'''		'''
INTERNAL, DO NOT USE.		INTERNAL, DO NOT USE.
Display a scene message.		Display a scene message.
'''		'''
wiz = _self.get_wizard()		wiz = _self.get_wizard()
replace_flag = (wiz is not None		replace_flag = (wiz is not None
and wiz.__class__.__name__ == 'Message'		and wiz.__class__.__name__ == 'Message'
and hasattr(wiz, 'from_scene'))		and hasattr(wiz, 'from_scene'))
skipping to change at line 1155		skipping to change at line 1160
action = scene_action_sc.auto_err(action, 'action')		action = scene_action_sc.auto_err(action, 'action')
if is_list(message):		if is_list(message):
message = '\n'.join(message)		message = '\n'.join(message)
# default when called with no arguments		# default when called with no arguments
if key == 'auto':		if key == 'auto':
if action == 'recall':		if action == 'recall':
action = 'next'		action = 'next'
		# preserve message on update
		if action == 'update':
		if message is None:
		message = _scene_get_current_message(_self)
# aliases (DEPRECATED)		# aliases (DEPRECATED)
if action == 'clear':		if action == 'clear':
action = 'delete'		action = 'delete'
elif action == 'append' or action == 'update':		elif action == 'append' or action == 'update':
action = 'store'		action = 'store'
# presentation auto quit		# presentation auto quit
if (pymol._scene_quit_on_action == action and		if (pymol._scene_quit_on_action == action and
action in ('next', 'previous') and		action in ('next', 'previous') and
_self.get_setting_boolean("presentation") and		_self.get_setting_boolean("presentation") and
End of changes. 4 change blocks.
2 lines changed or deleted		12 lines changed or added

---