Author: bugman
Date: Tue Oct 16 11:01:06 2012
New Revision: 17843
URL: http://svn.gna.org/viewcvs/relax?rev=17843&view=rev
Log:
Merged revisions 17689-17691 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r17689 | bugman | 2012-10-02 23:51:32 +0200 (Tue, 02 Oct 2012) | 3 lines
Python 3 bug fix for the geometric structure module - another integer
division to float problem.
........
r17690 | bugman | 2012-10-03 00:09:30 +0200 (Wed, 03 Oct 2012) | 3 lines
The Python 3 dictionary values() method no longer returns a list, so a
list() call is needed.
........
r17691 | bugman | 2012-10-03 01:26:26 +0200 (Wed, 03 Oct 2012) | 6 lines
Bug fix for wxPython 2.9.4.0 - the unsetting of the alpha mask for all
bitmap images should now work.
The wx.Bitmap.SetMaskColour(None) call does not work, so instead a
wx.Colour() instance is passed in
instead.
........
Modified:
branches/frame_order_testing/ (props changed)
branches/frame_order_testing/generic_fns/structure/geometric.py
branches/frame_order_testing/gui/misc.py
branches/frame_order_testing/test_suite/system_tests/peak_lists.py
Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct 16 11:01:06 2012
@@ -1,1 +1,1 @@
-/trunk:1-17274,17295-17359,17361-17365,17367-17376,17378-17389,17391-17538,17540,17542,17552-17687
+/trunk:1-17274,17295-17359,17361-17365,17367-17376,17378-17389,17391-17538,17540,17542,17552-17687,17689-17691
Modified: branches/frame_order_testing/generic_fns/structure/geometric.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/geometric.py?rev=17843&r1=17842&r2=17843&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/structure/geometric.py (original)
+++ branches/frame_order_testing/generic_fns/structure/geometric.py Tue Oct
16 11:01:06 2012
@@ -90,7 +90,7 @@
# Generate the increment values of v.
v = zeros(inc/2+2, float64)
val = 1.0 / float(inc/2)
- for i in range(1, inc/2+1):
+ for i in range(1, int(inc/2)+1):
v[i] = float(i-1) * val + val/2.0
v[-1] = 1.0
Modified: branches/frame_order_testing/gui/misc.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/misc.py?rev=17843&r1=17842&r2=17843&view=diff
==============================================================================
--- branches/frame_order_testing/gui/misc.py (original)
+++ branches/frame_order_testing/gui/misc.py Tue Oct 16 11:01:06 2012
@@ -130,7 +130,7 @@
# Unset the mask if an alpha mask is detected (only on GNU/Linux and MS
Windows).
if bitmap.HasAlpha() and status.wx_info["os"] != "darwin":
- bitmap.SetMaskColour(None)
+ bitmap.SetMaskColour(wx.Colour(alpha=wx.ALPHA_OPAQUE))
# Return the bitmap object.
return bitmap
Modified: branches/frame_order_testing/test_suite/system_tests/peak_lists.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/peak_lists.py?rev=17843&r1=17842&r2=17843&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/peak_lists.py
(original)
+++ branches/frame_order_testing/test_suite/system_tests/peak_lists.py Tue
Oct 16 11:01:06 2012
@@ -151,8 +151,8 @@
self.interpreter.spectrum.read_intensities(file="cNTnC.xpk",
dir=status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test',
int_method='height')
# Test the data.
- self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0],
-0.1694)
- self.assertEqual(cdp.mol[0].res[1].spin[0].intensities.values()[0],
-0.1142)
+
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0],
-0.1694)
+
self.assertEqual(list(cdp.mol[0].res[1].spin[0].intensities.values())[0],
-0.1142)
def test_read_peak_list_sparky(self):
@@ -169,10 +169,10 @@
self.interpreter.spectrum.read_intensities(file="ref_ave.list",
dir=status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test',
int_method='height')
# Test the data.
- self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0],
6262)
- self.assertEqual(cdp.mol[0].res[1].spin[0].intensities.values()[0],
148614)
- self.assertEqual(cdp.mol[0].res[2].spin[0].intensities.values()[0],
166842)
- self.assertEqual(cdp.mol[0].res[3].spin[0].intensities.values()[0],
128690)
+
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0],
6262)
+
self.assertEqual(list(cdp.mol[0].res[1].spin[0].intensities.values())[0],
148614)
+
self.assertEqual(list(cdp.mol[0].res[2].spin[0].intensities.values())[0],
166842)
+
self.assertEqual(list(cdp.mol[0].res[3].spin[0].intensities.values())[0],
128690)
def test_read_peak_list_xeasy(self):
@@ -206,25 +206,25 @@
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text",
dir=status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test',
int_method='height')
# Test the data.
- self.assertEqual(cdp.mol[0].res[ 0].spin[0].intensities.values()[0],
9.714e+03)
- self.assertEqual(cdp.mol[0].res[ 1].spin[0].intensities.values()[0],
7.919e+03)
- self.assertEqual(cdp.mol[0].res[ 2].spin[0].intensities.values()[0],
1.356e+04)
- self.assertEqual(cdp.mol[0].res[ 3].spin[0].intensities.values()[0],
9.884e+03)
- self.assertEqual(cdp.mol[0].res[ 4].spin[0].intensities.values()[0],
2.041e+04)
- self.assertEqual(cdp.mol[0].res[ 5].spin[0].intensities.values()[0],
9.305e+03)
- self.assertEqual(cdp.mol[0].res[ 6].spin[0].intensities.values()[0],
3.154e+04)
- self.assertEqual(cdp.mol[0].res[ 7].spin[0].intensities.values()[0],
9.180e+03)
- self.assertEqual(cdp.mol[0].res[ 9].spin[0].intensities.values()[0],
1.104e+04)
- self.assertEqual(cdp.mol[0].res[10].spin[0].intensities.values()[0],
7.680e+03)
- self.assertEqual(cdp.mol[0].res[11].spin[0].intensities.values()[0],
5.206e+03)
- self.assertEqual(cdp.mol[0].res[12].spin[0].intensities.values()[0],
2.863e+04)
- self.assertEqual(cdp.mol[0].res[14].spin[0].intensities.values()[0],
9.271e+03)
- self.assertEqual(cdp.mol[0].res[15].spin[0].intensities.values()[0],
7.919e+03)
- self.assertEqual(cdp.mol[0].res[16].spin[0].intensities.values()[0],
9.962e+03)
- self.assertEqual(cdp.mol[0].res[17].spin[0].intensities.values()[0],
1.260e+04)
- self.assertEqual(cdp.mol[0].res[18].spin[0].intensities.values()[0],
1.545e+04)
- self.assertEqual(cdp.mol[0].res[19].spin[0].intensities.values()[0],
1.963e+04)
- self.assertEqual(cdp.mol[0].res[20].spin[0].intensities.values()[0],
1.918e+04)
+ self.assertEqual(list(cdp.mol[0].res[
0].spin[0].intensities.values())[0], 9.714e+03)
+ self.assertEqual(list(cdp.mol[0].res[
1].spin[0].intensities.values())[0], 7.919e+03)
+ self.assertEqual(list(cdp.mol[0].res[
2].spin[0].intensities.values())[0], 1.356e+04)
+ self.assertEqual(list(cdp.mol[0].res[
3].spin[0].intensities.values())[0], 9.884e+03)
+ self.assertEqual(list(cdp.mol[0].res[
4].spin[0].intensities.values())[0], 2.041e+04)
+ self.assertEqual(list(cdp.mol[0].res[
5].spin[0].intensities.values())[0], 9.305e+03)
+ self.assertEqual(list(cdp.mol[0].res[
6].spin[0].intensities.values())[0], 3.154e+04)
+ self.assertEqual(list(cdp.mol[0].res[
7].spin[0].intensities.values())[0], 9.180e+03)
+ self.assertEqual(list(cdp.mol[0].res[
9].spin[0].intensities.values())[0], 1.104e+04)
+
self.assertEqual(list(cdp.mol[0].res[10].spin[0].intensities.values())[0],
7.680e+03)
+
self.assertEqual(list(cdp.mol[0].res[11].spin[0].intensities.values())[0],
5.206e+03)
+
self.assertEqual(list(cdp.mol[0].res[12].spin[0].intensities.values())[0],
2.863e+04)
+
self.assertEqual(list(cdp.mol[0].res[14].spin[0].intensities.values())[0],
9.271e+03)
+
self.assertEqual(list(cdp.mol[0].res[15].spin[0].intensities.values())[0],
7.919e+03)
+
self.assertEqual(list(cdp.mol[0].res[16].spin[0].intensities.values())[0],
9.962e+03)
+
self.assertEqual(list(cdp.mol[0].res[17].spin[0].intensities.values())[0],
1.260e+04)
+
self.assertEqual(list(cdp.mol[0].res[18].spin[0].intensities.values())[0],
1.545e+04)
+
self.assertEqual(list(cdp.mol[0].res[19].spin[0].intensities.values())[0],
1.963e+04)
+
self.assertEqual(list(cdp.mol[0].res[20].spin[0].intensities.values())[0],
1.918e+04)
def test_read_peak_list_xeasy_2(self):
@@ -238,7 +238,7 @@
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text",
dir=status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test',
heteronuc='NE1', proton='HE1', int_method='height')
# Test the data.
- self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0],
1.532e+04)
+
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0],
1.532e+04)
def test_read_peak_list_xeasy_3(self):
@@ -252,7 +252,7 @@
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text",
dir=status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test',
heteronuc='C', int_method='height')
# Test the data.
- self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0],
6.877e+03)
+
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0],
6.877e+03)
def test_read_peak_list_xeasy_4(self):
@@ -266,4 +266,4 @@
self.interpreter.spectrum.read_intensities(file="xeasy_r1_20ms.text",
dir=status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'peak_lists', spectrum_id='test',
heteronuc='C', proton='HE1', int_method='height')
# Test the data.
- self.assertEqual(cdp.mol[0].res[0].spin[0].intensities.values()[0],
7.123e+03)
+
self.assertEqual(list(cdp.mol[0].res[0].spin[0].intensities.values())[0],
7.123e+03)
r17843 - in /branches/frame_order_testing: ./ generic_fns/structure/ gui/ test_suite/system_tests/