"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "gui/spin_viewer/frame.py" between
relax-4.1.3.src.tar.bz2 and relax-5.0.0.src.tar.bz2

About: relax allows the study of molecular dynamics through the analysis of experimental NMR data. Organic molecules, proteins, RNA, DNA, sugars, and other biomolecules are all supported.

frame.py  (relax-4.1.3.src.tar.bz2):frame.py  (relax-5.0.0.src.tar.bz2)
############################################################################### ###############################################################################
# # # #
# Copyright (C) 2010-2012,2014-2015 Edward d'Auvergne # # Copyright (C) 2010-2012,2014-2015,2019 Edward d'Auvergne #
# Copyright (C) 2013 Troels E. Linnet # # Copyright (C) 2013 Troels E. Linnet #
# # # #
# This file is part of the program relax (http://www.nmr-relax.com). # # This file is part of the program relax (http://www.nmr-relax.com). #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or # # the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. # # (at your option) any later version. #
# # # #
# This program is distributed in the hope that it will be useful, # # This program is distributed in the hope that it will be useful, #
skipping to change at line 30 skipping to change at line 30
# # # #
############################################################################### ###############################################################################
# Module docstring. # Module docstring.
"""The spin viewer frame.""" """The spin viewer frame."""
# Python module imports. # Python module imports.
import wx import wx
# relax module imports. # relax module imports.
import dep_check
from graphics import WIZARD_IMAGE_PATH, fetch_icon from graphics import WIZARD_IMAGE_PATH, fetch_icon
from gui.icons import Relax_icons from gui.icons import Relax_icons
from gui.misc import gui_raise from gui.misc import gui_raise
from gui.spin_viewer.splitter import Tree_splitter from gui.spin_viewer.splitter import Tree_splitter
from gui.string_conv import gui_to_str, str_to_gui from gui.string_conv import gui_to_str, str_to_gui
from gui.wizards.wiz_objects import Wiz_page, Wiz_window from gui.wizards.wiz_objects import Wiz_page, Wiz_window
from gui.uf_objects import build_uf_menus, Uf_storage; uf_store = Uf_storage() from gui.uf_objects import build_uf_menus, Uf_storage; uf_store = Uf_storage()
from lib.errors import RelaxNoPipeError from lib.errors import RelaxNoPipeError
from pipe_control.pipes import cdp_name, pipe_names from pipe_control.pipes import cdp_name, pipe_names
from status import Status; status = Status() from status import Status; status = Status()
skipping to change at line 301 skipping to change at line 302
return sizer return sizer
def toolbar(self): def toolbar(self):
"""Create the toolbar.""" """Create the toolbar."""
# Init. # Init.
self.bar = self.CreateToolBar(wx.TB_HORIZONTAL|wx.TB_FLAT|wx.TB_TEXT) self.bar = self.CreateToolBar(wx.TB_HORIZONTAL|wx.TB_FLAT|wx.TB_TEXT)
# The spin loading button. # The spin loading button.
tooltip = "Load spins from either a sequence file or from a 3D structure file." tooltip = "Load spins from either a sequence file or from a 3D structure file."
self.bar.AddLabelTool(TB_SPIN_LOADER_ID, "Load spins", wx.Bitmap(fetch_i if dep_check.wx_classic:
con('relax.spin', '32x32'), wx.BITMAP_TYPE_ANY), bmpDisabled=wx.Bitmap(fetch_ico self.bar.AddLabelTool(TB_SPIN_LOADER_ID, "Load spins", wx.Bitmap(fet
n('relax.spin_grey', '32x32'), wx.BITMAP_TYPE_ANY), shortHelp=tooltip, longHelp= ch_icon('relax.spin', '32x32'), wx.BITMAP_TYPE_ANY), bmpDisabled=wx.Bitmap(fetch
tooltip) _icon('relax.spin_grey', '32x32'), wx.BITMAP_TYPE_ANY), shortHelp=tooltip, longH
elp=tooltip)
else:
self.bar.AddTool(TB_SPIN_LOADER_ID, "Load spins", wx.Bitmap(fetch_ic
on('relax.spin', '32x32'), wx.BITMAP_TYPE_ANY), bmpDisabled=wx.Bitmap(fetch_icon
('relax.spin_grey', '32x32'), wx.BITMAP_TYPE_ANY), shortHelp=tooltip)
self.Bind(wx.EVT_TOOL, self.load_spins_wizard, id=TB_SPIN_LOADER_ID) self.Bind(wx.EVT_TOOL, self.load_spins_wizard, id=TB_SPIN_LOADER_ID)
# A separator. # A separator.
self.bar.AddSeparator() self.bar.AddSeparator()
# The refresh button. # The refresh button.
tooltip = "Refresh the spin view." tooltip = "Refresh the spin view."
self.bar.AddLabelTool(TB_REFRESH, "Refresh", wx.Bitmap(fetch_icon('oxyge if dep_check.wx_classic:
n.actions.view-refresh', '32x32'), wx.BITMAP_TYPE_ANY), shortHelp=tooltip, longH self.bar.AddLabelTool(TB_REFRESH, "Refresh", wx.Bitmap(fetch_icon('o
elp=tooltip) xygen.actions.view-refresh', '32x32'), wx.BITMAP_TYPE_ANY), shortHelp=tooltip, l
ongHelp=tooltip)
else:
self.bar.AddTool(TB_REFRESH, "Refresh", wx.Bitmap(fetch_icon('oxygen
.actions.view-refresh', '32x32'), wx.BITMAP_TYPE_ANY), shortHelp=tooltip)
self.Bind(wx.EVT_TOOL, self.refresh, id=TB_REFRESH) self.Bind(wx.EVT_TOOL, self.refresh, id=TB_REFRESH)
# A separator. # A separator.
self.bar.AddSeparator() self.bar.AddSeparator()
# The pipe text. # The pipe text.
text = wx.StaticText(self.bar, -1, ' Current data pipe: ', style=wx.ALI GN_LEFT) text = wx.StaticText(self.bar, -1, ' Current data pipe: ', style=wx.ALI GN_LEFT)
self.bar.AddControl(text) self.bar.AddControl(text)
# The pipe selection. # The pipe selection.
 End of changes. 4 change blocks. 
8 lines changed or deleted 18 lines changed or added

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