[Avida-cvs] [avida-svn] r827 - branches/developers/avida-edward/source/python/AvidaGui2
gerrishj@myxo.css.msu.edu
gerrishj at myxo.css.msu.edu
Tue Jul 11 12:52:26 PDT 2006
Author: gerrishj
Date: 2006-07-11 15:52:25 -0400 (Tue, 11 Jul 2006)
New Revision: 827
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui
Log:
Thick and thin lines instead of thick and solid. Thick is now default.
Removed yellow lines.
Removed extra white space in analyze mode.
Fixed population stats resizing > 1024 issue.
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2006-07-11 18:55:44 UTC (rev 826)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2006-07-11 19:52:25 UTC (rev 827)
@@ -46,13 +46,15 @@
self.label = label
# Setup the combo boxes that control the graph
- self.layout = QHBoxLayout(None, 0, 6, "row%s_layout" % (label))
+ self.layout = QHBoxLayout(None, 0, 6,
+ "row%s_layout" % (label))
self.layout.spacer200_1 = QSpacerItem(23, 16, QSizePolicy.Expanding,
QSizePolicy.Minimum)
self.layout.addItem(self.layout.spacer200_1)
- self.layout.m_del_button = QPushButton("-", parent.population_box_widget)
+ self.layout.m_del_button = QPushButton("x", parent.population_box_widget)
+ self.layout.m_del_button.setMaximumWidth(20)
self.layout.addWidget(self.layout.m_del_button)
self.layout.spacer200_2 = QSpacerItem(20, 16, QSizePolicy.Preferred,
@@ -82,6 +84,7 @@
self.parent = parent
self.parent.population_box_layout.addLayout(self.layout)
+ self.parent.population_box.resize(self.parent.population_box_widget.sizeHint())
# parent.population_box.addItem(self.layout)
def del_population_slot(self):
@@ -96,7 +99,6 @@
self.layout.m_del_button.close(True)
del self.parent.m_combo_boxes[self.label]
self.parent.modeActivatedSlot()
- self.parent.my_resize()
def change_color_slot(self):
"User selected a new color"
@@ -149,7 +151,6 @@
self.m_session_mdl = session_mdl
self.m_avida = None
- self.toolButton31_2.hide()
# m_first_graph is true if we have graphed any population
self.m_first_graph = False
@@ -192,7 +193,7 @@
self.m_combo_box_2.insertItem(entry.name)
# line styles
- self.pen_styles = ['solid', 'thick', 'dotted']
+ self.pen_styles = ['thick', 'thin', 'dotted']
for style in self.pen_styles:
self.m_combo_box_1_style.insertItem(style)
self.m_combo_box_2_style.insertItem(style)
@@ -206,10 +207,9 @@
PriorityColor('green', Qt.green, 2),
PriorityColor('cyan', Qt.cyan, 3),
PriorityColor('magenta', Qt.magenta, 4),
- PriorityColor('yellow', Qt.yellow, 5),
- PriorityColor('dark red', Qt.darkRed, 6),
- PriorityColor('dark green', Qt.darkGreen, 7),
- PriorityColor('dark blue', Qt.darkBlue, 8)]
+ PriorityColor('dark red', Qt.darkRed, 5),
+ PriorityColor('dark green', Qt.darkGreen, 6),
+ PriorityColor('dark blue', Qt.darkBlue, 7)]
# available colors
self.avail_colors = self.m_Colors[:] # shallow copy m_Colors
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphView.ui 2006-07-11 18:55:44 UTC (rev 826)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphView.ui 2006-07-11 19:52:25 UTC (rev 827)
@@ -21,123 +21,6 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <property name="margin">
- <number>0</number>
- </property>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout210</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>1</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="enabled">
- <bool>false</bool>
- </property>
- <property name="font">
- <font>
- <pointsize>10</pointsize>
- </font>
- </property>
- <property name="text">
- <string></string>
- </property>
- <property name="iconSet">
- <iconset>image0</iconset>
- </property>
- <property name="toolTip" stdset="0">
- <string><i>Flip button not implemented here</i></string>
- </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>m_graph_ctrl</cstring>
@@ -374,7 +257,7 @@
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
- <pixmap>image1</pixmap>
+ <pixmap>image0</pixmap>
<property type="0">3</property>
<property type="1">pyGraphCtrl</property>
<property type="3">-1</property>
@@ -412,15 +295,14 @@
<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>
</customwidgets>
<images>
<image name="image0">
- <data format="PNG" length="528">89504e470d0a1a0a0000000d494844520000000f0000000e0806000000f08a46ef000001d74944415428918592cd6a53511485bf9b5c098969a3adb645c1e24f1a9d288a139180c1d0a9e044a18238a8934ed4e2d41770208a5121fa04fa06058722c46141090d0435850493e6aff626b9e72c076dd33411ba6071e0ecb3ce62efbd90c4205bad96969f3c55a552d1706d980106d06eb7957991e5883b85319683e04802a0d3e928f332cb4c608edfb53c53735142a1d0bec7b1588c542a45381c76fa62dff7f5e65596e39ca356dee2d8d418963d6721ac0c5e6f8b5223cfdd07b74824128e238977afdf2bd63dc546b983acc0d91581248c8495c5f37da6a7c7215a63e1e16d82972f5e5577fd30ed3f86dd16f63b8295c5588b91a5d6dce4686492466f9dc0cdf91b14367ee0197f48b80dbbf3a19130b20868793dcabfea04a2d1a8b3f4688192f79dae35fb5ca5edd358db77b7b2f47a066fabbb37edc25a4199e79f383d769e4dbfc3df6e1383b0560870022eae13c2c8303931ce89b303ab02c8e5bee9e3872f6c7a75aea5cf100c06fbb566a34deeeb1a13e10bb8ee21aecf4f32929a9595cfba776749d56a752461f97c5e8bf79fe9f1e25b158b45b9c3a949a7534e28e42a12898c242a1e8f3b3327a3aa55eaccce!
ce3a2362806432e9fcef1ee0d29504eb3f6b3b533d20fcc35c5d5d55a9549224fe01033d5afa1d4bae640000000049454e44ae426082</data>
- </image>
- <image name="image1">
<data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7!
ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e05!
82c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44a!
e426082<
/data>
</image>
</images>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py 2006-07-11 18:55:44 UTC (rev 826)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeCtrl.py 2006-07-11 19:52:25 UTC (rev 827)
@@ -84,6 +84,7 @@
else:
if self.m_one_ana_graph_ctrl.check_file(freezer_item_name):
self.m_one_ana_petri_ctrl.m_one_ana_pop_name.setText("")
+ self.m_one_ana_petri_ctrl.pixmapLabel1.hide()
self.emit(PYSIGNAL("freezerItemDroppedInOneAnalyzeSig"), (e,))
def freezerItemDoubleClicked(self, freezer_item_name):
@@ -93,6 +94,7 @@
if self.isVisible():
if self.m_one_ana_graph_ctrl.check_file(freezer_item_name):
self.m_one_ana_petri_ctrl.m_one_ana_pop_name.setText("")
+ self.m_one_ana_petri_ctrl.pixmapLabel1.hide()
self.emit(PYSIGNAL("freezerItemDoubleClickedOnInOneAnaSig"),
(freezer_item_name,))
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeView.ui 2006-07-11 18:55:44 UTC (rev 826)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAnalyzeView.ui 2006-07-11 19:52:25 UTC (rev 827)
@@ -27,13 +27,6 @@
<property name="margin">
<number>0</number>
</property>
- <widget class="QSplitter">
- <property name="name">
- <cstring>splitter3</cstring>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
<widget class="QLayoutWidget">
<property name="name">
<cstring>layout55</cstring>
@@ -96,7 +89,6 @@
</widget>
</vbox>
</widget>
- </widget>
</vbox>
</widget>
<customwidgets>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui 2006-07-11 18:55:44 UTC (rev 826)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui 2006-07-11 19:52:25 UTC (rev 827)
@@ -31,7 +31,7 @@
</property>
<property name="maximumSize">
<size>
- <width>400</width>
+ <width>32767</width>
<height>400</height>
</size>
</property>
@@ -56,7 +56,7 @@
</property>
<property name="maximumSize">
<size>
- <width>350</width>
+ <width>32767</width>
<height>30000</height>
</size>
</property>
@@ -916,7 +916,7 @@
</property>
<property name="maximumSize">
<size>
- <width>350</width>
+ <width>32767</width>
<height>32767</height>
</size>
</property>
@@ -1839,11 +1839,11 @@
</customwidgets>
<images>
<image name="image0">
- <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154789cad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7!
ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e05!
82c261e95f8bfc04f1a1e8bc5c4dfe0a19017a725d8c60000000049454e44a!
e426082<
/data>
+ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7!
ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e05!
82c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44a!
e426082<
/data>
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>pyorgsquarectrl.h</includehint>
+ <includehint>1</includehint>
</includehints>
</UI>
More information about the Avida-cvs
mailing list