[Avida-cvs] [avida-svn] r753 - branches/developers/avida-edward/source/python/AvidaGui2
baerb@myxo.css.msu.edu
baerb at myxo.css.msu.edu
Fri Jun 16 14:21:42 PDT 2006
Author: baerb
Date: 2006-06-16 17:21:42 -0400 (Fri, 16 Jun 2006)
New Revision: 753
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyNavBarView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
Log:
Cleaned up the petri-dish configure screen.
Change the ancestor list to an icon view
Moved the divider between Viewers and Freezer
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-06-16 01:18:48 UTC (rev 752)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-06-16 21:21:42 UTC (rev 753)
@@ -33,7 +33,7 @@
<property name="minimumSize">
<size>
<width>195</width>
- <height>575</height>
+ <height>455</height>
</size>
</property>
<property name="maximumSize">
@@ -73,7 +73,7 @@
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
- <vsizetype>3</vsizetype>
+ <vsizetype>1</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -81,7 +81,7 @@
<property name="minimumSize">
<size>
<width>145</width>
- <height>220</height>
+ <height>100</height>
</size>
</property>
</widget>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyNavBarView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyNavBarView.ui 2006-06-16 01:18:48 UTC (rev 752)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyNavBarView.ui 2006-06-16 21:21:42 UTC (rev 753)
@@ -94,11 +94,14 @@
<property name="hScrollBarMode">
<enum>AlwaysOff</enum>
</property>
+ <property name="selectionMode">
+ <enum>Single</enum>
+ </property>
<property name="allColumnsShowFocus">
<bool>true</bool>
</property>
<property name="rootIsDecorated">
- <bool>true</bool>
+ <bool>false</bool>
</property>
<property name="resizeMode">
<enum>AllColumns</enum>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-06-16 01:18:48 UTC (rev 752)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_PetriDishCtrl.py 2006-06-16 21:21:42 UTC (rev 753)
@@ -95,11 +95,17 @@
def ToggleDishSlot (self):
current_page = self.m_petri_dish_widget_stack.visibleWidget()
current_page_int = self.m_petri_dish_widget_stack.id(current_page)
+
+ # if the petri dish is visiable flip to env control
+
if (current_page_int == 0):
self.m_petri_dish_widget_stack.raiseWidget(1)
QToolTip.remove(self.m_petri_dish_toggle)
QToolTip.add(self.m_petri_dish_toggle,
"Flip to see the <b><i>Petri Dish</i></b>")
+
+ # else flip the env control to see the petri dish
+
else:
self.m_petri_dish_widget_stack.raiseWidget(0)
QToolTip.remove(self.m_petri_dish_toggle)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-06-16 01:18:48 UTC (rev 752)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureCtrl.py 2006-06-16 21:21:42 UTC (rev 753)
@@ -78,7 +78,10 @@
self.m_session_mdl.m_session_mdtr,
PYSIGNAL("petriDishDroppedInPopViewSig"))
self.connect( self.m_session_mdl.m_session_mdtr,
- PYSIGNAL("petriDishDroppedInPopViewSig"), self.petriDropped)
+ PYSIGNAL("petriDishDroppedInPopViewSig"), self.petriDroppedSlot)
+ self.connect(self.AncestorIconView,
+ SIGNAL("dropped(QDropEvent*,const QValueList<QIconDragItem>&)"),
+ self.petriAncestorDroppedSlot)
self.ChangeMutationTextSlot()
self.ChangeWorldSizeTextSlot()
self.m_session_mdl.m_session_mdtr.emit(
@@ -225,15 +228,15 @@
# Erase all items for the ancestor list (largest to smallest index)
- for i in range((self.AncestorComboBox.count() - 1), -1, -1):
- self.AncestorComboBox.removeItem (i)
+ self.AncestorIconView.clear()
- # Find all ancestors with the name of the form START_CREATUREx
+ # Find all ancestors with the name of the form START_CREATUREi
i = 0
while(settings_dict.has_key("START_CREATURE" + str(i))):
start_creature = settings_dict["START_CREATURE" + str(i)]
- self.AncestorComboBox.insertItem(start_creature)
+ tmp_item = QIconViewItem(self.AncestorIconView, start_creature,
+ self.image0)
i = i + 1
if settings_dict.has_key("MAX_UPDATES") == True:
max_updates = int(settings_dict["MAX_UPDATES"])
@@ -336,7 +339,7 @@
# Turn off the controls
- self.AncestorComboBox.setEnabled(False)
+ self.AncestorIconView.setEnabled(False)
# BDB -- while using pause at hack don't turn off these settings
@@ -388,7 +391,7 @@
# Turn on the controls
- self.AncestorComboBox.setEnabled(True)
+ self.AncestorIconView.setEnabled(True)
self.StopAtSpinBox.setEnabled(True)
self.StopManuallyRadioButton.setEnabled(True)
self.StopAtRadioButton.setEnabled(True)
@@ -449,10 +452,14 @@
descr()
settings_dict = {}
- # Write START_CREATUREx for all the organisms in the Ancestor Combo Box
+ # Write START_CREATUREi for all the organisms in the Ancestor Icon View
- for i in range(self.AncestorComboBox.count()):
- settings_dict["START_CREATURE" + str(i)] = str(self.AncestorComboBox.text(i))
+ curr_item = self.AncestorIconView.firstItem()
+ i = 0
+ while (curr_item):
+ settings_dict["START_CREATURE" + str(i)] = str(curr_item.text())
+ i = i + 1
+ curr_item = curr_item.nextItem()
if (self.StopAtRadioButton.isChecked() == True):
settings_dict["MAX_UPDATES"] = self.StopAtSpinBox.value()
else:
@@ -609,7 +616,11 @@
else:
self.emit(PYSIGNAL("petriDishDroppedInPopViewSig"), (e,))
- def petriDropped(self, e):
+ # The function petriDroppedSlot and petriAncestorDroppedSlot are identical
+ # at some point petriDroppedSlot should not allow creatures dropped outside
+ # the AncestorIconView to be added to the Ancestort List
+
+ def petriDroppedSlot(self, e):
descr()
# Try to decode to the data you understand...
freezer_item_name = QString()
@@ -618,5 +629,17 @@
if freezer_item_name[-8:] == 'organism':
core_name = freezer_item_name[:-9]
core_name = os.path.basename(str(freezer_item_name[:-9]))
- self.AncestorComboBox.insertItem(core_name)
+ tmp_item = QIconViewItem(self.AncestorIconView, core_name, self.image0)
return
+
+ def petriAncestorDroppedSlot(self, e):
+ descr()
+ # Try to decode to the data you understand...
+ freezer_item_name = QString()
+ if ( QTextDrag.decode( e, freezer_item_name ) and not self.DishDisabled) :
+ freezer_item_name = str(e.encodedData("text/plain"))
+ if freezer_item_name[-8:] == 'organism':
+ core_name = freezer_item_name[:-9]
+ core_name = os.path.basename(str(freezer_item_name[:-9]))
+ tmp_item = QIconViewItem(self.AncestorIconView, core_name, self.image0)
+ return
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-06-16 01:18:48 UTC (rev 752)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyPetriConfigureView.ui 2006-06-16 21:21:42 UTC (rev 753)
@@ -8,7 +8,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>379</width>
+ <width>392</width>
<height>626</height>
</rect>
</property>
@@ -27,19 +27,14 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <property name="margin">
- <number>2</number>
- </property>
- <property name="spacing">
- <number>2</number>
- </property>
<widget class="QLabel">
<property name="name">
<cstring>ConfigTitleTextLabel</cstring>
</property>
<property name="font">
<font>
- <pointsize>11</pointsize>
+ <pointsize>14</pointsize>
+ <bold>1</bold>
</font>
</property>
<property name="text">
@@ -53,272 +48,299 @@
<property name="name">
<cstring>SliderFrame</cstring>
</property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>1</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>70</height>
+ </size>
+ </property>
<property name="frameShape">
<enum>GroupBoxPanel</enum>
</property>
<property name="frameShadow">
<enum>Sunken</enum>
</property>
- <hbox>
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>layout17</cstring>
</property>
- <widget class="QLayoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>11</x>
+ <y>11</y>
+ <width>353</width>
+ <height>46</height>
+ </rect>
+ </property>
+ <hbox>
<property name="name">
- <cstring>layout22</cstring>
+ <cstring>unnamed</cstring>
</property>
- <grid>
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>layout22</cstring>
</property>
- <widget class="QSlider" row="1" column="0">
+ <grid>
<property name="name">
- <cstring>MutationSlider</cstring>
+ <cstring>unnamed</cstring>
</property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>130</width>
- <height>0</height>
- </size>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="focusPolicy">
- <enum>StrongFocus</enum>
- </property>
- <property name="minValue">
- <number>-30000</number>
- </property>
- <property name="maxValue">
- <number>20000</number>
- </property>
- <property name="lineStep">
- <number>100</number>
- </property>
- <property name="pageStep">
- <number>100</number>
- </property>
- <property name="value">
- <number>-3010</number>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="toolTip" stdset="0">
- <string><p>Set Mutation Rate from 0 to 100 % (use right and left arrow keys to fine tune the value)</P></string>
- </property>
- </widget>
- <widget class="QLineEdit" row="1" column="1">
- <property name="name">
- <cstring>MutationRateLineEdit</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>40</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>45</width>
- <height>32767</height>
- </size>
- </property>
- <property name="text">
- <string>0.50%%</string>
- </property>
- <property name="inputMask">
- <string>xxxxx%; </string>
- </property>
- <property name="toolTip" stdset="0">
- <string><P>Enter the exact mutation rate (1 to 100%)</p></string>
- </property>
- </widget>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
- <property name="name">
- <cstring>MutationRateHeadTextLabel</cstring>
- </property>
- <property name="font">
- <font>
- <bold>1</bold>
- </font>
- </property>
- <property name="text">
- <string>Per Site Mutation Rate</string>
- </property>
- <property name="alignment">
- <set>AlignCenter</set>
- </property>
- <property name="toolTip" stdset="0">
- <string>Set the rate of mutation from 0 to 1</string>
- </property>
- </widget>
- </grid>
- </widget>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout29</cstring>
- </property>
- <grid>
+ <widget class="QSlider" row="1" column="0">
+ <property name="name">
+ <cstring>MutationSlider</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>130</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
+ <property name="minValue">
+ <number>-30000</number>
+ </property>
+ <property name="maxValue">
+ <number>20000</number>
+ </property>
+ <property name="lineStep">
+ <number>100</number>
+ </property>
+ <property name="pageStep">
+ <number>100</number>
+ </property>
+ <property name="value">
+ <number>-3010</number>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string><p>Set Mutation Rate from 0 to 100 % (use right and left arrow keys to fine tune the value)</P></string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="1" column="1">
+ <property name="name">
+ <cstring>MutationRateLineEdit</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>40</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>45</width>
+ <height>32767</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>%</string>
+ </property>
+ <property name="inputMask">
+ <string>xxxxx%; </string>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string><P>Enter the exact mutation rate (1 to 100%)</p></string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <property name="name">
+ <cstring>MutationRateHeadTextLabel</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <bold>1</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Per Site Mutation Rate</string>
+ </property>
+ <property name="alignment">
+ <set>AlignCenter</set>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string>Set the rate of mutation from 0 to 1</string>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>layout29</cstring>
</property>
- <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+ <grid>
<property name="name">
- <cstring>WorldSizeHeadTextLable</cstring>
+ <cstring>unnamed</cstring>
</property>
- <property name="font">
- <font>
- <bold>1</bold>
- </font>
- </property>
- <property name="text">
- <string>World Size</string>
- </property>
- <property name="textFormat">
- <enum>AutoText</enum>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignCenter</set>
- </property>
- </widget>
- <widget class="QSlider" row="1" column="0">
- <property name="name">
- <cstring>WorldSizeSlider</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="focusPolicy">
- <enum>StrongFocus</enum>
- </property>
- <property name="minValue">
- <number>1</number>
- </property>
- <property name="maxValue">
- <number>100</number>
- </property>
- <property name="lineStep">
- <number>1</number>
- </property>
- <property name="pageStep">
- <number>1</number>
- </property>
- <property name="value">
- <number>30</number>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="toolTip" stdset="0">
- <string>Set the size of the petri dish (1 to 100)</string>
- </property>
- </widget>
- <widget class="QLayoutWidget" row="1" column="1">
- <property name="name">
- <cstring>layout28</cstring>
- </property>
- <hbox>
+ <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>WorldSizeHeadTextLable</cstring>
</property>
- <widget class="QLineEdit">
+ <property name="font">
+ <font>
+ <bold>1</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>World Size</string>
+ </property>
+ <property name="textFormat">
+ <enum>AutoText</enum>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignCenter</set>
+ </property>
+ </widget>
+ <widget class="QSlider" row="1" column="0">
+ <property name="name">
+ <cstring>WorldSizeSlider</cstring>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
+ <property name="minValue">
+ <number>1</number>
+ </property>
+ <property name="maxValue">
+ <number>100</number>
+ </property>
+ <property name="lineStep">
+ <number>1</number>
+ </property>
+ <property name="pageStep">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>30</number>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string>Set the size of the petri dish (1 to 100)</string>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget" row="1" column="1">
+ <property name="name">
+ <cstring>layout28</cstring>
+ </property>
+ <hbox>
<property name="name">
- <cstring>WorldSizeLineEdit</cstring>
+ <cstring>unnamed</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>26</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>26</width>
- <height>32767</height>
- </size>
- </property>
- <property name="text">
- <string></string>
- </property>
- <property name="inputMask">
- <string>000; </string>
- </property>
- <property name="toolTip" stdset="0">
- <string><p>Enter world size</p></string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>WorldSizeTextLabel</cstring>
- </property>
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>52</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>52</width>
- <height>32767</height>
- </size>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>x 100 cells</string>
- </property>
- </widget>
- </hbox>
- </widget>
- </grid>
- </widget>
- </hbox>
+ <widget class="QLineEdit">
+ <property name="name">
+ <cstring>WorldSizeLineEdit</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>26</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>26</width>
+ <height>32767</height>
+ </size>
+ </property>
+ <property name="text">
+ <string></string>
+ </property>
+ <property name="inputMask">
+ <string>000; </string>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string><p>Enter world size</p></string>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>WorldSizeTextLabel</cstring>
+ </property>
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>52</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>52</width>
+ <height>32767</height>
+ </size>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>x 100 cells</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ </grid>
+ </widget>
+ </hbox>
+ </widget>
</widget>
<spacer>
<property name="name">
- <cstring>spacer15</cstring>
+ <cstring>spacer17_3</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
@@ -329,22 +351,28 @@
<property name="sizeHint">
<size>
<width>20</width>
- <height>16</height>
+ <height>2</height>
</size>
</property>
</spacer>
<widget class="QFrame">
<property name="name">
- <cstring>AncestorFrame</cstring>
+ <cstring>frame16</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
+ <vsizetype>1</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>110</height>
+ </size>
+ </property>
<property name="frameShape">
<enum>GroupBoxPanel</enum>
</property>
@@ -371,37 +399,50 @@
<set>WordBreak|AlignCenter</set>
</property>
</widget>
- <widget class="QComboBox">
+ <widget class="QIconView">
<item>
<property name="text">
<string>@ancestor</string>
</property>
+ <property name="pixmap">
+ <pixmap>image0</pixmap>
+ </property>
</item>
<property name="name">
- <cstring>AncestorComboBox</cstring>
+ <cstring>AncestorIconView</cstring>
</property>
- <property name="font">
- <font>
- </font>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>3</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="acceptDrops">
- <bool>false</bool>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>60</height>
+ </size>
</property>
- <property name="editable">
- <bool>true</bool>
+ <property name="frameShape">
+ <enum>NoFrame</enum>
</property>
- <property name="currentItem">
- <number>0</number>
+ <property name="vScrollBarMode">
+ <enum>AlwaysOff</enum>
</property>
- <property name="toolTip" stdset="0">
- <string><P>The name of the organism(s) that will start the population on an empty petri dish (normally dragged in)</p></string>
+ <property name="hScrollBarMode">
+ <enum>AlwaysOn</enum>
</property>
+ <property name="arrangement">
+ <enum>TopToBottom</enum>
+ </property>
</widget>
</vbox>
</widget>
<spacer>
<property name="name">
- <cstring>spacer13_2</cstring>
+ <cstring>spacer17_2</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
@@ -412,29 +453,35 @@
<property name="sizeHint">
<size>
<width>20</width>
- <height>16</height>
+ <height>2</height>
</size>
</property>
</spacer>
<widget class="QFrame">
<property name="name">
- <cstring>BirthPlaceFrame</cstring>
+ <cstring>BirthFrame</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
+ <vsizetype>1</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>48</height>
+ </size>
+ </property>
<property name="frameShape">
<enum>GroupBoxPanel</enum>
</property>
<property name="frameShadow">
<enum>Sunken</enum>
</property>
- <vbox>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
@@ -448,115 +495,73 @@
</font>
</property>
<property name="text">
- <string>Where should new offspring be placed?</string>
+ <string>Place offspring:</string>
</property>
<property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
- <widget class="QButtonGroup">
+ <spacer>
<property name="name">
- <cstring>BirthButtonGroup</cstring>
+ <cstring>spacer26</cstring>
</property>
- <property name="focusPolicy">
- <enum>NoFocus</enum>
+ <property name="orientation">
+ <enum>Horizontal</enum>
</property>
- <property name="frameShadow">
- <enum>Plain</enum>
+ <property name="sizeType">
+ <enum>Expanding</enum>
</property>
- <property name="lineWidth">
- <number>0</number>
+ <property name="sizeHint">
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
</property>
- <property name="title">
- <string></string>
+ </spacer>
+ <widget class="QRadioButton">
+ <property name="name">
+ <cstring>LocalBirthRadioButton</cstring>
</property>
- <property name="flat">
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="focusPolicy">
+ <enum>TabFocus</enum>
+ </property>
+ <property name="text">
+ <string>Near their parent</string>
+ </property>
+ <property name="checked">
<bool>true</bool>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <spacer>
- <property name="name">
- <cstring>BirthLeftSpacer</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>41</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget class="QRadioButton">
- <property name="name">
- <cstring>LocalBirthRadioButton</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="focusPolicy">
- <enum>TabFocus</enum>
- </property>
- <property name="text">
- <string>Nearby their parent</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <property name="toolTip" stdset="0">
- <string>When a new organism is split off place it in one of the 8 cells around the parent</string>
- </property>
- </widget>
- <widget class="QRadioButton">
- <property name="name">
- <cstring>MassActionRadioButton</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="focusPolicy">
- <enum>NoFocus</enum>
- </property>
- <property name="text">
- <string>Anywhere, randomly</string>
- </property>
- <property name="toolTip" stdset="0">
- <string>When a new organism is split off place it in a cell any where in the petri dish</string>
- </property>
- </widget>
- <spacer>
- <property name="name">
- <cstring>BirthRightSpacer</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>51</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </hbox>
+ <property name="toolTip" stdset="0">
+ <string>When a new organism is split off place it in one of the 8 cells around the parent</string>
+ </property>
</widget>
- </vbox>
+ <widget class="QRadioButton">
+ <property name="name">
+ <cstring>MassActionRadioButton</cstring>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="focusPolicy">
+ <enum>NoFocus</enum>
+ </property>
+ <property name="text">
+ <string>Anywhere, randomly</string>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string>When a new organism is split off place it in a cell any where in the petri dish</string>
+ </property>
+ </widget>
+ </hbox>
</widget>
<spacer>
<property name="name">
- <cstring>spacer14_2</cstring>
+ <cstring>spacer17</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
@@ -567,22 +572,28 @@
<property name="sizeHint">
<size>
<width>20</width>
- <height>16</height>
+ <height>2</height>
</size>
</property>
</spacer>
<widget class="QFrame">
<property name="name">
- <cstring>RewardFrame</cstring>
+ <cstring>TaskRewardFrame</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
+ <vsizetype>1</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>140</height>
+ </size>
+ </property>
<property name="frameShape">
<enum>GroupBoxPanel</enum>
</property>
@@ -908,7 +919,7 @@
</widget>
<spacer>
<property name="name">
- <cstring>spacer16</cstring>
+ <cstring>spacer18</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
@@ -919,29 +930,35 @@
<property name="sizeHint">
<size>
<width>20</width>
- <height>16</height>
+ <height>2</height>
</size>
</property>
</spacer>
<widget class="QFrame">
<property name="name">
- <cstring>RandomNumFrame</cstring>
+ <cstring>RandomFrame</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
+ <vsizetype>1</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>48</height>
+ </size>
+ </property>
<property name="frameShape">
<enum>GroupBoxPanel</enum>
</property>
<property name="frameShadow">
<enum>Sunken</enum>
</property>
- <vbox>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
@@ -964,103 +981,67 @@
<set>AlignCenter</set>
</property>
</widget>
- <widget class="QButtonGroup">
+ <spacer>
<property name="name">
- <cstring>RandomButtonGroup</cstring>
+ <cstring>spacer16</cstring>
</property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QRadioButton">
+ <property name="name">
+ <cstring>RandomGeneratedRadioButton</cstring>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="focusPolicy">
+ <enum>TabFocus</enum>
+ </property>
+ <property name="text">
+ <string>No</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string>Each time this petri is run the results will not be exactly the same</string>
+ </property>
+ </widget>
+ <widget class="QRadioButton">
+ <property name="name">
+ <cstring>RandomFixedRadioButton</cstring>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="focusPolicy">
<enum>NoFocus</enum>
</property>
- <property name="frameShape">
- <enum>NoFrame</enum>
+ <property name="text">
+ <string>Yes</string>
</property>
- <property name="title">
- <string></string>
+ <property name="toolTip" stdset="0">
+ <string>Each time this petri is run the results will be exactly the same</string>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <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>51</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget class="QRadioButton">
- <property name="name">
- <cstring>RandomGeneratedRadioButton</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="focusPolicy">
- <enum>TabFocus</enum>
- </property>
- <property name="text">
- <string>No</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <property name="toolTip" stdset="0">
- <string>Each time this petri is run the results will not be exactly the same</string>
- </property>
- </widget>
- <widget class="QRadioButton">
- <property name="name">
- <cstring>RandomFixedRadioButton</cstring>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="focusPolicy">
- <enum>NoFocus</enum>
- </property>
- <property name="text">
- <string>Yes</string>
- </property>
- <property name="toolTip" stdset="0">
- <string>Each time this petri is run the results will be exactly the same</string>
- </property>
- </widget>
- <spacer>
- <property name="name">
- <cstring>spacer1</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>50</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </hbox>
</widget>
- </vbox>
+ </hbox>
</widget>
<spacer>
<property name="name">
- <cstring>spacer17</cstring>
+ <cstring>spacer14</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
@@ -1071,29 +1052,35 @@
<property name="sizeHint">
<size>
<width>20</width>
- <height>16</height>
+ <height>1</height>
</size>
</property>
</spacer>
<widget class="QFrame">
<property name="name">
- <cstring>StopFrame</cstring>
+ <cstring>PauseFrame</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
+ <vsizetype>1</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>48</height>
+ </size>
+ </property>
<property name="frameShape">
<enum>GroupBoxPanel</enum>
</property>
<property name="frameShadow">
<enum>Sunken</enum>
</property>
- <vbox>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
@@ -1107,164 +1094,112 @@
</font>
</property>
<property name="text">
- <string>Pause Run</string>
+ <string>Pause Run:</string>
</property>
<property name="alignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
- <widget class="QButtonGroup">
+ <spacer>
<property name="name">
- <cstring>StopButtonGroup</cstring>
+ <cstring>spacer29</cstring>
</property>
- <property name="focusPolicy">
- <enum>NoFocus</enum>
+ <property name="orientation">
+ <enum>Horizontal</enum>
</property>
- <property name="frameShadow">
- <enum>Plain</enum>
+ <property name="sizeType">
+ <enum>Expanding</enum>
</property>
- <property name="lineWidth">
- <number>0</number>
+ <property name="sizeHint">
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
</property>
- <property name="title">
- <string></string>
+ </spacer>
+ <widget class="QRadioButton">
+ <property name="name">
+ <cstring>StopManuallyRadioButton</cstring>
</property>
- <property name="flat">
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="focusPolicy">
+ <enum>TabFocus</enum>
+ </property>
+ <property name="text">
+ <string>Manually</string>
+ </property>
+ <property name="checked">
<bool>true</bool>
</property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <spacer>
- <property name="name">
- <cstring>spacer13</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="QRadioButton">
- <property name="name">
- <cstring>StopManuallyRadioButton</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="focusPolicy">
- <enum>TabFocus</enum>
- </property>
- <property name="text">
- <string>Manually</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <property name="toolTip" stdset="0">
- <string>Program will run until you pause it using the button under the petri dish</string>
- </property>
- </widget>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>StopAtLayout</cstring>
- </property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QRadioButton">
- <property name="name">
- <cstring>StopAtRadioButton</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="focusPolicy">
- <enum>StrongFocus</enum>
- </property>
- <property name="text">
- <string>At</string>
- </property>
- <property name="toolTip" stdset="0">
- <string>Run will pause at a given update and wait to you press the play button under the petri dish</string>
- </property>
- </widget>
- <widget class="QSpinBox">
- <property name="name">
- <cstring>StopAtSpinBox</cstring>
- </property>
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="suffix">
- <string> updates</string>
- </property>
- <property name="maxValue">
- <number>10000000</number>
- </property>
- <property name="minValue">
- <number>1</number>
- </property>
- <property name="lineStep">
- <number>1000</number>
- </property>
- <property name="value">
- <number>10000</number>
- </property>
- </widget>
- </hbox>
- </widget>
- <spacer>
- <property name="name">
- <cstring>spacer14</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>21</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </hbox>
+ <property name="toolTip" stdset="0">
+ <string>Program will run until you pause it using the button under the petri dish</string>
+ </property>
</widget>
- </vbox>
+ <widget class="QRadioButton">
+ <property name="name">
+ <cstring>StopAtRadioButton</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="focusPolicy">
+ <enum>StrongFocus</enum>
+ </property>
+ <property name="text">
+ <string>At</string>
+ </property>
+ <property name="toolTip" stdset="0">
+ <string>Run will pause at a given update and wait to you press the play button under the petri dish</string>
+ </property>
+ </widget>
+ <widget class="QSpinBox">
+ <property name="name">
+ <cstring>StopAtSpinBox</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="suffix">
+ <string> updates</string>
+ </property>
+ <property name="maxValue">
+ <number>10000000</number>
+ </property>
+ <property name="minValue">
+ <number>1</number>
+ </property>
+ <property name="lineStep">
+ <number>1000</number>
+ </property>
+ <property name="value">
+ <number>10000</number>
+ </property>
+ </widget>
+ </hbox>
</widget>
<spacer>
<property name="name">
- <cstring>spacer18</cstring>
+ <cstring>spacer13</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
@@ -1275,7 +1210,7 @@
<property name="sizeHint">
<size>
<width>20</width>
- <height>16</height>
+ <height>1</height>
</size>
</property>
</spacer>
@@ -1299,20 +1234,55 @@
</widget>
</vbox>
</widget>
+<images>
+ <image name="image0">
+ <data format="XPM.GZ" length="841">789c6dd1cd8e9b301007f07b9ec20ab768e5dd80f952d547a8d463a5aa87f930040281d8e450adf6ddcb4cba5256c196907efc3d36635e0fe6d7cf1fe6f0ba8b0b2c1d193a413007be8de3dfdf7fbebfeff6a933c7c2a49939ee5f76fbc5904932caf3cc0b2f4297425de5c2415856a94b9db051fa1aee8b3b61452595ba9885f5d151ae8baf423812e42c9c9405549009831033cc311546655e15150a4989e0a0108e427a4b217b13ce77a247fd0c502211696d2fe4729d5a9b087de1d881d02b4baa89843725665455425436328567619332b31ed42a5d9917ca93b284b2d65aabd4a1dc180958bb9d21b1dfced6841a7ccad0537b22ee7a7adaf34cc3d08d43c2bebf7ccd7abf76d24cd3304d5d9224f4909d67eeafb0be9ffbf5390ddaa1456c11edcc1d40e8a688162184fb9ed831c7654c5a8efe1293f87986fe028265ea22471edbb68de7c7cc067f0158783d645d80f64b8660af61d0fe1eef40b31e42e4f6e9e6ee3d84e936e3768600fef9c2ffd761bf11d9fdc7b7dd3f4172cb15</data>
+ </image>
+</images>
<connections>
<connection>
- <sender>RandomGeneratedRadioButton</sender>
- <signal><No Signal></signal>
+ <sender>LocalBirthRadioButton</sender>
+ <signal>clicked()</signal>
+ <receiver>MassActionRadioButton</receiver>
+ <slot>toggle()</slot>
+ </connection>
+ <connection>
+ <sender>MassActionRadioButton</sender>
+ <signal>clicked()</signal>
+ <receiver>LocalBirthRadioButton</receiver>
+ <slot>toggle()</slot>
+ </connection>
+ <connection>
+ <sender>RandomFixedRadioButton</sender>
+ <signal>clicked()</signal>
<receiver>RandomGeneratedRadioButton</receiver>
- <slot><No)</slot>
+ <slot>toggle()</slot>
</connection>
+ <connection>
+ <sender>RandomGeneratedRadioButton</sender>
+ <signal>clicked()</signal>
+ <receiver>RandomFixedRadioButton</receiver>
+ <slot>toggle()</slot>
+ </connection>
+ <connection>
+ <sender>StopManuallyRadioButton</sender>
+ <signal>clicked()</signal>
+ <receiver>StopAtRadioButton</receiver>
+ <slot>toggle()</slot>
+ </connection>
+ <connection>
+ <sender>StopAtRadioButton</sender>
+ <signal>clicked()</signal>
+ <receiver>StopManuallyRadioButton</receiver>
+ <slot>toggle()</slot>
+ </connection>
</connections>
<tabstops>
<tabstop>MutationSlider</tabstop>
<tabstop>MutationRateLineEdit</tabstop>
<tabstop>WorldSizeSlider</tabstop>
<tabstop>WorldSizeLineEdit</tabstop>
- <tabstop>AncestorComboBox</tabstop>
+ <tabstop>AncestorIconView</tabstop>
<tabstop>LocalBirthRadioButton</tabstop>
<tabstop>NotCheckBox</tabstop>
<tabstop>NandCheckBox</tabstop>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/to-do_list
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-06-16 01:18:48 UTC (rev 752)
+++ branches/developers/avida-edward/source/python/AvidaGui2/to-do_list 2006-06-16 21:21:42 UTC (rev 753)
@@ -13,6 +13,18 @@
29-Apr-06 Change configuration on fly -- work with Kaben on the underlieing problem
+15-Jun-06 Move Freezer/Viewer line up
+
+15-Jun-06 Drop on viewer icon
+
+15-Jun-06 Change menu item "Restart Experiment" -> "Start New Experiment"
+
+15-Jun-06 Add Viewer to view choice on menu
+
+15-Jun-06 Add text "environmental settings" on main screen
+
+15-Jun-06 Finish work on AncestorIconView
+
Priority Low
-Under the sliders with ranges put a few values in grey that tell you the range min and max
@@ -27,7 +39,13 @@
15-May-06 Prevent program from deleting files with names beginning with "*"
+15-Jun-06 Change wording on can't freeze message
+15-Jun-06 Add Splash screen
+
+15-Jun-06 Create CGI script to allow users to enter information when they check out avida executable.
+
+
************Jeff*******************
Priority High
More information about the Avida-cvs
mailing list