Author: jclune
Date: 2005-06-08 01:33:17 -0400 (Wed, 08 Jun 2005)
New Revision: 188
Modified:
trunk/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
trunk/source/python/AvidaGui2/pyFreezerCtrl.py
trunk/source/python/AvidaGui2/pyNavBarCtrl.py
trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
trunk/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py
trunk/source/python/AvidaGui2/pyOneAnalyzeCtrl.py
trunk/source/python/AvidaGui2/pyOnePop_GraphView.ui
trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
trunk/source/python/AvidaGui2/pyOnePop_StatsCtrl.py
trunk/source/python/AvidaGui2/pyOnePop_StatsView.ui
trunk/source/python/AvidaGui2/pyOnePopulationCtrl.py
trunk/source/python/AvidaGui2/pyPetriConfigureCtrl.py
Log:
1) Drag and drop now works with any freezer item (empty petri dish, full petri dish, organism)
2) path names are more likely to work on any operating system
3) it does not crash if there is no data file in the freezer directory
4) took the compare two bullets out, per rob's request
5) added avg. merit, age, genome length to pop stats
6) swapped pop stats and pop tasks
7) renamed 'task' to funcion
8) changed size of the stats window so the graph had more room (kaben, this was a tweak until it worked thing, rob needed it for screen shots for the grant review)
Modified: trunk/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2005-06-08 02:38:18 UTC (rev 187)
+++ trunk/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2005-06-08 05:33:17 UTC (rev 188)
@@ -37,11 +37,11 @@
for (cli, ctrl) in (
(self.m_nav_bar_ctrl.m_one_population_cli, self.m_one_population_ctrl),
- (self.m_nav_bar_ctrl.m_two_population_cli, self.m_two_population_ctrl),
+# (self.m_nav_bar_ctrl.m_two_population_cli, self.m_two_population_ctrl),
(self.m_nav_bar_ctrl.m_one_organism_cli, self.m_one_organism_ctrl),
- (self.m_nav_bar_ctrl.m_two_organism_cli, self.m_two_organism_ctrl),
+# (self.m_nav_bar_ctrl.m_two_organism_cli, self.m_two_organism_ctrl),
(self.m_nav_bar_ctrl.m_one_analyze_cli, self.m_one_analyze_ctrl),
- (self.m_nav_bar_ctrl.m_two_analyze_cli, self.m_two_analyze_ctrl),
+# (self.m_nav_bar_ctrl.m_two_analyze_cli, self.m_two_analyze_ctrl),
):
self.m_cli_to_ctrl_dict[cli] = ctrl
self.m_ctrl_to_cli_dict[ctrl] = cli
Modified: trunk/source/python/AvidaGui2/pyFreezerCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyFreezerCtrl.py 2005-06-08 02:38:18 UTC (rev 187)
+++ trunk/source/python/AvidaGui2/pyFreezerCtrl.py 2005-06-08 05:33:17 UTC (rev 188)
@@ -64,8 +64,24 @@
def pressed_itemSlot(self, item):
if item != None and item.depth() > 0:
+ top_level = item
+ while top_level.parent():
+ top_level = top_level.parent()
- dragHolder = self.itemDrag( item.text(0), self )
+ # Rebuild the file name
+
+ if str(top_level.text(0)).startswith(" Empty Petri"):
+ file_name = str(item.text(0)) + ".empty"
+ elif str(top_level.text(0)).startswith(" Full Petri"):
+ file_name = str(item.text(0)) + ".full"
+ elif str(top_level.text(0)).startswith(" Organism"):
+ file_name = str(item.text(0)) + ".organism"
+ file_name = self.m_session_mdl.m_current_freezer + file_name
+# thawed_item = pyReadFreezer(file_name)
+# self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("doDefrostDishSig"),
+# (item.text(0), thawed_item,))
+
+ dragHolder = self.itemDrag( file_name, self )
# maybe play with iconView
# dragHolder.dragEnabled()
dragHolder.dragCopy()
Modified: trunk/source/python/AvidaGui2/pyNavBarCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyNavBarCtrl.py 2005-06-08 02:38:18 UTC (rev 187)
+++ trunk/source/python/AvidaGui2/pyNavBarCtrl.py 2005-06-08 05:33:17 UTC (rev 188)
@@ -10,30 +10,41 @@
pyNavBarView.__init__(self,parent,name,fl)
def construct(self, session_mdl):
- def generateCLIGroup(list_view, group_name, first_name, second_name):
+# def generateCLIGroup(list_view, group_name, first_name, second_name):
+ def generateCLIGroup(list_view, group_name, first_name):
group_lvi = QCheckListItem(list_view, group_name, QCheckListItem.RadioButtonController)
group_lvi.setSelectable(False)
group_lvi.setOpen(True)
#
- second_cli = QCheckListItem(group_lvi, second_name, QCheckListItem.RadioButton)
- second_cli.setSelectable(False)
+# second_cli = QCheckListItem(group_lvi, second_name, QCheckListItem.RadioButton)
+# second_cli.setSelectable(False)
first_cli = QCheckListItem(group_lvi, first_name, QCheckListItem.RadioButton)
first_cli.setSelectable(False)
#
- return (group_lvi, first_cli, second_cli)
+# return (group_lvi, first_cli, second_cli)
+ return (group_lvi, first_cli)
self.m_list_view.setSortColumn(-1)
self.m_list_view.clear()
- (self.m_analyze_lvi, self.m_one_analyze_cli, self.m_two_analyze_cli) = generateCLIGroup(
- self.m_list_view, " Analysis", "Analyze One", "Compare Two")
+# (self.m_analyze_lvi, self.m_one_analyze_cli, self.m_two_analyze_cli) = generateCLIGroup(
+# self.m_list_view, " Analysis", "Analyze One", "Compare Two")
- (self.m_organism_lvi, self.m_one_organism_cli, self.m_two_organism_cli) = generateCLIGroup(
- self.m_list_view, " Organisms", "View One", "Compare Two")
+ (self.m_analyze_lvi, self.m_one_analyze_cli) = generateCLIGroup(
+ self.m_list_view, " Analysis", "Analyze One")
- (self.m_population_lvi, self.m_one_population_cli, self.m_two_population_cli) = generateCLIGroup(
- self.m_list_view, " Populations", "View One", "Compare Two")
+# (self.m_organism_lvi, self.m_one_organism_cli, self.m_two_organism_cli) = generateCLIGroup(
+# self.m_list_view, " Organisms", "View One", "Compare Two")
+ (self.m_organism_lvi, self.m_one_organism_cli) = generateCLIGroup(
+ self.m_list_view, " Organisms", "View One")
+
+# (self.m_population_lvi, self.m_one_population_cli, self.m_two_population_cli) = generateCLIGroup(
+# self.m_list_view, " Populations", "View One", "Compare Two")
+
+ (self.m_population_lvi, self.m_one_population_cli) = generateCLIGroup(
+ self.m_list_view, " Populations", "View One")
+
self.m_population_lvi.setPixmap(0, self.image0)
self.m_organism_lvi.setPixmap(0, self.image1)
self.m_analyze_lvi.setPixmap(0, self.image2)
Modified: trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2005-06-08 02:38:18 UTC (rev 187)
+++ trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2005-06-08 05:33:17 UTC (rev 188)
@@ -7,7 +7,9 @@
from qt import *
from qwt import *
import os
+import os.path
+
class PrintFilter(QwtPlotPrintFilter):
def __init__(self):
QwtPlotPrintFilter.__init__(self)
@@ -45,7 +47,6 @@
self.m_combo_box_2.clear()
self.m_combo_box_1.setInsertionPolicy(QComboBox.AtBottom)
self.m_combo_box_2.setInsertionPolicy(QComboBox.AtBottom)
-#jmc this should be made so it starts with no graph
self.m_petri_dish_dir_path = ' '
self.m_petri_dish_dir_exists_flag = False
@@ -77,7 +78,7 @@
self.m_combo_box_1_color, SIGNAL("activated(int)"), self.modeActivatedSlot)
self.connect(
self.m_combo_box_2_color, SIGNAL("activated(int)"), self.modeActivatedSlot)
- self.connect( self.m_session_mdl.m_session_mdtr, PYSIGNAL("petriDishDroppedSig"),
+ self.connect( self.m_session_mdl.m_session_mdtr, PYSIGNAL("freezerItemDroppedInOneAnalyzeSig"),
self.petriDropped)
self.m_graph_ctrl.setAxisTitle(QwtPlot.xBottom, "Time (updates)")
self.m_graph_ctrl.setAxisAutoScale(QwtPlot.xBottom)
@@ -99,21 +100,13 @@
self.printGraphSlot)
def load(self, filename, colx, coly):
- init_file = cInitFile(cString('default.workspace/freezer/' + str(self.m_petri_dish_dir_path) + '.full/' + filename))
-
- print "loading"
- if not init_file.IsOpen():
- print "the file you are looking for does not exist"
- return
-
+ init_file = cInitFile(cString(os.path.join(str(self.m_petri_dish_dir_path), filename)))
init_file.Load()
init_file.Compress()
x_array = zeros(init_file.GetNumLines(), Float)
y_array = zeros(init_file.GetNumLines(), Float)
- print "init_file.GetNumLines() is "
- print init_file.GetNumLines()
for line_id in range(init_file.GetNumLines()):
line = init_file.GetLine(line_id)
@@ -123,7 +116,7 @@
def modeActivatedSlot(self, index = None): #note: index is not used
self.m_graph_ctrl.clear()
-
+
#check to see if we have a valid directory path to analyze
if self.m_petri_dish_dir_exists_flag == False:
return
@@ -132,14 +125,27 @@
if self.m_combo_box_1.currentItem():
index_1 = self.m_combo_box_1.currentItem()
+
+ #check to see if the file exists
+ if os.path.isfile(os.path.join(str(self.m_petri_dish_dir_path), self.m_avida_stats_interface.m_entries[index_1][1])):
+ pass
+ else:
+ print "error: there is no data file in the directory to load from"
+ self.m_graph_ctrl.setTitle(self.m_avida_stats_interface.m_entries[0][0])
+ self.m_graph_ctrl.setAxisTitle(QwtPlot.yLeft, self.m_avida_stats_interface.m_entries[0][0])
+ self.m_graph_ctrl.replot()
+ return
self.m_graph_ctrl.setAxisTitle(QwtPlot.yLeft, self.m_avida_stats_interface.m_entries[index_1][0])
self.m_graph_ctrl.enableYLeftAxis(True)
self.m_graph_ctrl.setAxisAutoScale(QwtPlot.yLeft)
+ print "index_1[2] is"
+ print self.m_avida_stats_interface.m_entries[index_1][2]
self.m_curve_1_arrays = self.load(
self.m_avida_stats_interface.m_entries[index_1][1],
1,
self.m_avida_stats_interface.m_entries[index_1][2]
)
+
self.m_graph_ctrl.m_curve_1 = self.m_graph_ctrl.insertCurve(self.m_avida_stats_interface.m_entries[index_1][0])
self.m_graph_ctrl.setCurveData(self.m_graph_ctrl.m_curve_1, self.m_curve_1_arrays[0], self.m_curve_1_arrays[1])
self.m_graph_ctrl.setCurvePen(self.m_graph_ctrl.m_curve_1, QPen(self.m_Colors[self.m_combo_box_1_color.currentItem()][1]))
@@ -161,6 +167,7 @@
1,
self.m_avida_stats_interface.m_entries[index_2][2]
)
+
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])
if self.m_Colors[self.m_combo_box_2_color.currentItem()][0] is 'thick':
@@ -202,16 +209,16 @@
self.m_graph_ctrl.printPlot(printer, filter)
- def gotIt( self, e):
- print "got it"
+# def gotIt( self, e):
+# print "got it"
def petriDropped(self, e):
# a check in pyOneAnalyzeCtrl.py makes sure this is a valid path
self.m_petri_dish_dir_exists_flag = True
# Try to decode to the data you understand...
- str = QString()
- if ( QTextDrag.decode( e, str ) ) :
- self.m_petri_dish_dir_path = str
+ freezer_item_name = QString()
+ if ( QTextDrag.decode( e, freezer_item_name ) ) :
+ self.m_petri_dish_dir_path = freezer_item_name
self.modeActivatedSlot()
return
@@ -236,9 +243,6 @@
# for (QStringList.Iterator i=files.begin() i!=files.end() ++i)
for i in files:
m = m + " " + i + '\n'
-#jmc delete
-# self.setText( m )
-# self.setMinimumSize(self.minimumSize().expandedTo(self.sizeHint()))
return
str = decode( e )
Modified: trunk/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py 2005-06-08 02:38:18 UTC (rev 187)
+++ trunk/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py 2005-06-08 05:33:17 UTC (rev 188)
@@ -2,8 +2,8 @@
from qt import *
from pyOneAna_PetriDishView import pyOneAna_PetriDishView
+import os
-
class pyOneAna_PetriDishCtrl(pyOneAna_PetriDishView):
def __init__(self,parent = None,name = None,fl = 0):
@@ -12,13 +12,13 @@
def construct(self, session_mdl):
self.m_session_mdl = session_mdl
- self.connect( self.m_session_mdl.m_session_mdtr, PYSIGNAL("petriDishDroppedSig"),
- self.petriDropped)
+ self.connect( self.m_session_mdl.m_session_mdtr, PYSIGNAL("freezerItemDroppedInOneAnalyzeSig"),
+ self.freezerItemDropped)
- def petriDropped(self, e):
+ def freezerItemDropped(self, e):
# Try to decode to the data you understand...
- string = QString()
- if ( QTextDrag.decode( e, string ) ) :
- self.m_one_ana_pop_name.setText(string)
+ freezer_item_name = QString()
+ if ( QTextDrag.decode( e, freezer_item_name ) ) :
+ self.m_one_ana_pop_name.setText(os.path.splitext((os.path.split(str(freezer_item_name))[1]))[0])
Modified: trunk/source/python/AvidaGui2/pyOneAnalyzeCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOneAnalyzeCtrl.py 2005-06-08 02:38:18 UTC (rev 187)
+++ trunk/source/python/AvidaGui2/pyOneAnalyzeCtrl.py 2005-06-08 05:33:17 UTC (rev 188)
@@ -14,24 +14,24 @@
self.m_session_mdl = session_mdl
self.m_one_ana_graph_ctrl.construct(self.m_session_mdl)
self.m_one_ana_petri_ctrl.construct(self.m_session_mdl)
- self.connect( self, PYSIGNAL("petriDishDroppedSig"), self.m_session_mdl.m_session_mdtr, PYSIGNAL("petriDishDroppedSig"))
+ self.connect( self, PYSIGNAL("freezerItemDroppedInOneAnalyzeSig"), self.m_session_mdl.m_session_mdtr, PYSIGNAL("freezerItemDroppedInOneAnalyzeSig"))
print "self"
print self
def dropEvent( self, e ):
- string = QString()
+ freezer_item_name = QString()
- if ( QTextDrag.decode( e, string ) ) :
- if os.path.exists(str('default.workspace/freezer/' + str(string) + '.full/')) == False:
- print "that was not a valid path"
+ if ( QTextDrag.decode( e, freezer_item_name ) ) :
+ if os.path.exists( str(freezer_item_name)) == False:
+ print "that was not a valid path(3)"
else:
- self.emit(PYSIGNAL("petriDishDroppedSig"), (e,))
+ self.emit(PYSIGNAL("freezerItemDroppedInOneAnalyzeSig"), (e,))
- def dragEnterEvent( self, e ):
+# def dragEnterEvent( self, e ):
# # Check if you want the drag...
# if (secret.canDecode( e ) or
# QTextDrag.canDecode( e ) or
# QImageDrag.canDecode( e ) or
# QUriDrag.canDecode( e )):
- e.accept()
\ No newline at end of file
+# e.accept()
\ No newline at end of file
Modified: trunk/source/python/AvidaGui2/pyOnePop_GraphView.ui
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePop_GraphView.ui 2005-06-08 02:38:18 UTC (rev 187)
+++ trunk/source/python/AvidaGui2/pyOnePop_GraphView.ui 2005-06-08 05:33:17 UTC (rev 188)
@@ -10,10 +10,24 @@
<rect>
<x>0</x>
<y>0</y>
- <width>147</width>
- <height>202</height>
+ <width>574</width>
+ <height>743</height>
</rect>
</property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>3</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>200</height>
+ </size>
+ </property>
<property name="caption">
<string>pyOnePop_GraphView</string>
</property>
@@ -238,7 +252,7 @@
</sizehint>
<container>0</container>
<sizepolicy>
- <hordata>3</hordata>
+ <hordata>0</hordata>
<verdata>0</verdata>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
@@ -251,6 +265,16 @@
<property type="3">-1</property>
<property type="1">pyGraphCtrl</property>
<property type="4">-1</property>
+ <property type="1">pyGraphCtrl</property>
+ <property type="4">-1</property>
+ <property type="1">pyGraphCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGraphCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGraphCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGraphCtrl</property>
+ <property type="0">-1</property>
<property type="pyGraphCtrl"></property>
<property type="-1">1</property>
</customwidget>
Modified: trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2005-06-08 02:38:18 UTC (rev 187)
+++ trunk/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2005-06-08 05:33:17 UTC (rev 188)
@@ -4,6 +4,7 @@
from pyMapProfile import pyMapProfile
from pyOnePop_PetriDishView import pyOnePop_PetriDishView
import os
+from pyReadFreezer import pyReadFreezer
class pyOnePop_PetriDishCtrl(pyOnePop_PetriDishView):
@@ -133,12 +134,17 @@
print "send_quit_signal = " + str(send_quit_signal)
def petriDropped(self, e):
- print "caught it"
# Try to decode to the data you understand...
- string = QString()
- if ( QTextDrag.decode( e, string ) ) :
- dishName = string
- self.PopulationTextLabel.setText(dishName)
+ freezer_item_name = QString()
+ if ( QTextDrag.decode( e, freezer_item_name ) ) :
+ if freezer_item_name[-4:] == 'full':
+ freezer_item_name_temp = str(freezer_item_name) + '/petri_dish'
+ else:
+ freezer_item_name_temp = str(freezer_item_name)
+ thawed_item = pyReadFreezer(freezer_item_name_temp)
+ self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("doDefrostDishSig"),
+ (os.path.splitext((os.path.split(str(freezer_item_name))[1]))[0], thawed_item,))
+
current_page = self.m_petri_dish_widget_stack.visibleWidget()
current_page_int = self.m_petri_dish_widget_stack.id(current_page)
if (current_page_int == 0):
Modified: trunk/source/python/AvidaGui2/pyOnePop_StatsCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePop_StatsCtrl.py 2005-06-08 02:38:18 UTC (rev 187)
+++ trunk/source/python/AvidaGui2/pyOnePop_StatsCtrl.py 2005-06-08 05:33:17 UTC (rev 188)
@@ -56,13 +56,13 @@
avg_fitness = "%.2g" %(stats.GetAveFitness())
self.m_avg_fitness.setText(avg_fitness)
-
- dom_fitness = str(stats.GetDomFitness())
+ # i got rid of dominant stats, jmc
+# dom_fitness = str(stats.GetDomFitness())
# string_length = len(dom_fitness)
# while string_length < string_output_length:
# dom_fitness = dom_fitness + '0'
# string_length = string_length+1
- self.m_dom_fitness.setText(dom_fitness[0:string_output_length])
+# self.m_dom_fitness.setText(dom_fitness[0:string_output_length])
num_orgs = stats.GetNumCreatures()
self.m_num_orgs.setText(QString("%1").arg(num_orgs))
@@ -73,8 +73,17 @@
# avg_gest = avg_gest + '0'
# string_length = string_length+1
self.m_avg_gest.setText(QString("%1").arg(avg_gest))
+
+ avg_merit = "%d" %(stats.GetAveMerit())
+ self.m_avg_merit.setText(QString("%1").arg(avg_merit))
+ avg_age = "%d" %(stats.GetAveCreatureAge())
+ 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))
+
+
#TASK OUTLOOK
# #if num_orgs_doing_a_given_task is above this number, we say the pop is doing this task
Modified: trunk/source/python/AvidaGui2/pyOnePop_StatsView.ui
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePop_StatsView.ui 2005-06-08 02:38:18 UTC (rev 187)
+++ trunk/source/python/AvidaGui2/pyOnePop_StatsView.ui 2005-06-08 05:33:17 UTC (rev 188)
@@ -10,29 +10,41 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>0</y>
- <width>485</width>
- <height>743</height>
+ <y>171</y>
+ <width>574</width>
+ <height>400</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>3</vsizetype>
+ <hsizetype>5</hsizetype>
+ <vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>1010</width>
+ <height>400</height>
+ </size>
+ </property>
<property name="caption">
<string>pyOnePop_StatsView</string>
</property>
- <vbox>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout49</cstring>
+ <cstring>layout47</cstring>
</property>
<hbox>
<property name="name">
@@ -50,6 +62,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="maximumSize">
+ <size>
+ <width>32767</width>
+ <height>350</height>
+ </size>
+ </property>
<property name="font">
<font>
<pointsize>11</pointsize>
@@ -64,856 +82,411 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout48</cstring>
+ <cstring>layout40</cstring>
</property>
- <vbox>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="QLabel">
<property name="name">
- <cstring>layout40</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>
- <widget class="pyOrgSquareCtrl">
- <property name="name">
- <cstring>m_org_square_ctrl</cstring>
- </property>
- <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>
- </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>32767</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>layout42</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>
- <spacer>
- <property name="name">
- <cstring>spacer6</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_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>5</hsizetype>
+ <vsizetype>5</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>10</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>layout44</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>
- <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>
+ <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>layout45</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>
- <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>
+ <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>10</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>layout46</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>
- <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="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>5</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLabel">
<property name="name">
- <cstring>layout47</cstring>
+ <cstring>m_org_fitness</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>
- <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>
+ <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>
- </vbox>
+ </hbox>
</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>
+ <cstring>layout44</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>textLabel1_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="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Metabolic Rate:</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ <spacer>
<property name="name">
- <cstring>layout51_2</cstring>
+ <cstring>spacer7</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>
- </widget>
- <widget class="QLayoutWidget">
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>5</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLabel">
<property name="name">
- <cstring>layout52_2</cstring>
+ <cstring>m_org_merit</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>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout45</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>layout9_2</cstring>
+ <cstring>textLabel14_3_3_2_2_2_2</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="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>32767</width>
+ <height>10</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Gestation (instructions):</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ <spacer>
<property name="name">
- <cstring>layout10_2</cstring>
+ <cstring>spacer10</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>
- </widget>
- <widget class="QLayoutWidget">
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>5</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLabel">
<property name="name">
- <cstring>layout11_2</cstring>
+ <cstring>m_org_gestation_time</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="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>layout46</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>layout12_2</cstring>
+ <cstring>textLabel3</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>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Genome Length:</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ <spacer>
<property name="name">
- <cstring>layout13_2</cstring>
+ <cstring>spacer9</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="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>5</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>
- <widget class="QLayoutWidget">
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout47</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>layout14_2</cstring>
+ <cstring>textLabel1</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>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Age (updates):</string>
+ </property>
</widget>
- <widget class="QLayoutWidget">
+ <spacer>
<property name="name">
- <cstring>layout15_2</cstring>
+ <cstring>spacer8</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="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>40</width>
+ <height>5</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>
- </vbox>
+ </hbox>
</widget>
- </vbox>
- </widget>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout46</cstring>
- </property>
- <vbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QGroupBox">
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>groupBox3</cstring>
+ <cstring>layout33</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="title">
- <string>Population Task Report</string>
- </property>
<vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout53</cstring>
+ <cstring>layout32</cstring>
</property>
<vbox>
<property name="name">
@@ -921,7 +494,7 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout20</cstring>
+ <cstring>layout20_2</cstring>
</property>
<hbox>
<property name="name">
@@ -929,7 +502,7 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel14</cstring>
+ <cstring>textLabel14_5</cstring>
</property>
<property name="font">
<font>
@@ -937,12 +510,12 @@
</font>
</property>
<property name="text">
- <string>Task</string>
+ <string>Functions</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel14_2</cstring>
+ <cstring>textLabel14_2_2</cstring>
</property>
<property name="font">
<font>
@@ -950,14 +523,14 @@
</font>
</property>
<property name="text">
- <string>orgs performing</string>
+ <string>Times Performed</string>
</property>
</widget>
</hbox>
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout51</cstring>
+ <cstring>layout51_2</cstring>
</property>
<hbox>
<property name="name">
@@ -965,7 +538,7 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel14_3</cstring>
+ <cstring>textLabel14_3_2</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -977,6 +550,7 @@
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -985,7 +559,7 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>m_num_not</cstring>
+ <cstring>m_num_not_clickedOrg</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -997,6 +571,7 @@
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1007,7 +582,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout52</cstring>
+ <cstring>layout52_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1015,10 +590,11 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel4</cstring>
+ <cstring>textLabel4_2</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1030,10 +606,11 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>m_num_nand</cstring>
+ <cstring>m_num_nand_clickedOrg</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1044,7 +621,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout9</cstring>
+ <cstring>layout9_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1052,10 +629,11 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel6</cstring>
+ <cstring>textLabel6_2</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1067,10 +645,11 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>m_num_and</cstring>
+ <cstring>m_num_and_clickedOrg</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1081,7 +660,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout10</cstring>
+ <cstring>layout10_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1089,10 +668,11 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel17</cstring>
+ <cstring>textLabel17_2</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1104,10 +684,11 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>m_num_ornot</cstring>
+ <cstring>m_num_ornot_clickedOrg</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1118,7 +699,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout11</cstring>
+ <cstring>layout11_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1126,10 +707,11 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel10</cstring>
+ <cstring>textLabel10_2</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1141,10 +723,11 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>m_num_or</cstring>
+ <cstring>m_num_or_clickedOrg</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1155,7 +738,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout12</cstring>
+ <cstring>layout12_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1163,10 +746,11 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel12</cstring>
+ <cstring>textLabel12_2</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1178,10 +762,11 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>m_num_andnot</cstring>
+ <cstring>m_num_andnot_clickedOrg</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1192,7 +777,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout13</cstring>
+ <cstring>layout13_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1200,10 +785,11 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel14_4</cstring>
+ <cstring>textLabel14_4_2</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1215,10 +801,11 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>m_num_nor</cstring>
+ <cstring>m_num_nor_clickedOrg</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1229,7 +816,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout14</cstring>
+ <cstring>layout14_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1237,10 +824,11 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel16</cstring>
+ <cstring>textLabel16_2</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1252,10 +840,11 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>m_num_xor</cstring>
+ <cstring>m_num_xor_clickedOrg</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1266,7 +855,7 @@
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout15</cstring>
+ <cstring>layout15_2</cstring>
</property>
<hbox>
<property name="name">
@@ -1274,10 +863,11 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel18</cstring>
+ <cstring>textLabel18_2</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1289,10 +879,11 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>m_num_equals</cstring>
+ <cstring>m_num_equals_clickedOrg</cstring>
</property>
<property name="font">
<font>
+ <pointsize>10</pointsize>
</font>
</property>
<property name="text">
@@ -1303,52 +894,112 @@
</widget>
</vbox>
</widget>
- <spacer>
+ </vbox>
+ </widget>
+ </vbox>
+ </widget>
+ <widget class="QGroupBox">
+ <property name="name">
+ <cstring>groupBox5</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>11</pointsize>
+ </font>
+ </property>
+ <property name="frameShape">
+ <enum>GroupBoxPanel</enum>
+ </property>
+ <property name="title">
+ <string>Population Statistics</string>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout38</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>spacer1</cstring>
+ <cstring>textLabel14_3_3_2_2</cstring>
</property>
- <property name="orientation">
- <enum>Vertical</enum>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="sizeType">
- <enum>Minimum</enum>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>20</height>
+ </size>
</property>
- <property name="sizeHint">
+ <property name="maximumSize">
<size>
- <width>16</width>
- <height>16</height>
+ <width>32767</width>
+ <height>20</height>
</size>
</property>
- </spacer>
- </vbox>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>Population Size:</string>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>m_num_orgs</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="QGroupBox">
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>groupBox5</cstring>
+ <cstring>layout36</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>11</pointsize>
- </font>
- </property>
- <property name="title">
- <string>Population Statistics</string>
- </property>
- <grid>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="1" column="1">
+ <widget class="QLabel">
<property name="name">
- <cstring>m_dom_fitness</cstring>
+ <cstring>textLabel14_3_3</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -1358,16 +1009,22 @@
<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>-</string>
+ <string>Avg. Fitness:</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="1">
+ <widget class="QLabel">
<property name="name">
<cstring>m_avg_fitness</cstring>
</property>
@@ -1403,9 +1060,19 @@
<string>-</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="0">
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout39_2</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>textLabel14_3_3_2</cstring>
+ <cstring>textLabel14_3_3_2_2_2_3</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -1427,12 +1094,12 @@
</font>
</property>
<property name="text">
- <string>Dominant Org. Fitness:</string>
+ <string>Avg. Metabolic Rate:</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="1">
+ <widget class="QLabel">
<property name="name">
- <cstring>m_num_orgs</cstring>
+ <cstring>m_avg_merit</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -1451,9 +1118,19 @@
<string>-</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0">
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout39</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>textLabel14_3_3</cstring>
+ <cstring>textLabel14_3_3_2_2_2</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -1475,12 +1152,12 @@
</font>
</property>
<property name="text">
- <string>Avg. Fitness:</string>
+ <string>Avg. Gestation (instructions):</string>
</property>
</widget>
- <widget class="QLabel" row="3" column="0">
+ <widget class="QLabel">
<property name="name">
- <cstring>textLabel14_3_3_2_2_2</cstring>
+ <cstring>m_avg_gest</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -1490,6 +1167,37 @@
<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>layout39_3</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel14_3_3_2_2_2_4</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>
@@ -1502,12 +1210,12 @@
</font>
</property>
<property name="text">
- <string>Avg. Gestation (instructions):</string>
+ <string>Avg. Genome Length:</string>
</property>
</widget>
- <widget class="QLabel" row="3" column="1">
+ <widget class="QLabel">
<property name="name">
- <cstring>m_avg_gest</cstring>
+ <cstring>m_avg_genome_length</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -1526,9 +1234,19 @@
<string>-</string>
</property>
</widget>
- <widget class="QLabel" row="2" column="0">
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout39_3_2</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>textLabel14_3_3_2_2</cstring>
+ <cstring>textLabel14_3_3_2_2_2_4_2</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -1550,16 +1268,449 @@
</font>
</property>
<property name="text">
- <string>Population Size:</string>
+ <string>Avg. Age (updates):</string>
</property>
</widget>
- </grid>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>m_avg_age</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>layout53</cstring>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout20</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel14</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ <underline>1</underline>
+ </font>
+ </property>
+ <property name="text">
+ <string>Functions</string>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel14_2</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ <underline>1</underline>
+ </font>
+ </property>
+ <property name="text">
+ <string>Orgs Performing</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout51</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel14_3</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>not</string>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>m_num_not</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>layout52</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel4</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </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</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>layout9</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel6</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </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</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>layout10</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel17</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </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</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>layout11</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel10</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </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</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>layout12</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel12</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </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</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>layout13</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel14_4</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </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</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>layout14</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel16</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </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</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>layout15</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel18</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </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</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ </vbox>
+ </widget>
</vbox>
</widget>
</hbox>
</widget>
- </vbox>
+ </hbox>
</widget>
<customwidgets>
<customwidget>
Modified: trunk/source/python/AvidaGui2/pyOnePopulationCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOnePopulationCtrl.py 2005-06-08 02:38:18 UTC (rev 187)
+++ trunk/source/python/AvidaGui2/pyOnePopulationCtrl.py 2005-06-08 05:33:17 UTC (rev 188)
@@ -19,11 +19,11 @@
self.connect( self, PYSIGNAL("petriDishDroppedInPopViewSig"), self.m_session_mdl.m_session_mdtr, PYSIGNAL("petriDishDroppedInPopViewSig"))
def dropEvent( self, e ):
- string = QString()
+ freezer_item_name = QString()
print "dropEvent"
- if ( QTextDrag.decode( e, string ) ) :
- if os.path.exists(str('default.workspace/freezer/' + str(string) + '.full/')) == False:
- print "that was not a valid path"
+ if ( QTextDrag.decode( e, freezer_item_name ) ) : #freezer_item_name is a string...the file name
+ if os.path.exists(str(freezer_item_name)) == False:
+ print "that was not a valid path (1)"
else:
self.emit(PYSIGNAL("petriDishDroppedInPopViewSig"), (e,))
print "emitted"
\ No newline at end of file
Modified: trunk/source/python/AvidaGui2/pyPetriConfigureCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2005-06-08 02:38:18 UTC (rev 187)
+++ trunk/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2005-06-08 05:33:17 UTC (rev 188)
@@ -278,11 +278,14 @@
self.setAvidaSlot)
def dropEvent( self, e ):
- string = QString()
+ freezer_item_name = QString()
print "dropEvent"
- if ( QTextDrag.decode( e, string ) ) :
- if os.path.exists(str('default.workspace/freezer/' + str(string) + '.full/')) == False:
- print "that was not a valid path"
+ if ( QTextDrag.decode( e, freezer_item_name ) ) :
+ print "in here"
+ print freezer_item_name
+# if os.path.exists(str('default.workspace/freezer/' + str(string) + '.full/')) == False:
+ if os.path.exists(str(freezer_item_name)) == False:
+ print "that was not a valid path (2)"
else:
self.emit(PYSIGNAL("petriDishDroppedInPopViewSig"), (e,))
- print "emitted"
\ No newline at end of file
+ print "emitted(1)"
\ No newline at end of file