[Avida-cvs] [Avida2-svn] r164 - trunk/source/python/AvidaGui2
jclune at myxo.css.msu.edu
jclune at myxo.css.msu.edu
Thu May 19 12:43:30 PDT 2005
Author: jclune
Date: 2005-05-19 15:43:30 -0400 (Thu, 19 May 2005)
New Revision: 164
Modified:
trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
trunk/source/python/AvidaGui2/pyOneAna_GraphView.ui
Log:
test commit (ignore) -- also improved some comments
Modified: trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
===================================================================
--- trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2005-05-19 19:26:26 UTC (rev 163)
+++ trunk/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2005-05-19 19:43:30 UTC (rev 164)
@@ -45,15 +45,19 @@
self.m_combo_box_2.clear()
self.m_combo_box_1.setInsertionPolicy(QComboBox.AtBottom)
self.m_combo_box_2.setInsertionPolicy(QComboBox.AtBottom)
+
+ # set up the combo boxes with plot options
for entry in self.m_avida_stats_interface.m_entries:
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])
+
+ # set up the plot line color options
+ for entry in self.m_avida_stats_interface.m_entries:
+ self.m_combo_box_1.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
+ # connect combo boxes to signal
self.connect(
self.m_combo_box_1, SIGNAL("activated(int)"), self.modeActivatedSlot)
self.connect(
Modified: trunk/source/python/AvidaGui2/pyOneAna_GraphView.ui
===================================================================
--- trunk/source/python/AvidaGui2/pyOneAna_GraphView.ui 2005-05-19 19:26:26 UTC (rev 163)
+++ trunk/source/python/AvidaGui2/pyOneAna_GraphView.ui 2005-05-19 19:43:30 UTC (rev 164)
@@ -10,8 +10,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>372</width>
- <height>367</height>
+ <width>568</width>
+ <height>540</height>
</rect>
</property>
<property name="caption">
@@ -26,232 +26,242 @@
</property>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout6</cstring>
+ <cstring>layout210</cstring>
</property>
- <vbox>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <spacer>
<property name="name">
- <cstring>layout210</cstring>
+ <cstring>spacer152</cstring>
</property>
- <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="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>m_graph_ctrl</cstring>
+ <cstring>textLabel9_2</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>3</hsizetype>
- <vsizetype>3</vsizetype>
+ <vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>100</height>
- </size>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
</property>
+ <property name="text">
+ <string></string>
+ </property>
</widget>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout5</cstring>
+ <cstring>layout178</cstring>
</property>
- <hbox>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<spacer>
<property name="name">
- <cstring>spacer200_2</cstring>
+ <cstring>spacer126</cstring>
</property>
<property name="orientation">
- <enum>Horizontal</enum>
+ <enum>Vertical</enum>
</property>
<property name="sizeType">
- <enum>Expanding</enum>
+ <enum>Minimum</enum>
</property>
<property name="sizeHint">
<size>
- <width>16</width>
- <height>16</height>
+ <width>1</width>
+ <height>1</height>
</size>
</property>
</spacer>
- <widget class="QComboBox">
- <item>
- <property name="text">
- <string>Merit</string>
- </property>
- </item>
+ <widget class="QToolButton">
<property name="name">
- <cstring>m_combo_box_1</cstring>
+ <cstring>toolButton31_2</cstring>
</property>
<property name="font">
<font>
- <pointsize>11</pointsize>
+ <pointsize>10</pointsize>
</font>
</property>
- </widget>
- <spacer>
- <property name="name">
- <cstring>spacer200_3</cstring>
+ <property name="text">
+ <string></string>
</property>
- <property name="orientation">
- <enum>Horizontal</enum>
+ <property name="iconSet">
+ <iconset>image0</iconset>
</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>spacer200</cstring>
+ <cstring>spacer126_2</cstring>
</property>
<property name="orientation">
- <enum>Horizontal</enum>
+ <enum>Vertical</enum>
</property>
<property name="sizeType">
- <enum>Expanding</enum>
+ <enum>Minimum</enum>
</property>
<property name="sizeHint">
<size>
- <width>16</width>
- <height>16</height>
+ <width>1</width>
+ <height>1</height>
</size>
</property>
</spacer>
- </hbox>
+ </vbox>
</widget>
- </vbox>
+ </hbox>
</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>layout12</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>23</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_1</cstring>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ </widget>
+ <widget class="QComboBox">
+ <item>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>m_combo_box_1_color</cstring>
+ </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>40</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>
+ <widget class="QComboBox">
+ <item>
+ <property name="text">
+ <string>-</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>m_combo_box_2_color</cstring>
+ </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>75</width>
+ <height>16</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+ </widget>
</vbox>
</widget>
<customwidgets>
@@ -283,6 +293,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>
More information about the Avida-cvs
mailing list