[Avida-SVN] r1673 - branches/developers/avida-edward/source/python/AvidaGui2
baerb at myxo.css.msu.edu
baerb at myxo.css.msu.edu
Tue Jun 12 13:14:14 PDT 2007
Author: baerb
Date: 2007-06-12 16:14:14 -0400 (Tue, 12 Jun 2007)
New Revision: 1673
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py
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/pyOnePop_StatsView.ui
Log:
Fixed a few minor problems with the user interface.
Can now open an organism using the main menu.
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2007-06-12 19:38:58 UTC (rev 1672)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2007-06-12 20:14:14 UTC (rev 1673)
@@ -626,7 +626,9 @@
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("openFreezerItemSig"), (file_name,))
else:
- info("Can not open an organism by using the menu")
+ self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("raiseOrgViewSig"),())
+ self.m_session_mdl.m_session_mdtr.emit(PYSIGNAL("parseOrganismFileSig"),
+ (str(file_name),))
# public slot
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py 2007-06-12 19:38:58 UTC (rev 1672)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py 2007-06-12 20:14:14 UTC (rev 1673)
@@ -354,7 +354,6 @@
# if the user has selected to open an item from an external widget
def freezerItemExtSelSlot(self, in_file_name):
- descr("BDB --file name = " + str(in_file_name))
if (in_file_name.endswith(".full")) or (in_file_name.endswith(".empty")):
short_name = os.path.basename(in_file_name)
if (short_name.endswith("empty")):
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2007-06-12 19:38:58 UTC (rev 1672)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphCtrl.py 2007-06-12 20:14:14 UTC (rev 1673)
@@ -75,6 +75,12 @@
self.layout.m_combo_box_1_color = QComboBox(0,
parent.population_box_widget,
"row%s_m_combo_box_1_color" % (label))
+ m_combo_box_1_font = QFont(self.layout.m_combo_box_1_color.font())
+ m_combo_box_1_font.setFamily("Arial")
+ m_combo_box_1_font.setPointSize(11)
+ self.layout.m_combo_box_1_color.setFont(m_combo_box_1_font)
+
+
self.layout.addWidget(self.layout.m_combo_box_1_color)
self.layout.spacer200_4 = QSpacerItem(25, 16, QSizePolicy.Expanding,
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphView.ui 2007-06-12 19:38:58 UTC (rev 1672)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneAna_GraphView.ui 2007-06-12 20:14:14 UTC (rev 1673)
@@ -131,6 +131,7 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>11</pointsize>
</font>
</property>
@@ -142,6 +143,12 @@
<property name="name">
<cstring>m_combo_box_1_style</cstring>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
<property name="toolTip" stdset="0">
<string>Style for line #1</string>
</property>
@@ -201,6 +208,7 @@
</property>
<property name="font">
<font>
+ <family>Arial</family>
<pointsize>11</pointsize>
</font>
</property>
@@ -212,6 +220,12 @@
<property name="name">
<cstring>m_combo_box_2_style</cstring>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
<property name="toolTip" stdset="0">
<string>Style for line #2</string>
</property>
@@ -281,33 +295,17 @@
<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="1">pyGraphCtrl</property>
- <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="1">pyGraphCtrl</property>
- <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="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="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154388dad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7!
ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e05!
82c261e95f8bfc04f1a1e8bc5c4dfe0a190172af6a9690000000049454e44a!
e426082<
/data>
+ <data format="PNG" length="1002">89504e470d0a1a0a0000000d4948445200000016000000160806000000c4b46c3b000003b149444154789cad945f4c5b551cc73fe7dc4b7b4bcba0762d45c43114323599ee6192609c51d883892ce083f1718b3ebb185f8dc91e972cf39d2d2a2f1af664b6f1e0fe3863a0718969700eb0c52142da0242a1bd6d696f7bcff101585203ceb8fd9ece39f99dcff9fe7edf939f88c562ec465f5f9fe609442c161362173c3e3eae7b7a7ac8e7f36432196cdbfe4f907c3e4f2291201e8fe338cec3737357e9e8e828aded1e229d650e1f2d51754b082110124c13a4dc5ea341eb9dc284c0558a853f3ce8cb0677ef500fde7d39d2596679e326597b8e9abb85d7a770ab16ab6983ec5a05b487a70e36f0f4e10afe408d6a558310980108478dba4a1e8233990c5d474b64ed39aa3a8fe5f3317fbf81dbd70bccfeb205947632fd74f6589c1c6ea2f70d03a58ba0c1f2c9bdc1b66de3b8256a6e11cbe7e3ee1d181b590124fe2693aeee08d223c82c3a2c24b7b874bec8f26288774f7bd054504aef0dde6e99c0eb83f9fb266323cb80a27fb0958141836044605a2ee5523393371cc646fee2da37195aa35d0c0c5b4859ac03d7e91712dcaac5adab3650a3ff9d08ef7dd8404bb48869e5d958b5b87dadc4c9a1464e9f0d0326df7!
ebd86bd2e310cb1bf62d384d59441f2d70a070e1c60e09489929b988681bdd9cc97170bcc4c65595f71f8e0e3301337fc24a7732467831875a47f289652b0be5e4151e6d07316c1b0c0340d8ab92023e76d66a6b2840e36d2fb7a13fee632475e6edc367ea98a90fb98b7dd6310ca0328a44761582e1bab41befabcc0ec940d28bc5e93b68e064cab84e1d9beaeb48934eac1f53b01c1b000fca496aa54b61a99fcde61662a4b4b4b23d1680be9d426173e4df3602a48ea411989a4fd590f52a8fd156b05ed9d350e3defe3cfdf4b4c7ce770ea7d3fb9f520afbe1620daeee5c26735d20b9b9cfb6811a754a439e4e5c5639a4caa1e5caf586bfc0197b78702005cb9b4cae4cd3267ce8638fe964bd72b393e39d74928d242617303a756a37f284447770dcdbffc6384a05a85de1306e9a52057c7527c7131c3c42d3f475eb2303c82d4fc3276d6811db37efeb148723082d9b08f79f97c1e5729109a9a28307cc622d2d6cdf52b2b24efe548dedb00142009862cfa879ee1a71f6cec928353511472fbf4389148b0b0e0c108081412458dfe21c9f11351e67e7358595468246d1d1e5e38a6e9e851bc39d84ab502a669331dafec0d8ec7e3e8cb06e1a881d727d1ae40180a434a8c9db129a54126ad48a7358c2b4c5352c8c374bcccdab2bb37d8719cba79fab8211f9df218e05!
82c261e95f8bfc04f1a1e8bc5c4dfe0a19017a725d8c60000000049454e44a!
e426082<
/data>
</image>
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>1</includehint>
+ <includehint>pygraphctrl.h</includehint>
</includehints>
</UI>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui 2007-06-12 19:38:58 UTC (rev 1672)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_StatsView.ui 2007-06-12 20:14:14 UTC (rev 1673)
@@ -9,7 +9,7 @@
</property>
<property name="geometry">
<rect>
- <x>10</x>
+ <x>0</x>
<y>0</y>
<width>373</width>
<height>400</height>
@@ -211,7 +211,7 @@
</property>
<property name="sizeHint">
<size>
- <width>40</width>
+ <width>30</width>
<height>5</height>
</size>
</property>
@@ -222,7 +222,7 @@
</property>
<property name="sizePolicy">
<sizepolicy>
- <hsizetype>0</hsizetype>
+ <hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
@@ -242,6 +242,12 @@
<property name="text">
<string>-</string>
</property>
+ <property name="alignment">
+ <set>AlignVCenter|AlignRight</set>
+ </property>
+ <property name="indent">
+ <number>-1</number>
+ </property>
</widget>
</hbox>
</widget>
@@ -1082,7 +1088,7 @@
</property>
<property name="sizePolicy">
<sizepolicy>
- <hsizetype>0</hsizetype>
+ <hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
@@ -1102,6 +1108,9 @@
<property name="text">
<string>-</string>
</property>
+ <property name="alignment">
+ <set>AlignVCenter|AlignRight</set>
+ </property>
</widget>
</hbox>
</widget>
More information about the Avida-cvs
mailing list