[Avida-cvs] [Avida2-svn] r161 - trunk/source/python/AvidaGui2
jclune at myxo.css.msu.edu
jclune at myxo.css.msu.edu
Wed May 18 21:36:11 PDT 2005
Author: jclune
Date: 2005-05-19 00:36:10 -0400 (Thu, 19 May 2005)
New Revision: 161
Modified:
trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
trunk/source/python/AvidaGui2/pyOneAna_GraphView.ui
trunk/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py
trunk/source/python/AvidaGui2/pyOneAna_PetriDishView.ui
Log:
You can now plot two lines on the same graph in analyze mode. I also set up pyOneAna_PetriDishCtrl.py to setText the name of the population (to hook up when drag and drop is available).
Modified: trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2005-05-18 17:32:41 UTC (rev 160)
+++ trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2005-05-19 04:36:10 UTC (rev 161)
@@ -41,12 +41,24 @@
self.m_avida = None
self.m_graph_ctrl.construct(self.m_session_mdl)
- self.m_combo_box.clear()
- self.m_combo_box.setInsertionPolicy(QComboBox.AtBottom)
+ self.m_combo_box_1.clear()
+ self.m_combo_box_2.clear()
+ self.m_combo_box_1.setInsertionPolicy(QComboBox.AtBottom)
+ self.m_combo_box_2.setInsertionPolicy(QComboBox.AtBottom)
for entry in self.m_avida_stats_interface.m_entries:
- self.m_combo_box.insertItem(entry[0])
+ self.m_combo_box_1.insertItem(entry[0])
+ for entry in self.m_avida_stats_interface.m_entries:
+ self.m_combo_box_2.insertItem(entry[0])
+
+
+
+ # the first int is the entry from the combo box (which graph the user wants)
+ # the second int tells it which combo box is set to that
self.connect(
- self.m_combo_box, SIGNAL("activated(int)"), self.modeActivatedSlot)
+ self.m_combo_box_1, SIGNAL("activated(int)"), self.modeActivatedSlot)
+ self.connect(
+ self.m_combo_box_2, SIGNAL("activated(int)"), self.modeActivatedSlot)
+
self.m_x_array = zeros(2, Float)
self.m_y_array = zeros(2, Float)
@@ -54,10 +66,14 @@
self.m_graph_ctrl.setAxisTitle(QwtPlot.xBottom, "Time (updates)")
self.m_graph_ctrl.setAxisAutoScale(QwtPlot.xBottom)
- # Start with second graph mode -- "Average Fitness".
- self.m_combo_box.setCurrentItem(2)
- self.modeActivatedSlot(self.m_combo_box.currentItem())
+ # Start the left with second graph mode -- "Average Fitness".
+ self.m_combo_box_1.setCurrentItem(2)
+ # Start the right with zeroth mode -- "None"
+ self.m_combo_box_2.setCurrentItem(0)
+
+ self.modeActivatedSlot(self.m_combo_box_1.currentItem())
+
self.connect(
self.m_session_mdl.m_session_mdtr, PYSIGNAL("printGraphSig"),
self.printGraphSlot)
@@ -75,53 +91,69 @@
line = init_file.GetLine(line_id)
x_array[line_id] = line.GetWord(colx - 1).AsDouble()
y_array[line_id] = line.GetWord(coly - 1).AsDouble()
-##
-# self.m_y_array_2[line_id] = line.GetWord(2).AsDouble()
-##
return x_array, y_array
-
+
def modeActivatedSlot(self, index):
- self.m_graph_ctrl.setTitle(self.m_avida_stats_interface.m_entries[index][0])
+ self.m_graph_ctrl.setTitle(self.m_avida_stats_interface.m_entries[0][0])
self.m_graph_ctrl.clear()
- if index:
+ self.m_graph_ctrl.enableYRightAxis(False)
- fake_index_1 = 1
- fake_index_2 = 2
+
- self.m_graph_ctrl.setAxisTitle(QwtPlot.yLeft, self.m_avida_stats_interface.m_entries[fake_index_1][0])
- self.m_graph_ctrl.setAxisTitle(QwtPlot.yRight, self.m_avida_stats_interface.m_entries[fake_index_2][0])
+ if self.m_combo_box_1.currentItem() or self.m_combo_box_2.currentItem():
- self.m_graph_ctrl.setAxisAutoScale(QwtPlot.xBottom)
- self.m_graph_ctrl.setAxisAutoScale(QwtPlot.yLeft)
- self.m_graph_ctrl.setAxisAutoScale(QwtPlot.yRight)
+ if self.m_combo_box_1.currentItem():
+ index_1 = self.m_combo_box_1.currentItem()
+ self.m_graph_ctrl.setAxisTitle(QwtPlot.yLeft, self.m_avida_stats_interface.m_entries[index_1][0])
+ self.m_graph_ctrl.setAxisAutoScale(QwtPlot.yLeft)
+ 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(Qt.red))
+ self.m_graph_ctrl.setCurveYAxis(self.m_graph_ctrl.m_curve_1, QwtPlot.yLeft)
+ self.m_graph_ctrl.setTitle(self.m_avida_stats_interface.m_entries[index_1][0])
+ else:
+ self.m_graph_ctrl.enableYLeftAxis(False)
- self.m_curve_1_arrays = self.load(
- self.m_avida_stats_interface.m_entries[fake_index_1][1],
- 1,
- self.m_avida_stats_interface.m_entries[fake_index_1][2]
- )
- self.m_curve_2_arrays = self.load(
- self.m_avida_stats_interface.m_entries[fake_index_2][1],
- 1,
- self.m_avida_stats_interface.m_entries[fake_index_2][2]
- )
- self.m_graph_ctrl.m_curve_1 = self.m_graph_ctrl.insertCurve(self.m_avida_stats_interface.m_entries[fake_index_1][0])
- self.m_graph_ctrl.m_curve_2 = self.m_graph_ctrl.insertCurve(self.m_avida_stats_interface.m_entries[fake_index_2][0])
+ if self.m_combo_box_2.currentItem():
+ index_2 = self.m_combo_box_2.currentItem()
+ self.m_graph_ctrl.setAxisTitle(QwtPlot.yRight, self.m_avida_stats_interface.m_entries[index_2][0])
+ self.m_graph_ctrl.enableYRightAxis(True)
+ self.m_graph_ctrl.setAxisAutoScale(QwtPlot.yRight)
+ self.m_curve_2_arrays = self.load(
+ self.m_avida_stats_interface.m_entries[index_2][1],
+ 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])
+ self.m_graph_ctrl.setCurvePen(self.m_graph_ctrl.m_curve_2, QPen(Qt.green))
+ self.m_graph_ctrl.setCurveYAxis(self.m_graph_ctrl.m_curve_2, QwtPlot.yRight)
+ self.m_graph_ctrl.setTitle(self.m_avida_stats_interface.m_entries[index_2][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.setCurveData(self.m_graph_ctrl.m_curve_2, self.m_curve_2_arrays[0], self.m_curve_2_arrays[1])
- self.m_graph_ctrl.setCurvePen(self.m_graph_ctrl.m_curve_1, QPen(Qt.red))
- self.m_graph_ctrl.setCurvePen(self.m_graph_ctrl.m_curve_2, QPen(Qt.green))
+ self.m_graph_ctrl.setAxisAutoScale(QwtPlot.xBottom)
- self.m_graph_ctrl.setCurveYAxis(self.m_graph_ctrl.m_curve_1, QwtPlot.yLeft)
- self.m_graph_ctrl.setCurveYAxis(self.m_graph_ctrl.m_curve_2, QwtPlot.yRight)
+ if self.m_combo_box_1.currentItem() and self.m_combo_box_2.currentItem():
+ self.m_graph_ctrl.setTitle(self.m_avida_stats_interface.m_entries[self.m_combo_box_1.currentItem()][0]+ ' (red) and ' + self.m_avida_stats_interface.m_entries[self.m_combo_box_2.currentItem()][0]+
+' (green)')
+ bounding_rect_1 = self.m_graph_ctrl.curve(self.m_graph_ctrl.m_curve_1).boundingRect()
+ bounding_rect_2 = self.m_graph_ctrl.curve(self.m_graph_ctrl.m_curve_2).boundingRect()
+ bounding_rect = bounding_rect_1.unite(bounding_rect_2)
+ elif self.m_combo_box_1.currentItem():
+ bounding_rect = self.m_graph_ctrl.curve(self.m_graph_ctrl.m_curve_1).boundingRect()
+ else:
+ bounding_rect = self.m_graph_ctrl.curve(self.m_graph_ctrl.m_curve_2).boundingRect()
- bounding_rect_1 = self.m_graph_ctrl.curve(self.m_graph_ctrl.m_curve_1).boundingRect()
- bounding_rect_2 = self.m_graph_ctrl.curve(self.m_graph_ctrl.m_curve_2).boundingRect()
- bounding_rect = bounding_rect_1.unite(bounding_rect_2)
self.m_graph_ctrl.m_zoomer.setZoomBase(bounding_rect)
+
+ else: # goes with ' if self.m_combo_box_1.currentItem() or self.m_combo_box_2.currentItem():'
+ self.m_graph_ctrl.setAxisTitle(QwtPlot.yLeft, self.m_avida_stats_interface.m_entries[0][0])
self.m_graph_ctrl.replot()
@@ -134,53 +166,4 @@
self.m_graph_ctrl.printPlot(printer, filter)
- def avidaUpdatedSlot(self):
- if self.m_combo_box.currentItem():
- fake_index_1 = 1
- fake_index_2 = 2
- self.m_curve_1_arrays[0] = concatenate(
- (self.m_x_array, [self.m_avida.m_population.GetStats().GetUpdate()]),
- 1
- )
- self.m_curve_2_arrays[0] = concatenate(
- (self.m_x_array, [self.m_avida.m_population.GetStats().GetUpdate()]),
- 1
- )
-
- self.m_curve_1_arrays[1] = concatenate(
- (self.m_curve_1_arrays[1],
- [self.m_avida_stats_interface.getValue(
- fake_index_1,
- self.m_avida.m_population.GetStats()
- )]
- ),
- 1
- )
- self.m_curve_2_arrays[1] = concatenate(
- (self.m_curve_2_arrays[1],
- [self.m_avida_stats_interface.getValue(
- fake_index_2,
- self.m_avida.m_population.GetStats()
- )]
- ),
- 1
- )
-
- if hasattr(self.m_graph_ctrl, "m_curve_1") and hasattr(self.m_graph_ctrl, "m_curve_2"):
- 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.setCurveData(self.m_graph_ctrl.m_curve_2, self.m_curve_2_arrays[0], self.m_curve_2_arrays[1])
-
- # Quick hack: Cause the zoomer to limit zooming-out to the
- # boundaries of the displayed curve.
- bounding_rect_1 = self.m_graph_ctrl.curve(self.m_graph_ctrl.m_curve_1).boundingRect()
- bounding_rect_2 = self.m_graph_ctrl.curve(self.m_graph_ctrl.m_curve_2).boundingRect()
- bounding_rect = bounding_rect_1.unite(bounding_rect_2)
- self.m_graph_ctrl.m_zoomer.setZoomBase(bounding_rect)
- # Quick hack: If the user has zoomed-in on or -out from the graph,
- # autoscaling will have been disabled. This reenables it.
- self.m_graph_ctrl.setAxisAutoScale(QwtPlot.xBottom)
- self.m_graph_ctrl.setAxisAutoScale(QwtPlot.yLeft)
- self.m_graph_ctrl.setAxisAutoScale(QwtPlot.yRight)
- self.m_graph_ctrl.replot()
-
Modified: trunk/source/python/AvidaGui2/pyOneAna_GraphView.ui
===================================================================
--- trunk/source/python/AvidaGui2/pyOneAna_GraphView.ui 2005-05-18 17:32:41 UTC (rev 160)
+++ trunk/source/python/AvidaGui2/pyOneAna_GraphView.ui 2005-05-19 04:36:10 UTC (rev 161)
@@ -10,8 +10,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>124</width>
- <height>201</height>
+ <width>372</width>
+ <height>367</height>
</rect>
</property>
<property name="caption">
@@ -26,276 +26,232 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout210</cstring>
+ <cstring>layout6</cstring>
</property>
- <hbox>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <spacer>
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>spacer152</cstring>
+ <cstring>layout210</cstring>
</property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>Minimum</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>1</width>
- <height>32</height>
- </size>
- </property>
- </spacer>
- <widget class="QLabel">
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <spacer>
+ <property name="name">
+ <cstring>spacer152</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Minimum</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>1</width>
+ <height>32</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel9_2</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string></string>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout178</cstring>
+ </property>
+ <vbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <spacer>
+ <property name="name">
+ <cstring>spacer126</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Minimum</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>1</width>
+ <height>1</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QToolButton">
+ <property name="name">
+ <cstring>toolButton31_2</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="text">
+ <string></string>
+ </property>
+ <property name="iconSet">
+ <iconset>image0</iconset>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer126_2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Minimum</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>1</width>
+ <height>1</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
+ </widget>
+ </hbox>
+ </widget>
+ <widget class="pyGraphCtrl">
<property name="name">
- <cstring>textLabel9_2</cstring>
+ <cstring>m_graph_ctrl</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>3</hsizetype>
- <vsizetype>5</vsizetype>
+ <vsizetype>3</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="font">
- <font>
- <pointsize>11</pointsize>
- </font>
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>100</height>
+ </size>
</property>
- <property name="text">
- <string>Graph</string>
- </property>
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout178</cstring>
+ <cstring>layout5</cstring>
</property>
- <vbox>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<spacer>
<property name="name">
- <cstring>spacer126</cstring>
+ <cstring>spacer200_2</cstring>
</property>
<property name="orientation">
- <enum>Vertical</enum>
+ <enum>Horizontal</enum>
</property>
<property name="sizeType">
- <enum>Minimum</enum>
+ <enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
- <width>1</width>
- <height>1</height>
+ <width>16</width>
+ <height>16</height>
</size>
</property>
</spacer>
- <widget class="QToolButton">
+ <widget class="QComboBox">
+ <item>
+ <property name="text">
+ <string>Merit</string>
+ </property>
+ </item>
<property name="name">
- <cstring>toolButton31_2</cstring>
+ <cstring>m_combo_box_1</cstring>
</property>
<property name="font">
<font>
- <pointsize>10</pointsize>
+ <pointsize>11</pointsize>
</font>
</property>
- <property name="text">
- <string></string>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer200_3</cstring>
</property>
- <property name="iconSet">
- <iconset>image0</iconset>
+ <property name="orientation">
+ <enum>Horizontal</enum>
</property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QComboBox">
+ <item>
+ <property name="text">
+ <string>Merit</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>m_combo_box_2</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
</widget>
<spacer>
<property name="name">
- <cstring>spacer126_2</cstring>
+ <cstring>spacer200</cstring>
</property>
<property name="orientation">
- <enum>Vertical</enum>
+ <enum>Horizontal</enum>
</property>
<property name="sizeType">
- <enum>Minimum</enum>
+ <enum>Expanding</enum>
</property>
<property name="sizeHint">
<size>
- <width>1</width>
- <height>1</height>
+ <width>16</width>
+ <height>16</height>
</size>
</property>
</spacer>
- </vbox>
+ </hbox>
</widget>
- </hbox>
+ </vbox>
</widget>
- <widget class="pyGraphCtrl">
- <property name="name">
- <cstring>m_graph_ctrl</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>3</hsizetype>
- <vsizetype>3</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>100</height>
- </size>
- </property>
- </widget>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout262</cstring>
- </property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <spacer>
- <property name="name">
- <cstring>spacer200_2</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>10</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- <widget class="QToolButton">
- <property name="name">
- <cstring>toolButton31_2_2</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</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="QComboBox">
- <item>
- <property name="text">
- <string>Merit</string>
- </property>
- </item>
- <property name="name">
- <cstring>m_combo_box</cstring>
- </property>
- <property name="font">
- <font>
- <pointsize>11</pointsize>
- </font>
- </property>
- </widget>
- <spacer>
- <property name="name">
- <cstring>spacer200</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>10</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </hbox>
- </widget>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout262_2</cstring>
- </property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <spacer>
- <property name="name">
- <cstring>spacer200_2_2</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>10</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- <widget class="QToolButton">
- <property name="name">
- <cstring>toolButton31_2_2_2</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</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>
- <spacer>
- <property name="name">
- <cstring>spacer200_3</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>10</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </hbox>
- </widget>
</vbox>
</widget>
<customwidgets>
@@ -325,6 +281,8 @@
<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="pyGraphCtrl"></property>
<property type="-1">1</property>
</customwidget>
Modified: trunk/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py 2005-05-18 17:32:41 UTC (rev 160)
+++ trunk/source/python/AvidaGui2/pyOneAna_PetriDishCtrl.py 2005-05-19 04:36:10 UTC (rev 161)
@@ -8,3 +8,4 @@
def __init__(self,parent = None,name = None,fl = 0):
pyOneAna_PetriDishView.__init__(self,parent,name,fl)
+ self.m_one_ana_pop_name.setText('A Relatively Boring Population')
Modified: trunk/source/python/AvidaGui2/pyOneAna_PetriDishView.ui
===================================================================
--- trunk/source/python/AvidaGui2/pyOneAna_PetriDishView.ui 2005-05-18 17:32:41 UTC (rev 160)
+++ trunk/source/python/AvidaGui2/pyOneAna_PetriDishView.ui 2005-05-19 04:36:10 UTC (rev 161)
@@ -55,7 +55,7 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel9_2</cstring>
+ <cstring>m_one_ana_pop_name</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
@@ -67,7 +67,8 @@
</property>
<property name="font">
<font>
- <pointsize>11</pointsize>
+ <pointsize>14</pointsize>
+ <bold>1</bold>
</font>
</property>
<property name="text">
@@ -347,7 +348,7 @@
</sizehint>
<container>0</container>
<sizepolicy>
- <hordata>3</hordata>
+ <hordata>0</hordata>
<verdata>0</verdata>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
@@ -360,6 +361,18 @@
<property type="3">-1</property>
<property type="1">pyPetriDishCtrl</property>
<property type="4">-1</property>
+ <property type="1">pyPetriDishCtrl</property>
+ <property type="4">-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>
@@ -372,7 +385,7 @@
</sizehint>
<container>0</container>
<sizepolicy>
- <hordata>3</hordata>
+ <hordata>0</hordata>
<verdata>0</verdata>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
@@ -385,6 +398,18 @@
<property type="3">-1</property>
<property type="1">pyGradientScaleCtrl</property>
<property type="4">-1</property>
+ <property type="1">pyGradientScaleCtrl</property>
+ <property type="4">-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>
More information about the Avida-cvs
mailing list