r13149 - in /branches/gui_testing: graphics/analyses/consistency_testing_150x70.png gui/analyses/wizard.py gui/paths.py -- June 21, 2011 - 16:54

Author: bugman
Date: Tue Jun 21 16:54:52 2011
New Revision: 13149

URL: http://svn.gna.org/viewcvs/relax?rev=13149&view=rev
Log:
Consistency testing is now one of the new analysis buttons, though is 
disabled.


Added:
    branches/gui_testing/graphics/analyses/consistency_testing_150x70.png   
(with props)
Modified:
    branches/gui_testing/gui/analyses/wizard.py
    branches/gui_testing/gui/paths.py

Added: branches/gui_testing/graphics/analyses/consistency_testing_150x70.png
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/graphics/analyses/consistency_testing_150x70.png?rev=13149&view=auto
==============================================================================
Binary file - no diff available.

Propchange: 
branches/gui_testing/graphics/analyses/consistency_testing_150x70.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: branches/gui_testing/gui/analyses/wizard.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/wizard.py?rev=13149&r1=13148&r2=13149&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/wizard.py (original)
+++ branches/gui_testing/gui/analyses/wizard.py Tue Jun 21 16:54:52 2011
@@ -159,14 +159,14 @@
         # The R2 button.
         self.button_r2 = self.create_button(box=sizer1, size=size, 
bmp=paths.IMAGE_PATH+'sphere.jpg', tooltip="R2 relaxation curve-fitting 
analysis", fn=self.select_r2)
 
+        # Consistency testing.
+        self.button_consist_test = self.create_button(box=sizer2, size=size, 
bmp=paths.ANALYSIS_IMAGE_PATH+'consistency_testing_150x70.png', 
tooltip="Relaxation data consistency testing", fn=self.select_consist_test, 
disabled=True)
+
         # The model-free button.
         self.button_mf = self.create_button(box=sizer2, size=size, 
bmp=paths.IMAGE_PATH+'sphere.jpg', tooltip="Model-free analysis", 
fn=self.select_mf)
 
         # The custom analysis button.
         self.button_custom = self.create_button(box=sizer2, size=size, 
bmp=paths.IMAGE_PATH+'sphere.jpg', tooltip="Custom analysis", 
fn=self.select_custom, disabled=True)
-
-        # A blank button.
-        self.button_none = self.create_button(box=sizer2, size=size, 
disabled=True)
 
         # Add the sizers.
         box.Add(sizer1, 0, wx.ALIGN_CENTER_HORIZONTAL, 0)
@@ -230,6 +230,20 @@
         return button
 
 
+    def select_consist_test(self, event):
+        """NOE analysis selection.
+
+        @param event:   The wx event.
+        @type event:    wx event
+        """
+
+        # Toggle all buttons off.
+        self.toggle(self.button_consist_test)
+
+        # Set the analysis type.
+        self.analysis_type = 'consistency test'
+
+
     def select_custom(self, event):
         """NOE analysis selection.
 
@@ -242,8 +256,6 @@
 
         # Set the analysis type.
         self.analysis_type = 'custom'
-
-        event.Skip()
 
 
     def select_mf(self, event):
@@ -316,9 +328,9 @@
         self.button_noe.SetValue(False)
         self.button_r1.SetValue(False)
         self.button_r2.SetValue(False)
+        self.button_consist_test.SetValue(False)
         self.button_mf.SetValue(False)
         self.button_custom.SetValue(False)
-        self.button_none.SetValue(False)
 
         # Turn on the selected button.
         button.SetValue(True)

Modified: branches/gui_testing/gui/paths.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/paths.py?rev=13149&r1=13148&r2=13149&view=diff
==============================================================================
--- branches/gui_testing/gui/paths.py (original)
+++ branches/gui_testing/gui/paths.py Tue Jun 21 16:54:52 2011
@@ -36,6 +36,7 @@
 
 
 # GUI image and icon paths.
+ANALYSIS_IMAGE_PATH = status.install_path + sep + 'graphics' + sep + 
'analyses' + sep
 OXY_ICON_PATH = status.install_path + sep + 'graphics' + sep + 
'oxygen_icons' + sep
 IMAGE_PATH = status.install_path + sep + 'gui' + sep + 'images' + sep
 ICON_RELAX_PATH = status.install_path + sep + 'graphics' + sep + 
'relax_icons' + sep