r21663 - /trunk/gui/analyses/wizard.py -- November 27, 2013 - 09:10

Author: bugman
Date: Wed Nov 27 09:10:08 2013
New Revision: 21663

URL: http://svn.gna.org/viewcvs/relax?rev=21663&view=rev
Log:
Fix for the new analysis GUI wizard - two model-free analysis buttons were 
present.

This is due to an imperfect merge of the relax_disp branch back to trunk.


Modified:
    trunk/gui/analyses/wizard.py

Modified: trunk/gui/analyses/wizard.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/gui/analyses/wizard.py?rev=21663&r1=21662&r2=21663&view=diff
==============================================================================
--- trunk/gui/analyses/wizard.py (original)
+++ trunk/gui/analyses/wizard.py Wed Nov 27 09:10:08 2013
@@ -264,9 +264,6 @@
 
         # Consistency testing.
         self.button_consist_test = 
self.create_button(id=self.button_ids['consist_test'], box=sizer2, size=size, 
bmp=ANALYSIS_IMAGE_PATH+"consistency_testing_150x70.png", tooltip="Relaxation 
data consistency testing (disabled)", fn=self.select_consist_test, 
disabled=True)
-
-        # The model-free button.
-        self.button_mf = self.create_button(id=self.button_ids['mf'], 
box=sizer2, size=size, 
bmp=ANALYSIS_IMAGE_PATH+"model_free"+sep+"model_free_150x150.png", 
tooltip="Model-free analysis", fn=self.select_mf)
 
         # The custom analysis button.
         self.button_custom = 
self.create_button(id=self.button_ids['custom'], box=sizer2, size=size, 
bmp=ANALYSIS_IMAGE_PATH+"custom_150x150.png", tooltip="Custom analysis 
(disabled)", fn=self.select_custom, disabled=True)