r11075 - /branches/bieri_gui/gui_bieri/controller.py -- April 13, 2010 - 06:46

Author: michaelbieri
Date: Tue Apr 13 06:46:44 2010
New Revision: 11075

URL: http://svn.gna.org/viewcvs/relax?rev=11075&view=rev
Log:
Updated progress bar using Monte Carlo simulation number is also accessible 
for Rx curvefit.

Modified:
    branches/bieri_gui/gui_bieri/controller.py

Modified: branches/bieri_gui/gui_bieri/controller.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/controller.py?rev=11075&r1=11074&r2=11075&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/controller.py (original)
+++ branches/bieri_gui/gui_bieri/controller.py Tue Apr 13 06:46:44 2010
@@ -190,16 +190,12 @@
             # Determine actual round (maximum is 20).
             wx.CallAfter(self.out.progress_bar.SetValue, 
(100*(self.status.dAuvergne_protocol.round-1)/20))
 
-        # Final analysis.
-        elif self.status.dAuvergne_protocol.diff_model == 'final':
+        # Final analysis or Rx calculation.
+        else self.status.dAuvergne_protocol.diff_model == 'final':
             if self.status.mc_number:
                 progress = 100 * self.status.mc_number / cdp.sim_number
                 wx.CallAfter(self.out.progress_bar.SetValue, progress)
 
-        # Rx Analysis.
-        #else:
-        #    print str(cdp.sim_number)
-
         # Add new output.
         wx.CallAfter(self.out.log_panel.AppendText, string)
         time.sleep(0.001)  # allow relaxGUI log panel to get refreshed