[Avida-cvs] [avida-svn] r1000 - branches/developers/avida-edward/source/python/AvidaGui2
jclune at myxo.css.msu.edu
jclune at myxo.css.msu.edu
Tue Sep 26 13:44:05 PDT 2006
Author: jclune
Date: 2006-09-26 16:44:05 -0400 (Tue, 26 Sep 2006)
New Revision: 1000
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui
Log:
changed org clicked on to three letter codes, that plus and minus
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsCtrl.py 2006-09-26 20:11:20 UTC (rev 999)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsCtrl.py 2006-09-26 20:44:05 UTC (rev 1000)
@@ -118,7 +118,7 @@
self.m_avg_age.setText(QString("%1").arg(avg_age))
avg_genome_length = "%d" %(stats.GetAveSize())
- self.m_avg_genome_length.setText(QString("%1").arg(avg_genome_length))
+# self.m_avg_genome_length.setText(QString("%1").arg(avg_genome_length))
#TASK OUTLOOK
@@ -230,7 +230,7 @@
if clicked_cell_item is None or not self.m_avida.m_population.GetCell(int(self.clicked_cell_number)).IsOccupied():
- # PAINT the stats fields empty
+ # PAINT the clickedOnOrg stats fields empty
# if not self.m_session_mdl.m_cell_num_ancestor_name_dict.has_key(str(self.clicked_cell_number)):
self.m_org_name.setText('empty cell')
@@ -252,6 +252,15 @@
self.m_num_xor_clickedOrg.setText('-')
self.m_num_equals_clickedOrg.setText('-')
self.m_org_ancestor_name.setText('-')
+ self.m_not_name.setText('Not-')
+ self.m_nan_name.setText('Nan-')
+ self.m_and_name.setText('And-')
+ self.m_orn_name.setText('Orn-')
+ self.m_oro_name.setText('Oro-')
+ self.m_ant_name.setText('Ant-')
+ self.m_nor_name.setText('Nor-')
+ self.m_xor_name.setText('Xor-')
+ self.m_equ_name.setText('Equ-')
#why is this code necessary?
if clicked_cell_item is not None:
@@ -314,30 +323,66 @@
num_not_clickedOrg = m_clickedOrg_task_count[0]
self.m_num_not_clickedOrg.setText(str(num_not_clickedOrg))
+ if num_not_clickedOrg>0:
+ self.m_not_name.setText('Not+')
+ else:
+ self.m_not_name.setText('Not-')
num_nand_clickedOrg = m_clickedOrg_task_count[1]
self.m_num_nand_clickedOrg.setText(str(num_nand_clickedOrg))
+ if num_nand_clickedOrg>0:
+ self.m_nan_name.setText('Nan+')
+ else:
+ self.m_nan_name.setText('Nan-')
num_and_clickedOrg = m_clickedOrg_task_count[2]
self.m_num_and_clickedOrg.setText(str(num_and_clickedOrg))
+ if num_and_clickedOrg>0:
+ self.m_and_name.setText('And+')
+ else:
+ self.m_and_name.setText('And-')
num_ornot_clickedOrg = m_clickedOrg_task_count[3]
self.m_num_ornot_clickedOrg.setText(str(num_ornot_clickedOrg))
+ if num_ornot_clickedOrg>0:
+ self.m_orn_name.setText('Orn+')
+ else:
+ self.m_orn_name.setText('Orn-')
num_or_clickedOrg = m_clickedOrg_task_count[4]
self.m_num_or_clickedOrg.setText(str(num_or_clickedOrg))
+ if num_or_clickedOrg>0:
+ self.m_oro_name.setText('Oro+')
+ else:
+ self.m_oro_name.setText('Oro-')
num_andnot_clickedOrg = m_clickedOrg_task_count[5]
self.m_num_andnot_clickedOrg.setText(str(num_andnot_clickedOrg))
+ if num_andnot_clickedOrg>0:
+ self.m_ant_name.setText('Ant+')
+ else:
+ self.m_ant_name.setText('Ant-')
num_nor_clickedOrg = m_clickedOrg_task_count[6]
self.m_num_nor_clickedOrg.setText(str(num_nor_clickedOrg))
+ if num_nor_clickedOrg>0:
+ self.m_nor_name.setText('Nor+')
+ else:
+ self.m_nor_name.setText('Nor-')
num_xor_clickedOrg = m_clickedOrg_task_count[7]
self.m_num_xor_clickedOrg.setText(str(num_xor_clickedOrg))
+ if num_xor_clickedOrg>0:
+ self.m_xor_name.setText('Xor+')
+ else:
+ self.m_xor_name.setText('Xor-')
num_equals_clickedOrg = m_clickedOrg_task_count[8]
self.m_num_equals_clickedOrg.setText(str(num_equals_clickedOrg))
+ if num_equals_clickedOrg>0:
+ self.m_equ_name.setText('Equ+')
+ else:
+ self.m_equ_name.setText('Equ-')
def petriDropped(self, e):
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui 2006-09-26 20:11:20 UTC (rev 999)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui 2006-09-26 20:44:05 UTC (rev 1000)
@@ -542,7 +542,7 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel14_3_2</cstring>
+ <cstring>m_not_name</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -558,7 +558,7 @@
</font>
</property>
<property name="text">
- <string>not</string>
+ <string>Not-</string>
</property>
</widget>
<widget class="QLabel">
@@ -594,7 +594,7 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel4_2</cstring>
+ <cstring>m_nan_name</cstring>
</property>
<property name="font">
<font>
@@ -602,7 +602,7 @@
</font>
</property>
<property name="text">
- <string>nand</string>
+ <string>Nan-</string>
</property>
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
@@ -633,7 +633,7 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel6_2</cstring>
+ <cstring>m_and_name</cstring>
</property>
<property name="font">
<font>
@@ -641,7 +641,7 @@
</font>
</property>
<property name="text">
- <string>and</string>
+ <string>And-</string>
</property>
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
@@ -672,7 +672,7 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel17_2</cstring>
+ <cstring>m_orn_name</cstring>
</property>
<property name="font">
<font>
@@ -680,7 +680,7 @@
</font>
</property>
<property name="text">
- <string>ornot</string>
+ <string>Orn-</string>
</property>
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
@@ -711,7 +711,7 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel10_2</cstring>
+ <cstring>m_oro_name</cstring>
</property>
<property name="font">
<font>
@@ -719,7 +719,7 @@
</font>
</property>
<property name="text">
- <string>or</string>
+ <string>Oro-</string>
</property>
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
@@ -750,7 +750,7 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel12_2</cstring>
+ <cstring>m_ant_name</cstring>
</property>
<property name="font">
<font>
@@ -758,7 +758,7 @@
</font>
</property>
<property name="text">
- <string>andnot</string>
+ <string>Ant-</string>
</property>
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
@@ -789,7 +789,7 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel14_4_2</cstring>
+ <cstring>m_nor_name</cstring>
</property>
<property name="font">
<font>
@@ -797,7 +797,7 @@
</font>
</property>
<property name="text">
- <string>nor</string>
+ <string>Nor-</string>
</property>
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
@@ -828,7 +828,7 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel16_2</cstring>
+ <cstring>m_xor_name</cstring>
</property>
<property name="font">
<font>
@@ -836,7 +836,7 @@
</font>
</property>
<property name="text">
- <string>xor</string>
+ <string>Xor-</string>
</property>
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
@@ -867,7 +867,7 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel18_2</cstring>
+ <cstring>m_equ_name</cstring>
</property>
<property name="font">
<font>
@@ -875,11 +875,8 @@
</font>
</property>
<property name="text">
- <string>equals</string>
+ <string>Equ-</string>
</property>
-# <property name="alignment">
-# <set>WordBreak|AlignVCenter|AlignLeft</set>
-# </property>
</widget>
<widget class="QLabel">
<property name="name">
More information about the Avida-cvs
mailing list