Author: jclune
Date: 2005-05-26 01:30:24 -0400 (Thu, 26 May 2005)
New Revision: 167
Modified:
trunk/source/python/AvidaGui2/_Custom_Widgets.cw
trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
trunk/source/python/AvidaGui2/pyOnePop_StatsCtrl.py
trunk/source/python/AvidaGui2/pyOnePop_StatsView.ui
trunk/source/python/AvidaGui2/pyPetriCanvasView.py
trunk/source/python/AvidaGui2/pyPetriDishCtrl.py
trunk/source/python/AvidaGui2/pyPopulationCellItem.py
trunk/source/python/AvidaGui2/pyTemporaryReloads.py
Log:
You can now make a graph with a 'thick' line in analyze mode...for use with black and white printers. The org view in OnePop mode also now has a square image that is colored the same as the organism it is reporting on. That organism is also outlined (neon green) in the petri dish so the user knows which org in the population s/he is looking at.
Modified: trunk/source/python/AvidaGui2/_Custom_Widgets.cw
===================================================================
--- trunk/source/python/AvidaGui2/_Custom_Widgets.cw 2005-05-19 23:16:02 UTC (rev 166)
+++ trunk/source/python/AvidaGui2/_Custom_Widgets.cw 2005-05-26 05:30:24 UTC (rev 167)
@@ -184,6 +184,29 @@
<property type="-1">1</property>
</customwidget>
<customwidget>
+ <class>pyOrgSquareCtrl</class>
+ <header location="global">1</header>
+ <sizehint>
+ <width>-1</width>
+ <height>0</height>
+ </sizehint>
+ <container>0</container>
+ <sizepolicy>
+ <hordata>3</hordata>
+ <verdata>3</verdata>
+ </sizepolicy>
+ <pixmap>
+ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154789cad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d032!
6df7ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df21!
8e0582c261e95f8bfc04f1a1e8bc5c4dfe0a19017a725d8c60000000049454!
e44ae426
082</data>
+ </pixmap>
+ <property type="0">3</property>
+ <property type="1">pyOrgSquareCtrl</property>
+ <property type="3">-1</property>
+ <property type="1">pyOrgSquareCtrl</property>
+ <property type="3">-1</property>
+ <property type="pyOrgSquareCtrl"></property>
+ <property type="-1">1</property>
+ </customwidget>
+ <customwidget>
<class>pyTimelineCtrl</class>
<header location="global">1</header>
<sizehint>
Modified: trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2005-05-19 23:16:02 UTC (rev 166)
+++ trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2005-05-26 05:30:24 UTC (rev 167)
@@ -56,7 +56,8 @@
self.m_Red = ['red', Qt.red]
self.m_Blue = ['blue', Qt.blue]
self.m_Green = ['green', Qt.green]
- self.m_Colors = [self.m_Red, self.m_Blue, self.m_Green]
+ self.m_ThickBlue = ['thick', Qt.blue]
+ self.m_Colors = [self.m_Red, self.m_Blue, self.m_Green, self.m_ThickBlue]
self.m_combo_box_1_color.clear()
self.m_combo_box_2_color.clear()
for color in self.m_Colors:
@@ -149,7 +150,11 @@
)
self.m_graph_ctrl.m_curve_2 = self.m_graph_ctrl.insertCurve(self.m_avida_stats_interface.m_entries[index_2][0])
self.m_graph_ctrl.setCurveData(self.m_graph_ctrl.m_curve_2, self.m_curve_2_arrays[0], self.m_curve_2_arrays[1])
- self.m_graph_ctrl.setCurvePen(self.m_graph_ctrl.m_curve_2, QPen(self.m_Colors[self.m_combo_box_2_color.currentItem()][1]))
+ if self.m_Colors[self.m_combo_box_2_color.currentItem()][0] is 'thick':
+ print "+++++++++++++++++++++++++++++++++++++++++++++++++++"
+ self.m_graph_ctrl.setCurvePen(self.m_graph_ctrl.m_curve_2, QPen(self.m_Colors[self.m_combo_box_2_color.currentItem()][1],3))
+ else:
+ self.m_graph_ctrl.setCurvePen(self.m_graph_ctrl.m_curve_2, QPen(self.m_Colors[self.m_combo_box_2_color.currentItem()][1]))
self.m_graph_ctrl.setCurveYAxis(self.m_graph_ctrl.m_curve_2, QwtPlot.yRight)
if not self.m_combo_box_1.currentItem():
self.m_graph_ctrl.setTitle(self.m_avida_stats_interface.m_entries[index_2][0])
Modified: trunk/source/python/AvidaGui2/pyOnePop_StatsCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePop_StatsCtrl.py 2005-05-19 23:16:02 UTC (rev 166)
+++ trunk/source/python/AvidaGui2/pyOnePop_StatsCtrl.py 2005-05-26 05:30:24 UTC (rev 167)
@@ -1,3 +1,4 @@
+
# -*- coding: utf-8 -*-
from qt import *
@@ -2,2 +3,3 @@
from pyOnePop_StatsView import pyOnePop_StatsView
+from pyOrgSquareCtrl import pyOrgSquareCtrl
@@ -8,10 +10,11 @@
def __init__(self,parent = None,name = None,fl = 0):
pyOnePop_StatsView.__init__(self,parent,name,fl)
-
+
def construct(self, session_mdl):
self.m_session_mdl = session_mdl
self.m_avida = None
+ self.m_org_square_ctrl.construct(self.m_session_mdl)
self.connect(
self.m_session_mdl.m_session_mdtr, PYSIGNAL("setAvidaSig"),
self.setAvidaSlot)
@@ -73,9 +76,9 @@
#TASK OUTLOOK
-
- #if num_orgs_doing_a_given_task is above this number, we say the pop is doing this task
- m_org_threshold = 1
+
+# #if num_orgs_doing_a_given_task is above this number, we say the pop is doing this task
+# m_org_threshold = 1
num_not = str(stats.GetTaskLastCount(0))
# if num_not > m_org_threshold:
@@ -141,14 +144,21 @@
self.m_num_equals.setText(num_equals)
if self.m_clicked_cell_number>= 0:
- self.updateOrgReportSlot(self.m_clicked_cell_number)
+ self.updateOrgReportSlot(self.m_clicked_cell_item)
- def updateOrgReportSlot(self, clicked_cell_num):
+ def updateOrgReportSlot(self, clicked_cell_item):
- self.m_clicked_cell_number = clicked_cell_num
- if clicked_cell_num is None or not self.m_avida.m_population.GetCell(int(clicked_cell_num)).IsOccupied():
+ self.m_clicked_cell_item = clicked_cell_item
+ if clicked_cell_item:
+ clicked_cell_num = clicked_cell_item.m_population_cell.GetID()
+#the_item.brush().color()
+#the_item.m_population_cell.GetID()
+ if clicked_cell_item:
+ self.m_clicked_cell_number = clicked_cell_num
+# if clicked_cell_num is None or not self.m_avida.m_population.GetCell(int(clicked_cell_num)).IsOccupied():
+ if clicked_cell_item is None or not self.m_avida.m_population.GetCell(int(clicked_cell_num)).IsOccupied():
#PAINT the stats fields empty
self.m_org_name.setText('empty cell')
self.m_org_fitness.setText('-')
@@ -167,9 +177,12 @@
self.m_num_nor_clickedOrg.setText('-')
self.m_num_xor_clickedOrg.setText('-')
self.m_num_equals_clickedOrg.setText('-')
+ self.m_org_square_ctrl.paint(Qt.black)
return
+ self.m_org_square_ctrl.paint(clicked_cell_item.brush().color())
+
clicked_cell = self.m_avida.m_population.GetCell(int(clicked_cell_num))
organism = clicked_cell.GetOrganism()
Modified: trunk/source/python/AvidaGui2/pyOnePop_StatsView.ui
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePop_StatsView.ui 2005-05-19 23:16:02 UTC (rev 166)
+++ trunk/source/python/AvidaGui2/pyOnePop_StatsView.ui 2005-05-26 05:30:24 UTC (rev 167)
@@ -1,5 +1,8 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>pyOnePop_StatsView</class>
+<comment>
+Python:from pyOrgSquareCtrl import pyOrgSquareCtrl
+</comment>
<widget class="QWidget">
<property name="name">
<cstring>pyOnePop_StatsView</cstring>
@@ -29,7 +32,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout35</cstring>
+ <cstring>layout49</cstring>
</property>
<hbox>
<property name="name">
@@ -61,7 +64,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout36</cstring>
+ <cstring>layout48</cstring>
</property>
<vbox>
<property name="name">
@@ -69,734 +72,809 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout32</cstring>
+ <cstring>layout40</cstring>
</property>
- <vbox>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="QLabel">
<property name="name">
- <cstring>layout31</cstring>
+ <cstring>textLabel14_3_3_3</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel14_3_3_3</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>40</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string>Name:</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_org_name</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>70</width>
- <height>15</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>70</width>
- <height>15</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>32767</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Name:</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="QLabel">
<property name="name">
- <cstring>layout30</cstring>
+ <cstring>m_org_name</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel14_3_3_2_2_3</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>40</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string>Fitness:</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_org_fitness</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>70</width>
+ <height>15</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>70</width>
+ <height>15</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="pyOrgSquareCtrl">
<property name="name">
- <cstring>layout29</cstring>
+ <cstring>m_org_square_ctrl</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel1_2</cstring>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string>Merit:</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_org_merit</cstring>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="minimumSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout42</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>layout28</cstring>
+ <cstring>textLabel14_3_3_2_2_3</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel14_3_3_2_2_2_2</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize">
- <size>
- <width>32767</width>
- <height>40</height>
- </size>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string>Gestation (instructions):</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_org_gestation_time</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>32767</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Fitness:</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ <spacer>
<property name="name">
- <cstring>layout27</cstring>
+ <cstring>spacer6</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel3</cstring>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string>Genome Length:</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_org_genome_length</cstring>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>m_org_fitness</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout44</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>layout26</cstring>
+ <cstring>textLabel1_2</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel1</cstring>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string>Age (updates):</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_org_age</cstring>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Merit:</string>
+ </property>
</widget>
- </vbox>
+ <spacer>
+ <property name="name">
+ <cstring>spacer7</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>m_org_merit</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </hbox>
</widget>
- <spacer>
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>spacer3</cstring>
+ <cstring>layout45</cstring>
</property>
- <property name="orientation">
- <enum>Vertical</enum>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel14_3_3_2_2_2_2</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>32767</width>
+ <height>40</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Gestation (instructions):</string>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer10</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>m_org_gestation_time</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout46</cstring>
</property>
- <property name="sizeType">
- <enum>Expanding</enum>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel3</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Genome Length:</string>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer9</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>m_org_genome_length</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout47</cstring>
</property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel1</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Age (updates):</string>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer8</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>m_org_age</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ </vbox>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer5</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Preferred</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>215</width>
+ <height>5</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout53_2</cstring>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout20_2</cstring>
</property>
- </spacer>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel14_5</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <underline>1</underline>
+ </font>
+ </property>
+ <property name="text">
+ <string>Task</string>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel14_2_2</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <underline>1</underline>
+ </font>
+ </property>
+ <property name="text">
+ <string>times performed</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout53_2</cstring>
+ <cstring>layout51_2</cstring>
</property>
- <vbox>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="QLabel">
<property name="name">
- <cstring>layout20_2</cstring>
+ <cstring>textLabel14_3_2</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel14_5</cstring>
- </property>
- <property name="font">
- <font>
- <underline>1</underline>
- </font>
- </property>
- <property name="text">
- <string>Task</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel14_2_2</cstring>
- </property>
- <property name="font">
- <font>
- <underline>1</underline>
- </font>
- </property>
- <property name="text">
- <string>times performed</string>
- </property>
- </widget>
- </hbox>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>not</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="QLabel">
<property name="name">
- <cstring>layout51_2</cstring>
+ <cstring>m_num_not_clickedOrg</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel14_3_2</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>not</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_num_not_clickedOrg</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout52_2</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>layout52_2</cstring>
+ <cstring>textLabel4_2</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel4_2</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>nand</string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignVCenter|AlignLeft</set>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_num_nand_clickedOrg</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>nand</string>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignVCenter|AlignLeft</set>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="QLabel">
<property name="name">
- <cstring>layout9_2</cstring>
+ <cstring>m_num_nand_clickedOrg</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel6_2</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>and</string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignVCenter|AlignLeft</set>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_num_and_clickedOrg</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout9_2</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>layout10_2</cstring>
+ <cstring>textLabel6_2</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel17_2</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>ornot</string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignVCenter|AlignLeft</set>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_num_ornot_clickedOrg</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>and</string>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignVCenter|AlignLeft</set>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="QLabel">
<property name="name">
- <cstring>layout11_2</cstring>
+ <cstring>m_num_and_clickedOrg</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel10_2</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>or</string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignVCenter|AlignLeft</set>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_num_or_clickedOrg</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout10_2</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>layout12_2</cstring>
+ <cstring>textLabel17_2</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel12_2</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>andnot</string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignVCenter|AlignLeft</set>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_num_andnot_clickedOrg</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>ornot</string>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignVCenter|AlignLeft</set>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="QLabel">
<property name="name">
- <cstring>layout13_2</cstring>
+ <cstring>m_num_ornot_clickedOrg</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel14_4_2</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>nor</string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignVCenter|AlignLeft</set>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_num_nor_clickedOrg</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout11_2</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>layout14_2</cstring>
+ <cstring>textLabel10_2</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel16_2</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>xor</string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignVCenter|AlignLeft</set>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_num_xor_clickedOrg</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>or</string>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignVCenter|AlignLeft</set>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="QLabel">
<property name="name">
- <cstring>layout15_2</cstring>
+ <cstring>m_num_or_clickedOrg</cstring>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel18_2</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>equals</string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignVCenter|AlignLeft</set>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>m_num_equals_clickedOrg</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>-</string>
- </property>
- </widget>
- </hbox>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
</widget>
- </vbox>
+ </hbox>
</widget>
- <spacer>
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>spacer1_2_2</cstring>
+ <cstring>layout12_2</cstring>
</property>
- <property name="orientation">
- <enum>Vertical</enum>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel12_2</cstring>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>andnot</string>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignVCenter|AlignLeft</set>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>m_num_andnot_clickedOrg</cstring>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout13_2</cstring>
</property>
- <property name="sizeType">
- <enum>Minimum</enum>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel14_4_2</cstring>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>nor</string>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignVCenter|AlignLeft</set>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>m_num_nor_clickedOrg</cstring>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout14_2</cstring>
</property>
- <property name="sizeHint">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel16_2</cstring>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>xor</string>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignVCenter|AlignLeft</set>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>m_num_xor_clickedOrg</cstring>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout15_2</cstring>
</property>
- </spacer>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel18_2</cstring>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>equals</string>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignVCenter|AlignLeft</set>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>m_num_equals_clickedOrg</cstring>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
</vbox>
</widget>
</vbox>
@@ -1483,5 +1561,31 @@
</widget>
</vbox>
</widget>
+<customwidgets>
+ <customwidget>
+ <class>pyOrgSquareCtrl</class>
+ <header location="global">1</header>
+ <sizehint>
+ <width>-1</width>
+ <height>0</height>
+ </sizehint>
+ <container>0</container>
+ <sizepolicy>
+ <hordata>5</hordata>
+ <verdata>5</verdata>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ <pixmap>image0</pixmap>
+ </customwidget>
+</customwidgets>
+<images>
+ <image name="image0">
+ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154789cad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7!
ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e05!
82c261e95f8bfc04f1a1e8bc5c4dfe0a19017a725d8c60000000049454e44a!
e426082<
/data>
+ </image>
+</images>
<layoutdefaults spacing="6" margin="11"/>
+<includehints>
+ <includehint>pyorgsquarectrl.h</includehint>
+</includehints>
</UI>
Modified: trunk/source/python/AvidaGui2/pyPetriCanvasView.py
===================================================================
--- trunk/source/python/AvidaGui2/pyPetriCanvasView.py 2005-05-19 23:16:02 UTC (rev 166)
+++ trunk/source/python/AvidaGui2/pyPetriCanvasView.py 2005-05-26 05:30:24 UTC (rev 167)
@@ -8,11 +8,17 @@
def contentsMousePressEvent(self,e): # QMouseEvent e
if e.button() != Qt.LeftButton: return
cell_id = None
+ org_clicked_on_item = None
point = self.inverseWorldMatrix().map(e.pos())
if self.canvas():
ilist = self.canvas().collisions(point) #QCanvasItemList ilist
for item in ilist:
if item.rtti()==271828:
cell_id = item.m_population_cell.GetID()
- self.emit(PYSIGNAL("orgClickedOnSig"), (cell_id,))
-
+ org_clicked_on__color = item.brush().color()
+ org_clicked_on_item = item
+ self.emit(PYSIGNAL("orgClickedOnSig"), (org_clicked_on_item,))
+ if org_clicked_on_item:
+ self.emit(PYSIGNAL("orgClickedOnSig"), (org_clicked_on_item,))
+#the_item.brush().color()
+#the_item.m_population_cell.GetID()
\ No newline at end of file
Modified: trunk/source/python/AvidaGui2/pyPetriDishCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyPetriDishCtrl.py 2005-05-19 23:16:02 UTC (rev 166)
+++ trunk/source/python/AvidaGui2/pyPetriDishCtrl.py 2005-05-26 05:30:24 UTC (rev 167)
@@ -48,6 +48,7 @@
self.m_color_lookup_functor = None
self.m_background_rect = None
self.m_change_list = None
+ self.m_org_clicked_on_item = None
self.m_occupied_cells_ids = []
self.m_target_dish_width = 270
@@ -56,7 +57,11 @@
self.connect( self.m_session_mdl.m_session_mdtr, PYSIGNAL("setAvidaSig"), self.setAvidaSlot)
self.connect( self.m_canvas_view, PYSIGNAL("orgClickedOnSig"), self.m_session_mdl.m_session_mdtr, PYSIGNAL("orgClickedOnSig"))
+ self.connect( self.m_session_mdl.m_session_mdtr, PYSIGNAL("orgClickedOnSig"),
+ self.updateOrgClickedOutlineCellNumberSlot)
+
+
def setColorLookupFunctor(self, color_lookup_functor):
self.m_color_lookup_functor = color_lookup_functor
@@ -121,6 +126,14 @@
def setIndexer(self, indexer):
self.m_indexer = indexer
+ def updateOrgClickedOutlineCellNumberSlot(self, org_clicked_on_item):
+ if self.m_org_clicked_on_item:
+ self.m_org_clicked_on_item.setPen(QPen(Qt.NoPen))
+ self.m_org_clicked_on_item = org_clicked_on_item
+ if self.m_org_clicked_on_item:
+ self.updateCellItems(self.m_org_clicked_on_item.m_population_cell.GetID())
+
+
def updateCellItem(self, cell_id):
if self.m_cell_info[cell_id] is None:
self.m_cell_info[cell_id] = self.createNewCellItem(cell_id)
@@ -128,6 +141,12 @@
self.m_indexer(cell_info_item, self.m_cs_min_value, self.m_cs_value_range)
cell_info_item.updateColorUsingFunctor(self.m_color_lookup_functor)
+#JMC
+ if self.m_org_clicked_on_item:
+ if cell_info_item.m_population_cell.GetID == self.m_org_clicked_on_item.m_population_cell.GetID:
+ cell_info_item.setPen(QPen(QColor(0,255,0)))
+#JMC
+
def updateCellItems(self, should_update_all = False):
if self.m_cell_info:
@@ -143,6 +162,7 @@
self.updateCellItem(cell_id)
if self.m_canvas: self.m_canvas.update()
+#jmc this is where you put the AllCellsPaintedSignal
def extractPopulationSlot(self, send_reset_signal = False, send_quit_signal = False):
population_dict = {}
Modified: trunk/source/python/AvidaGui2/pyPopulationCellItem.py
===================================================================
--- trunk/source/python/AvidaGui2/pyPopulationCellItem.py 2005-05-19 23:16:02 UTC (rev 166)
+++ trunk/source/python/AvidaGui2/pyPopulationCellItem.py 2005-05-26 05:30:24 UTC (rev 167)
@@ -34,3 +34,5 @@
color = (self.m_population_cell.IsOccupied() and functor) and functor(self.m_index) or self.s_empty_color
self.setBrush(QBrush(color))
+
+
Modified: trunk/source/python/AvidaGui2/pyTemporaryReloads.py
===================================================================
--- trunk/source/python/AvidaGui2/pyTemporaryReloads.py 2005-05-19 23:16:02 UTC (rev 166)
+++ trunk/source/python/AvidaGui2/pyTemporaryReloads.py 2005-05-26 05:30:24 UTC (rev 167)
@@ -99,6 +99,7 @@
"AvidaGui2.pyOnePop_TimelineView",
"AvidaGui2.pyOnePop_TimelineCtrl",
+ "AvidaGui2.pyOrgSquareCtrl",
"AvidaGui2.pyTwoPop_GraphView",
"AvidaGui2.pyTwoPop_GraphCtrl",