[Avida-SVN] r1065 - branches/developers/avida-edward/source/python/AvidaGui2
baerb at myxo.css.msu.edu
baerb at myxo.css.msu.edu
Wed Nov 1 12:24:19 PST 2006
Author: baerb
Date: 2006-11-01 15:24:18 -0500 (Wed, 01 Nov 2006)
New Revision: 1065
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleView.py
Log:
Fix problem where items in freezer will being listed in reverse alphabetical
order.
Changed a few more fonts.
Fixed problem where legend scale name would get gut off when name was long.
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui 2006-10-30 19:45:56 UTC (rev 1064)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyBeforeStartingView.ui 2006-11-01 20:24:18 UTC (rev 1065)
@@ -23,6 +23,12 @@
<property name="name">
<cstring>BeforeStartTextLabel</cstring>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ <pointsize>16</pointsize>
+ </font>
+ </property>
<property name="text">
<string><p align="center">Before you can freeze a petri dish or organism<br> you must choose a workspace to work with</p></string>
</property>
@@ -42,6 +48,11 @@
<property name="name">
<cstring>OpenExistingPushButton</cstring>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ </font>
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
@@ -56,6 +67,11 @@
<property name="name">
<cstring>CreateNewPushButton</cstring>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ </font>
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
@@ -70,6 +86,11 @@
<property name="name">
<cstring>CancelPushButton</cstring>
</property>
+ <property name="font">
+ <font>
+ <family>Arial</family>
+ </font>
+ </property>
<property name="focusPolicy">
<enum>StrongFocus</enum>
</property>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui 2006-10-30 19:45:56 UTC (rev 1064)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezeDialogView.ui 2006-11-01 20:24:18 UTC (rev 1065)
@@ -26,6 +26,7 @@
<property name="font">
<font>
<family>Arial</family>
+ <pointsize>16</pointsize>
</font>
</property>
<property name="text">
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py 2006-10-30 19:45:56 UTC (rev 1064)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py 2006-11-01 20:24:18 UTC (rev 1065)
@@ -196,9 +196,14 @@
def createFreezerIndexSlot(self):
+ # Creates the liste of items in the freezer by reading the names from the
+ # current freezer directory
+ #
# Freezer is hardcoded to list in order :
# Configured Dishes, Populated Dishes, Organisms
+ # First empty out the existing indexes
+
self.m_empty_item = self.m_list_view.firstChild()
while self.m_empty_item.firstChild():
tmp_child = self.m_empty_item.firstChild()
@@ -214,22 +219,37 @@
tmp_child = self.m_organism_item.firstChild()
self.m_organism_item.takeItem(tmp_child)
del (tmp_child)
+
+ # Find the current directory -- if it doesn't exist (which should never
+ # happen) create a new directory
+
if os.path.exists(self.m_session_mdl.m_current_freezer) == False:
os.mkdir(self.m_session_mdl.m_current_freezer)
freezer_dir = os.listdir(self.m_session_mdl.m_current_freezer)
+
+ # Go through each item in the current freezer directory and see if it is
+ # an empty (configured) dish, full (populated) dish or organism and add
+ # name to the end of the correct list
+
+ last_empty = None
+ last_full = None
+ last_org = None
for file in freezer_dir:
if file.endswith(".empty"):
dish_name = file[:-6]
- tmp_item = QListViewItem(self.m_empty_item)
+ tmp_item = QListViewItem(self.m_empty_item, last_empty)
tmp_item.setText(0,dish_name)
+ last_empty = tmp_item
if file.endswith(".full"):
dish_name = file[:-5]
- tmp_item = QListViewItem(self.m_full_item)
+ tmp_item = QListViewItem(self.m_full_item, last_full)
tmp_item.setText(0,dish_name)
+ last_full = tmp_item
if file.endswith(".organism"):
organism_name = file[:-9]
- tmp_item = QListViewItem(self.m_organism_item)
+ tmp_item = QListViewItem(self.m_organism_item, last_org)
tmp_item.setText(0,organism_name)
+ last_org = tmp_item
# if mouse is pressed on list item prepare its info to be dragged
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleView.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleView.py 2006-10-30 19:45:56 UTC (rev 1064)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyGradientScaleView.py 2006-11-01 20:24:18 UTC (rev 1065)
@@ -22,7 +22,7 @@
s_empty_text_width = 0
s_off_scale_text_width = 0
s_label_text_width = 0
- s_map_mode_name_label_width = 100
+ s_map_mode_name_label_width = 120
s_text_height = 0
def __init__(self,parent = None,name = None,fl = 0):
@@ -47,7 +47,6 @@
self.s_off_scale_text_width = self.fontMetrics().width(self.s_off_scale_text)
self.s_label_text_width = self.fontMetrics().width("0.00000")
self.s_text_height = self.fontMetrics().height()
- print "pyGradientScaleView.intiailized"
if not name:
setName("pyGradientScaleView")
@@ -55,7 +54,6 @@
def construct(self, session_mdl):
self.m_session_mdl = session_mdl
self.m_avida = None
- print "pyGradientScaleView.constructing"
def doubleToColor(self, x): return self.m_color_lookup and self.m_color_lookup(x) or QColor(Qt.black)
More information about the Avida-cvs
mailing list