[Avida-cvs] [avida-svn] r826 - branches/developers/avida-edward/source/python/AvidaGui2
baerb@myxo.css.msu.edu
baerb at myxo.css.msu.edu
Tue Jul 11 11:55:44 PDT 2006
Author: baerb
Date: 2006-07-11 14:55:44 -0400 (Tue, 11 Jul 2006)
New Revision: 826
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeOrganismCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Josh's fix to timeline on Org Viewer
Fixed model problem with organizim freezer dialog being non-modal
Fixed problem where user cancels durning select file name when quitting caused
the program to quit
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-07-11 16:54:13 UTC (rev 825)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-07-11 18:55:44 UTC (rev 826)
@@ -441,6 +441,9 @@
# (actually only works with one population will need to expand to
# two populations in the future)
+ descr ("BDB -- self.m_session_mdl.saved_empty_dish = " + str(self.m_session_mdl.saved_empty_dish))
+ descr ("BDB -- self.m_session_mdl.saved_full_dish = " + str(self.m_session_mdl.saved_full_dish))
+
if (not self.m_one_population_ctrl.m_session_mdl.saved_full_dish and
not self.m_one_population_ctrl.m_session_mdl.new_full_dish):
m_quit_avida_ed = pyQuitDialogCtrl()
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogCtrl.py 2006-07-11 16:54:13 UTC (rev 825)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogCtrl.py 2006-07-11 18:55:44 UTC (rev 826)
@@ -25,6 +25,15 @@
m_prompt_dir.construct(session_mdl)
if (m_prompt_dir.showDialog() == 0):
return ''
+
+ # If the user selects to open existing/create new workspace then hits
+ # the cancel button in the choose dir dialog box the program will end
+ # up saving into the program default workspace -- to prevent that
+ # double check that a directory has actually been chosen
+
+ if (session_mdl.directory_chosen == False):
+ return ''
+
if freeze_empty_only_flag == True:
self.FullRadioButton.setEnabled(False)
self.FullRadioButton.setChecked(False)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeOrganismCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeOrganismCtrl.py 2006-07-11 16:54:13 UTC (rev 825)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeOrganismCtrl.py 2006-07-11 18:55:44 UTC (rev 826)
@@ -25,12 +25,17 @@
m_prompt_dir.construct(session_mdl)
if (m_prompt_dir.showDialog() == 0):
return ''
+
+ # If the user selects to open existing/create new workspace then hits
+ # the cancel button in the choose dir dialog box the program will end
+ # up saving into the program default workspace -- to prevent that
+ # double check that a directory has actually been chosen
+ if (session_mdl.directory_chosen == False):
+ return ''
+
while (found_valid_name == False and dialog_result > 0):
- self.show()
self.exec_loop()
- # while (self.exec_loop() and self.result() == 0):
- # pass
dialog_result = self.result()
tmp_name = str(self.FileNameLineEdit.text())
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeView.ui 2006-07-11 16:54:13 UTC (rev 825)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeView.ui 2006-07-11 18:55:44 UTC (rev 826)
@@ -79,7 +79,7 @@
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
+ <vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -87,7 +87,7 @@
<property name="minimumSize">
<size>
<width>0</width>
- <height>20</height>
+ <height>50</height>
</size>
</property>
</widget>
@@ -183,8 +183,6 @@
<property type="0">-1</property>
<property type="1">pyAnalyzeControlsCtrl</property>
<property type="0">-1</property>
- <property type="1">pyAnalyzeControlsCtrl</property>
- <property type="0">-1</property>
<property type="pyAnalyzeControlsCtrl"></property>
<property type="-1">1</property>
</customwidget>
@@ -247,17 +245,17 @@
</customwidgets>
<images>
<image name="image0">
- <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7!
ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e05!
82c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44a!
e426082<
/data>
+ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154789cad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7!
ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e05!
82c261e95f8bfc04f1a1e8bc5c4dfe0a19017a725d8c60000000049454e44a!
e426082<
/data>
</image>
<image name="image1">
- <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154388db5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93!
d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45!
c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890!
e04c2501
85262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c6a2573410000000049454e44ae426082</data>
+ <data format="PNG" length="1125">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000042c49444154789cb5954f6c14551cc73fefcd7476b65bdaae4bb78bb5502a14d404e4801c88182d1c4c2c693da847400f9c24c68b878684238660e2b1e01f12c19493012ef2478c814412d354a46017a8a564bb6da5bbedccee767776e63d0ffb073751d483bfe49799974c3eeffb7ebf37df9fd05a530b2184040cc0042420aaf9a4d0d554800f045a6b256ae0e1e1e1d6bebebe838ee31c48a7d39b5cd7fd075e251cc7617272f2ded8d8d819cff33e0316819259537aead4a9839d5dd6d1784f91f55b0a94830242088404d304292bef68a89f520802a598fecddaa04f1a876f5c250c7c0a64cdeac686e33807e23d45e6b297c8b877f1831542614550b6599835c83c2a81b6786a75134faf2f1169f12997350881d9021d0903e06de0745d3160a6d3e94dbd5b0a64dcbb94b5831d0e3375ab892b1772dcf9790528543f8dd0d367b36768153b5e31503a0f1aecb004580b44ffac58baae8b1714f0833c7638cc8dab303a320f4822ab4c7a37c69196203de3319d5ce1c4d13c733331dedc67a129a154fd128401ab0616d55a130ac3d42d93d1913940d13fd0c9ee0183685c60da01c5421bd72f7a8c8efccef9afd374267ad93!
d642365be0636a0d28ec7600941d9e6f23917f0e97f23ce5bef35d19ec863da0ed9059b2be70bec196c66dfa10ec0e49b338f7017258651bf95021035c595429bb0903248fe52a2b5b595dd7b4d945cc2340cdca536be389ee3f67886c5798f773fe8e0dac508c989659277a2180da4ca4ff07821058b8b251445d63d6b13ed1098a6417e39cac85197dbe31962ab9bd9f1f22a226d45366f6d0620fdb08c900d281af6110284b20085b414861d905d88f2e52739ee8cbb8022143259d3dd84691730aa2d52da441a8de0c6958068870022a41e9629ad3473fd3b8fdbe319dadb9b4924da994d2d716c7896fbe35152f78b48245d6b2da4507faf582be8eaf159b721cc837b05ae7debb1f79d08cb8b515edad942a22bc4b1c33eb3d34b1c797f06af90a72d16e2f96d9a74aa11dca8586b222d01af0fb60070f6c402d72f15d97f28c6f6d7027a5f5ce6c3233dc4e2ede496b278be4fff608cee8d3e1add806aeca51094cbb06397c1ecc328e746537c7e3ccdb5cb1136bf60635882d4d41c6ec6836ab37efa214f72208ed9f4d7cdd38ee310280542e38b1c43fb6de26b3672e1ec3cc99bcb246f66a938a3241ab3e91f7c861fbf77710b1e5e49915bae974203ba0e9e9c9cbc373d6d6d305a040a89c2a77f50b27d5782bbbf7acccf28349235dd16cf6dd374f7295e1de8a45!
c02d37499182b01cc0201a085d61a2144d8b2ac8fb6ed340e77240c4261890!
e04c2501
85262546d534a032154b59e0ad394e41c98182bf268ce6721ed9f064e0253356f6da2e24c1f030f783c15fe6da680af8021602bd051532ca9b8521488559f61aa86c29343578fbf0264a94c906c7d3409214c20043457a116ff6de6795578012889ff6b98fe016ea0ce1c203e47720000000049454e44ae426082</data>
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>pyorganismdatactrl.h</includehint>
<includehint>pyorganismscopectrl.h</includehint>
- <includehint>pyanalyzecontrolsctrl.h</includehint>
<includehint>pytimeline.h</includehint>
+ <includehint>pyanalyzecontrolsctrl.h</includehint>
</includehints>
</UI>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-07-11 16:54:13 UTC (rev 825)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-07-11 18:55:44 UTC (rev 826)
@@ -251,6 +251,9 @@
else:
return
+ descr ("BDB -- self.m_session_mdl.saved_empty_dish = " + str(self.m_session_mdl.saved_empty_dish))
+ descr ("BDB -- self.m_session_mdl.saved_full_dish = " + str(self.m_session_mdl.saved_full_dish))
+ descr ("BDB -- self.m_session_mdl.new_full_dish = " + str(self.m_session_mdl.new_full_dish))
self.RenameDishSlot(dish_name)
#self.MakeConfigVisibleSlot()
self.finishedPetriDish = False
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-07-11 16:54:13 UTC (rev 825)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-07-11 18:55:44 UTC (rev 826)
@@ -558,21 +558,27 @@
self.m_session_mdl.saved_empty_dish = True
else:
self.m_session_mdl.saved_full_dish = True
+ descr ("BDB -- self.m_session_mdl.saved_empty_dish = " + str(self.m_session_mdl.saved_empty_dish))
+ descr ("BDB -- self.m_session_mdl.saved_full_dish = " + str(self.m_session_mdl.saved_full_dish))
+
- self.m_session_mdl.m_session_mdtr.emit(
- PYSIGNAL("doRefreshFreezerInventorySig"), ())
- if send_reset_signal:
+ # Have program redraw the freezer menu pane
+
self.m_session_mdl.m_session_mdtr.emit(
- PYSIGNAL("restartPopulationSig"), (self.m_session_mdl, ))
+ PYSIGNAL("doRefreshFreezerInventorySig"), ())
- # If the send_quit_signal flag was sent to this routine kill the application
- # (Instead of killing the application directly a signal should be sent
- # upto the workspace moderator)
+ if send_reset_signal:
+ self.m_session_mdl.m_session_mdtr.emit(
+ PYSIGNAL("restartPopulationSig"), (self.m_session_mdl, ))
- if send_quit_signal:
- qApp.quit()
+ # If the send_quit_signal flag was sent to this routine kill the
+ # application (Instead of killing the application directly a signal
+ # should be sent upto the workspace moderator)
+ if send_quit_signal:
+ qApp.quit()
+
def doLoadPetriDishConfigFileSlot(self, genesisFileName = None):
descr()
genesis = cGenesis()
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-07-11 16:54:13 UTC (rev 825)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-07-11 18:55:44 UTC (rev 826)
@@ -130,7 +130,7 @@
<number>100</number>
</property>
<property name="value">
- <number>-3010</number>
+ <number>3010</number>
</property>
<property name="orientation">
<enum>Horizontal</enum>
@@ -978,7 +978,7 @@
</font>
</property>
<property name="text">
- <string>Should this run be exactly repeatable?</string>
+ <string>Mode:</string>
</property>
<property name="alignment">
<set>AlignCenter</set>
@@ -1013,7 +1013,8 @@
<enum>TabFocus</enum>
</property>
<property name="text">
- <string>No</string>
+ <string>Experimental
+(natural variation)</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -1034,7 +1035,8 @@
<enum>NoFocus</enum>
</property>
<property name="text">
- <string>Yes</string>
+ <string>Demo
+(forces exact replay)</string>
</property>
<property name="toolTip" stdset="0">
<string><p>Each time this petri dish is run the mutations will be exactly the same</p></string>
@@ -1189,7 +1191,7 @@
<number>10000000</number>
</property>
<property name="minValue">
- <number>1</number>
+ <number>0</number>
</property>
<property name="lineStep">
<number>1000</number>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogCtrl.py 2006-07-11 16:54:13 UTC (rev 825)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogCtrl.py 2006-07-11 18:55:44 UTC (rev 826)
@@ -27,9 +27,6 @@
dialog_result = 1
while (dialog_result > 0):
self.exec_loop()
-
- # while (self.exec_loop() and self.result() == 0):
- # pass
dialog_result = self.result()
if dialog_result == 0:
return self.CancelFlag
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py 2006-07-11 16:54:13 UTC (rev 825)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py 2006-07-11 18:55:44 UTC (rev 826)
@@ -61,6 +61,10 @@
self.m_session_mdl = pyMdl()
self.m_session_mdl.saved_empty_dish = False
self.m_session_mdl.saved_full_dish = False
+
+ descr ("BDB -- self.m_session_mdl.saved_empty_dish = " + str(self.m_session_mdl.saved_empty_dish))
+ descr ("BDB -- self.m_session_mdl.saved_full_dish = " + str(self.m_session_mdl.saved_full_dish))
+
self.m_session_mdl.new_empty_dish = True
self.m_session_mdl.new_full_dish = True
@@ -240,6 +244,9 @@
self.m_session_mdl.saved_full_dish = False
self.m_session_mdl.new_full_dish = False
+
+ descr ("BDB -- self.m_session_mdl.saved_empty_dish = " + str(self.m_session_mdl.saved_empty_dish))
+ descr ("BDB -- self.m_session_mdl.saved_full_dish = " + str(self.m_session_mdl.saved_full_dish))
def unitTest(self, recurse = False):
return pyUnitTestSuiteRecurser("pySessionCtrl", globals(), recurse).construct().runTest().lastResult()
Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-07-11 16:54:13 UTC (rev 825)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-07-11 18:55:44 UTC (rev 826)
@@ -1,5 +1,3 @@
-hange Viewer Icons to different ones than freezer
-
Click on freezer name same on clicking on expand/contract
************Brian******************
@@ -7,21 +5,23 @@
Priority High
+15-Jun-06 Finish work on AncestorIconView
+
16-Jan-06 Get file system finished -- Make one big database file?
+07-Jul-06 Save organism box is not model -- fix it.
+
Priority Medium
29-Apr-06 Change configuration on fly -- work with Kaben on the underlieing problem
15-Jun-06 Drop on viewer icon
-15-Jun-06 Change menu item "Restart Experiment" -> "Start New Experiment"
-
15-Jun-06 Add Viewers to view choice on menu
15-Jun-06 Add text "environmental settings" on main screen
-15-Jun-06 Finish work on AncestorIconView
+07-Jul-06 Save lineage of creature as well as genotype
Priority Low
@@ -53,6 +53,7 @@
03-Jul-06 Delete item by clicking and delete
+07-Jul-06 Set Default organism freezer name to aaaa, aaab, etc.
************Jeff*******************
@@ -155,8 +156,6 @@
16-Jan-06 Default mutation rate to 0.5? (easy to change) -- Finished 1-Feb-06
--change the word "repopulate" to "start new experiment" -- Finished 2-Feb-06
-
27-Feb-06 Change Navigation -> Viewer
16-Jan-06 Initial location of workspace box (ie before user can run program they must chose (or create) a workspace). -- Finished 06-Apr-06
@@ -189,7 +188,12 @@
15-Jun-06 Add Viewers to view choice on menu -- Finished 03-Jul-06
+07-Jul-06 Change repeatable switch to: Experimental mode (natural variation) demo mode (forces exact replay) -- Finished 11-Jul-06
+07-Jul-06 Set default mutation rate to one genomic (2%) -- Finished 11-Jul-06
+
+07-Jul-06 Set Default Pause 10,000 -- Finished 11-Jul-06
+
************Kaben******************
* 23-Jan-06 Get program to run on all Macs -- Finished 27-Jan-06
More information about the Avida-cvs
mailing list