[Avida-cvs] [avida-svn] r858 - branches/developers/avida-edward/source/python/AvidaGui2
baerb@myxo.css.msu.edu
baerb at myxo.css.msu.edu
Mon Jul 31 12:11:38 PDT 2006
Author: baerb
Date: 2006-07-31 15:11:37 -0400 (Mon, 31 Jul 2006)
New Revision: 858
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_GraphCtrl.py
Log:
Added a "trash can" area -- that does nothing yet.
Removed a few print statements.
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-07-31 18:49:35 UTC (rev 857)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceView.ui 2006-07-31 19:11:37 UTC (rev 858)
@@ -46,7 +46,7 @@
<string>Avida-ED</string>
</property>
<property name="acceptDrops">
- <bool>true</bool>
+ <bool>false</bool>
</property>
<vbox>
<property name="name">
@@ -128,18 +128,9 @@
<property name="paletteBackgroundPixmap">
<pixmap>image0</pixmap>
</property>
- <property name="frameShape">
- <enum>NoFrame</enum>
+ <property name="acceptDrops">
+ <bool>true</bool>
</property>
- <property name="vScrollBarMode">
- <enum>AlwaysOff</enum>
- </property>
- <property name="hScrollBarMode">
- <enum>AlwaysOff</enum>
- </property>
- <property name="arrangement">
- <enum>TopToBottom</enum>
- </property>
<property name="toolTip" stdset="0">
<string><P>Delete organisms and petri dishes</p></string>
</property>
@@ -292,6 +283,10 @@
<property type="0">-1</property>
<property type="1">pyFreezerView</property>
<property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
+ <property type="1">pyFreezerView</property>
+ <property type="0">-1</property>
<property type="pyFreezerView"></property>
<property type="-1">1</property>
</customwidget>
@@ -355,6 +350,10 @@
<property type="0">-1</property>
<property type="1">pyNavBarView</property>
<property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
+ <property type="1">pyNavBarView</property>
+ <property type="0">-1</property>
<property type="pyNavBarView"></property>
<property type="-1">1</property>
</customwidget>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py 2006-07-31 18:49:35 UTC (rev 857)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerCtrl.py 2006-07-31 19:11:37 UTC (rev 858)
@@ -34,12 +34,8 @@
print type(e)
if ( QIconDrag.canDecode(e)):
+ descr()
format = QDropEvent.format(e, 0)
- print "format = " + str(format)
- print type(e.encodedData(format))
- print "--------------------"
- print dir(e.encodedData(format))
- print str(e.encodedData(format))
if ( QTextDrag.decode( e, freezer_item_name ) ) :
if freezer_item_name[:9] == 'organism.':
freezer_item_name = freezer_item_name[9:]
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerView.ui 2006-07-31 18:49:35 UTC (rev 857)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyFreezerView.ui 2006-07-31 19:11:37 UTC (rev 858)
@@ -103,6 +103,9 @@
<property name="resizeMode">
<enum>AllColumns</enum>
</property>
+ <property name="defaultRenameAction">
+ <enum>Accept</enum>
+ </property>
<property name="toolTip" stdset="0">
<string><p>Storage for existing petri dishes and organisims</p></string>
</property>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_GraphCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_GraphCtrl.py 2006-07-31 18:49:35 UTC (rev 857)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOnePop_GraphCtrl.py 2006-07-31 19:11:37 UTC (rev 858)
@@ -40,13 +40,10 @@
self.modeActivatedSlot(self.m_combo_box.currentItem())
def load(self, path, filename, colx, coly):
- print "pyOnePop_GraphCtrl.load file name = " + filename
if (self.m_avida is None) or (self.m_avida.m_population.GetStats().GetUpdate() == 0):
- print " m_avida is None, or update is zero. Not loading from file."
self.m_x_array = zeros(1, Float)
self.m_y_array = zeros(1, Float)
else:
- print " loading from file."
self.m_x_array, self.m_y_array = self.m_avida_stats_interface.load(
path,
filename, colx, coly)
@@ -72,17 +69,14 @@
self.m_graph_ctrl.replot()
def setAvidaSlot(self, avida):
- print "pyOnePop_GraphCtrl.setAvidaSlot() ..."
old_avida = self.m_avida
self.m_avida = avida
if(old_avida):
- print "pyOnePop_GraphCtrl.setAvidaSlot() disconnecting old_avida ..."
self.disconnect(
self.m_avida.m_avida_thread_mdtr, PYSIGNAL("AvidaUpdatedSig"),
self.avidaUpdatedSlot)
del old_avida
if(self.m_avida):
- print "pyOnePop_GraphCtrl.setAvidaSlot() connecting self.m_avida ..."
self.connect(
self.m_avida.m_avida_thread_mdtr, PYSIGNAL("AvidaUpdatedSig"),
self.avidaUpdatedSlot)
More information about the Avida-cvs
mailing list