[Avida-cvs] [avida-svn] r749 - branches/developers/avida-edward/source/python/AvidaGui2
baerb@myxo.css.msu.edu
baerb at myxo.css.msu.edu
Wed Jun 14 10:08:32 PDT 2006
Author: baerb
Date: 2006-06-14 13:08:32 -0400 (Wed, 14 Jun 2006)
New Revision: 749
Added:
branches/developers/avida-edward/source/python/AvidaGui2/AnaViewerIcon.png
branches/developers/avida-edward/source/python/AvidaGui2/OrgViewerIcon.png
branches/developers/avida-edward/source/python/AvidaGui2/PopViewerIcon.png
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/pyGraphCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyLiveControlsCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyNavBarView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Changed menu item Control | Repopulate to Control | Restart Experiment and
fixed default file name in that contorl to @default.empty
Changed tool tip on on graph.
Check that program pauses before freezing
Changed viewer icons
Deactivated some menu items that don't do anything
Updated to-do list.
Added: branches/developers/avida-edward/source/python/AvidaGui2/AnaViewerIcon.png
===================================================================
(Binary files differ)
Property changes on: branches/developers/avida-edward/source/python/AvidaGui2/AnaViewerIcon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/developers/avida-edward/source/python/AvidaGui2/OrgViewerIcon.png
===================================================================
(Binary files differ)
Property changes on: branches/developers/avida-edward/source/python/AvidaGui2/OrgViewerIcon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/developers/avida-edward/source/python/AvidaGui2/PopViewerIcon.png
===================================================================
(Binary files differ)
Property changes on: branches/developers/avida-edward/source/python/AvidaGui2/PopViewerIcon.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-06-14 13:18:54 UTC (rev 748)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-06-14 17:08:32 UTC (rev 749)
@@ -13,6 +13,7 @@
from pyQuitDialogCtrl import pyQuitDialogCtrl
from pyDefaultFiles import pyDefaultFiles
from pyButtonListDialog import pyButtonListDialog
+from pyReadFreezer import pyReadFreezer
import os.path, shutil
@@ -107,8 +108,8 @@
# PYSIGNAL("doNextUpdateSig"),
# self.updatePBClickedSlot)
- self.connect(self.controlRepopulateAction,SIGNAL("activated()"),
- self.RepopulateActionSlot)
+ self.connect(self.controlRestart_ExpAction,SIGNAL("activated()"),
+ self.Restart_ExpActionSlot)
self.connect(self.m_session_mdl.m_session_mdtr, PYSIGNAL("addStatusBarWidgetSig"), self.addStatusBarWidgetSlot)
self.connect(self.m_session_mdl.m_session_mdtr, PYSIGNAL("removeStatusBarWidgetSig"), self.removeStatusBarWidgetSlot)
@@ -429,17 +430,19 @@
else:
self.emit(PYSIGNAL("quitAvidaPhaseIISig"), ())
- def RepopulateActionSlot(self):
+ def Restart_ExpActionSlot(self):
# If the user clicks the repopulate button pretend that they double
# the default empty petri dish from the freezer
file_name = os.path.join(self.m_session_mdl.m_current_freezer,
- "default.empty")
+ "@default.empty")
+ thawed_item = pyReadFreezer(file_name)
+ self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("doDefrostDishSig"),
+ ("@default.empty", thawed_item,))
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("freezerItemDoubleClicked"), (file_name, ))
-
def addStatusBarWidgetSlot(self, *args):
widget = args[0]
pt = QPoint()
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-06-14 13:18:54 UTC (rev 748)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-06-14 17:08:32 UTC (rev 749)
@@ -148,6 +148,9 @@
<property name="name">
<cstring>MenuBar</cstring>
</property>
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
<item text="&File" name="File">
<action name="fileNewAction"/>
<action name="fileOpenAction"/>
@@ -171,7 +174,7 @@
<item text="&Control" name="Control">
<action name="controlStartAction"/>
<action name="controlNext_UpdateAction"/>
- <action name="controlRepopulateAction"/>
+ <action name="controlRestart_ExpAction"/>
</item>
<item text="&View" name="View">
</item>
@@ -241,6 +244,10 @@
<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>
@@ -296,6 +303,10 @@
<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>
@@ -531,6 +542,9 @@
<property name="name">
<cstring>helpContentsAction</cstring>
</property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>Contents</string>
</property>
@@ -545,6 +559,9 @@
<property name="name">
<cstring>helpIndexAction</cstring>
</property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>Index</string>
</property>
@@ -559,6 +576,9 @@
<property name="name">
<cstring>helpAboutAction</cstring>
</property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>About</string>
</property>
@@ -667,6 +687,9 @@
<property name="name">
<cstring>windowZoom_WindowAction</cstring>
</property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>Zoom Window</string>
</property>
@@ -678,6 +701,9 @@
<property name="name">
<cstring>windowMinimize_WindowAction</cstring>
</property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>Minimize Window</string>
</property>
@@ -687,14 +713,20 @@
</action>
<action>
<property name="name">
- <cstring>controlRepopulateAction</cstring>
+ <cstring>controlRestart_ExpAction</cstring>
</property>
<property name="text">
- <string>Repopulate Dish</string>
+ <string>Restart Experiment</string>
</property>
<property name="menuText">
- <string>Repopulate dish</string>
+ <string>Restart Experiment</string>
</property>
+ <property name="toolTip">
+ <string><P>Restart experiment with empty petri dish</p></string>
+ </property>
+ <property name="statusTip">
+ <string>Restart experiment with empty petri dish</string>
+ </property>
</action>
</actions>
<images>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyGraphCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyGraphCtrl.py 2006-06-14 13:18:54 UTC (rev 748)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyGraphCtrl.py 2006-06-14 17:08:32 UTC (rev 749)
@@ -7,7 +7,7 @@
def __init__(self, *args):
QwtPlot.__init__(self, *args)
- QToolTip.add(self, "To zoom -- pause run and use mouse to select an area on graph to magnify")
+ QToolTip.add(self, "<p><b>To zoom in</b> -- pause run and use mouse to select an area on graph to magnify<br><b>To zoom out</b> -- press ESC key</p>")
def construct(self, session_mdl):
self.setCanvasBackground(Qt.white)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyLiveControlsCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyLiveControlsCtrl.py 2006-06-14 13:18:54 UTC (rev 748)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyLiveControlsCtrl.py 2006-06-14 17:08:32 UTC (rev 749)
@@ -27,7 +27,12 @@
self.connect(
self.m_pause_button, SIGNAL("clicked()"),
self.clickedPauseAvidaSlot)
+
+ # Before freezing be sure the population is paused
+
self.connect(self.FreezeToolButton, SIGNAL("clicked()"),
+ self.m_session_mdl.m_session_mdtr, PYSIGNAL("doPauseAvidaSig"))
+ self.connect(self.FreezeToolButton, SIGNAL("clicked()"),
self.m_session_mdl.m_session_mdtr, PYSIGNAL("freezeDishPhaseISig"))
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyNavBarView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyNavBarView.ui 2006-06-14 13:18:54 UTC (rev 748)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyNavBarView.ui 2006-06-14 17:08:32 UTC (rev 749)
@@ -111,13 +111,13 @@
</widget>
<images>
<image name="image0">
- <data format="PNG" length="2166">89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af40000083d49444154789ced965d6c1cd515c7ffe7de99d9d94f7bbdfe88d71b6c123b350492b4e13340534844092204a2d2d2873685f6a55511a52d502168d5022a0d1105aa3e205024d440118516a9a050a08a8302095875e4382190388eedaced6ce2d8bbeb9dd999d9b9f7f481354a281508a9ea0b7fe9e8ce9566747ee77f8fee19e00bfd9f459fe7a3dede5e239148c4b4d63600b22ccbb36ddbedebebabfd4f00d6adbb36bd62c585975ebefaca65cb572cef1124b3c2b46dcb22101154a851ab05810afdc2c1a1fdc3834383075ff9fbdf76edd8b163ea7303343636e2baeb367cf9d65b6fbb6971f7791747ac0831989818600d8260800800181a520a862012c48665515c854a14a6f2fd8f3df6f09fb76d7bbaaf52a9e8cf0cb06cd9f2962d5b9eb8a367f1b24b49082622822408225b9a463c547e42a9c0545082344108c164183553d82e42ed1986884ac99284505ab12a4c8ff7fff887b7dcdfd7b7e3e8a7026cdc78d3d2dffdf689fb8561a749486870bc16786dfcfe60c63564cc4f35722dd02ca5412c04c0820166a5439206211a89503c1155f164836b9b56516be52985596173f1f1471f78e8a1071fdc797a3e79fa66f!
d861b7b376fdeba458568508c983b37d3633cf7444fe2d73f6d8cbef8ac55b87203478d2681532cec50520862d38ec194364cc3264346692e1260944eca5967c60a1ca7811447416645d528bc62ed555f65e58dec7efbedf1ff00685db020f2e49f5efcbd509166a752e928ce16cea955dc78707286e6b29d5ceeea6671f93a54a74be4557c049e0fb325c9562402614821a4c1920c7a3db69736d356da2107490651ee0e72e6ececa916210d82b2e6d65c73e545bb76ee782d7fec980b00c63cc05df7dc7375636b36373b796aa15b2d9d659971862541abafd3200841822d098ee55a95d64c81d6306c0b441244202249028295ef5167b599cbb24a29cf228e986c99292a1767737e508dc168f9e02777fde25bbb6fb8fe8f67f4c0beb1f1479853ebcbf9e35da68812910121084402009160b01586a23ae1906148f896e24436c362c621cd048a0aa86482df8dbf4f5c03a7c3283afc6648925a2a12cc1ab59a031911f9444b6af7b95d999bcf708028d6599e2c74466482200488058429191a421069105330576537f0c854041d8bb2a998bcb22212125eb50a95b1f41f8ce7c5341fa7b4d98847dd3bd4cb4dfdc66e0ca0432fe0ebdd8bb8c76dcd7a65af13401440751ec09cce9fe848990d426b01410299dddba9e9b9a7a46ecb626ed555287ded7a4e0f0fa0c94e70ada!
583fdb616f695a64a8c35c21a0bdb204ff8942d26a0559449d7286d36e0b03!
986823f8
58ae1d04c75096cab9b2a4e2927848868ad3f0288e99a9f86252009440651faf597608e1c068d8fa2d0bb82d2837bd0facbdb05b382d79ea38967778571af0a3b1227a3c91035db56b163a362ebe165ba965983627bbb1629139b0a6bf5517f094d739117193922084023a9b58e02281a00048048b9e49a0d51909416136be42fbf86d0d90bbb788abd4bd7726acfebe458064c2d515e7c0e9b8641e15c48811342b90a5e86a9e3f9271179f11941a601ebea1bd8b9e5365effab3b299416fc454b28fffd35ac88c0b66d0a216cadb531ef8071f88323a149315e98eb427ae81da40e0c40b5b6ebe08a35f0969cc7c34b73b0bebd49c7a7cb64b005a14145edb3960a61d54326d1c5aa3029825814863450cdb4c1ca8fc118fe8064a8402387801fdcaddca04a3293545a6b02401f35e1b1c9d1c3d90567779b91495ef4d236b277fe83c888d0f1af6fe0e9b5ab717bec11e1441d64dbb2b86ff6bb6ae55b2f5376600f6a6d3978e7af44592ee289079ed2ba5c044f8e01a934a2a18fb11bbfa78dc97162a78892ef09470b71a4ffdd3100b579000610eeec7be5d54b56ad5b973f3a4103c926ea5e9043cc7330b762151fb2a7c8a1392862b8ce2c3ad04a89e7b69218d84351d380bbfe6646ef4a12c2603466981a3204300f26c7e581a59771b35e8feca80d77a24076b2815f7d!
e19957018400c27980eabebdeff4ed1bdaf3afee6ccfca63975ccdde3737216ec6d0d09ce5aed9227ee4dec0d3b248920d6d9a3ee6c240c8540aa652a8f42c65a54230334002cc3580857859be8df766f68a6bdd5530fc76c4b4c5232307c6dfd8fe97bf02f000e8f98bc800d09a6e6abee0de4d3f7fb21d686d5d7416389164ce75217b78088d634761c7e35cb96c1d54ba9545a54455cb625d2913271a20e2093048b10e85ef7b54f55d1e8d4d88b6482369669cc817513e72aafcf0963bef181b1dfe2780e300fcf959a00128afea7a7b8787f69d7feef24bdadbda5261a281a014b94e85665bda68ca0fe888afa9367280e8e9c705bdb95de8fc119a5c740edc23efd389916139911fa3d98a43b1a42dce4eb4515246415585f143a3852d9befbe6f7474f84d00d3009c8f4fc31040e8ba4ef9adfdfd6f253299f6cef357e60c82e0aa4ba11fa0e478989249764f16e864ac09854c0ef9641bcf5871aa0e0e90373e8edad424e95a8d626dcdb0a3124ed9516fbcb6bdffc1dffcecdee3c727fbeb95973fba8171a608401c4006404bd7d9dd176ffcc677367e75f5b517472276d42939e244c9070a79a852112208a02c0b685d80c8a1fd90cc2002f4c22e9deae90a0e1eecdff7fc0bdb5e786fffe02e000500a700ccd51dff448079450034d4231d8f27ba565e78d9055f3a!
f72bcb524d1d67b52f5cbc2062462d3004b32668a57ca7549b1a3978e2647e!
647264f2
e8d0d0c1bd7bcae5d208801280627dadd69bfe8c8aff9b043e1c180900b1ba337100b610221e8dc6929615b18904825ae057dd8aa3949aab27a902a80070eb67ed02509f94e4b3fc15130013805577c6acafa21e5c7fa7860ffbc8af3ffb00828f57fc79003e2e715ae034005d0ffeb4a45fe80b9dae7f030cdbe8df8fa444040000000049454e44ae426082</data>
+ <data format="XPM.GZ" length="8017">789c8d99c99224b70d86eff3141dc39bc2415526730d870fd5fbbeef0e1f4032b3f77d6f85dfdd28fc48aa7a666c4b50b5ea0b324126f013244bbfff3673bcbd31f3dbefdf9e9ee9f922cc84737a9cf92dbedcdc7cfcf35ffff8e3db7797cf4cfeadf299fcfbdfbe7d37273361c68ce49f097b9f3893f65162279c272ea4bf49dc0adbc424fdb3c461c2614ed98da2f0a5729975c2b3ca94cb78619cb814ff17033be9ef37957d21fdfd7b62ccaf520e452dfe5ae50eed6157b92faa09c79bc48db49f83b3bac47cce949b52fa878bc4e2dff7e0bc27797faffddd48b953cebcc4d7ab7f977bc9875f57761ef36d940bb07f4d2cfea2c6cf955ee2e9d712233e1bca55407e5f1263fc2231e2e7946be5b7c488d77662c947d8516e02e69727c6fb96ca6d90fc9b63e12ce98d9433b03915ce877673a4aced3e08bbd41ff32d264f4c98307e352a322f0cfdd5ccd023e643fc84f40f8b89251e6149b954fd233e3ef59f170edc8ef1b795eb5cf44246b971924f42bee2a875a217ba4a2cf18ad7e08c9cc487b07eba51ed647cda542627eb2b20bf3dbf21fcbf28374ef2419789319ee88983d538999f3914ce2726ed6d62e4f753b944bc42afdce4581f437b8bf7f351393a89b75f55ee747d3e27eec5dfd6c005f29929f7!
e0f80ecedb4ae61bdf9449f955d957d0ff476219dfca7aca8acc65785f59fffc360eef1b309f8a332afab66760ee21ed3624c67abf17ae47adc65bf49935593682feef94dd48e26396134b7ead57aee0cf48feb2362bb4fd52b9cae5fded5562c9bfbd50ae95a51e66c4f50b7a467e29cb518f0dc60b5cbf24dee672e012eb6304e6f1f1befbc291dba17f8c1f8776b3a5ac7a0f9bcab5becf81729b637d235f1d8747e263657de7ac8f4ce2637be54eb953ee33c443d64fee527b54d6f6f802ce5be839800b56bcbcbf95f59b979987feec35382fa0df1dc97f5eb1215ee85f7384647dc515e166f2c6122fa92ff9245f588f27ca71043d2e0e8cfe71419886f91bd11717f70cfb4b10bde661e86f4fc1dc8efa29fb4fced1523d8dc1798e7c07a9e779c7fac27e78ad5ca81e5795f5796a947b9d8f729e617fb6cfca25f66333ab5c65a83788479fe6b3a71cb0decc6e62c97f1c2bf7bade449f5cae87f92d2897cacbca35fcdb0f709e637efe4ab9c4f9c1be2b57982f1d0c8cf5eee57ce1b2acd1f9ee2bc70aeb6147b9abb1ff81f3613e7e9418f15b04e76e84fde451b900db4ab919a1dec9fb3bc7f1821e82b2ce279e25c6fe9e29b7daee9509ed740e4ee36d2ab7182fc87ee18aa1bf31e0a1bfb9502ec17e5bb9d17cebf3833f2ffb812b877c8413659d5f3856f65abf!
76c1837f5a4d2cf9f29fca2dc6b33bca84f1cc4362c94f7c12ae86f7898fca!
41c783bf
2aaf519f22c6e3ea88fa605e946b8c6f5ae546cfab8db2d7f19f9503c63752af1cf17c50efe713cbf3f4acecd59fd457e707ff764fd9ebf3887f18fa47c4bbe3f7c17e77a51cf53cf10acea33ebf9618cf6f2a77a8671ef9e987f9f92d651d2fc87cb878757a7efa00f3fbc2dfad30d75f6daf85dd309e957a5494130548bbe4a7e0788249f45c34b9d776f86b793cecbff0d7ba16e7fb28f12b3c575cccf754b9d5e78f954959ea4f1106a639e5a8bca0dc812de6175831d8cf307e4ccfdf2b0ffd47601732c9bf5d568ee020fb53d1a5f713bd177daef71dda077305937a45a29f72529fb07f5e83392388afe8890f1b199e0f725e2df3816d0976a4e7b30765aff554d677590cf5d16e80877692fdb7ac723daf1879dfb26685c97e4d984f33b493e8a50cac079c07647ed5e4fc8ef9cc29b7ca0b8931bed4c78aaf2b11e717d93faa9219e703895f55bb18a1879858fc19d17fd50c6ce5bc5fb5ae8ba8f78789513f441f150d6ce43c5179d777389fc8fb57ac0fbd6f3e825da1eb3d801971be13bd547168b72760469c0f64bd545d9175d89f0e12a37e8bdeabbeccf5bc2cfb1317a74eefb70f6057a2be841b70ea2febbdcef25eebb1d4b73a2f5c27f3a18dc4f23c893e6ae76af8a34ab9d1fa85f15dc11215ffd7e0b2c47dc848feeaaa1cee43f3ca7ade27592f75edb41!
e9b5570a9eb83e43e54b7ac4fd4ab4d70596bfd15bdd454367aff927cd69edb91ff45e536437d5e01f372813fbc6f2c09fd49f25ff7e5b07e25ffcda8d4f518e57cd14c8e67d83f64fd3679a1e7e538af4c39f68b3965af2ce3351c0e7d7e49b9d5e76795a3f6977adc54938a29eb59d6578c1c1fd407c977ec06a608ae28c37925287b65591fb11fd88a3f3edc3b87fbc9837201f6a2e7ae2c7be4cbde81877692f5d05555877a6bdfc03ec3fdd2be2ae7608fe79b6aa85f72fee8da5ae36945df5da016f74b8bf12379dc2fed0bd8377adf93f5d1757c7dc179635fd9294b3ebb7e60fa04d71a4ffa50769a8f0b65cd07497efa51ea3f561efa93f290bf5e9994a57ef26542d98b1e7b5795d0a387ff6260ba05d7a5ea53ce632cc71ef777ebc07c9d044b3de7742a7bd17f5f5715fc8542b90647f8abebe1fed7827d5f60ff92f5de37437f5a060ffd6956b9068743e541af9d7207b60d38f997fdaf6fd3f307cadadfcbf9a1e7db37c6b76b60ef70ff8aa2efde0fed7e3931f4fd0eae1bbdbfae8287e73de61f867cd96d30176cd42fd1631fab56fddd8187fe41d653dfa5f61d70caf703b8c9f07b223d817d89df536ca65c81bdd4c7be1ffc854a59d76f70caba5e43548efafb2529ebfaa35df0301fba498cf73b55f6dabea7acf127c4a36f46987fbc57d6f70947cab9f!
2beb2d3fe77ca7adfb5d05fcfeb15f56345b9059b5b658fdf73ecba72001b9!
d7fc81de
2adcf87026cee12a3fed4ca157e9fb55bca84df5fcd93b22fa4be9847306fc8b27e769eadb1a466acb7c146b68e6df2dfc086f65edacfecb9bdb0976a57f65ac6bcb1b7f6cedeb33dd847fb649fed8b7db56f622ff6dd7ea4f63bfef669c776d6ced979fe2cd845bb243e96ed8a5db56b62eb76c36eda2dbbadb66577ec6e6a5fe56f7b76df1ed843b6237b6c4feca9f818d9cce6d68915b6b495ad6d635bb6c6d6c61a93da739b1932de04134dc7164d6fcefef461ceffab8f0bf8e01ef071997c5c7df5a1e3fc151fbf9887b93637e656edcedc9b07f3689ed41ecdb379996abf31afe6cdbcdb03f3613ef8efa7198b8f593367e6c516cca25932cb66c5acaaad9835b36e36cca6da86d932db66c7ec9a3dfeec9a7d73203e0ecdd1941d9b1373ca7f61936f23934d596e9c294ca95618fc46507fd58769a6f5605ab2ac82055683e8810c11790a14d93aeae9ec57faa0f3693dd0055db20a8e590d47ac8913baa26bbaa15bb53bbaff39b7f4408ff4f4a71ee8995e38fa290ff44a6ff44e1ff4c936a6599afb556ee9713a9734ff7f7c2cfc4aa7b438ad4b9dc7957899f631f1b244cb98c7b43e68c5dcd3eab41e688dd6cde7a007daa04ddaa26dda11dba53dda97da72408774a4764c2774aa7a59e0cf1c8d286315ecaaedf315dd5141a5584535e1fcd87aeb8d9a35b9a769!
bd78efc3b41e7cf0fe8b7e0e654f88bef33ddb197fcefd85bf547d3c4cf4e1affc35aba01bf4e06ffcadbff3f7620ffed13f898f67ffe25fd5defcbbff98d687fff4635681eac1cffa393fef17fca2d8925ff62be263d5aff975b50dbfe9b7a6f3e2b7fd0e67f0438c73c93e76fd9edff707fc39f447fef8973e4e7ef2b1cc4f7ffee0635f7d9cfe251f239ec758f430a6e59fe6011f99cf798b29d89c2f7de5eb697df8c6b7ac82dd410f5ce64da0e0c54288017b6d1fcec2b9da45b80c57e13adc845bb61bfe7617eec34378147be26fcfe125bc8637b5f7f0213e3ec338ccaa8dc35c980f0bfe1a1616c262580acb6125acb2adf0b7a5b016d6c386da7ad8141f5b619b23221676c26ed80bfbe1201cb21d84a3701c4ec22947649696c3289c868c2fdb2e141c89a350864affbf19c734349388f2df8dd0f2d67610cd4452d1f0371f83c474cc2b4cf3122347532c94bfcaedc447ec62afc647f478c63e96a08f78fe536e8fbfcee38b8f8b1f7c7cfe90db1ff4112fbfcce34a7c9078e9d2bb7cf571f0d547bc9ed647bc89b7f12e1cc5fbf8c07fefe2637cfa5ffa88cfe2e325bec637b677fe7cc4cf388eb3718e6d9e3fb371212ec6a5b8acb61457e26a5c8beb6a1b71f3fbbffffeed3fe1665105</data>
</image>
<image name="image1">
- <data format="PNG" length="1175">89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af40000045e49444154789cad976f6c535518c67f172db0761d97c4b1db328debaeae0c42bb946d6c66ccf941044460084e867c4112d80796cc64882108311135c644139d891213c240378d280cff1298fc9940611d9959d7f50f4ad67513d8655bc712428e1fea1a62d6d9bbee49ce9773cfb9eff33eef73de7b2e4208f48e5f0e1f117d17dd622a7bff3b746f180a044578f54af1baaa4e0b8119e880d7db254e5c3e8f2f10e6b999e978bd5d42cffe89f070a207ee2b6e917d5f422972499aa6097fc0cfaec0cfacecd4783ad7ca99ea97190efa0184ddbe409a7602f3f7bf49933062dbb1455cee7d9f32e3763e76ada37fff26c8b5c6d7298a65aab1011297c0f27d8b945f55c9f9da3aca8cdbc97639918746e9b0a91c712c8c05cfb220cbf294b3874914d0344d64bb9c3c52b58e0e6f3b6373d3e96e3bcb266994338b166336cf21dd644a2536308902b22c4b8a62a17ced460c9e10dd6d67317842f8026120967daaf24f4a609c849aab925f5589c113628334ca9e851900a49b4c29cbffbf04c6492c59b582fcaa4a3eeaf2b1e1ee3caeedd94f7f5f044dd3523e8649f701835561e78227b9e7cce15c81953d0dfb38f4ca367e6d3!
c9a128984267c10b22c4bc5fd3e713110e6d8ec116ad66f23dc790dd5380fc3dbef71f2af5e51f6d27accb61cdd259184482e81687dadf874d62c963cb382f0406f7c3edc798d4d1d7fd05e5241e98e5775fb22e912b4399672f3cb6f090ff4e21dfa2c1e3cf38508ed2515940fdee042c3e77a62eb2360b02a00fc7df83bcecd59cef3854fb1f5b537c89fb193998fcd8faf1b0e86747922690279a6d8f1cbdcbc86c6c797d33d788b7317ced2e3f772c01002c07fe122dd83b7f4c44fde039aa60977cb0f9cdab7178bdd89bc378dfc193b517355c67c01cc5f1fa275eea3d8d6ad4251926fd1492b20cbb2545cb2148bdd09409179370063be00574f9dc6ddf21b776c0af2d0a82e23eaba0f986d3992a3ae863eaf8796c62fe8f17ba9befe13056da759b26a19738211b40ca39e57265f8271689a26c67c019ade7a877bce1c000c9e98073237afa1c0e142cffd409702102b859661c4515783c113c2e009b1758115b5b418d07f3fd0adc03886832171f5cfeb447fbf4241db699a454c7a475d0de51515492b90542b9e08665b8e9477f3b6300fdea0b5a402f5dff98e0f3e21cf94219422d7f49e8289a014b9a4835d614c871b0138d07e9ce6b4013eacae225a5f2b92f95a4eb9041033e4dd2dd56c9c3dc2dabc62cad76e24d2df0740b0e15052e548490100c3e032761!
7acc6ba68717cee7666336a69310bf75e225a5f2b2297ae24cc322502b37ff!
c8a23b21
bd3521700adc79a181ebe137f7e69e5430c79fd74f6f812be23a51244eb6bc5c1aed81db1396d80992f2ee79b676b9065593a71f2b81827f3846a27dd649ab03fa4ec81770b0bb1d89d94eedb45f67d092dc3c848340a10f783926541cd55276cd12913f007fcb41e6bc2612f606c6e7a3c5824d217cf58d33491e8fb90120188fd2ffa837e94ac58074c946922a44c0062193e98b11efc037d9a6503120fc2630000000049454e44ae426082</data>
+ <data format="XPM.GZ" length="9425">789c9599c97224398e86eff51469c55bd9183bc2237ca1b5cd415b4aa97ddfc6e60010706da97dd7d8bc7b33f023a2d4d3995d39a63ce427a7832076bafef6c797e3ed8d2f7ffcedb7c7277abac85ff2393d7cf9439eafafdfffebbffff37f7efb7d547d29ffc6f5e04bf5fb7ffcf67b3efa92bf84715d37ad4e981ae7b61b4c5807c654776d3b61fe6aac75d7a409c7e184ebd1383578bf36ae9bbaed4dfea171d7749deda7a7c654d8e47332e6a6198bad7f37d6a64b435b7f6fdc37a9cb267f65c2cda8e993edaf0a6e2bec47cbc6e346bb91c97b73eebbf184651edc32f4113b7fd3b44d67fb91e9d7b4b5e0bc7460dcb5a304796bc6a9ad93c923b34f430d27acdf03b7a3aeb1f5df8ca5c887be785fbb96ec3cb268dc771d993cb5fdda613d1cb3d9f7c83935264fef8cab96600fb5f3b6e33ac31fb20d6eaadaf4e55d705711993cf3475b1c34367f05d3a76dca7ad8e7c4b84d63b6fd68d3b82bf6b6e7d9f46d535bd5b0df31b84ba933867e298dc8f60f9047cdc8f5d900b77e1ec673ee064d6de719821365f3a742df5cb7fedce2afd55a204f03b8a9a1bf42bea694618f05e33e8d92c55734ff77c3f23ece736e5cc2bb41bcf7606ab2c54378316e9a5cdbf9781d9c86adad0f58dfd67d0dff5e1977e5bc66!
5fc5fa893dec3cc1fcd1e5a6afcd1f34062782bdf32ab8b817ebbf1b4b5bc39e6af9d2695236f98cfdfbc2669f7036e1349844bc9d77e02c886feec05ddfe0fc8fe0c4c89f68f1544e471e8fab601a30e27bdfb82211db2f9a7dd3a8f57cd70730f58afd2c3ed298aa16f17e6b5c93b071b6784f0dd519f9f56adc96fdcc3e79c9b9e98c7964dc5185fdc9e221251ab1f997979d594c1f7e36ce94c4ec25902f5d6a2dbff8094ce38cfa65f191b49beab70ee6acf63ce37c7dcaad9d4fe284694039a31e58fcd130b9fe7408e6beb7f5d1ea01555dc67983d50b2ad505f58277c05479fc91f1b84480e91bee9d15f6e62330950a65fa1d83f3a0b7fca4d6b9ea115f561fa8c4770bfb7e183779d49bfe3dced33289c53357c6ddd49f82fdbb620ed41f8b4f4a2583108f4be0b2c2f4259cb798ab47fc983d89ba86506f333855e83fc1e293b8eb5be4d30998456cbf60fe2bca09f6cbd7e05ca9e52759be92e6bab7fccc37ce2dcea7b0673f7d5f6fc1b956c497e5030f38f5c83793c7c3d4a29fc81c3833f461cb07ae38e37cbce22c3dec3776d61ef1f00ace19cfe5d059c5e297207f440341bddc06177fe2bcb7ce8cfda4719eca6b9d7d7f857ee33637c88f3530371e3f0fce7d8ffadd81b3623fb67acf751efafee24c904fcf6071fd24388f603fb2fecb4dd107feb778e3!
36d58c783e05d318fd55cfc022b0175f1aa75230b1bfc55b89ceaab7f7e5c6!
99b15f84
fd3979fde63d70f13fe6119b4fb8980ff5245f804b01c6fb568f583ac27c4227e0d4225f15f61119229f84c13a827c863ccd9dfbff65c6d82f3be7defc214b60adfd7dd8a7cfc9edb10996c69f9f3a97166a6cf1920732403eb13a57b0b73e3a8fddbf19ac43e823668f3c94d6f5b1fc28d9e4fa04cbd73c224d98bfb69c7b9c9f37c1c2047f3c80b582fc007dc65d87facf57e0e200cc7b56ef4a70d63e0f9d8295dc5f66bfdc4a86ff6969c698f7acffe48e073dfac12e78ba9e6d9ec8a9d803f55c9dd9fd91660cfda10f710d7b06e85ba63bc45386bd4bf67b3e1fcdd8decf2bce3df453e89b539b104f3db8c437f48960add9ea53b47a9b8554713ee82f3c423ce50df0743fb27c29d5635a5fac5f97e07256cb57194a56ccfb562fa41285bfd4eab38c7252d49b33b056d89f2d3e642c84fdd4f4935ac7385fb4fa5ba2b1f27a7e052ee304eaf1a573e7fc7dc6d0d7df2ff5d69eeb0db8f417d4db7570d90ffe317f492723f427b1f890c423cca7819dd5f32338f7888f80f739571e6f966fc59a038f779b5f454a85c2bc67f5545487b0573e71f6f865d8b79fc62bcf83fb119bbfa3cd273ae081c2bf4fce43efcfa6af0e3925f4e733b064c2fc3d02ab783e607da55ecff4c399bcfe59fee9886b30133827c41b6d3b33e2298c9dd5ebb9f5079de427e2efdd799a4f113!
cad17d1e68112bdecf6dd07e7e9fde6cdb9235b1f6a70e91788dfc519db73b578d18688305fcecd18f79f67306b42ffc0799b221ff3c839583bcc5bf4e44cd02f43bf66ea6f7e776e19f96df15bac3b80bd6463c6b037f42fa7f1fbd423b89c1ff182fdbb121ff67e04a7ecf597145c56a01e7e73f67e401db8777be453e7313858be94e4558fd7002e1519f76b7626c27cf30a961261761e014fe545c41797f902f1307066bfafbc3967d887f03e8bdf07e400dc4fe371ced9e3275afdd3cc19f3783c71f67927c0dfb9cc6bd0c7ea834ab12fbe2fdc8079e8fac09e928719f72f7f5e3a08eecb67ce5e9fd9e51573215fb7c03d7b3fb77aa89303239e5a70895fd47ff85fcb79914fd8af88c3fb11fee9a7f3515c75ae9c11afbdd4ae0ffcd3abcf2f84f3f4537ff09d7312ab177cedecf3b85abfe907537d65175cfc8bf507e0def7e78173c63cceb7ce3dee8fc1ea533f14afe7a1716e04df5f8ec1eaf5417c7d9f7c5eb876767ff3aab3663cb7fed557c57f60e853958e84fa77012ef98a7c58004fcf1badbe956adae27cb2052ef1897ab3eaecf532425e9947bcde41ff91fafc4495b3d72f7e031773583c099e8fcb448cfb1aec55ee531e1fc7ced9f75f76f67e1f56c0c5bf88ef91b3e777de04f76d463f9e77ee104f82f5a57ee23ea94f6051bf4fdd80b556f4a33d7!
0eff72ddd9a32fcaf56dffb26971b989de7ca9932e6c11567c1fbd1d74f060!
c93df82f
be4df2796a79ce1af43e73291da7e56cf4b35edb05e2f9c09f5226670ae90bf519c3d3e23834b7f37fb84e85cfbf78d77e7c679d3b9f5fab63763d4e76de70e2cae4f3fc6f703b97276fbc89a33b9fde69d7dde8cf07fc78afd14fa75a5dcd8fb01f9d7958903fde39b330bf63f77cef0bff4601d225f82afd70af615f8a35c877dbedc7566f7c7f479f67a7c3965f8375abf2bdecbaecf3358c6a86772e6dc31d6b7ce82f80bd9d9eb9dfec9f027ec9d4a0787fe4fcec9f3776bc69847db292b9edf39fbfd30f6ce7effccc88734d1c878e0ecf348f6fdfa92f0f63ee28f58608f00ffd134de03f2994a7ca07ed7ce09fe8cbbceeadf5f1ec1c51fa8b79bce23f7d712b8f77ccf77ce8c799b5fa7ecf3db5767f1787d9cb2f74fd4532ef982fb0c814b7c60fdbb73e5f575d97984fdc29133a31fca9373f6ef5fdfc17dc6f792dccd18f7a10567b75fde7256e40f375386bf02f237cbd0bf57a2dee7a22feab1824b4740bebf3b57987fc3c58c71bfa99c47d027bece18f5f7c379ac9817d69c93d7f7e4ecf9da07e7e9fc7cefac7ebee9f3debfef5d4ed9ef23a88f32cb77c47ba99619f75be49388cf8f6161caa82f61ce5931ff10ea85948e8af936398ffd7bda68caf85e15379c6b9c370f678cfebd38655fbfeedcfaf7c6ce39e179767dcb0511e7a5297b3ef5ce8af8e03c!
65ef6f763feecb8086fc09a8af5af441fd2067bfefc51767df5f569dc9bf0f1c3afbf72b0a3386ff2f678cfdb79cfdfb90eccf18f3cdbdb37affff93315fefcc18f5023c7128f2bf9931ea15fcd9f703d88b1e9cfd7b21dd3a378a7eb73d63ecf7e8dcc23eba3363c87f9b32f283ee9cd9bf57be3bbb3d74d7d9cf1fdf668c7cd719e3fe119cbd9e86cad9e7e1b839637bbef334e31efce39f187ef6e49f7f7e262352e498a3442dffefe3593c8f17f1f2ff2323867815bfc7eb78136fe35dbc8f0ff1313ec5e75f93115fe26b7c8beff123cec5f9b81017e352fc1a97e34afc1657e35a5c8f1b71f3dfc9885b713beec4ddb817f7e3413c8c47f1389ec4d33888c358c5511cc73a36b18dddcf64c41462088102871c2468e8c359380f17e1325c85efe13adc84db7017eec34378fc6cefcf32c253780e2fe135bc85f7f011e6c27c58088be5f74be16b580e2be15b580d6b613d6c84cdb0f51319db6127ec86bdb01f0ec2e1bfda2e1c85e370124ec3200c43f5af32c2288c431d9ad0862e248a3fb23f857283e7d28685cae593cee8fcb30cbaa04bbaa2ef744d37744b773f8b26baa7077aa4277aa6177aa537487119eff44173344f0bb4f8d771494bf495966985bed1ea27196bb44e1bb4495bb4fd9712766897f6689f0ee8908e3ec938a6133aa5010da9fa2b1965f588c6!
93bfc6504bdd27198923873203f05f4bd8792ab3dda43ff57cf6a74df99c2f!
f892aff8
fbaf4898fcc44dbee61bbee53bbe77190ffcc84ffccc2ffcfa6b32f88ddff983e7789e175cc6222ff1575ee615fef68b3256798dd779833779cb656cf30eeff21eeff3c12fca38e4233ee6133ee581cb1872c5a372abab7fd51edcf0e4169372cc0132ca0cc9e59e226554ea7e4d461943cef279bec89753bf94df5de5eff93adfe4db5f9192eff27d7ec88ff9293f7f92f1925ff35b7ecf1f79eeaffd9ae7f3425ecc4bf96b5efe2463257fcbab792dafe78d5fd063336fe5edbc9377f3de2719fbf9201fe6a37c9c4ff2691efc9bf787e5c637cae35ce7a6dc6d3fc5ba4949122508955b5216f9d1fb93f949cee28e9ccb855cca95785c7fae63722d37722b77722f0ff2f803194ff22c2ff22a6ff2feb37a2a1f3227f3b2208bb2245f655956e49b940a216bb24e67b2219bb225dbb223bbb227fb3f917120877224c77222a7329061bc91aadc67cb8d539a321796bba1460d4a5aa672baffb18c9d272d135a69da677aae177aa957fa5daff5466ff54eeff5411ff5499ff5455ff5edf319ff8f8c77fdd0399dd7055dd425fdaacbbaa2df7455d7745d377453b7745b7774f79fedf4e37e5bd4d9d37d3dd0433dd2633dd1531de8502bdaf991bf7ed6f7cb3d65acb536da16891bda69ea63ff9359e2f7fffdfb6fff005d9bc1ee</data>
</image>
<image name="image2">
- <data format="PNG" length="1530">89504e470d0a1a0a0000000d4948445200000020000000200806000000737a7af4000005c149444154789ced97cb8f1d4715c67fe754553feebd73e73233b1b11dcb0e2090268e718243002f03ca7f405608b101fe9f6cf83322b14128b248781981630913a284c48f0590f17866ec99b98feeaeaac3a2efccd8847d16b8a4965af5e8f3d539df575fb598195f64d32f34fa3300cf00003e9999586467fb015d4a608699212288086686aa0713206229937326a544ce190c543dce397005aa8ea228288a80f781a20838d7efd304b2192a7d7011116f66dcbf778f5fbcf516df7ffdf5e5801e0717119c0b080292484bd91e8d9b818a034051cc32391b08a8280838e770eac82a68f06c6e6e32994c961988919d073bdcbb7b9fba1ee0bc4355fb1d1964cb7df065cb7c1e80886039e39c2efbfae7e966601992f1c9c71f71e5956f1142c03b15e6b319af7de7356ede7aff78f151094e029df40198d971299e04f4df738ede9fec33844b97bfd903b879f34f7c7ae7639cf7dcbf7f1fe714553d9e7cbce87f7cec2453cb7908aafa39f018a853bc73882a975ebacce3478f5055f35528a9ab9a33df38c7ab57bf4ddb2d08ce539625555d210865599e805a065e2c5a9aa645545117a8eb1a7222a544d334a82a4dd3001caff!
7de932cd3761d77efdca5ed3a3c40ce992e462e5dbac47bef5ee70fbffd3d725476118a104e3860464a892e194ddb9152667d7d83377ff8262f7ce5222925767777492931994ce8ba0e55a56b3bc6cfad9153e6f1de1e4551202278cb3d379c3ab2657e75fd1d7ef3ee7b3800172066f2a2c572421c58360cc58d07c84a0d838ae1fb337efeb39fb2bdbdcdfafa3aa3d108e71c5dd7e1bda7aa2a3088ce319f1e508682e9eca0079073cfe49c0d5525c7841ab46af8d8d75d07153821132143a86a643ca0508f9d5d67f1f82eea021fdebecdb56bd7b871e306aa4a51141c1c1c60665465c557bff675c62b63a208f3658afd916e45849c33a68aae8e285242f16477c4de8c6a81189838bc0b2c54907bff460e6788f4b5ce39b3b1b181f73d8f2693096686f39ef17048f00e438f788b4fa923a59e3c1814a6b48fa66433ac89145509d9386c1794658178cf7431676d52d2ec1c520701c9e41cd9dfdfa7691a2693c9b10286c3215dd7c7983533168f77a9aa8aa6e97a19c61469db961823d932d9815b292892a12b2352ceb8648ceb0227da4baa82a11b71e6952b903bf66efe051363341a9152627f7f9fbaae4929e19c63b158e0bd4744a8eb9ab66d494bc5f81421c68e183b2c0b290b3e3ba21aa642f40ecdd2db56324028c498cd0e917b1f71b0b58536734494870f1f2!
e756f74299172a66d5b72ce6c6f6f73fefc790683016646ea126dd3e1734a7!
45d77e24
e196cde90534252c679253bcf22260665897a4732a3dbda663a9be313ac0c5688a9637575b5079005af8a110921d0b62df3f9fc383347a052ca7843c0046179e4664344718562fb53a229d56848d526bac339121c0908a355562ebf847841effc0b41fa8db8c03fa7f05c503606152925cab2e4c2851778b8bd4d0805de3b42f09865fcdac6064e1d29a5def94449070bcc0be028cd91f76624cbfdf19a0c0f848329f35b1fe062e64ba74f913b63737393c3fdc75c58f334cd218ff615e7e498e483e180e9748af78e8c912de12f5ebcc8ef96cea7aa7cf9f9732c72242447701eef3d2e04caba62301850d735c3e190baae180e0754a3112f5f7999e178c4a7fff8845b7ffe23dffbee353edbddc285c0cec3478c4623f6f7f73873f62c7fffe043ae5e7d9564bd91c9e16c66bf7cfb6d34c31b6ffc00935e8e22d22b63e97866468c11b34c8cfd6524c64817234dd7d2751dcd74ce83ad1d5627e3252133bb7b3bacafad6106a74f9f25c5c4eddb7fe3b3075bfce8273f46166d6b7fbd758bebbf7e8753a73640f2532e78d4fa83cac8bdfb9ed8b00ae25c7ff0541ee72aca32509605de8763570c41110994659fc973cf9f633c1ee383736cbef8223926e6f3294515084bf3b16cf8e09757ac92aa1a508492aaaaf045c0798f0f01a78a98612c6f48aab07c7ff24222a24fd9!
3a803cfb337a06e0ff1ec07f0062834130e49a616f0000000049454e44ae426082</data>
+ <data format="XPM.GZ" length="7073">789c9d9859731cb90dc7dffd2954cbb7ad14b7efa35279d07d9fb62ccba93c00e86e9d23eb189d5bf9ee21f1c7b4355e57b259c125f93704d1242eb2e7b75f17be1cec2efcfadb8787294d2f6441cee97ee1d7ee713279fde7bffef1fb875ff26c21fe4bf285ec97bf7df8853f2dc8826baa2891dda672dbe66da3e3deb86859f95899a2a8fe1eb84ddb52c707639befd695258af286721725b2bf56eea3284f948728ca5791db248ace5f34ce5b5dbf5b322ec0fe46398d12994ae3accd950be3d9fc37e52c8a8e57ca7978beaecfad8167fafe7264b5e7968dcbb6d0f10be5228adacb8d6ddcad1857e0c3e9c8ea7f7fae5c4651fd55e30afbf167cad5a82fc6b5311b376d1d59ee94eb283aee8cb96d355edbc603613fafca4d14d52763d3f71adf567f947b658aa2dc199bbec05f1c45fdb167dcb7c887d67820f83f5396283afecd7868351e82f80ba7acfb71f7ca5d14e50be3bed57c62f8a36f9a1af60ec1b3718ff8f65410f21df11adaa441fe3e1807d1f5211f07aa49edf1b53131f2338d4c49145defba714d1a4fd1f5511a45f513e30cfb971de30af1a027e306cf739adf41bb24cd1f3e33ae8c0f8c07863dad5fcaa3a8bd5d639bef5be30afb17675c13e2abf511bc5398fd45e38ae0ffc6b8c67c3f356e!
b05f5e1b59f3939f46d6f93cb34f8478bc289751d47e6ddc623edd8e8c7c7e56aea2a8fea931619c1647c6feaec19cb0daf7f0771d4579cbd8f4fd3763863fe46a64e4dbb9b190e687fbaadcccf6e7b74786bd8fc6b63e5f8c8c7c23637b9ed3fcd5f2423cbe1acff4b55f91fea83f31cea16234bf04fe0ad6a04fbd7110b5776a2cc82f7f68dc19af1bf796ef582f87fa433ffba22cb3f9a2fd9bba36a9512f886f1745f5bd716f8c7c8cf589f3a80447d1e7237e4314d53f8acc19978c7ea7f5c97960e4b39e675c44517ba7c6cc3a9f357e5c3659a5f1a76be3ae86bd5d7014ddcf9a71857ec3ea3fae9aa282ff051c45e71f1937d027064b22a8877de57aa6cfabc635f465dbb861e4cba6710b76195852c1fc47e566a6ef9c714801b5a7fd40db2ff2e9051cd603ff68fc98a9b1fe3905732fdabf48fb034b93941a0fd2fce52eac1ff9a5f9cf7d141d3f311ee06f21b0d482fce88d1b517d81bd61a64f5fc192c35fa2f923499357e8a767e028ca83712a38ef0f8c6bd17a20edc771d4c6778c2bec9fb4ff4a1645f73f319e8d6b3f08ab09a2e397c60598b647463d5c1b97c6985fd46581f85c8167fab46f6cfaa2f19470fad7c8b70a1ce289f14370149daff72909e73deacd617e152288e7df8147fb47c615f2c7eb792775dd1688ff2d38c407ebd37a92964adcbf44!
cf7719dab4427daabfbbb4e602fed67874792539fca3e77317ee2f35f245eb!
a1ab5850
ffa4fd3b141f6760dd5f9f736de7ed67e5705ed8fd54f5fbb2490af847f3adafc2f2907f7a5ef46d39a4e827c65592c25fa7e03acfb11f3d4f7b2a25417fd0fae9fb8a52b0e66f3f947d82fcd5f36048ea2ec77d58fbc590b57d85fbea12388aaef7b37135a09ef5be38e45194578c9b01f7a755631a100fad8fa1e8871efd7d028ea23c352e07f4979b9111df5be30ae35eeb7d28ab02fe7127e0993dff6a6cf6fc9d7165f6ee8d6b7bdeb9310df00fd653955d82fbd403b8af3adc5f0ec0e37a9e4686fd47e31accda5f87ba4a12f8fb024c4dadecf6c1c17f580fd6dbd44986fcd77a1f423e24e8c79aff035599e50bfc417591e13e8cf87297a09f0a9e2f759aa1fe8fc1e1f9aa4f7aff19bab05f8c633f5d2529ea01ebe986f0a3f6e1bf3ee41bee67d0ef43fbc3f3f78c4d5fb4ff0f4351269aaffec4b807d3b9f100763db84c6d7ccd38b3f9a9716ee337c6858dd7c6f63c7a30ae6c3c33aeed79dbc68de99f19b7c6536302f3edc8e8c79b23a35e3b6336fd656331de1c19fdecfb38ce8b57e3ce9e7f6cdc233e7c090edb413f9818a709f2af32ce51ef64f643bde0f98d71857ee10ae31af524e6aff0ba06fb2fc61df2818f8c07f4173780eb24c57968fa63be7d32ce33e4f76cbc41bfe40de316fdcca3df0c4d9ae3be66fe68b25c9f2fa6df1439f27fd5b8ccd17f5!
78ceb1cf9ba34e302e781c5a769c07edfb82df0bcc498d09f656b64dc3fd78db940bedbf382bb703eec19d7b85f79b3d7860ad6f91733c67d80c4582af4335b1f2515f66beba7b4d27e21f63ccaac5f5b3ca9aeb13f070e3742bc3f5abd7083ef23f8a331dbf709e81783d8fb94ec1adbfb083d1adbfb05b7c6f6fee27263bb1ff3e719e37d923c38f423f47bf36797dafb8bf9abeb05feb4faec06c17e2dbee1f882fd1de3b4837df34f9f75c85f8b679f77a8178b57cf1dfc551a4b0ffd67e3bec7fa663c805d3932eac1f271487bdc4fef8db31ee7c5a171d1e3fdc4ea37140cd64bc634a09f5b3dc70debf3acff440d9dbf31b2aeff70ea9da751d88bef7c6f32f8337f1e7e7f97337fa172e9affcb59ff81bb5f9cddffa3b937bffe0a7fed13f8df2ec5ffceb48affecd2ffa25bfacb2e257fd9ada58f71bef64d36fcdf17690f7bce377c7ffeff97d7fa0360ee7748efcc71f6cecccf1b3ff64ff3bf69ffd89ffa2364e7fb0f1f54fda487cea339fffd446f1a76c94bef2b56f3cde4bfc7b1de71ccd31ffe80f27fa79e77a37b83377ae362edca5bb52b9761377e3beb95b77679f5cb9fb2057efe4de3db8a97b744fbe76cfeec5bdea5e2efc8d7b5359744b6ed9adb855b7864ffc8d8eaebb0d93f5f0c9a5db745b6edbedb85db7e72f751d3cc63f6648c80fb7ef0ec67!
c787687960d2a611d47eea3fb147672ec3ebb13ffac36becce7879bf3b1fbe!
a92394e5
de6729fbac295cad54f6c1cb97a6e4ee3da50028e6866237e0be04fa89bf9fc7fdb086fe9039dd1395dd0a5f2155dd3846ee8db7fb341b7ef2cdcd13d3d041b539fd2a37ef244cfe193177a7d6f83dee6f38316dfd958a265b74d2bb44a6ba475451b81378347c675ea3a0e692b469eb6dd84766897f6685ff9800ee925cc38a28ff429fc3da6cf74425f7c46a7f415dfe5c56fe8901f961dc8880bcaa9706f54c6efc3c2cc865af6ee8d1d4dc31b1bb38437e5f02e1cba4794c9981f4fefe4139f852c79e273bea01bbee42bbee609dff037be0d74c7f7aee0079e86cc09c213e4c7bc3ff8919ff4ef33bfd01abff21b9b7f78c9d7bcec335e99f3df4ff28357792dfc5ee78db08a4ddee2edd0fd30b243cb213e35eff2defb9afc898d7d3ee0433e0a759d71e846fc898fc7b1cfc127273ca7ff531ba7fc95135f8755a4fac955e8c9df4733ceb9f8a30d2ee76c545cfbf81d4a6b9fbcc95c7f11c7abf3796cf99142848445684a0fd2492f839cc919657e90f3ef12e8e23d8bc6369c193b7e47aee45a267213f35abec9ad6bc2991044eee42efc7d36091c4e9d39fe1e5bb9779d84ca90a93ccad3bbd5464befebe96d7e2fdf632bcf12b2816ee455de64716ece1f6ca09ffe312eb2446bb22c2bb22a6bb2fe176d6cc8a6e8f926dbb2f3176decca9eec234f69f7ffb7315f2f!
72f0c39ce8fd399bfcf893fcb897433932390c16423e84aa790cb9b14549bc41c84739087c1e3b46201ffe6e9924213ffefdf70fff01f657abfa</data>
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-06-14 13:18:54 UTC (rev 748)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-06-14 17:08:32 UTC (rev 749)
@@ -50,7 +50,12 @@
self.ChangeStopSpinBoxEnabledSlot)
self.connect(self.StopAtSpinBox, SIGNAL("valueChanged(int)"),
self.ChangeStopSpinBoxSlot)
+
+ # Before freezing be sure the population is paused
+
self.connect(self.SavePetriPushButton, SIGNAL("clicked()"),
+ self.m_session_mdl.m_session_mdtr, PYSIGNAL("doPauseAvidaSig"))
+ self.connect(self.SavePetriPushButton, SIGNAL("clicked()"),
self.m_session_mdl.m_session_mdtr, PYSIGNAL("freezeDishPhaseISig"))
self.connect(self.m_session_mdl.m_session_mdtr,
PYSIGNAL("freezeDishPhaseIISig"), self.FreezePetriSlot)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-06-14 13:18:54 UTC (rev 748)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-06-14 17:08:32 UTC (rev 749)
@@ -11,8 +11,6 @@
Priority Medium
-18-Apr-06 Replace "Viewers" buttons icons.
-
29-Apr-06 Change configuration on fly -- work with Kaben on the underlieing problem
Priority Low
@@ -21,8 +19,6 @@
-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 Non-Fix length Genomes -- Much Later
@@ -133,6 +129,12 @@
15-May-06 Make "default" organism named "*Ancestor" -- Finished 30-May-06
+18-Apr-06 Replace "Viewers" buttons icons. -- Finished 14-Jun-06
+
+12-Jun-06 Deactivate Help Menus -- Finished 14-Jun-06
+
+-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 -- Finished 14-Jun-06
+
************Kaben******************
* 23-Jan-06 Get program to run on all Macs -- Finished 27-Jan-06
More information about the Avida-cvs
mailing list