[Avida-cvs] [avida-svn] r831 - branches/developers/avida-edward/source/python/AvidaGui2
baerb@myxo.css.msu.edu
baerb at myxo.css.msu.edu
Thu Jul 13 11:48:42 PDT 2006
Author: baerb
Date: 2006-07-13 14:48:42 -0400 (Thu, 13 Jul 2006)
New Revision: 831
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
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/pyQuitDialogCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Started adding code to support "Autoclaving" items.
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-07-13 16:31:49 UTC (rev 830)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-07-13 18:48:42 UTC (rev 831)
@@ -144,7 +144,7 @@
self.navBarItemClickedSlot(self.m_nav_bar_ctrl.m_one_population_cli)
self.m_nav_bar_ctrl.m_list_view.setSelected(self.m_nav_bar_ctrl.m_one_population_cli, True)
- self.splitter1.setSizes([100])
+ self.splitter1.setSizes([150,500,100])
self.show()
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-07-13 16:31:49 UTC (rev 830)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-07-13 18:48:42 UTC (rev 831)
@@ -33,7 +33,7 @@
<property name="minimumSize">
<size>
<width>195</width>
- <height>455</height>
+ <height>521</height>
</size>
</property>
<property name="maximumSize">
@@ -107,6 +107,43 @@
<bool>true</bool>
</property>
</widget>
+ <widget class="QIconView">
+ <property name="name">
+ <cstring>AutoclaveIconView</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>3</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>60</height>
+ </size>
+ </property>
+ <property name="paletteBackgroundPixmap">
+ <pixmap>image0</pixmap>
+ </property>
+ <property name="frameShape">
+ <enum>NoFrame</enum>
+ </property>
+ <property name="vScrollBarMode">
+ <enum>AlwaysOff</enum>
+ </property>
+ <property name="hScrollBarMode">
+ <enum>AlwaysOff</enum>
+ </property>
+ <property name="arrangement">
+ <enum>TopToBottom</enum>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string><P>Delete organisms and petri dishes</p></string>
+ </property>
+ </widget>
</widget>
<widget class="QWidgetStack">
<property name="name">
@@ -209,7 +246,7 @@
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
- <pixmap>image0</pixmap>
+ <pixmap>image1</pixmap>
<property type="0">3</property>
<property type="1">pyFreezerView</property>
<property type="3">-1</property>
@@ -235,6 +272,26 @@
<property type="0">-1</property>
<property type="1">pyFreezerView</property>
<property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
<property type="pyFreezerView"></property>
<property type="-1">1</property>
</customwidget>
@@ -252,7 +309,7 @@
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
- <pixmap>image0</pixmap>
+ <pixmap>image1</pixmap>
<property type="0">3</property>
<property type="1">pyNavBarView</property>
<property type="3">-1</property>
@@ -278,6 +335,26 @@
<property type="0">-1</property>
<property type="1">pyNavBarView</property>
<property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
<property type="pyNavBarView"></property>
<property type="-1">1</property>
</customwidget>
@@ -288,7 +365,7 @@
<cstring>fileNewAction</cstring>
</property>
<property name="iconSet">
- <iconset>image1</iconset>
+ <iconset>image2</iconset>
</property>
<property name="text">
<string>New Workspace</string>
@@ -305,7 +382,7 @@
<cstring>fileOpenAction</cstring>
</property>
<property name="iconSet">
- <iconset>image2</iconset>
+ <iconset>image3</iconset>
</property>
<property name="text">
<string>Open Workspace...</string>
@@ -322,7 +399,7 @@
<cstring>fileSaveAction</cstring>
</property>
<property name="iconSet">
- <iconset>image3</iconset>
+ <iconset>image4</iconset>
</property>
<property name="text">
<string>&Save Workspace</string>
@@ -381,7 +458,7 @@
<cstring>m_print_action</cstring>
</property>
<property name="iconSet">
- <iconset>image4</iconset>
+ <iconset>image5</iconset>
</property>
<property name="text">
<string>&Print</string>
@@ -412,7 +489,7 @@
<cstring>editUndoAction</cstring>
</property>
<property name="iconSet">
- <iconset>image5</iconset>
+ <iconset>image6</iconset>
</property>
<property name="text">
<string>Undo</string>
@@ -429,7 +506,7 @@
<cstring>editRedoAction</cstring>
</property>
<property name="iconSet">
- <iconset>image6</iconset>
+ <iconset>image7</iconset>
</property>
<property name="text">
<string>Redo</string>
@@ -446,7 +523,7 @@
<cstring>editCutAction</cstring>
</property>
<property name="iconSet">
- <iconset>image7</iconset>
+ <iconset>image8</iconset>
</property>
<property name="text">
<string>Cut</string>
@@ -463,7 +540,7 @@
<cstring>editCopyAction</cstring>
</property>
<property name="iconSet">
- <iconset>image8</iconset>
+ <iconset>image9</iconset>
</property>
<property name="text">
<string>Copy</string>
@@ -480,7 +557,7 @@
<cstring>editPasteAction</cstring>
</property>
<property name="iconSet">
- <iconset>image9</iconset>
+ <iconset>image10</iconset>
</property>
<property name="text">
<string>Paste</string>
@@ -497,7 +574,7 @@
<cstring>editFindAction</cstring>
</property>
<property name="iconSet">
- <iconset>image10</iconset>
+ <iconset>image11</iconset>
</property>
<property name="text">
<string>Find</string>
@@ -747,36 +824,39 @@
</actions>
<images>
<image name="image0">
+ <data format="XPM.GZ" length="15697">789cb59a598feb3c7286efe7571c0cef0601c792655942908bde37bbdd9bddee0e72c155ea7d5f83fcf794ea2df12cd30799c197ef14dcf66351ac85c522299fbfffeddbf260faed6f7fffcbd3b379be70df5c6b1ebffdcdbfdcdc7cfce77ffdc77fffe5af65fead187f2b07f9b7fcaffff697bf36d36fee9b2a5c618bba63ffd6f1a818e5a361c7ea94b91e8d86036ebf275c8dca8edd9cd911f3fd7a5bd88ec61d875b6112e627e6d009f7b7cb1c89f9fae1b33009db93755c0e3ae1f613e6ac1ce07e3f15ced05eaf31e7a501ab03e6e1c8e7b0cf803be1eb87ccc528e615f311f38802c4fe29f6af2ccb2c677fd489709ee3fee3c423b66f293c42ffcd9b705916acff3631f71f617f558e4bbe5fe1feba2cca8cdbdf0b93b0bf8ed9d01d96afdf0893b0be1d66dbb5e0eb1ccfd29576ccf18bdbc20eedf55d628ebf437c7d391ec39f4de1be7d1026617e048ff312e339630e741df659e180eb7a034ced118f07e102f1d02fcc91dac39f4162b64f3b6112ce271ebff18018f66c82e91bf4dff60cfff5ab7006fb1ce7339119c3bf77f058f24b5f0893307f30e7d43f73b3219cc11edd0893f0782e9887e3410efb3e8533d8d76c0be7b0aff1c243d1779598f349af3217143f1e1fbd9298e3172a61b93f96c205e!
cd19789119f27e111fc573c7e4459c1f18e4be111f4fb4be152f26b5dd8c27f87f897640fe65b142661ffd07e4c0cfdd7c2f48fed87be6a2cf9a7bd3009f7bf256c2bbe3f209e357d83fc51c224dc7e5bd855dc9f437f669c0f11ff2de11afadd8eb0afb83f83fcb2e35101ff2b61037b9a356112be7f573854dc9f46ff8e04f5f62031c73bb8c41c6f8ffe3cf5cff686b1b0b4572bc2247c1dfa0231eb6f3e8503fa0b3e31e7b382fdb113b6efade78ae36539fed560ec86dcbfb9eb19f5dd6f823b61be10ce319e9eeb63958d6bc4cf4d852de2dfdc80e91bd4f7db9e2bce57c3f942bdb902f17a04f7ed9b63e11cfad53031b7b75c9faae1785c201f7b76580f5c06260dec5f6b7b467fcd87f010f6848bc43cfe4e3317d52083fd63e1be7d295cc09ed024e6f838cecf6a546539eb0b07c27dfb4c78047d7a2731c7cfaf0a8f31be8ed7b3aaacf21cf5685f58eef767c2a58c07fc1d57c31cf13aec19eb7db8111e237f9b73e68a18f3a712a67fdc1ef1aa09b97fcbf95b5135c5fae7315e86ae233fb5708dfecd9b3009df5f335b9ace88e7a9b0813eff206ca53f8c8f23e6fc6cde851dfa5375628e578378f8fe7a7324ecd19f1a27e6fcb0e7c2b1c67cc27884be7d73281cd07fac13f37c8b0573ecaf875c38a27fc3f95f0f2a9f63fd8cc2fd759e6f75565543f62f146!
0fa06f93ce8b9c6fc61fbebbcaab0df892fe0be7d530a93b07f5cffeb61552!
19f9deb7
9887afb09a6feb97dbc12ce6be4ef507808fd7e27318f7f1c3117fd75d70a9370bc395feb513d407d7345cf88973be919ede3a170017bdc589884f573fed2666900fbfc867051637d51c223b1ef439884db73bed1e251d418df57e112fac348780c7d2124e6fe2deeafea3c87bd5a58dac70de10afacc7362ac27bc1ed675ba7e2a4cff581fcfa7da10623f3a10368887ca13633e717da92d2d6f1c7f5b0957581ffdab708df6ca0b1be86f9e1363be9f085bc4c7c07f57cb7aee3684c788afba173632bf5e1273be8735610bff621476b027dc25e67c50b0d7277b1f849d61ff54294cc2f69d08478c9f413c426d33f8d70a7bf8a31e7b36c8af2631c6ef4d9884ede3fd32f51ec4bea79e0deadf409884e38ffea2c9249f783f65069df0fdcf8931df38be26a3f6586f1e7b86bfe6417888f1513c5f4d4eed51efae12e33c5408e7e8df6e0a17186fc7f1a1de02e2ebefc19db03e8e2fb53625eaf786b09c2fdc5bcf884f3c05d3fdd88f7e0a17d01fd61363bef07898517f3d5ae111f4079398c7c3221e656db1de38d85b9a4ceaf3a5b0dc6fce8549b87ff84fcb15f4db2d6112becef963ba050dfb974cb8c2fdf63231d6a789702dfdf17c22ca328e67bc1626e1ebbc9e1b53079c373dfc35d403db1f67c2b5d8e3850df499a7c4e89fd74363fbebd1095bd1b79318f397e7!
93719d707e60fcbc195be4fbbab0477bb79a98e75744be84fe7a6c8483f4374a8cf50df910fbebcd8a300933df6f07c4dc7f7302a66f70ff6acf16f385eb83cda83dcedb0538b5cf8533f41f4dcf16fb0bde2fd83c5d5f11ced1bf794fccf9e85b61193f87f6c34ef87e5e5f6cd109ebe7f96947c4c8e757e191c497c7cf96c4c84f2d4cc2fdc3bfb195f91eae8549f83afaabba11e3eb0bb095f1f347c295f4374a8cfcc0f5babf1ea6c235fa6fe689b15eac087bc437223e9c50ccbc9e5b4bccfddb4c98feb1fe7361e7b07fe0fcb68ebee1fecd993009ebe37a633d31d68367618ffe3cf479973bacc77cdeb3a1bf1ede8403fa731789f1fc08fa831b3aac073cff6cecdbfb5c385ae4e32231eaf101d8150ef393f7436ed0b70f1b60fa06ebc555cff0df1f0a8f1cc683fd7759dfde0f8533e8531b3d3beca71689b1de707da0680c907f7e249c439fcd13637d3b4d8cf6efc24319af07e102f3d5f37a44d1ca905fcd8bb0f4ef0be121ecb3db89519f9789919f1fc2858ccfa3f008f3dff37e80a29b233fdbb667f417e6c285f85326c67ee42c31eaeba7f008e3e39e844be4b3437c46a40ff9de080f311fd4a6f008f6bb67e131ea8782be924614f9ba255cc21ef39218eb0fae8ffbebad111e63bceda067e497c3f8541421ecefce8465be37ae67990f9bc215f4994562!
ece7b87ef0f68afbf7cbc4f01ff96a5c29f36f4558da072b6cc41e8c97a588!
627d3912
2e911f71206ca0df1d0a5bb4773c9f9d23fb31bf6b610b7bc28bb093f8c6c4c84fe403d5038f7a9c09f7edf7853dfa8f93c4d82fde08473cff70b03f74c2fef17ae8a22b3dee9f0b07e86f86c211fdd93631ea058fb71f74c2ccfdf98cc603fe6e833be1fe39bf7c4e2df8fef6429884ed63fffd90fa877e05a6eba8aff7c243c4c3f2f3225f74c2f7733cfd8836e0b077211cf0fc25ec81a93d78204cc2edf9fce54bb200d7cf8447a2ef429884e30b7bc6640ff68b6bc2246c3fcf473a7c8fa5ff2b61129e5f88176ff0b93fae17bc1dc1f911d72ddd8ffdd88bb00107b4e701e7fe797cbdf7c321d6c763e1cae379d954d8c09e980b3be8535bc2f48fede17ae183cf113f7b2c5c0cb15f1e0997888f5917aea5ffbebd97fcba110eb0c7703ef948f6a23e9c088f705e375ed820de8d110ef0d70c844998797cc280eec7f8cf854b3c6fd0bbe04e980be14cfae3fd085139045f098fc5dfcbc418bf0cdc09ebe3f525e4642fcecf33612febe939987ac0f3895a9884fbe37a18863e063ccf6bc0d403f6276bc243e833f3c4883fcf975074c2fef1f8f0cf53f83d86eb692889f9feb66712be9feb253f5e453d843ffc0088ede5e73b74581c215eaae70afa95498cdf07cac4f8fde148988499e71b6da6eb80df3f5a6112ee4f0b5bf4e7787d25aad05e57c226623f7b274cc2f!
ef17ca16227edbd1136625f2d6c23f61be7c224ac1ff1e68465e6f52104ba8efdfd48d8439f3e140ef03772fd09b1bb83f94e58c657c5c4586f597f1c841071fe6fc09df0f8cc84e5f7bbc8f918b3ee0ee655e14ce2b3d733fad3e7c225e26579fd8b79a833dc7f0b26c179643531f253090f23f4737e100da5ffe3c48827d7fb58f4d79b5be102fde993c4787e76295ce27e7d266ce05f8bfe4614013c6f381296fe9a3be191dc7f9a18f5774fd8c27ec5f944da0ab03e1026e1f653e171c4f9e852d8a2bf86f397ae96f02f9c27c6f9bfbf3e467bbd9f18f5619418e7d942b88aa8ffbcfe1215c8afb02a2cfd3541b882bd7a9a18f5e94ad8a0ff96f747b1a608809f847b7f3784ab88f3e3bd702df16a1363bd3a1636b0475d27c67a74271c23db6f317e26caf303fb229c673c5eed957029f170c263fcbed06ae11afae26362e4e3aeb081ff7a9998f5992231d68b4f610bff8d1576e8cff07ad81d9f32d883f8d1e80f505f6e85c7d0d7de27667deda37085fe422d2cf6c51d610b7ff52c31ea499618ebf15a62ac9737c262afbb4e8c7a3b488cf6bdbd11f96a8689b1bff9ced8efae26c67a3a498cf8f1fe8eb68b3ec3796047380ed01ef175b11c201f3e84c7039ca7df85ab01ce736f89910f37c2327efe4958e2152b6187eb7a9e18f55beca1f28a7c5d118e526f2e1!
263beec26c6fefd2a31e2ef12c37fcc674fe51af519f3cfc701fc35bbc2d90!
0e78f9e2
bd8d7be0b4bfeb50f89b17f5689f1ff0586c232de7e2f31f6833a317e0fba17f6924f8bc4189fefd7e10fe2d9b903de13ce07981f93c4e8bf6f2fe3d3fac4785e592786bf77c2e25f7b9d18d74362ec7fde849db4bf4c8cf3f58db0d81f7b7b838c7f488cfdef2431fccb8523ec57db89b13eef25467bf843b305e369b57039c0fecf26c6f352233c96fc56c292ef7e215ccbfcbc1696f96d326199bfbed7e7e18ff9488cebfdfd41ea514c8c7c9e25463e9bc4388ff5f645592ff713637d281363bee589f17bc34d62ecaf2689b9ffc367adb4a197d54e7b1d74d48d6ef505fded5e97fa4a5fd3df1b7dabefe8fd9afe5aba0e71d4de51ab86bf8bd4f65e3fe847fda49ff58b7e257ad3effa437fea159655fab4a6d7f586ded45b7a9bedd9d1bb7a4f4ff454efeb197deade0fe885bf537da88ff4315d9f101fea133da7d731b55c109f122de935e3bb96f43ed367fa5c0f74a6733dd4851ee9528f75a56b964a574a2ba58cb2ca29c4e38eb54fe8eec9cfa2820ae973548dd830672d735ca3362dddb9a0cf0bb664a22ed4a5ba52d7ea46ddaa3b75af1ed4a37a52cf224fea45bdaa37f5ae3ed4278fcf0af7b34afd4c7ed017a8af05ff9da835e856eb6a436dd26b4b35f4cd945b9e902d3f59aeb6d58eda557b6aa2a66a5fcdd4813a5447ea589dd06b4eb250a76aa9ced4b9!
c279abd14bd27d907a5bf0a7b9bc77919da84ce5fa420d55a146aa546355a9da68a3a4751791094780e2628cb1eac2387af7746488a631adb93097e68a5ed7f4e9c6dc9a3b73af73f320fa67c9e7fd1f63c0726c1ecd9379362f5d2458175a8eccab7933ef64f144ec5ce24ef3613ecd8a59356b66dd6c984db365b6cd8ed9357b6662a666dfcccc81393447e6d89cb0fec8faa7944bfb1cd329e24eafa5999b8539350bcab705fb3a53ab9c291c71b33467e6dc0c3aabbfdb6d32939b21e92fccc874ffe9ab32b5d556b198eeb9b4f5b479897adf36acff92ef9f8b1fa73ffa6e5bf344df4c85e17b2bed3a1bf6ed85bdb457ac1b3decdb6b7b636fed9dbdb70ff6d13ed967fb625fed9b7da7d787fdb42b76d5aed975bb613759bf92b19f4bc677d61c76a369b7ecf6af7382bd9fa7cf74a76ded8edd65bbf87bbb6727764a07be7d3bb307f6d01ed9637b62e7222776614fedd29e99357bfea5fe09d80e6ca68fc5db1f65c16d90771c1933b0b9dae2519c53cc86c6d9c28e6c69c7b6b2b5a302e5bae787969f091ae79ca7a364341faef98dfe19bd37ae556b5f57057ecdd24ca17172340a52a326eed25db96b77638cbb7577eede3db847f7e49e459edc8b7b756feedd7db8cf2ff5771a97e6ddada4b1fe5966d24ec61bf7ba55b7d6d94dd1b08a468d66df875b771b6ed3!
6db96db7e3764576dc9e9bb8a9db773377f01bff177acfbc51450afdccfc49!
a6127df6
9e66e78ba36c7147e654b237a7cad7e937eed89db8b95bb853b77467224b77ee062eeb9eaee379f43fea57ab6ee44aae79b35faa415fa767fca2ba63b41bbbcad5d4fa1afad58dd79e7faff4c65befbcf78136538d48f4adbff097feca5ffb9bdff87fea6f55f07729ba3fcbbc8f41171f7f6f73ffd0cd17ff682fe8bb96ea4fa7fbc93ffb17ffeadffc3bc987ff4cb2e257fd9a5f371f7ee337e37fec37d9fbbd2fb423eea94aa8c26f510f27aaf5db7ea7ebc5efda6b37d3b9df53ce4ffcd4effb993f203924e9de8ffcb13ff173bff0a75fea9fab75eee9abb1eff5f7f36fe2effdd29fb1ff77aef2e73fd4efb9def5039ff9dc0ff969303fd1a5f7b27b72eaeba083fa5abfdf0ee6d755edf7fa83552b3453976a35381eff3fac9f72f9f5fb7af27ffabf1d3ccdfd6ebd8cddb7ff0ffad7026accf49fd11f22adc65db69c86eeeffc0feb5f84962239d13faf45bfd56f5ec205ed04a802844b3df9e3fe7733403cfaa7fcb7addfa1bc5b98f37025b5f98fea9fd82db5a927bfb1e0d7f85f871baa13c7bedbc7fe58b1fe807ebf85587e59017ecdbfcd70aba21eb9015bbbfc97f57b19e77e55eff6606db80bf77ac2bbab59bfd3ed7786bd06ae55fb942d0fb402ae042b3d9cf4710b8f149d27d24fbac333bd5ec26b780befe1237c8695b01ad6bed4dfdd3db55776abf3b2c!
b83aeceaab6df5f24dddd8ebf8b00d51c5a83da647b67ddb4b356ad87f570eb8fc246d80c9bddef4b64c356d80e3b6137eca99b30f98dfea3ae57f3e4ffb102ccc98e4ef3495a992926a175ab9e7763a966cdd8f6ccbc1e3e878d4eaf2fc8f3a91f86fd300b07e190e27f148e7fa3ffa0aba62ae3984e7ef65b7f5f93a6b417edf41d87131eab5efbbcb742659dff61defd52c69e6f862d7a5f84d3b00c67e1fcebf1e739b4c69fd654e12e3896f0692a6bc28c4f6af0fed868bfe4b3cf495a3f659f1a06e659df872ce461180a7a8de86f49a33f0e15e9afa3fed2ff59caf189da8a8a76e08fbcebfe41107dd2701f8dcdf584cf81dfafa00acfec9539b75bfca4cdf3f382ee994413db784123b0122fe3d56ffc3fc018f0389cc76bda8b95644314bf22b2dc1dba55f344bbb403c44beec3bc5c74eff1262ada99dcc4db78477ba29b781f1fe8f5489f9ee2b37f8e2fbf19ff89aca30b9c0cc2637c8d6ff1cdadc677b5e19746137d906f83ae1d7469d48a53ddef8f49e86cb0e5cffd287ec695b84a5ad7e27adc087b61356ec62d9aff9cff719b6ddbe1bfbbf1eb8a7362966160b7dd8a798a26be776312e8ccf8e50a99f60d7142a7c518a7713fce02698907f1301e91eee37812e7711179ff11971c997bfabbd7d94071f859d28ca7b13da54cd8eb66df0f9a7f69dfef60a!
92a28bf132ee2593c270ba67140dab39887491cc6229c913e3caf2ee9d398b!
d1fc7bd5
87de1cffc4b3f7146ffc75d12be39eeea42588f35e93e8eb91fc7ad46d3b1dd849dc6c6a271a4ef909fc7f94e37eb27ff9ba07e911f342db90a76e33dc7d301ac77bfb4c77c5df0fc7bb579f73b4b139b261e87f7a66d2e9acbb0d75c8515d275cdfa6fe25d731bef9bbb386e6814bef2f45f940354a06efe99f7e6a1b96e1e1bd73cc5acb96a9ec376f3d2bcd2f83f36afacffad790f59f3d17c86b2f9888d79ff59e86443a246cd4a34dda9289a66b55951a3fefb5fdb1bdd7dd7b55645b3a663b3de6c349bcd56b3ddec34bb247bcda499d277fbcd8cc77f9d741f3487cd5173eca7cd89d13f4b3387e07fe4b811adf7d7dd7bf75d7ca7b9f04b7b9a23ba597456529b15aae1338ac069731a66f188a2bf6cb668f4cf9af366d05ce1f95c933539cdcdbb66d81cc6bbaff24f2acafce75d315788f917f1ff7e6aa15cf04fb4d269caae4792615310ad52ec479407675c7f4ea8aae4e6dcdf376534febc1937d59f2075ab29794d6b55493bb54bd2f5a670fe99b44eadbb5aefda5dda412d8cf933f4b7be0d6d6c9bb6a5f3ca16edf017ed85bf83fe1f23da5eb6577f8aff9d0dd7ddc99056d1ee791bafa5ac7fcaf5658eb9dcdefc59da49ff6d7bd7deff58d7c5ff79b7c740f5682fff3cfd8801e5ec54d6efd0eb4f5574d63efcc9fa1f357648bc66e2f7a9f4ac93e64bfbf4!
27e97d6e5fdad7f6ad7dffbe6a91fffff3ef7ff95fd6028814</data>
+ </image>
+ <image name="image1">
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154789cad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7!
ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e05!
82c261e95f8bfc04f1a1e8bc5c4dfe0a19017a725d8c60000000049454e44a!
e426082<
/data>
</image>
- <image name="image1">
+ <image name="image2">
<data format="PNG" length="173">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000007449444154789cedd5c109c0200c05d06fe936812c10b2ffdd85d25385b6a991480f053f081af0291210f828c5a9d9c4de96cd2b9ad9eb0000660e2fe0c2519839c4f70c4c446d5e6b3538cf928245e4b2f6f014acaa8fda1d4fc1a5741b22079f9d111d96ea8a912c78c10bee64e60719f57e9203ad452a040318f5f70000000049454e44ae426082</data>
</image>
- <image name="image2">
+ <image name="image3">
<data format="PNG" length="210">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000009949444154789ced94410e85200c445f89c7367f61bc775d2848a42860ffced9548bbe8e13043e1d928177f481a123dc2b34f6f47a3de2b865a8843f4001982a0b3d5f62c58300aa1ad70550449ab9d507a773a8a4ba4f92a2df333c64c63bebbd82e5b8addecbcc7820eb4266c639745dfa80f36faf66c66fa19c3f882fb470ec05cdc0bed07893f68e171492635f686c3eeff6ba3c8fdd366dc4c0452cf153a9590000000049454e44ae426082</data>
</image>
- <image name="image3">
+ <image name="image4">
<data format="PNG" length="217">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000a049444154789cd5954d0a802010859fd14668e18de662d222bc98376a21b4ac451992c66469e0b7f187f1f11c47052a218e762daddbfb9e99f6568f80b5364b8588ce35440400e80a398ce8f99034d2292cc37c8ebd530feb583a05e954341f8a027b2a7d3a1f09bf854dc5d5d953aa396e4f38cab199e2d2e108abe156f82e30977fcb4d8ff942d75dbebed2e143953a93f6caad3d6111f44b7d4f820ff9c0069bb51ecd122066740000000049454e44ae426082</data>
</image>
- <image name="image4">
+ <image name="image5">
<data format="PNG" length="725">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000029c49444154789c8d95ad76db4010853ff718cc3289d950d06136344c98c362964087256f503f426161021be6b2842550612e8be14299496c866dc14ab2fc77da2192665777eedc3b5af53813afafaf414448d3742f6f6600a82a005555912409575757bdeebefe396011613299b440876b4d946589f7fe68cf596080cd6673047658485571cefd3ff02900333b2a70aa23806fa792799e07336b9938e770ceede9dde82f2247fa9e65acaa244942599688486b54374eb5ff4fc6105b3c9c882e6853ec9c142719376c4e31ede655756f42ba71a40dc06ab50a5996311c0ecf8237467e7e7e022092309f5fb7787b8cdfdfdf83f79efc2347668288b40087d786695994e479ceb6daf2f0f01066b319d7d7d7bd5e1774b3f154c5163580d34c019ca408020e7ce159afffb0dd16a81a1717198bc5224ad130bd9c5ee2d2145503538e6c3103849c4f3e78656a53d2af94e79767fc57fcfad4946c7411419f9e7e85b228c3ffc457f80aa3300a12248cc228acd7ebf0e3fbcf301e8fc360908524494236c842bfda56dcdddd9c75f73052522e999223cc98311e8f4964486905cfbf5ea8aa8a7490d237c0fb22cea31988106b48ed3638!
5c54dc14c4f160dfb9c133b4217fd88019e97018d76b77fa6551e045a29e66b4be39882ed69d38031520e604f0b6c5886788df6c5a4f1cf5b835096b00b17628148b35746f673b39d278da0945e9236065e705adc976371a200a76b8e2302ba9fb6c7a633299f20debb06cc96a7cb4faba07ea9a6d35680d58cb39180c582cee2263ef7d631588412540159d338b30d2b0b21d183bcd31430496cb25f3f9bcd7cfb28c8fb70f7ebfbda16ac4f347d81b3ee93ccb0eb2edb39ea6e572c9e3e3630f3a87d06ab50aabd51bdbfaffa5686dcace99dd5f0354cb785f1993e984dbdb5beeefef5bbcbfd1f69e0c0f8448030000000049454e44ae426082</data>
</image>
- <image name="image5">
+ <image name="image6">
<data format="PNG" length="172">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000007349444154789ced92c10e80200840b1ef661d1cff4d876aa888a17669f9360f283ed80060f159425f3a71f53602e08e992b098801d02854176ae47f21ce1fb5b05d38eddc9060d0f11379635b3bc92bd518e239a943ec1d5ab7785cee107be4b215af4091f894de47181ecea59ede9ec59f380062ac28b10fe74fef0000000049454e44ae426082</data>
</image>
- <image name="image6">
+ <image name="image7">
<data format="PNG" length="173">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000007449444154789ced92c10ac02008406ddf2d3b84ffed0ea3586a26d165e0830ea53e8504487e4b910f5489f19ea5a3ca0f8a896365b306c42dd613c649bdc2598316136219f0f936c0a2ef00d75a62614d3ab22996f2a362ffa337c5ebede962aad1a2e84aaaa2f750dd12748c0fd0ab9324677800596e28b1bb69e3510000000049454e44ae426082</data>
</image>
- <image name="image7">
+ <image name="image8">
<data format="PNG" length="187">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000008249444154789ccdd341128020080550e8e02ebc38ad3273503e48537fe3e48c4f2425fa28e29c6f39920bf9276cb60185358877611388c2576418cda015f520b4e6b55be109dc0622b8e22acf31056e18dfdff80606aa551cc63564c4dcf80cd0201d577a5c85a8845fdc025ea5307afccd07e23a1df283ec2b37d9ad5fb4dfefd49cfbf72facb651b89d0000000049454e44ae426082</data>
</image>
- <image name="image8">
+ <image name="image9">
<data format="PNG" length="248">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000bf49444154789cd593410a83301045df488ee51dbc8c3ba98bf46a9eabd385350d266362444a3f0c4266fcf3f824f06f12402b66da8c55f3de2212cf9d92cb98c0ba2d7c4544cf9a07638bbad53c4491235ecf7cc1623697a92540c11ff4fda75275015d24a9389e7d6f53df4fe4ccab323eea0f03c0c4b2a0712ce6add89b59b7661c3be095985f261679ee4ebcc22c9788551fe6a2cbc4969a894bcb6f23ee361aab62e252c57294dfbfb610bbf2c897b8a46cc6677eaa519571fa087ea83762da9aba45b637520000000049454e44ae426082</data>
</image>
- <image name="image9">
+ <image name="image10">
<data format="PNG" length="270">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000000d549444154789cc5955d0a84300c8427e2a90a9e6c8b0f4b3dd982d7ca3e58d7fe4cd0ba5d7640024df265da0a057e2439c9eb8d9eaa8841a0c9aad8c82ab32f9c425be1e30e0dcf00c00308f0b3a7a07410a9d7142e00b42c5a5fab696b979b1c837fc0c316b6e4165b64f78d716359919bdc4570de47c04732dd5e5bcc35f0c97762ae787936dccf7513577e79f48c4b27aa0f1327b240f5117fcbe348aa33b6e0224b054d0746b8025e2e3b3e73cde0dd1c97f02e8ed9d0af1db381224bdf33eee698a934a0f617b45540d00bcf4ca08fc0dff406e325c198b16b67fb0000000049454e44ae426082</data>
</image>
- <image name="image10">
+ <image name="image11">
<data format="PNG" length="662">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b0000025d49444154789cd593a172db4010863f670a56ecc42278d0653693a0c21c68d6c2e60df21a818111349499c254a8329b55f0e089ddb15ba602b79d6692d699b6d399fee86e67e7db7f77efe07fd3e2c74bd775b3730eef3d5115002382b5166b2d5757578b1729bf02b76d3b0f8703b92d58aed7600400ef1ce3c70306a8aa8aebebeb57c117dfa06ddb525dd754efb600a82a49138a123532ec3ac42b9bcde655ce2ffabe9f87c340fde13dcb4d8daaa24e48ee12c6823808c107969b1a8a9ce3f1f8aa515c38e7c8ada5aa6b00c45f129c67d223938c88e6c860d118b1d592d139baae9bcf83a78965b5465134801b1d2e1f4945c0e350096408ea154490c2e0bd3fef5853c2e486a0019f4d84f58418418362b0408e8b23c924501093314dd359f01b809814112025144015f1964c0bbc1b484b07e4688880c029ebd78e4141f5b434fd76864c053f1e084b0f8580265440634044ce838bbcc03987a61350a3a2285e1d5a4414d0708aa598082162ad3d0fb6d6e287cfa498508d274050447370428c91af8d10fd4481608c390b5e00dcddddcd8e80a9de420248e804840856f03e02907d729465c9ba5ae3468731e6a79fe50260!
b55a6102c4ee40a6894c33f2cb0cb106512814f8f899b22cb9b9b959b8d1f1f8f848d334b46dfbe29bfe5eadeffbf9783c323a871881ecb4200d1151a8eb9aed76bb00188661eeba8efd7e8f3186ed76cb6ab57ae2fe591b5dd7cdde7b628c8808799e63ada5aaaa67b9bbdd6e6e9a06ef3d755d3f29fec7eafb7ebebdbd9dadb5735996f3fdfdfdfca2e3dfd5c3c3c3dc340dd334b1d96cfe1e184e63dceff7a494fe26f61fe90bbc4c5e59b8ac895e0000000049454e44ae426082</data>
</image>
</images>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2006-07-13 16:31:49 UTC (rev 830)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2006-07-13 18:48:42 UTC (rev 831)
@@ -54,7 +54,8 @@
self.layout.addItem(self.layout.spacer200_1)
self.layout.m_del_button = QPushButton("x", parent.population_box_widget)
- self.layout.m_del_button.setMaximumWidth(20)
+ self.layout.m_del_button.setMaximumWidth(40)
+ self.layout.m_del_button.setSizePolicy(QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum))
self.layout.addWidget(self.layout.m_del_button)
self.layout.spacer200_2 = QSpacerItem(20, 16, QSizePolicy.Preferred,
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-07-13 16:31:49 UTC (rev 830)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-07-13 18:48:42 UTC (rev 831)
@@ -251,11 +251,7 @@
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
self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("FillDishSig"),
(dish_name, petri_dict, ))
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-07-13 16:31:49 UTC (rev 830)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-07-13 18:48:42 UTC (rev 831)
@@ -248,11 +248,13 @@
if max_updates < 0:
self.StopManuallyRadioButton.setChecked(True)
self.StopAtRadioButton.setChecked(False)
+ self.StopAtSpinBox.setEnabled(False)
# BDB -- hack for pause at given update
self.m_session_mdl.m_update_to_pause = -99
else:
self.StopManuallyRadioButton.setChecked(False)
self.StopAtRadioButton.setChecked(True)
+ self.StopAtSpinBox.setEnabled(True)
# BDB -- hack for pause at given update
self.m_session_mdl.m_update_to_pause = self.StopAtSpinBox.value()
if settings_dict.has_key("WORLD-X") == True:
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogCtrl.py 2006-07-13 16:31:49 UTC (rev 830)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogCtrl.py 2006-07-13 18:48:42 UTC (rev 831)
@@ -18,7 +18,7 @@
if (textChange):
self.setCaption(textChange)
self.SaveToFreezerPushButton.setText("Freeze and " + textChange)
- self.QuitPushButton.setText(textChange)
+ self.QuitPushButton.setText("Autoclave and " + textChange)
def DownQuitSlot(self):
self.QuitPushButton.setDown(True)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogView.ui 2006-07-13 16:31:49 UTC (rev 830)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyQuitDialogView.ui 2006-07-13 18:48:42 UTC (rev 831)
@@ -60,7 +60,7 @@
<enum>StrongFocus</enum>
</property>
<property name="text">
- <string>Quit</string>
+ <string>Autoclave and Quit</string>
</property>
<property name="toolTip" stdset="0">
<string><P>Quit the program discarding any unsaved data</P></string>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py 2006-07-13 16:31:49 UTC (rev 830)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pySessionCtrl.py 2006-07-13 18:48:42 UTC (rev 831)
@@ -29,16 +29,6 @@
self.m_session_mdl.m_session_mdtr, PYSIGNAL("setAvidaSig"),
self.setAvidaSlot)
print "pySessionCtrl.__del__() sending setAvidaSig(None) ..."
-#
-# Why does the following command give error:
-#
-# "'NoneType' object has no attribute 'm_avida_thread_mdtr'" in <bound
-# method pySessionCtrl.__del__ of <AvidaGui2.pySessionCtrl.pySessionCtrl
-# object at 0xd734d20>> ignored
-#
-# self.m_session_mdl.m_session_mdtr.emit(
-# PYSIGNAL("setAvidaSig"),
-# (None,))
print 'pySessionCtrl.__del__() done.'
@@ -61,10 +51,6 @@
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
@@ -245,9 +231,6 @@
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-13 16:31:49 UTC (rev 830)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-07-13 18:48:42 UTC (rev 831)
@@ -9,7 +9,7 @@
16-Jan-06 Get file system finished -- Make one big database file?
-07-Jul-06 Save organism box is not model -- fix it.
+11-Jul-06 Fix problem where user drags in in a new population, clicks on freeze and then clicks cancel the program loads the new population without saving.
Priority Medium
@@ -193,6 +193,8 @@
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
+
+07-Jul-06 Save organism box is not modal -- fix it. -- Finished 11-Jul-06
************Kaben******************
More information about the Avida-cvs
mailing list