"Fossies" - the Fresh Open Source Software Archive  

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

utils.py  (pymol-open-source-2.2.0):utils.py  (pymol-open-source-2.3.0)
skipping to change at line 260 skipping to change at line 260
return font return font
def loadUi(uifile, widget): def loadUi(uifile, widget):
""" """
Load .ui file into widget Load .ui file into widget
@param uifile: filename @param uifile: filename
@type uifile: str @type uifile: str
@type widget: QtWidgets.QWidget @type widget: QtWidgets.QWidget
""" """
if PYQT_NAME != 'PySide': if PYQT_NAME.startswith('PyQt'):
m = __import__(PYQT_NAME + '.uic') m = __import__(PYQT_NAME + '.uic')
return m.uic.loadUi(uifile, widget) return m.uic.loadUi(uifile, widget)
elif PYQT_NAME == 'PySide2':
import pyside2uic as pysideuic
import pysideuic
import io, pysideuic import io
stream = io.BytesIO() stream = io.StringIO()
pysideuic.compileUi(uifile, stream) pysideuic.compileUi(uifile, stream)
ns_locals = {} ns_locals = {}
exec(stream.getvalue(), None, ns_locals) exec(stream.getvalue(), None, ns_locals)
if 'Ui_Form' in ns_locals: if 'Ui_Form' in ns_locals:
form = ns_locals['Ui_Form']() form = ns_locals['Ui_Form']()
else: else:
form = ns_locals['Ui_Dialog']() form = ns_locals['Ui_Dialog']()
form.setupUi(widget) form.setupUi(widget)
 End of changes. 3 change blocks. 
3 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)