r20246 - in /branches/relax_disp: ./ gui/analyses/auto_model_free.py -- June 21, 2013 - 11:49

Author: bugman
Date: Fri Jun 21 11:49:30 2013
New Revision: 20246

URL: http://svn.gna.org/viewcvs/relax?rev=20246&view=rev
Log:
Merged revisions 20245 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20245 | bugman | 2013-06-21 11:46:23 +0200 (Fri, 21 Jun 2013) | 9 lines
  
  Fix for bug #20921 (https://gna.org/bugs/?20921), the GUI tests freezing in 
MS Windows.
  
  The problem was that the dipolar interaction wizard in the model-free 
auto-analysis GUI element was
  calling its user functions asynchronously.  This can lead to racing 
conditions.  The commit r80084
  (http://article.gmane.org/gmane.science.nmr.relax.scm/17840) somehow 
randomly triggers this racing
  on MS Windows systems only together with the Mf.test_mf_auto_analysis GUI 
test.  Now all user
  functions are called synchronously.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/gui/analyses/auto_model_free.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 21 11:49:30 2013
@@ -1,1 +1,1 @@
-/trunk:1-20242
+/trunk:1-20245

Modified: branches/relax_disp/gui/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/analyses/auto_model_free.py?rev=20246&r1=20245&r2=20246&view=diff
==============================================================================
--- branches/relax_disp/gui/analyses/auto_model_free.py (original)
+++ branches/relax_disp/gui/analyses/auto_model_free.py Fri Jun 21 11:49:30 
2013
@@ -684,28 +684,28 @@
         # Structural data.
         if not hasattr(cdp, 'structure'):
             # Create the PDB reading page.
-            page = 
uf_store['structure.read_pdb'].create_page(self.dipole_wizard)
+            page = 
uf_store['structure.read_pdb'].create_page(self.dipole_wizard, sync=True)
             self.dipole_wizard.add_page(page, skip_button=True)
 
             # Create the position reading page.
-            page = 
uf_store['structure.get_pos'].create_page(self.dipole_wizard)
+            page = 
uf_store['structure.get_pos'].create_page(self.dipole_wizard, sync=True)
             self.dipole_wizard.add_page(page, skip_button=True)
 
         # Create the interatom.define page.
-        page = uf_store['interatom.define'].create_page(self.dipole_wizard)
+        page = uf_store['interatom.define'].create_page(self.dipole_wizard, 
sync=True)
         page.SetValue('spin_id1', '@N')
         page.SetValue('spin_id2', '@H')
         self.dipole_wizard.add_page(page)
 
         # Create the interatom.set_dist page.
-        page = uf_store['interatom.set_dist'].create_page(self.dipole_wizard)
+        page = 
uf_store['interatom.set_dist'].create_page(self.dipole_wizard, sync=True)
         page.SetValue('spin_id1', '@N*')
         page.SetValue('spin_id2', '@H*')
         page.SetValue('ave_dist', NH_BOND_LENGTH)
         self.dipole_wizard.add_page(page)
 
         # Create the interatom.unit_vectors page.
-        page = 
uf_store['interatom.unit_vectors'].create_page(self.dipole_wizard)
+        page = 
uf_store['interatom.unit_vectors'].create_page(self.dipole_wizard, sync=True)
         self.dipole_wizard.add_page(page)
 
         # Reset the cursor.