[Avida-cvs] [Avida2-svn] r162 - trunk/source/python/AvidaGui2

[kaben at myxo.css.msu.edu]

Author: kaben
Date: 2005-05-19 15:24:39 -0400 (Thu, 19 May 2005)
New Revision: 162

Modified:
   trunk/source/python/AvidaGui2/Avida_ED_startup.py
   trunk/source/python/AvidaGui2/Avida_ED_startup_utils.py
Log:

* Removed Edu_WorkSpace_Ctrl() function; added .m_edu_workspace_ctrl to
  object returned by AvidaEd() function.



Modified: trunk/source/python/AvidaGui2/Avida_ED_startup.py
===================================================================
--- trunk/source/python/AvidaGui2/Avida_ED_startup.py	2005-05-19 04:36:10 UTC (rev 161)
+++ trunk/source/python/AvidaGui2/Avida_ED_startup.py	2005-05-19 19:24:39 UTC (rev 162)
@@ -10,6 +10,6 @@
 def Interactive():
   import IPython
   import __builtin__
-  ipython_shell = IPython.Shell.IPShell(argv=["-c", "import iqt; import AvidaGui2; from AvidaGui2.Avida_ED_startup_utils import *; AvidaCore.cConfig.InitGroupList(); avida_ed = AvidaEd(); edu_workspace_ctrl = Edu_WorkSpace_Ctrl(avida_ed);"])
+  ipython_shell = IPython.Shell.IPShell(argv=["-c", "import iqt; import AvidaGui2; from AvidaGui2.Avida_ED_startup_utils import *; AvidaCore.cConfig.InitGroupList(); avida_ed = AvidaEd()"])
   ipython_shell.mainloop()
 

Modified: trunk/source/python/AvidaGui2/Avida_ED_startup_utils.py
===================================================================
--- trunk/source/python/AvidaGui2/Avida_ED_startup_utils.py	2005-05-19 04:36:10 UTC (rev 161)
+++ trunk/source/python/AvidaGui2/Avida_ED_startup_utils.py	2005-05-19 19:24:39 UTC (rev 162)
@@ -50,10 +50,18 @@
     Reload()
     from AvidaGui2.pyEduMainCtrl import pyEduMainCtrl
     s_splash.message("Assembling Avida-ED user-interface ...")
+
     edu_main_controller = pyEduMainCtrl()
     edu_main_controller.construct()
     edu_main_controller.m_main_mdl.m_main_mdtr.m_main_controller_factory_mdtr.emit(
       qt.PYSIGNAL("newMainControllerSig"), ("pySessionCtrl",))
+
+    # Get the edu_workspace_ctrl to browse interactively via
+    # 'avida_ed.m_edu_workspace_ctrl'
+    #
+    session_ctrl = edu_main_controller.m_main_controller_factory.m_main_controllers_list[1]
+    edu_main_controller.m_edu_workspace_ctrl = session_ctrl.m_session_controller_factory.m_session_controllers_list[2]
+
   finally:
     s_splash.clear()
     s_splash.hide()
@@ -63,10 +71,3 @@
     
     """
   return edu_main_controller
-
-# Get the edu_workspace_ctrl to browse interactively
-def Edu_WorkSpace_Ctrl(avida_ed):
-  session_ctrl = avida_ed.m_main_controller_factory.m_main_controllers_list[1]
-  edu_workspace_ctrl = session_ctrl.m_session_controller_factory.m_session_controllers_list[2]
-  return edu_workspace_ctrl
-