Author: bugman Date: Thu Feb 12 18:41:26 2015 New Revision: 27632 URL: http://svn.gna.org/viewcvs/relax?rev=27632&view=rev Log: Merged revisions 27631 via svnmerge from svn+ssh://[email protected]/svn/relax/trunk
........ r27631 | bugman | 2015-02-12 18:40:34 +0100 (Thu, 12 Feb 2015) | 7 lines Fix for bug #23265 (https://gna.org/bugs/?23265). This is the failure of the edit buttons in the user function GUI windows. The problem was that the column titles of the window opened by the edit button were being incorrectly handled if the dimensions of the window were not supplied. ........ Modified: branches/frame_order_cleanup/ (props changed) branches/frame_order_cleanup/gui/input_elements/sequence_2D.py Propchange: branches/frame_order_cleanup/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Feb 12 18:41:26 2015 @@ -1 +1 @@ -/trunk:1-27629 +/trunk:1-27631 Modified: branches/frame_order_cleanup/gui/input_elements/sequence_2D.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/gui/input_elements/sequence_2D.py?rev=27632&r1=27631&r2=27632&view=diff ============================================================================== --- branches/frame_order_cleanup/gui/input_elements/sequence_2D.py (original) +++ branches/frame_order_cleanup/gui/input_elements/sequence_2D.py Thu Feb 12 18:41:26 2015 @@ -161,7 +161,10 @@ # Store the titles. self.titles = titles if titles == None: - self.titles = [wx.EmptyString] * dim[1] + if dim == None: + self.titles = [wx.EmptyString] + else: + self.titles = [wx.EmptyString] * dim[1] # Determine the dimensions if not given. if dim == None: _______________________________________________ relax (http://www.nmr-relax.com) This is the relax-commits mailing list [email protected] To unsubscribe from this list, get a password reminder, or change your subscription options, visit the list information page at https://mail.gna.org/listinfo/relax-commits
