[Avida-cvs] [avida-svn] r981 - branches/developers/avida-edward/source/python/AvidaGui2
baerb at myxo.css.msu.edu
baerb at myxo.css.msu.edu
Mon Sep 25 05:04:31 PDT 2006
Author: baerb
Date: 2006-09-25 08:04:30 -0400 (Mon, 25 Sep 2006)
New Revision: 981
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyAvida.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/pyPetriConfigureView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyPetriDishCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyWriteGenesisEvent.py
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Changed names of resources.
Yet another fix to m_session_mdl.m_cell_num_ancestor_name_dict
Removed some print/descr lines
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyAvida.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyAvida.py 2006-09-24 22:48:28 UTC (rev 980)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyAvida.py 2006-09-25 12:04:30 UTC (rev 981)
@@ -22,7 +22,6 @@
qt.QObject.__init__(self, None, self.__class__.__name__)
def construct(self, genesis):
- descr()
self.m_name = genesis.GetFilename()
self.m_environment = cEnvironment()
cConfig.Setup(genesis)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-09-24 22:48:28 UTC (rev 980)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-09-25 12:04:30 UTC (rev 981)
@@ -82,17 +82,14 @@
def setAvidaSlot(self, avida):
- print "pyOnePop_PetriDishCtrl.setAvidaSlot() ..."
old_avida = self.m_avida
self.m_avida = avida
if(old_avida):
- print "pyOnePop_PetriDishCtrl.setAvidaSlot() disconnecting old_avida ..."
self.disconnect(
self.m_avida.m_avida_thread_mdtr, PYSIGNAL("AvidaUpdatedSig"),
self.avidaUpdatedSlot)
del old_avida
if(self.m_avida):
- print "pyOnePop_PetriDishCtrl.setAvidaSlot() connecting self.m_avida ..."
self.connect(
self.m_avida.m_avida_thread_mdtr, PYSIGNAL("AvidaUpdatedSig"),
self.avidaUpdatedSlot)
@@ -117,7 +114,6 @@
for label, name in self.m_session_mdl.m_ancestors_dict.iteritems():
lineage_range = len(self.m_session_mdl.m_ancestors_dict)
- print "LABEL IS " , label
non_normalized_index = int(label) + 1
normalized_index = float(non_normalized_index) / float(lineage_range)
a_sensible_color = self.m_petri_dish_ctrl.m_color_lookup_functor(normalized_index)
@@ -185,10 +181,7 @@
# self.m_ancestor_legend_ctrl.setHScrollBarMode(QScrollView.AlwaysOn)
self.m_ancestor_legend_ctrl.setHScrollBarMode(QScrollView.Auto)
-# print "*********************: self.m_ancestor_legend_ctrl.horizontalScrollBar is ", self.m_ancestor_legend_ctrl.horizontalScrollBar
# self.m_ancestor_legend_ctrl.setHBarGeometry(self.m_ancestor_legend_ctrl.horizontalScrollBar,0,0,100,10)
- print "ancestor label HEIGHT, Width IS---------------->", self.m_ancestor_legend_ctrl.height(),self.m_ancestor_legend_ctrl.width()
- print "m_map_legend_widget_stack HEIGHT IS____________>", self.m_map_legend_widget_stack.height(),self.m_map_legend_widget_stack.width()
self.m_petri_dish_ctrl.setIndexer(self.m_map_profile.getIndexer(self.m_mode_index))
self.m_petri_dish_ctrl.setColorLookupFunctor(self.m_map_profile.getColorLookup(self.m_mode_index))
@@ -291,7 +284,6 @@
PYSIGNAL("petriDishDroppedAncestorSig"), (e,))
return
- descr("BDB -- freezer_item_list = " + str(freezer_item_list))
freezer_item_names = freezer_item_list.split("\t")[1:]
if (len(freezer_item_names) == 1):
freezer_item_name = freezer_item_names[0]
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-09-24 22:48:28 UTC (rev 980)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-09-25 12:04:30 UTC (rev 981)
@@ -374,10 +374,10 @@
self.HardTextLabel.setEnabled(False)
self.VHardTextLabel.setEnabled(False)
self.BrutalTextLabel.setEnabled(False)
- self.line1.setEnabled(False)
- self.line2.setEnabled(False)
- self.line3.setEnabled(False)
- self.line4.setEnabled(False)
+ # self.line1.setEnabled(False)
+ # self.line2.setEnabled(False)
+ # self.line3.setEnabled(False)
+ # self.line4.setEnabled(False)
self.NotCheckBox.setEnabled(False)
self.NandCheckBox.setEnabled(False)
self.AndCheckBox.setEnabled(False)
@@ -421,10 +421,10 @@
self.HardTextLabel.setEnabled(True)
self.VHardTextLabel.setEnabled(True)
self.BrutalTextLabel.setEnabled(True)
- self.line1.setEnabled(True)
- self.line2.setEnabled(True)
- self.line3.setEnabled(True)
- self.line4.setEnabled(True)
+ # self.line1.setEnabled(True)
+ # self.line2.setEnabled(True)
+ # self.line3.setEnabled(True)
+ # self.line4.setEnabled(True)
self.NotCheckBox.setEnabled(True)
self.NandCheckBox.setEnabled(True)
self.AndCheckBox.setEnabled(True)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-09-24 22:48:28 UTC (rev 980)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-09-25 12:04:30 UTC (rev 981)
@@ -606,7 +606,7 @@
</font>
</property>
<property name="text">
- <string><p align="center"><b>What rewards are available in the environment?</b><br>
+ <string><p align="center"><b>What resources are available in the environment?</b><br>
(strength of reward shown in parentheses)</p></string>
</property>
<property name="alignment">
@@ -640,11 +640,13 @@
<property name="name">
<cstring>NandCheckBox</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
<property name="text">
- <string>nand</string>
+ <string>nanose</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -657,11 +659,13 @@
<property name="name">
<cstring>OrnCheckBox</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
<property name="text">
- <string>ornot</string>
+ <string>ornose</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -674,11 +678,13 @@
<property name="name">
<cstring>AndCheckBox</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
<property name="text">
- <string>and</string>
+ <string>andose</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -691,11 +697,13 @@
<property name="name">
<cstring>OrCheckBox</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
<property name="text">
- <string>or</string>
+ <string>orose</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -708,11 +716,13 @@
<property name="name">
<cstring>NorCheckBox</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
<property name="text">
- <string>nor</string>
+ <string>norose</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -725,6 +735,8 @@
<property name="name">
<cstring>EasyTextLabel</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="font">
<font>
</font>
@@ -737,6 +749,8 @@
<property name="name">
<cstring>HardTextLabel</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="font">
<font>
</font>
@@ -749,11 +763,13 @@
<property name="name">
<cstring>NotCheckBox</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
<property name="text">
- <string>not</string>
+ <string>notose</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -766,6 +782,8 @@
<property name="name">
<cstring>ModerateTextLabel</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="font">
<font>
</font>
@@ -774,24 +792,12 @@
<string><p align="center">Moderate<br>(x 4)</p></string>
</property>
</widget>
- <widget class="Line" row="0" column="1" rowspan="3" colspan="1">
- <property name="name">
- <cstring>line1</cstring>
- </property>
- <property name="frameShape">
- <enum>VLine</enum>
- </property>
- <property name="frameShadow">
- <enum>Sunken</enum>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- </widget>
<widget class="QLabel" row="0" column="6">
<property name="name">
<cstring>VHardTextLabel</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="font">
<font>
</font>
@@ -804,11 +810,13 @@
<property name="name">
<cstring>XorCheckBox</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
<property name="text">
- <string>xor</string>
+ <string>xorose</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -821,11 +829,13 @@
<property name="name">
<cstring>AndnCheckBox</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
<property name="text">
- <string>andnot</string>
+ <string>antose</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -834,52 +844,12 @@
<string>Reward the <b><i>andnot</i></b> function</string>
</property>
</widget>
- <widget class="Line" row="0" column="3" rowspan="3" colspan="1">
- <property name="name">
- <cstring>line2</cstring>
- </property>
- <property name="frameShape">
- <enum>VLine</enum>
- </property>
- <property name="frameShadow">
- <enum>Sunken</enum>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- </widget>
- <widget class="Line" row="0" column="5" rowspan="3" colspan="1">
- <property name="name">
- <cstring>line3</cstring>
- </property>
- <property name="frameShape">
- <enum>VLine</enum>
- </property>
- <property name="frameShadow">
- <enum>Sunken</enum>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- </widget>
- <widget class="Line" row="0" column="7" rowspan="3" colspan="1">
- <property name="name">
- <cstring>line4</cstring>
- </property>
- <property name="frameShape">
- <enum>VLine</enum>
- </property>
- <property name="frameShadow">
- <enum>Sunken</enum>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- </widget>
<widget class="QLabel" row="0" column="8">
<property name="name">
<cstring>BrutalTextLabel</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="font">
<font>
</font>
@@ -892,11 +862,13 @@
<property name="name">
<cstring>EquCheckBox</cstring>
</property>
+ <property name="paletteBackgroundColor">
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
<property name="text">
- <string>equals</string>
+ <string>equose</string>
</property>
<property name="checked">
<bool>true</bool>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriDishCtrl.py 2006-09-24 22:48:28 UTC (rev 980)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriDishCtrl.py 2006-09-25 12:04:30 UTC (rev 981)
@@ -42,7 +42,6 @@
self.m_stat_task_button_states = [0,0,0,0,0,0,0,0,0]
self.m_petri_dish_layout = pySquareVBoxLayout(self,0,0,"m_petri_dish_layout")
- print "pyPetriDishCtrl.construct() self.m_petri_dish_layout.heightForWidth(20) :", self.m_petri_dish_layout.heightForWidth(20)
self.m_canvas_view = pyPetriCanvasView(None, self,"m_canvas_view",session_mdl)
#hiding the scroll bars, the pre-packaged ones were not working so we are adding them manually elsewhere
@@ -146,11 +145,9 @@
def setAvidaSlot(self, avida):
descr(avida)
- #print "pyPetriDishCtrl.setAvidaSlot() ..."
old_avida = self.m_avida
self.m_avida = avida
if(old_avida):
- print "pyPetriDishCtrl.setAvidaSlot() deleting old_avida ..."
self.m_org_clicked_on_item = None
self.m_last_cell_outlined = None
self.m_last_cell_outlined_color = (QPen(Qt.NoPen))
@@ -198,15 +195,7 @@
self.m_session_mdl.m_cell_num_ancestor_name_dict = {}
for k, v in m_founding_cells_dict.iteritems():
cell_info_item = self.updateCellItem(int(k))
- # print "BDB"
- # print m_founding_cells_dict
- # print self.m_session_mdl.m_ancestors_dict
- # org_in_founding_cell = v
- # linage_lable_in_cell = ancestor_link_dict[org_in_founding_cell]
- # ann_name_in_cell = session_mdl.m_ancestors_dict[linage_lable_in_cell]
- # self.m_session_mdl.m_cell_num_ancestor_name_dict[k] = ann_name_in_cell
cell_info_item.setPen(QPen(QColor(Qt.gray)))
- descr("BDB" + str(self.m_session_mdl.m_cell_num_ancestor_name_dict))
self.m_thread_work_cell_item_index = 0
self.m_cs_min_value = 0
@@ -272,7 +261,6 @@
failedATest = False #refers to tests regarding whether a task button is on and that task is performed
for i in range(len(self.m_stat_task_button_states)):
if (self.m_stat_task_button_states[i]):
-# print "IN THE STATE LOOP, WITH I = ", i
if(self.m_avida.m_population.GetCell(cell_id).GetOrganism().GetPhenotype().GetCurTaskCount()[i]>=1):
passedATest = True
else:
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyWriteGenesisEvent.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyWriteGenesisEvent.py 2006-09-24 22:48:28 UTC (rev 980)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyWriteGenesisEvent.py 2006-09-25 12:04:30 UTC (rev 981)
@@ -45,8 +45,6 @@
ann_name_in_cell = session_mdl.m_ancestors_dict[linage_lable_in_cell]
session_mdl.m_cell_num_ancestor_name_dict[tmp_cell] = ann_name_in_cell
- print session_mdl.m_cell_num_ancestor_name_dict
-
#if it is not a full petri dish
else:
cells_dict = {}
@@ -61,6 +59,7 @@
num_ancestors = 0
while(settings_dict.has_key("START_CREATURE" + str(num_ancestors))):
+ self.m_session_mdl.m_cell_num_ancestor_name_dict = {}
num_ancestors = num_ancestors + 1
# Process all the ancestors
@@ -80,13 +79,11 @@
self.m_session_mdl.m_founding_cells_dict = None
self.m_session_mdl.m_founding_cells_dict = cells_dict
self.m_session_mdl.m_cell_num_ancestor_name_dict[str(self.start_cell_location)] = session_mdl.m_ancestors_dict[str(i)]
- print self.m_session_mdl.m_cell_num_ancestor_name_dict
# Read the genome from the dictionary
organisms_dict[str(i)] = settings_dict["START_GENOME" + str(i)]
-
shutil.copyfile(os.path.join(workspace_dir, "inst_set.default"), os.path.join(tmp_in_dir, "inst_set.default"))
settings_dict["EVENT_FILE"] = os.path.join(tmp_in_dir, "events.cfg")
Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-09-24 22:48:28 UTC (rev 980)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-09-25 12:04:30 UTC (rev 981)
@@ -11,6 +11,10 @@
31-Aug-06 E-Mail Josh about state of resize at beginning of run
+19-Sep-06 Change "What rewards are available in the environment?" to
+
+19-Sep-06 Empty -> configured actually empty of organisms. Default full one organism, @Default -> @Example. Warning when we try to start with an empty dish.
+
Priority Medium
29-Apr-06 Change configuration on fly -- work with Kaben on the underlieing problem
More information about the Avida-cvs
mailing list