[Pyphant-devel] SF.net SVN: pyphant:[664] trunk

[<zk...@us...>]

Revision: 664
          http://pyphant.svn.sourceforge.net/pyphant/?rev=664&view=rev
Author:   zklaus
Date:     2010-02-02 11:21:26 +0000 (Tue, 02 Feb 2010)

Log Message:
-----------
Merge branch 'master' into svn-trunk

* master:
  Change: Adapted viewOSC.py to new naming convention.
  Fix: wxPyphant not closing correctly

Modified Paths:
--------------
    trunk/doc/demo/viewOSC.py
    trunk/src/pyphant/pyphant/wxgui2/wxPyphantApplication.py

Modified: trunk/doc/demo/viewOSC.py
===================================================================
--- trunk/doc/demo/viewOSC.py	2010-02-01 17:45:00 UTC (rev 663)
+++ trunk/doc/demo/viewOSC.py	2010-02-02 11:21:26 UTC (rev 664)
@@ -174,8 +174,8 @@
     minimaPos = worker.plugMra.getResult().inUnitsOf(simulation.dimensions[1])
     worker = recipe.getWorker("AddColumn")
     table = worker.plugCompute.getResult(subscriber=TextSubscriber("Add Column"))
-    xPos = table[u"horizontal_table_position"]
-    yPos = table[u"vertical_table_position"]
+    xPos = table[u"x-position"]
+    yPos = table[u"y-position"]
     thickness = table[u"thickness"]
     index = curvNo2Index(table[u"pixel"], curvNo)
     result = "$%s_{%s}$(%s %s,%s %s)=%s %s" % (thickness[index].shortname,curvNo,

Modified: trunk/src/pyphant/pyphant/wxgui2/wxPyphantApplication.py
===================================================================
--- trunk/src/pyphant/pyphant/wxgui2/wxPyphantApplication.py	2010-02-01 17:45:00 UTC (rev 663)
+++ trunk/src/pyphant/pyphant/wxgui2/wxPyphantApplication.py	2010-02-02 11:21:26 UTC (rev 664)
@@ -301,6 +301,7 @@
                 self._wxPyphantApp._knowledgeNode.stop()
             except AttributeError:
                 pass
+            self._wxPyphantApp._excframe.Destroy()
             self.Destroy()
 
     def editCompositeWorker(self, worker):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.