"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "gui/components/relax_data_meta.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.

relax_data_meta.py  (relax-4.1.3.src.tar.bz2):relax_data_meta.py  (relax-5.0.0.src.tar.bz2)
############################################################################### ###############################################################################
# # # #
# Copyright (C) 2009-2010 Michael Bieri # # Copyright (C) 2009-2010 Michael Bieri #
# Copyright (C) 2009-2012,2014 Edward d'Auvergne # # Copyright (C) 2009-2012,2014,2019 Edward d'Auvergne #
# # # #
# 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, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
skipping to change at line 30 skipping to change at line 30
# # # #
############################################################################### ###############################################################################
# Module docstring. # Module docstring.
"""Module containing the classes for GUI components involving relaxation data."" " """Module containing the classes for GUI components involving relaxation data."" "
# Python module imports. # Python module imports.
import wx import wx
# relax module imports. # relax module imports.
import dep_check
from graphics import fetch_icon from graphics import fetch_icon
from gui.components.base_list import Base_list from gui.components.base_list import Base_list
from gui.string_conv import gui_to_str, str_to_gui from gui.string_conv import gui_to_str, str_to_gui
from gui.uf_objects import Uf_storage; uf_store = Uf_storage() from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
from status import Status; status = Status() from status import Status; status = Status()
from user_functions.data import Uf_info; uf_info = Uf_info() from user_functions.data import Uf_info; uf_info = Uf_info()
# Some IDs for the menu entries. # Some IDs for the menu entries.
MENU_RELAX_DATA_DISPLAY = wx.NewId() MENU_RELAX_DATA_DISPLAY = wx.NewId()
MENU_RELAX_DATA_PEAK_INTENSITY_TYPE = wx.NewId() MENU_RELAX_DATA_PEAK_INTENSITY_TYPE = wx.NewId()
skipping to change at line 235 skipping to change at line 236
# Expand the number of rows to match the number of relaxation IDs, and a dd the IDs. # Expand the number of rows to match the number of relaxation IDs, and a dd the IDs.
n = 0 n = 0
if hasattr(cdp, 'ri_ids'): if hasattr(cdp, 'ri_ids'):
# The number of IDs. # The number of IDs.
n = len(cdp.ri_ids) n = len(cdp.ri_ids)
# Add all the data. # Add all the data.
for i in range(n): for i in range(n):
# Set the IDs. # Set the IDs.
id = cdp.ri_ids[i] id = cdp.ri_ids[i]
self.element.InsertStringItem(i, str_to_gui(id)) if dep_check.wx_classic:
self.element.InsertStringItem(i, str_to_gui(id))
else:
self.element.InsertItem(i, str_to_gui(id))
# Set the peak intensity types. # Set the peak intensity types.
if hasattr(cdp, 'exp_info') and hasattr(cdp.exp_info, 'peak_inte nsity_type') and id in cdp.exp_info.peak_intensity_type: if hasattr(cdp, 'exp_info') and hasattr(cdp.exp_info, 'peak_inte nsity_type') and id in cdp.exp_info.peak_intensity_type:
self.element.SetStringItem(i, 1, str_to_gui(cdp.exp_info.pea if dep_check.wx_classic:
k_intensity_type[id])) self.element.SetStringItem(i, 1, str_to_gui(cdp.exp_info
.peak_intensity_type[id]))
else:
self.element.SetItem(i, 1, str_to_gui(cdp.exp_info.peak_
intensity_type[id]))
# Set the temperature calibration methods. # Set the temperature calibration methods.
if hasattr(cdp, 'exp_info') and hasattr(cdp.exp_info, 'temp_cali bration') and id in cdp.exp_info.temp_calibration: if hasattr(cdp, 'exp_info') and hasattr(cdp.exp_info, 'temp_cali bration') and id in cdp.exp_info.temp_calibration:
self.element.SetStringItem(i, 2, str_to_gui(cdp.exp_info.tem if dep_check.wx_classic:
p_calibration[id])) self.element.SetStringItem(i, 2, str_to_gui(cdp.exp_info
.temp_calibration[id]))
else:
self.element.SetItem(i, 2, str_to_gui(cdp.exp_info.temp_
calibration[id]))
# Set the temperature control methods. # Set the temperature control methods.
if hasattr(cdp, 'exp_info') and hasattr(cdp.exp_info, 'temp_cont rol') and id in cdp.exp_info.temp_control: if hasattr(cdp, 'exp_info') and hasattr(cdp.exp_info, 'temp_cont rol') and id in cdp.exp_info.temp_control:
self.element.SetStringItem(i, 3, str_to_gui(cdp.exp_info.tem if dep_check.wx_classic:
p_control[id])) self.element.SetStringItem(i, 3, str_to_gui(cdp.exp_info
.temp_control[id]))
else:
self.element.SetItem(i, 3, str_to_gui(cdp.exp_info.temp_
control[id]))
 End of changes. 6 change blocks. 
6 lines changed or deleted 18 lines changed or added

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