[Avida-cvs] [avida-svn] r708 - branches/developers/avida-edward/source/python/AvidaGui2
baerb@myxo.css.msu.edu
baerb at myxo.css.msu.edu
Fri May 26 12:52:58 PDT 2006
Author: baerb
Date: 2006-05-26 15:52:57 -0400 (Fri, 26 May 2006)
New Revision: 708
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup_utils.py
branches/developers/avida-edward/source/python/AvidaGui2/pyEduMainCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Fixed problem where "start" menu item did not change to "pause" when experiment
was running.
"Temporary" fix to problem where quit function was deactivated when user
cancelled out of the quit dialog box. This fix required turning of the Main
Menu Bar Handler.
Modified: branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup_utils.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup_utils.py 2006-05-26 16:46:14 UTC (rev 707)
+++ branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup_utils.py 2006-05-26 19:52:57 UTC (rev 708)
@@ -59,8 +59,12 @@
# 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]
+ # BDB -- When I commented out the creation of the contoller for
+ # pyEduMainMenuBarHdlr the array index for the session contoller
+ # changed from 1 to 0
+ session_ctrl = edu_main_controller.m_main_controller_factory.m_main_controllers_list[0]
+
# Get the workspace from the session controller factory
edu_main_controller.m_edu_workspace_ctrl = session_ctrl.m_session_controller_factory.m_session_controllers_list[1]
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduMainCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduMainCtrl.py 2006-05-26 16:46:14 UTC (rev 707)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduMainCtrl.py 2006-05-26 19:52:57 UTC (rev 708)
@@ -2,8 +2,8 @@
Main controller for AvidaEdu.
"""
-import pyEduMainMenuBarHdlr; reload(pyEduMainMenuBarHdlr)
-from pyEduMainMenuBarHdlr import *
+# import pyEduMainMenuBarHdlr; reload(pyEduMainMenuBarHdlr)
+# from pyEduMainMenuBarHdlr import *
import pyMainControllerFactory; reload(pyMainControllerFactory)
from pyMainControllerFactory import *
@@ -27,8 +27,13 @@
self.m_main_mdl.m_main_mdtr = pyMdtr()
self.m_main_controller_factory = pyMainControllerFactory()
self.m_main_controller_factory.construct(self.m_main_mdl)
- self.m_main_controller_factory.addControllerCreator(
- "pyEduMainMenuBarHdlr", pyEduMainMenuBarHdlr)
+
+ # BDB -- Prevented creation of contoller for pyEduMainMenuBarHdlr
+ # it seemed to be causing problem where if you quit and
+ # canceled the quit button would no longer work
+
+ # self.m_main_controller_factory.addControllerCreator(
+ # "pyEduMainMenuBarHdlr", pyEduMainMenuBarHdlr)
#self.m_main_controller_factory.addControllerCreator(
# "pyEduMainConsoleCtrl", pyEduMainConsoleCtrlCreator())
#self.m_main_controller_factory.addControllerCreator(
@@ -38,8 +43,10 @@
self.m_main_controller_factory.addControllerCreator(
"pySessionCtrl", pySessionCtrl)
- self.m_main_mdl.m_main_mdtr.m_main_controller_factory_mdtr.emit(
- qt.PYSIGNAL("newMainControllerSig"), ("pyEduMainMenuBarHdlr",))
+ # BDB -- Also commented out the following two lines
+
+ # self.m_main_mdl.m_main_mdtr.m_main_controller_factory_mdtr.emit(
+ # qt.PYSIGNAL("newMainControllerSig"), ("pyEduMainMenuBarHdlr",))
return self
def unitTest(self, recurse = False):
@@ -66,7 +73,9 @@
%s
""" % self.__class__.__name__
- self.adoptUnitTestSuite("pyEduMainMenuBarHdlr")
+ # BDB -- Commented out this line as well
+
+ # self.adoptUnitTestSuite("pyEduMainMenuBarHdlr")
self.adoptUnitTestSuite("pyMainControllerFactory")
self.adoptUnitTestSuite("pyMdtr")
@@ -88,8 +97,11 @@
driver without causing a crash. then all of the objects below
will be properly deleted.
"""
+
+ # BDB -- Commented out m_main_controllers_list[0].m_menu_bar line
+
these_are_not_being_deleted_and_it_really_sucks = [
- ".m_main_controller_factory.m_main_controllers_list[0].m_menu_bar",
+ # ".m_main_controller_factory.m_main_controllers_list[0].m_menu_bar",
# ".m_main_controller_factory.m_main_controllers_list[1].m_session_mdl.m_avida_threaded_driver",
# ".m_main_controller_factory.m_main_controllers_list[1].m_session_mdl.m_avida_threaded_driver.m_thread",
# ".m_main_controller_factory.m_main_controllers_list[1].m_session_mdl.m_avida_threaded_driver.m_updated_semaphore",
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-05-26 16:46:14 UTC (rev 707)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-05-26 19:52:57 UTC (rev 708)
@@ -394,13 +394,13 @@
pass
def doPauseAvidaSlot(self):
- self.controlStartAction.text = "Start"
- self.controlStartAction.menuText = "Start"
+ self.controlStartAction.setText("Start")
+ self.controlStartAction.setMenuText("Start")
self.startStatus = True
def doStartAvidaSlot(self):
- self.controlStartAction.text = "Pause"
- self.controlStartAction.menuText = "Pause"
+ self.controlStartAction.setText("Pause")
+ self.controlStartAction.setMenuText("Pause")
self.startStatus = False
def startQuitProcessSlot(self):
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2006-05-26 16:46:14 UTC (rev 707)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2006-05-26 19:52:57 UTC (rev 708)
@@ -267,7 +267,6 @@
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) :
freezer_item_name = str(e.encodedData("text/plain"))
- print "BDB:pyOneAna_GraphCtrl:petriDropped freezer_item_name = " + freezer_item_name
self.m_petri_dish_dir_path = freezer_item_name
self.modeActivatedSlot()
return
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py 2006-05-26 16:46:14 UTC (rev 707)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py 2006-05-26 19:52:57 UTC (rev 708)
@@ -122,29 +122,29 @@
self.connect(
self.m_session_mdl.m_session_mdtr,
PYSIGNAL("doStartSig"),
- self.doStart)
+ self.doStartSlot)
self.connect(
self.m_session_mdl.m_session_mdtr,
PYSIGNAL("doPauseSig"),
- self.doPause)
+ self.doPauseSlot)
self.connect(
self.m_session_mdl.m_session_mdtr,
PYSIGNAL("fromLiveCtrlStartAvidaSig"),
- self.doStart)
+ self.doStartSlot)
self.connect(
self.m_session_mdl.m_session_mdtr,
PYSIGNAL("fromLiveCtrlPauseAvidaSig"),
- self.doPause)
+ self.doPauseSlot)
self.connect(
self.m_session_mdl.m_session_mdtr,
PYSIGNAL("restartPopulationSig"),
self.restartPopulationSlot)
- self.doPause()
+ self.doPauseSlot()
return self
@@ -217,7 +217,7 @@
(self.m_session_mdl.m_tempdir,))
self.m_avida.m_avida_thread_mdtr.emit(PYSIGNAL("AvidaUpdatedSig"), ())
- def doStart(self):
+ def doStartSlot(self):
if self.sessionInitialized == False:
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("doInitializeAvidaPhaseISig"),
@@ -226,7 +226,7 @@
self.m_should_update = True
self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("doStartAvidaSig"), ())
- def doPause(self):
+ def doPauseSlot(self):
self.m_should_update = False
self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("doPauseAvidaSig"), ())
Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-05-26 16:46:14 UTC (rev 707)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-05-26 19:52:57 UTC (rev 708)
@@ -9,8 +9,6 @@
16-Jan-06 Get file system finished -- Make one big database file?
-26-May-06 Fix problem where canceling out of initial Quit menu causes Quit to stop working
-
Priority Medium
18-Apr-06 Replace "Viewers" buttons icons.
@@ -23,16 +21,12 @@
-Under the sliders with ranges put a few values in grey that tell you the range min and max
--Make arrow keys bind to environmental parameter configurations
-
-Make the selection of a workspace look like you are choosing a file not a directory
-Make the slider have the textbox that shows the readout value this box can also take input if they put a number in it (which then changes the slider) and has up and down arrows next to it
-add the ability to tell genesis where you want the default organism to be
-16-Jan-06 Fix problem where start in menu bar not linked to start button
-
16-Jan-06 Non-Fix length Genomes?
29-Apr-06 Add "Environment Setting"/"Petri Dish" at top left of frame
@@ -136,8 +130,14 @@
18-Apr-06 Remove query screen at the beginning of the program, make users choose this the first time a file is saved. -- Finished 26-May-06
+26-May-06 Fix problem where canceling out of initial Quit menu causes Quit to stop working -- "Temporary" fix, removed the Main Menu Bar Handler, 26-May-06
+-Make arrow keys bind to environmental parameter configurations -- Finished 26-Ma-06
+16-Jan-06 Fix problem where start in menu bar not linked to start button -- Finished 26-May-06
+
+
+
************Kaben******************
* 23-Jan-06 Get program to run on all Macs -- Finished 27-Jan-06
More information about the Avida-cvs
mailing list