[Avida-SVN] r1062 - branches/developers/avida-edward/source/python/AvidaGui2
baerb at myxo.css.msu.edu
baerb at myxo.css.msu.edu
Mon Oct 30 10:45:10 PST 2006
Author: baerb
Date: 2006-10-30 13:45:10 -0500 (Mon, 30 Oct 2006)
New Revision: 1062
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup.py
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_GraphView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismDataCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Made a number of changes that should make Avida-ED look better on Windows
based computers.
-- Messed around with fonts (moving to Arial as default font)
-- Allow user to make application bigger to see areas that are currently
being cut off
Changed some of the wording.
-- Full Petri Dish => Populated Dish
-- Empty Petri Dish => Configured Dish
-- One side effect is that sort had to be turned off on the freezer list
and items are now listed in reverse alphabetical order
Modified: branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup.py 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_startup.py 2006-10-30 18:45:10 UTC (rev 1062)
@@ -5,6 +5,8 @@
from AvidaGui2 import Avida_ED_startup_utils as Avida_ED_startup_utils
Avida_ED_startup_utils.AvidaCore.cConfig.InitGroupList()
ctrl = Avida_ED_startup_utils.AvidaEd()
+ default_font = qt.QFont("Arial", 12)
+ a.setFont(default_font, True)
a.exec_loop()
def Interactive():
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-10-30 18:45:10 UTC (rev 1062)
@@ -25,22 +25,22 @@
</property>
<property name="sizePolicy">
<sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</vsizetype>
+ <hsizetype>3</hsizetype>
+ <vsizetype>3</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
- <width>195</width>
- <height>501</height>
+ <width>1024</width>
+ <height>700</height>
</size>
</property>
<property name="maximumSize">
<size>
- <width>1024</width>
- <height>700</height>
+ <width>2000</width>
+ <height>1400</height>
</size>
</property>
<property name="caption">
@@ -302,6 +302,8 @@
<property type="0">-1</property>
<property type="1">pyFreezerView</property>
<property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
<property type="pyFreezerView"></property>
<property type="-1">1</property>
</customwidget>
@@ -377,6 +379,8 @@
<property type="0">-1</property>
<property type="1">pyNavBarView</property>
<property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
<property type="pyNavBarView"></property>
<property type="-1">1</property>
</customwidget>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui 2006-10-30 18:45:10 UTC (rev 1062)
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>500</width>
- <height>177</height>
+ <width>510</width>
+ <height>179</height>
</rect>
</property>
<property name="caption">
@@ -23,6 +23,11 @@
<property name="name">
<cstring>MainMessageTextLabel</cstring>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ </font>
+ </property>
<property name="text">
<string>Enter Name of Item to Freeze</string>
</property>
@@ -34,6 +39,12 @@
<property name="name">
<cstring>FileNameLineEdit</cstring>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ <pointsize>16</pointsize>
+ </font>
+ </property>
<property name="frameShape">
<enum>LineEditPanel</enum>
</property>
@@ -65,11 +76,17 @@
<property name="name">
<cstring>EmptyRadioButton</cstring>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ <pointsize>16</pointsize>
+ </font>
+ </property>
<property name="focusPolicy">
- <enum>StrongFocus</enum>
+ <enum>TabFocus</enum>
</property>
<property name="text">
- <string>Empty Petri Dish</string>
+ <string>Configured Dish</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -85,11 +102,17 @@
<property name="enabled">
<bool>false</bool>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ <pointsize>16</pointsize>
+ </font>
+ </property>
<property name="focusPolicy">
- <enum>StrongFocus</enum>
+ <enum>NoFocus</enum>
</property>
<property name="text">
- <string>Full Petri Dish</string>
+ <string>Populated Dish</string>
</property>
<property name="toolTip" stdset="0">
<string><p>Save the envrionmental settings and all the organisms in the population</P></string>
@@ -102,8 +125,14 @@
<property name="enabled">
<bool>false</bool>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ <pointsize>16</pointsize>
+ </font>
+ </property>
<property name="focusPolicy">
- <enum>StrongFocus</enum>
+ <enum>NoFocus</enum>
</property>
<property name="text">
<string>Highlighted Organism</string>
@@ -135,6 +164,11 @@
<property name="name">
<cstring>SaveToFreezerPushButton</cstring>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ </font>
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
@@ -149,6 +183,11 @@
<property name="name">
<cstring>CancelPushButton</cstring>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ </font>
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py 2006-10-30 18:45:10 UTC (rev 1062)
@@ -154,16 +154,18 @@
# This shadows pyFreezerView.languageChange, which was generated by
# pyuic from pyFreezerView.ui. @kgn
+
def languageChange(self):
self.setCaption("pyFreezerView")
self.m_list_view.header().setLabel(0,"Freezer")
- self.m_list_view.clear()
+ self.m_list_view.setSorting(-1)
+ # self.m_list_view.clear()
item = pyEmptyDishListViewItem(self.m_list_view,None)
- item.setText(0," Empty Petri Dishes")
+ item.setText(0," Configured Dishes")
item.setPixmap(0,self.image0)
item = pyFullDishListViewItem(self.m_list_view,item)
- item.setText(0," Full Petri Dishes")
+ item.setText(0," Populated Dishes")
item.setPixmap(0,self.image1)
item = pyOrganismListViewItem(self.m_list_view,item)
@@ -195,7 +197,7 @@
def createFreezerIndexSlot(self):
# Freezer is hardcoded to list in order :
- # Empty Dishes, Full Dishes, Organisms
+ # Configured Dishes, Populated Dishes, Organisms
self.m_empty_item = self.m_list_view.firstChild()
while self.m_empty_item.firstChild():
@@ -241,9 +243,9 @@
top_level = parent_view.firstChild()
while top_level:
- if str(top_level.text(0)).startswith(" Empty Petri"):
+ if str(top_level.text(0)).startswith(" Configured Dish"):
file_suffix = ".empty"
- elif str(top_level.text(0)).startswith(" Full Petri"):
+ elif str(top_level.text(0)).startswith(" Populated Dish"):
file_suffix = ".full"
elif str(top_level.text(0)).startswith(" Organism"):
file_suffix = ".organism"
@@ -275,9 +277,9 @@
# Rebuild the file name
- if str(top_level.text(0)).startswith(" Empty Petri"):
+ if str(top_level.text(0)).startswith(" Configured Dish"):
file_name = str(item.text(0)) + ".empty"
- elif str(top_level.text(0)).startswith(" Full Petri"):
+ elif str(top_level.text(0)).startswith(" Populated Dish"):
file_name = str(item.text(0)) + ".full"
file_name = os.path.join(file_name, "petri_dish")
elif str(top_level.text(0)).startswith(" Organism"):
@@ -302,9 +304,9 @@
# Rebuild the file name
- if str(top_level.text(0)).startswith(" Empty Petri"):
+ if str(top_level.text(0)).startswith(" Configured Dish"):
file_name = str(item.text(0)) + ".empty"
- elif str(top_level.text(0)).startswith(" Full Petri"):
+ elif str(top_level.text(0)).startswith(" Populated Dish"):
file_name = str(item.text(0)) + ".full"
elif str(top_level.text(0)).startswith(" Organism"):
file_name = str(item.text(0)) + ".organism"
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerView.ui 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerView.ui 2006-10-30 18:45:10 UTC (rev 1062)
@@ -44,7 +44,7 @@
</column>
<item>
<property name="text">
- <string> Empty Petri Dishes</string>
+ <string> Configured Dishes</string>
</property>
<property name="pixmap">
<pixmap>image0</pixmap>
@@ -52,7 +52,7 @@
</item>
<item>
<property name="text">
- <string> Full Petri Dishes</string>
+ <string> Populated Dishes</string>
</property>
<property name="pixmap">
<pixmap>image1</pixmap>
@@ -79,6 +79,7 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>9</pointsize>
</font>
</property>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py 2006-10-30 18:45:10 UTC (rev 1062)
@@ -8,7 +8,7 @@
def __init__(self,parent = None,name = None,fl = 0):
pyOneAna_PetriDishView.__init__(self,parent,name,fl)
- self.m_one_ana_pop_name.setText('Drag A Full Petri Dish Into This Window To Analyze It')
+ self.m_one_ana_pop_name.setText('Drag A Populated Dish Into This Window To Analyze It')
def construct(self, session_mdl):
self.m_session_mdl = session_mdl
@@ -26,7 +26,6 @@
def freezerItemDropped(self, e):
- descr("BDB")
# Try to decode to the data you understand...
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) :
@@ -35,7 +34,6 @@
self.m_one_ana_pop_name.setText(short_name)
def freezerItemDoubleClickedOn(self, freezer_item_name):
- descr("BDB")
short_name = os.path.split(os.path.splitext(os.path.split(freezer_item_name)[0])[0])[1]
self.m_one_ana_pop_name.setText(short_name)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py 2006-10-30 18:45:10 UTC (rev 1062)
@@ -90,7 +90,7 @@
(freezer_item_name,))
else:
warningNoMethodName(freezer_item_name +
- " does not seem to be a full petri dish.")
+ " does not seem to be a populated dish.")
def freezerItemDoubleClicked(self, freezer_item_list):
descr("BDB")
@@ -106,7 +106,7 @@
(freezer_item_name,))
else:
warningNoMethodName(freezer_item_name +
- " does not seem to be a full petri dish.")
+ " does not seem to be a populated dish.")
def saveImagesSlot(self):
"Save image of graph"
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismView.ui 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrganismView.ui 2006-10-30 18:45:10 UTC (rev 1062)
@@ -62,11 +62,12 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>11</pointsize>
</font>
</property>
<property name="text">
- <string>[drag an organism into this window for analysis]</string>
+ <string>[drag an organism into the center of this window for analysis]</string>
</property>
<property name="toolTip" stdset="0">
<string>Name of organism being analyzed (dragged in from freezer)</string>
@@ -78,6 +79,7 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>9</pointsize>
</font>
</property>
@@ -241,7 +243,7 @@
</sizehint>
<container>0</container>
<sizepolicy>
- <hordata>5</hordata>
+ <hordata>0</hordata>
<verdata>0</verdata>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
@@ -250,6 +252,8 @@
<property type="0">3</property>
<property type="1">pyOrganismConfigureCtrl</property>
<property type="3">-1</property>
+ <property type="1">pyOrganismConfigureCtrl</property>
+ <property type="3">-1</property>
<property type="pyOrganismConfigureCtrl"></property>
<property type="-1">1</property>
</customwidget>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_GraphView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_GraphView.ui 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_GraphView.ui 2006-10-30 18:45:10 UTC (rev 1062)
@@ -91,7 +91,8 @@
</property>
<property name="font">
<font>
- <pointsize>12</pointsize>
+ <family>Arial</family>
+ <pointsize>11</pointsize>
<bold>1</bold>
</font>
</property>
@@ -173,6 +174,7 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>11</pointsize>
</font>
</property>
@@ -238,6 +240,8 @@
<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: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-10-30 18:45:10 UTC (rev 1062)
@@ -55,7 +55,7 @@
self.connect(self.m_zoom_spinbox, SIGNAL("valueChanged(int)"),
self.m_petri_dish_ctrl.zoomSlot)
self.connect(self.m_petri_dish_ctrl, PYSIGNAL("zoomSig"),
- self.m_zoom_spinbox.setValue)
+ self.setZoomSlot)
self.connect(self.m_mode_combobox, SIGNAL("activated(int)"),
self.modeActivatedSlot)
self.connect(self.m_session_mdl.m_session_mdtr,
@@ -396,3 +396,8 @@
painter = QPainter(printer)
painter.drawPixmap(0, 0, self.getPetriDishPixmap())
painter.end()
+
+ def setZoomSlot(self, zoomValue):
+ print("BDB, zoom set to " + str(zoomValue))
+ self.m_zoom_spinbox.setValue(zoomValue)
+ self.m_zoom_spinbox.setFont(QFont("Arial",13))
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishView.ui 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishView.ui 2006-10-30 18:45:10 UTC (rev 1062)
@@ -411,6 +411,11 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ </font>
+ </property>
<property name="toolTip" stdset="0">
<string>Zoom in or out on petri dish</string>
</property>
@@ -587,6 +592,14 @@
<property type="0">-1</property>
<property type="1">pyPetriDishCtrl</property>
<property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="0">-1</property>
<property type="pyPetriDishCtrl"></property>
<property type="-1">1</property>
</customwidget>
@@ -654,6 +667,14 @@
<property type="0">-1</property>
<property type="1">pyGradientScaleCtrl</property>
<property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="0">-1</property>
<property type="pyGradientScaleCtrl"></property>
<property type="-1">1</property>
</customwidget>
@@ -715,6 +736,20 @@
<property type="0">-1</property>
<property type="1">pyLiveControlsCtrl</property>
<property type="0">-1</property>
+ <property type="1">pyLiveControlsCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyLiveControlsCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyLiveControlsCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyLiveControlsCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyLiveControlsCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyLiveControlsCtrl</property>
+ <property type="0">-1</property>
+ <property type="1">pyLiveControlsCtrl</property>
+ <property type="0">-1</property>
<property type="pyLiveControlsCtrl"></property>
<property type="-1">1</property>
</customwidget>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui 2006-10-30 18:45:10 UTC (rev 1062)
@@ -62,7 +62,9 @@
</property>
<property name="font">
<font>
- <pointsize>11</pointsize>
+ <family>Arial</family>
+ <pointsize>10</pointsize>
+ <bold>1</bold>
</font>
</property>
<property name="title">
@@ -103,7 +105,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -136,7 +139,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -190,7 +194,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -234,7 +239,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -257,7 +263,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -287,7 +294,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -324,7 +332,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -362,7 +371,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -385,7 +395,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -415,7 +426,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -438,7 +450,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -468,7 +481,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -510,6 +524,9 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
+ <pointsize>11</pointsize>
+ <bold>0</bold>
<underline>1</underline>
</font>
</property>
@@ -523,6 +540,9 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
+ <pointsize>11</pointsize>
+ <bold>0</bold>
<underline>1</underline>
</font>
</property>
@@ -554,7 +574,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -575,7 +596,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -598,7 +620,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -614,7 +637,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -637,7 +661,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -653,7 +678,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -676,7 +702,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -692,7 +719,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -715,7 +743,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -731,7 +760,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -754,7 +784,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -770,7 +801,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -793,7 +825,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -809,7 +842,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -832,7 +866,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -848,7 +883,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -871,7 +907,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -884,7 +921,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -919,7 +957,9 @@
</property>
<property name="font">
<font>
- <pointsize>11</pointsize>
+ <family>Arial</family>
+ <pointsize>10</pointsize>
+ <bold>1</bold>
</font>
</property>
<property name="frameShape">
@@ -969,7 +1009,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1007,7 +1048,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1044,7 +1086,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1088,7 +1131,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1125,7 +1169,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1163,7 +1208,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1200,7 +1246,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1238,7 +1285,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1275,7 +1323,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1313,7 +1362,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1350,7 +1400,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1388,7 +1439,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1422,7 +1474,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
<underline>1</underline>
</font>
</property>
@@ -1436,7 +1489,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
<underline>1</underline>
</font>
</property>
@@ -1468,7 +1522,9 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>9</pointsize>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1492,7 +1548,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1515,7 +1572,9 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>9</pointsize>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1534,7 +1593,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1557,7 +1617,9 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>9</pointsize>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1576,7 +1638,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1599,7 +1662,9 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>9</pointsize>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1618,7 +1683,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1641,7 +1707,9 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>9</pointsize>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1660,7 +1728,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1683,7 +1752,9 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>9</pointsize>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1702,7 +1773,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1725,7 +1797,9 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>9</pointsize>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1744,7 +1818,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1767,7 +1842,9 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>9</pointsize>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1786,7 +1863,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1809,7 +1887,9 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>9</pointsize>
+ <bold>0</bold>
</font>
</property>
<property name="text">
@@ -1828,7 +1908,8 @@
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <family>Arial</family>
+ <bold>0</bold>
</font>
</property>
<property name="text">
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationView.ui 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePopulationView.ui 2006-10-30 18:45:10 UTC (rev 1062)
@@ -75,7 +75,7 @@
<property name="sizePolicy">
<sizepolicy>
<hsizetype>3</hsizetype>
- <vsizetype>3</vsizetype>
+ <vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismDataCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismDataCtrl.py 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismDataCtrl.py 2006-10-30 18:45:10 UTC (rev 1062)
@@ -97,7 +97,7 @@
self.widget_factory.setWidgetFn(taskDescrSetup)
self.hideshow_tasks = self.hideshow_factory.newWidget()
- self.hideshow_tasks.getLabel().setText("Task Counts")
+ self.hideshow_tasks.getLabel().setText("Function Counts")
self.widget_factory.setParent(self.hideshow_tasks)
self.task0_label = self.widget_factory.newWidget('task0').setReadFn(self, lambda f, fn: 0)
self.task1_label = self.widget_factory.newWidget('task1').setReadFn(self, lambda f, fn: 1)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-10-30 18:45:10 UTC (rev 1062)
@@ -15,6 +15,7 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>9</pointsize>
</font>
</property>
@@ -34,7 +35,7 @@
</property>
<property name="font">
<font>
- <pointsize>14</pointsize>
+ <pointsize>13</pointsize>
<bold>1</bold>
</font>
</property>
@@ -641,6 +642,11 @@
<cstring>NandCheckBox</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
@@ -660,6 +666,11 @@
<cstring>OrnCheckBox</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
@@ -679,6 +690,11 @@
<cstring>AndCheckBox</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
@@ -698,6 +714,11 @@
<cstring>OrCheckBox</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
@@ -717,6 +738,11 @@
<cstring>NorCheckBox</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
@@ -736,6 +762,11 @@
<cstring>EasyTextLabel</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="font">
<font>
@@ -750,6 +781,11 @@
<cstring>HardTextLabel</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="font">
<font>
@@ -764,6 +800,11 @@
<cstring>NotCheckBox</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
@@ -783,6 +824,11 @@
<cstring>ModerateTextLabel</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="font">
<font>
@@ -797,6 +843,11 @@
<cstring>VHardTextLabel</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="font">
<font>
@@ -811,6 +862,11 @@
<cstring>XorCheckBox</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
@@ -830,6 +886,11 @@
<cstring>AndnCheckBox</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
@@ -849,6 +910,11 @@
<cstring>BrutalTextLabel</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="font">
<font>
@@ -863,6 +929,11 @@
<cstring>EquCheckBox</cstring>
</property>
<property name="paletteBackgroundColor">
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
</property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
@@ -1198,7 +1269,7 @@
<string>Freeze Petri Dish</string>
</property>
<property name="toolTip" stdset="0">
- <string><p>Save either an empty or full petri dish to the freezer</p></string>
+ <string><p>Save either an configured or populated dish to the freezer</p></string>
</property>
</widget>
</vbox>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-10-25 19:28:17 UTC (rev 1061)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-10-30 18:45:10 UTC (rev 1062)
@@ -35,6 +35,8 @@
31-Aug-06 Make active/deactive more clear on petri dish configuration
+24-Oct-06 Configured/Populated dish names versus empty/full
+
Priority Low
-Under the sliders with ranges put a few values in grey that tell you the range min and max
More information about the Avida-cvs
mailing list