[Yt-svn] yt-commit r504 - trunk/yt/reason

[mturk at wrangler.dreamhost.com]

Author: mturk
Date: Thu May 29 09:43:15 2008
New Revision: 504
URL: http://yt.spacepope.org/changeset/504

Log:
Set the 'add field' to include exclusivity.  Closes #109.



Modified:
   trunk/yt/reason/App.py
   trunk/yt/reason/Notebook.py
   trunk/yt/reason/Windows.py

Modified: trunk/yt/reason/App.py
==============================================================================
--- trunk/yt/reason/App.py	(original)
+++ trunk/yt/reason/App.py	Thu May 29 09:43:15 2008
@@ -307,7 +307,6 @@
                           argdict = argdict, CreationID = MyID,
                           mw = self),
             "Phase Plot %s" % MyID, MyID)
-        self.plot_panel.UpdateSubscriptions()
 
     def __find_min(self, data_object, field):
         return data_object[field].min()

Modified: trunk/yt/reason/Notebook.py
==============================================================================
--- trunk/yt/reason/Notebook.py	(original)
+++ trunk/yt/reason/Notebook.py	Thu May 29 09:43:15 2008
@@ -762,6 +762,7 @@
             argdict = pf2daf.return_argdict()
             if argdict is None:
                 pf2daf.Destroy()
+                self.UpdateAvailableFields()
                 return
             self.data.add_fields(**argdict)
             self.UpdateAvailableFields()

Modified: trunk/yt/reason/Windows.py
==============================================================================
--- trunk/yt/reason/Windows.py	(original)
+++ trunk/yt/reason/Windows.py	Thu May 29 09:43:15 2008
@@ -30,7 +30,9 @@
     def __init__(self, data_object, parent):
         wx.Dialog.__init__(self, parent, -1, title="Add Field to 2D Profile")
 
-        fields = QueryFields(data_object)
+        fields = [field for field in QueryFields(data_object)
+                  if field not in [parent.data.x_bin_field,
+                        parent.data.y_bin_field, parent.data.keys()]]
         
         border = wx.BoxSizer(wx.VERTICAL)
         inner_border = wx.BoxSizer(wx.VERTICAL)