[Avida-cvs] [avida-svn] r561 - branches/developers/avida-edward/source/python/AvidaGui2
avidaedward@myxo.css.msu.edu
avidaedward at myxo.css.msu.edu
Tue Apr 4 11:16:59 PDT 2006
Author: avidaedward
Date: 2006-04-04 14:16:58 -0400 (Tue, 04 Apr 2006)
New Revision: 561
Added:
branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_version.py
branches/developers/avida-edward/source/python/AvidaGui2/closed.png
branches/developers/avida-edward/source/python/AvidaGui2/open.png
branches/developers/avida-edward/source/python/AvidaGui2/pyBufferCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyBufferView.py
branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowButtonCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowButtonView.py
branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowView.py
branches/developers/avida-edward/source/python/AvidaGui2/pyInstructionDescriptionCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyInstructionDescriptionView.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeView/
branches/developers/avida-edward/source/python/AvidaGui2/svn_commit.sh
Modified:
branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeView.ui
branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeCtrl.py
branches/developers/avida-edward/source/python/AvidaGui2/pyTemporaryReloads.py
Log:
- Added a commit script "svn_commit.sh" which writes svn revision info
into Avida-ED file "Avida_ED_version.py".
- Rewriting Organism Viewer.
Added: branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_version.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_version.py 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/Avida_ED_version.py 2006-04-04 18:16:58 UTC (rev 561)
@@ -0,0 +1 @@
+svn_revision_string = 'Avida-ED v2.0.552M'
Added: branches/developers/avida-edward/source/python/AvidaGui2/closed.png
===================================================================
(Binary files differ)
Property changes on: branches/developers/avida-edward/source/python/AvidaGui2/closed.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/developers/avida-edward/source/python/AvidaGui2/open.png
===================================================================
(Binary files differ)
Property changes on: branches/developers/avida-edward/source/python/AvidaGui2/open.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/developers/avida-edward/source/python/AvidaGui2/pyBufferCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyBufferCtrl.py 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyBufferCtrl.py 2006-04-04 18:16:58 UTC (rev 561)
@@ -0,0 +1,22 @@
+
+from descr import descr
+from pyBufferView import pyBufferView
+from qt import *
+from AvidaCore import cHardwareDefs, cHardwareCPUDefs
+
+class pyBufferCtrl(pyBufferView):
+ def __init__(self,parent = None,name = None,fl = 0):
+ pyBufferView.__init__(self,parent,name,fl)
+ if not name: self.setName("pyBufferCtrl")
+ self.read_fn = None
+
+ def setReadFn(self, sender, read_fn):
+ self.read_fn = read_fn
+ self.connect(sender, PYSIGNAL("propagated-FrameShownSig"), self.frameShownSlot)
+ return self
+
+ def frameShownSlot(self, frames, frame_no):
+ if frames is not None and frame_no < frames.m_gestation_time and self.read_fn is not None:
+ self.setBits(self.read_fn(frames, frame_no))
+ else:
+ self.setBits(0)
Added: branches/developers/avida-edward/source/python/AvidaGui2/pyBufferView.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyBufferView.py 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyBufferView.py 2006-04-04 18:16:58 UTC (rev 561)
@@ -0,0 +1,75 @@
+from descr import descr
+from qt import *
+
+class pyBufferView(QWidget):
+ def __init__(self,parent = None,name = None,fl = 0):
+ QWidget.__init__(self,parent,name,fl)
+ if not name: self.setName("pyBufferView")
+
+ self.indicator_h = self.indicator_w = self.indicator_bit_count = 0
+ self.old_bits = -1
+ self.backing_store = QPixmap()
+
+ self.setIndicatorHeight(6)
+ self.setIndicatorWidth(6)
+ self.setIndicatorBitCount(32)
+ self.setBits(0)
+
+ def _updateSize(self):
+ size = QSize(self.getIndicatorWidth() * self.getIndicatorBitCount(), self.getIndicatorHeight())
+ self.setMinimumSize(size)
+ self.setMaximumSize(size)
+ self.backing_store.resize(size)
+
+ def getIndicatorHeight(self):
+ return self.indicator_h
+ def getIndicatorWidth(self):
+ return self.indicator_w
+ def getIndicatorBitCount(self):
+ return self.indicator_bit_count
+
+ def setIndicatorHeight(self, pixels):
+ self.indicator_h = pixels
+ self._updateSize()
+ def setIndicatorWidth(self, pixels):
+ self.indicator_w = pixels
+ self._updateSize()
+ def setIndicatorBitCount(self, count):
+ self.indicator_bit_count = count
+ self._updateSize()
+
+ def setBit(self, bit_no, bit_val):
+ p = QPainter(self.backing_store)
+ # fill rect with first color if bit_val is high, otherwise use
+ # second color
+ p.setBrush(bit_val and Qt.yellow or Qt.blue)
+ # alternate background colors, to help count bits visually.
+ # do this by outlining odd bit number the fist color, and even the
+ # second.
+ p.setPen(bit_no & 1 and Qt.lightGray or Qt.darkGray)
+ p.drawRect(
+ (self.getIndicatorBitCount() - bit_no - 1) * self.getIndicatorWidth(),
+ 0,
+ self.getIndicatorWidth(),
+ self.getIndicatorHeight()
+ )
+
+ def setBits(self, bits):
+ if self.old_bits != bits:
+ # hi is always 2^(current bit number)
+ hi = 1
+ for i in xrange(32):
+ self.setBit(i, hi & bits)
+ hi = hi << 1
+ self.old_bits = bits
+ self.paint(self.backing_store.rect())
+ #descr(self.name(), bits)
+
+ def paint(self, rect):
+ p = QPainter(self)
+ # update dirty rectangle from backing store.
+ p.drawPixmap(rect, self.backing_store)
+
+ def paintEvent(self, paint_event):
+ # update dirty rectangle from backing store.
+ self.paint(paint_event.rect())
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyEduWorkspaceCtrl.py 2006-04-04 18:16:58 UTC (rev 561)
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
+from Avida_ED_version import svn_revision_string
from pyEduWorkspaceView import pyEduWorkspaceView
from pyMdtr import pyMdtr
from pyOneAnalyzeCtrl import pyOneAnalyzeCtrl
@@ -28,7 +29,7 @@
self.m_cli_to_ctrl_dict = {}
self.m_ctrl_to_cli_dict = {}
#self.setCaption(self.m_session_mdl.m_current_workspace)
- self.setCaption('Avida-ED v%s - %s' % ('$Revision$', self.m_session_mdl.m_current_workspace) )
+ self.setCaption('%s - %s' % (svn_revision_string, self.m_session_mdl.m_current_workspace) )
while self.m_widget_stack.visibleWidget():
self.m_widget_stack.removeWidget(self.m_widget_stack.visibleWidget())
@@ -199,7 +200,7 @@
self.m_session_mdl.m_current_workspace = str(new_dir)
self.m_session_mdl.m_current_freezer = os.path.join(new_dir, "freezer")
#self.setCaption(self.m_session_mdl.m_current_workspace)
- self.setCaption('Avida-ED v%s - %s' % ('$Revision$', self.m_session_mdl.m_current_workspace) )
+ self.setCaption('%s - %s' % (svn_revision_string, self.m_session_mdl.m_current_workspace) )
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("doRefreshFreezerInventorySig"), ())
created = True
@@ -225,7 +226,7 @@
self.m_session_mdl.m_current_workspace = str(workspace_dir)
self.m_session_mdl.m_current_freezer = os.path.join(self.m_session_mdl.m_current_workspace, "freezer")
#self.setCaption(self.m_session_mdl.m_current_workspace)
- self.setCaption('Avida-ED v%s - %s' % ('$Revision$', self.m_session_mdl.m_current_workspace) )
+ self.setCaption('%s - %s' % (svn_revision_string, self.m_session_mdl.m_current_workspace) )
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("doRefreshFreezerInventorySig"), ())
@@ -278,7 +279,7 @@
self.m_session_mdl.m_current_workspace = str(new_dir)
self.m_session_mdl.m_current_freezer = os.path.join(new_dir, "freezer")
#self.setCaption(self.m_session_mdl.m_current_workspace)
- self.setCaption('Avida-ED v%s - %s' % ('$Revision$', self.m_session_mdl.m_current_workspace) )
+ self.setCaption('%s - %s' % (svn_revision_string, self.m_session_mdl.m_current_workspace) )
self.m_session_mdl.m_session_mdtr.emit(
PYSIGNAL("doRefreshFreezerInventorySig"), ())
created = True
Added: branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowButtonCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowButtonCtrl.py 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowButtonCtrl.py 2006-04-04 18:16:58 UTC (rev 561)
@@ -0,0 +1,68 @@
+from qt import *
+
+#from pyHideShowButtonView import pyHideShowButtonView
+#
+#class pyHideShowButtonCtrl(pyHideShowButtonView):
+# def __init__(self,parent = None,name = None,fl = 0):
+# pyHideShowButtonView.__init__(self,parent,name,fl)
+# if not name: self.setName("pyHideShowButtonCtrl")
+
+class pyHideShowButton(QWidget):
+ def __init__(self,parent = None,name = None,fl = 0):
+ QWidget.__init__(self,parent,name,fl)
+ if not name: self.setName("pyHideShowButtonView")
+
+ def mouseReleaseEvent(self, mouse_event):
+ self.emit(PYSIGNAL("clicked"),())
+
+class pyHideShowButtonCtrl(QWidget):
+ def __init__(self,parent = None,name = None,fl = 0):
+ QWidget.__init__(self,parent,name,fl)
+ if not name: self.setName("pyHideShowButtonView")
+
+
+ pyHideShowButtonViewLayout = QVBoxLayout(self,0,0,"pyHideShowButtonViewLayout")
+
+ self.m_widget_stack = QWidgetStack(self,"m_widget_stack")
+
+ self.m_is_hidden_page = QWidget(self.m_widget_stack,"m_is_hidden_page")
+ m_is_hidden_pageLayout = QVBoxLayout(self.m_is_hidden_page,0,0,"m_is_hidden_pageLayout")
+
+
+ self.m_is_hidden_button = pyHideShowButton(self.m_is_hidden_page,"m_is_hidden_button")
+ self.m_is_hidden_button.setPaletteBackgroundPixmap(QPixmap("closed.png"))
+ #self.m_is_hidden_button.setMinimumSize(QSize(11, 11))
+ #self.m_is_hidden_button.setMaximumSize(QSize(11, 11))
+
+ #self.m_is_hidden_button = QToolButton(Qt.RightArrow, self.m_is_hidden_page,"m_is_hidden_button")
+ #self.m_is_hidden_button.setAutoRaise(False)
+
+ #self.m_is_hidden_button = QRadioButton(self.m_is_hidden_page,"m_is_hidden_button")
+ #self.m_is_hidden_button.setPixmap(QPixmap("closed.png"))
+
+ m_is_hidden_pageLayout.addWidget(self.m_is_hidden_button)
+ self.m_widget_stack.addWidget(self.m_is_hidden_page,0)
+
+ self.m_is_shown_page = QWidget(self.m_widget_stack,"m_is_shown_page")
+ m_is_shown_pageLayout = QVBoxLayout(self.m_is_shown_page,0,0,"m_is_shown_pageLayout")
+
+
+ self.m_is_shown_button = pyHideShowButton(self.m_is_shown_page,"m_is_shown_button")
+ self.m_is_shown_button.setPaletteBackgroundPixmap(QPixmap("open.png"))
+
+ #self.m_is_shown_button = QToolButton(Qt.DownArrow, self.m_is_shown_page,"m_is_shown_button")
+ #self.m_is_shown_button.setPixmap(QPixmap("open.png"))
+ #self.m_is_shown_button.setBackgroundMode(Qt.FixedPixmap)
+
+ #self.m_is_shown_button.setAutoRaise(False)
+ #self.m_is_shown_button = QRadioButton(self.m_is_shown_page,"m_is_shown_button")
+ #self.m_is_shown_button.setPixmap(QPixmap("open.png"))
+
+ m_is_shown_pageLayout.addWidget(self.m_is_shown_button)
+ self.m_widget_stack.addWidget(self.m_is_shown_page,1)
+ pyHideShowButtonViewLayout.addWidget(self.m_widget_stack)
+
+ #self.resize(QSize(149,149).expandedTo(self.minimumSizeHint()))
+ #self.clearWState(Qt.WState_Polished)
+
+
Added: branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowButtonView.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowButtonView.py 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowButtonView.py 2006-04-04 18:16:58 UTC (rev 561)
@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+
+# Form implementation generated from reading ui file 'pyHideShowButtonView.ui'
+#
+# Created: Mon Apr 3 17:15:33 2006
+# by: The PyQt User Interface Compiler (pyuic) 3.15.1
+#
+# WARNING! All changes made in this file will be lost!
+
+
+from qt import *
+
+
+class pyHideShowButtonView(QWidget):
+ def __init__(self,parent = None,name = None,fl = 0):
+ QWidget.__init__(self,parent,name,fl)
+
+ if not name:
+ self.setName("pyHideShowButtonView")
+
+
+ pyHideShowButtonViewLayout = QVBoxLayout(self,0,0,"pyHideShowButtonViewLayout")
+
+ self.m_widget_stack = QWidgetStack(self,"m_widget_stack")
+
+ self.m_is_hidden_page = QWidget(self.m_widget_stack,"m_is_hidden_page")
+ m_is_hidden_pageLayout = QVBoxLayout(self.m_is_hidden_page,0,0,"m_is_hidden_pageLayout")
+
+ self.m_is_hidden_button = QToolButton(self.m_is_hidden_page,"m_is_hidden_button")
+ m_is_hidden_pageLayout.addWidget(self.m_is_hidden_button)
+ self.m_widget_stack.addWidget(self.m_is_hidden_page,0)
+
+ self.m_is_shown_page = QWidget(self.m_widget_stack,"m_is_shown_page")
+ m_is_shown_pageLayout = QVBoxLayout(self.m_is_shown_page,0,0,"m_is_shown_pageLayout")
+
+ self.m_is_shown_button = QToolButton(self.m_is_shown_page,"m_is_shown_button")
+ m_is_shown_pageLayout.addWidget(self.m_is_shown_button)
+ self.m_widget_stack.addWidget(self.m_is_shown_page,1)
+ pyHideShowButtonViewLayout.addWidget(self.m_widget_stack)
+
+ self.languageChange()
+
+ self.resize(QSize(149,149).expandedTo(self.minimumSizeHint()))
+ self.clearWState(Qt.WState_Polished)
+
+
+ def languageChange(self):
+ self.setCaption(self.__tr("pyHideShowButtonView"))
+ self.m_is_hidden_button.setText(self.__tr("..."))
+ self.m_is_shown_button.setText(self.__tr("..."))
+
+
+ def __tr(self,s,c = None):
+ return qApp.translate("pyHideShowButtonView",s,c)
Added: branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowCtrl.py 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowCtrl.py 2006-04-04 18:16:58 UTC (rev 561)
@@ -0,0 +1,30 @@
+from qt import *
+
+from pyHideShowView import pyHideShowView
+
+class pyHideShowCtrl(pyHideShowView):
+ def __init__(self,parent = None,name = None,fl = 0):
+ pyHideShowView.__init__(self,parent,name,fl)
+ if not name: self.setName("pyHideShowCtrl")
+
+ self.min_width = 0
+
+ self.connect(self.m_hide_show_btn.m_is_shown_button, PYSIGNAL("clicked"), self.hideSlot)
+ self.connect(self.m_hide_show_btn.m_is_hidden_button, PYSIGNAL("clicked"), self.showSlot)
+ self.showSlot()
+
+ def updateMinWidth(self, child_width):
+ width = self.m_hide_show_btn.maximumWidth() + child_width + 2*self.layout().margin()
+ #width = self.m_hide_show_btn.maximumWidth() + child_width + 30
+ if self.min_width < width: self.min_width = width
+ self.setMinimumWidth(self.min_width)
+
+ def hideSlot(self):
+ self.m_spacer_widget.hide()
+ self.m_subwidget.hide()
+ self.m_hide_show_btn.m_widget_stack.raiseWidget(self.m_hide_show_btn.m_is_hidden_page)
+
+ def showSlot(self):
+ self.m_spacer_widget.show()
+ self.m_subwidget.show()
+ self.m_hide_show_btn.m_widget_stack.raiseWidget(self.m_hide_show_btn.m_is_shown_page)
Added: branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowView.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowView.py 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyHideShowView.py 2006-04-04 18:16:58 UTC (rev 561)
@@ -0,0 +1,49 @@
+from qt import *
+
+from pyHideShowButtonCtrl import pyHideShowButtonCtrl
+
+class pyHideShowView(QWidget):
+ def __init__(self,parent = None,name = None,fl = 0):
+ QWidget.__init__(self,parent,name,fl)
+ if not name: self.setName("pyHideShowView")
+
+ top_layout = QVBoxLayout(self,0,0,"pyHideShowView,top_layout")
+
+ h_layout1 = QHBoxLayout(None,0,0,"pyHideShowView,h_layout1")
+ #self.m_hide_show_btn = QWidget(self)
+ self.m_hide_show_btn = pyHideShowButtonCtrl(self)
+ self.m_hide_show_btn.setMinimumSize(11, 11)
+ self.m_hide_show_btn.setMaximumSize(11, 11)
+ h_layout1.addWidget(self.m_hide_show_btn)
+ # temporary
+ self.m_label = QLabel(self)
+ font = QFont(qApp.font())
+ font.setPointSize(9)
+ self.m_label.setFont(font)
+ h_layout1.addWidget(self.m_label)
+
+ h_layout2 = QHBoxLayout(None,0,0,"pyHideShowView,h_layout2")
+ # temporary
+ self.m_spacer_widget = QWidget(self)
+ self.m_spacer_widget.setMinimumWidth(11)
+ self.m_spacer_widget.setMaximumWidth(11)
+ h_layout2.addWidget(self.m_spacer_widget)
+ # temporary
+ self.m_subwidget = QWidget(self)
+ h_layout2.addWidget(self.m_subwidget)
+ # temporary
+ #self.m_spacer_widget2 = QWidget(self)
+ #h_layout3 = QHBoxLayout(self.m_spacer_widget2,11,0,"pyHideShowView,h_layout2")
+ #self.m_spacer_widget2.setMinimumWidth(11)
+ #self.m_spacer_widget2.setMaximumWidth(11)
+ #h_layout2.addWidget(self.m_spacer_widget2)
+
+ top_layout.addLayout(h_layout1)
+ top_layout.addLayout(h_layout2)
+ top_layout.addStretch()
+
+ def getLabel(self):
+ return self.m_label
+
+ def getSubwidget(self):
+ return self.m_subwidget
Added: branches/developers/avida-edward/source/python/AvidaGui2/pyInstructionDescriptionCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyInstructionDescriptionCtrl.py 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyInstructionDescriptionCtrl.py 2006-04-04 18:16:58 UTC (rev 561)
@@ -0,0 +1,36 @@
+
+from descr import descr
+from qt import *
+#from AvidaCore import cHardwareDefs, cHardwareCPUDefs
+from AvidaCore import *
+
+class pyInstructionDescriptionCtrl(QLabel):
+ def __init__(self,parent = None,name = None,fl = 0):
+ QLabel.__init__(self,parent,name,fl)
+ if not name: self.setName("pyInstructionDescriptionCtrl")
+ font = QFont(qApp.font())
+ font.setPointSize(9)
+ self.setFont(font)
+
+ #self.read_fn = None
+
+ def setReadFn(self, sender, read_fn):
+ #self.read_fn = read_fn
+ self.connect(sender, PYSIGNAL("propagated-FrameShownSig"), self.frameShownSlot)
+ return self
+
+ def frameShownSlot(self, frames, frame_no):
+ #if frames is not None and frame_no < frames.m_gestation_time and self.read_fn is not None:
+ if frames is not None and frame_no < frames.m_gestation_time:
+ #self.read_fn(frames, frame_no)
+ inst_set = frames.getHardwareSnapshotAt(frame_no).GetInstSet()
+ short_name = frames.m_genome_info[frame_no][frames.m_ihead_info[frame_no]]
+ #self.setText(short_name)
+ inst = cInstruction()
+ inst.SetSymbol(short_name)
+ long_name = inst_set.GetName(inst)
+ self.setText("%s: %s" % (short_name, long_name))
+ else:
+ self.setText("(no instruction)")
+ pass
+
Added: branches/developers/avida-edward/source/python/AvidaGui2/pyInstructionDescriptionView.py
===================================================================
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeCtrl.py 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeCtrl.py 2006-04-04 18:16:58 UTC (rev 561)
@@ -32,7 +32,11 @@
self.connect(
self.m_organism_scope_ctrl, qt.PYSIGNAL("executionStepResetSig"),
self.executionStepResetSlot)
+ self.connect(
+ self.m_organism_scope_ctrl, qt.PYSIGNAL("frameShownSig"),
+ self.m_organism_data_ctrl.frameShownSlot)
+
self.connect(
self.m_analyze_controls_ctrl.m_rewind_btn, qt.SIGNAL("clicked()"),
self.rewindSlot)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeView.ui
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeView.ui 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOneOrg_ScopeView.ui 2006-04-04 18:16:58 UTC (rev 561)
@@ -1,6 +1,7 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>pyOneOrg_ScopeView</class>
-<comment>Python:from pyOrganismScopeCtrl import pyOrganismScopeCtrl
+<comment>Python:from pyOrganismDataCtrl import pyOrganismDataCtrl
+Python:from pyOrganismScopeCtrl import pyOrganismScopeCtrl
Python:from pyAnalyzeControlsCtrl import pyAnalyzeControlsCtrl
</comment>
<widget class="QWidget">
@@ -22,18 +23,53 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="pyOrganismScopeCtrl">
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>m_organism_scope_ctrl</cstring>
+ <cstring>layout6</cstring>
</property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>3</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="pyOrganismDataCtrl">
+ <property name="name">
+ <cstring>m_organism_data_ctrl</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>5</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>50</width>
+ <height>50</height>
+ </size>
+ </property>
+ </widget>
+ <widget class="pyOrganismScopeCtrl">
+ <property name="name">
+ <cstring>m_organism_scope_ctrl</cstring>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>5</hsizetype>
+ <vsizetype>3</vsizetype>
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>50</width>
+ <height>50</height>
+ </size>
+ </property>
+ </widget>
+ </hbox>
</widget>
<widget class="QSlider">
<property name="name">
@@ -125,6 +161,8 @@
<property type="3">-1</property>
<property type="1">pyAnalyzeControlsCtrl</property>
<property type="0">-1</property>
+ <property type="1">pyAnalyzeControlsCtrl</property>
+ <property type="0">-1</property>
<property type="pyAnalyzeControlsCtrl"></property>
<property type="-1">1</property>
</customwidget>
@@ -144,6 +182,26 @@
</sizepolicy>
<pixmap>image0</pixmap>
</customwidget>
+ <customwidget>
+ <class>pyOrganismDataCtrl</class>
+ <header location="global">1</header>
+ <sizehint>
+ <width>-1</width>
+ <height>0</height>
+ </sizehint>
+ <container>0</container>
+ <sizepolicy>
+ <hordata>5</hordata>
+ <verdata>0</verdata>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ <pixmap>image0</pixmap>
+ <property type="0">4</property>
+ <property type="1">pyOrganismDataCtrl</property>
+ <property type="-1">-1</property>
+ <property type="3">0</property>
+ </customwidget>
</customwidgets>
<images>
<image name="image0">
@@ -152,6 +210,7 @@
</images>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
+ <includehint>pyorganismdatactrl.h</includehint>
<includehint>pyorganismscopectrl.h</includehint>
<includehint>pyanalyzecontrolsctrl.h</includehint>
</includehints>
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeCtrl.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeCtrl.py 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyOrganismScopeCtrl.py 2006-04-04 18:16:58 UTC (rev 561)
@@ -4,8 +4,6 @@
from AvidaCore import cAnalyzeGenotype, cGenome, cInstruction, cInstUtil, cString
from pyHardwareTracer import pyHardwareTracer
-from descr import descr
-
from qt import *
import os
@@ -62,12 +60,7 @@
def dragEnterEvent( self, e ):
- descr(e)
e.acceptAction(True)
- if e.isAccepted():
- descr("isAccepted.")
- else:
- descr("not isAccepted.")
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) :
@@ -83,7 +76,6 @@
print "pyOrganismScopeCtrl.dragEnterEvent(e): freezer_item_name doesn't end with .organism."
def dropEvent( self, e ):
- descr(e)
freezer_item_name = QString()
if ( QTextDrag.decode( e, freezer_item_name ) ) :
if os.path.exists( str(freezer_item_name)) == False:
@@ -179,54 +171,45 @@
)
def HeadsTypeCBActivatedSlot(self, index):
- descr(index)
self.anim.setDisplayHeadsAs(index)
def ShowTaskTestsCBToggledSlot(self, bool):
- descr(bool)
self.anim.setShowTaskTestsCBToggled(bool)
def ShowRegistersCBToggledSlot(self, bool):
- descr(bool)
self.anim.setShowRegistersCBToggled(bool)
def AnimateHeadMovementCBToggledSlot(self, bool):
- descr(bool)
+ pass
def ShowStacksCBToggledSlot(self, bool):
- descr(bool)
self.anim.setShowStacksCBToggled(bool)
def ShowHeadsAsLettersCBToggledSlot(self, bool):
- descr(bool)
+ pass
def ShowInstructionNamesCBToggledSlot(self, bool):
- descr(bool)
self.anim.setShowInstructionNamesCBToggled(bool)
def ShowInputsAndOutputsCBToggledSlot(self, bool):
- descr(bool)
self.anim.setShowInputsAndOutputsCBToggled(bool)
def ShowFullStacksCBToggledSlot(self, bool):
- descr(bool)
self.anim.setShowFullStacksCBToggled(bool)
def AnimateInstructionCopyCBToggledSlot(self, bool):
- descr(bool)
+ pass
def ShowHardwareCBToggledSlot(self, bool):
- descr(bool)
self.anim.setShowHardwareCBToggled(bool)
def AnimateOrganismDivideCBToggledSlot(self, bool):
- descr(bool)
+ pass
def LayoutSpacingSBValueChangedSlot(self, value):
- descr(value)
+ pass
def HardwareIndicatorSBValueChangedSlot(self, value):
- descr(value)
self.anim.setHardwareIndicatorSBValueChanged(value)
Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyTemporaryReloads.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyTemporaryReloads.py 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyTemporaryReloads.py 2006-04-04 18:16:58 UTC (rev 561)
@@ -41,6 +41,7 @@
]
nontest_module_names = [
+ "AvidaGui2.Avida_ED_version",
# For some reason these dialog views/controls need to be listed first
# (not in Alphabetic order)
@@ -55,6 +56,8 @@
"AvidaGui2.pyAvidaStatsInterface",
"AvidaGui2.pyBeforeStartingView",
"AvidaGui2.pyBeforeStartingCtrl",
+ "AvidaGui2.pyBufferView",
+ "AvidaGui2.pyBufferCtrl",
"AvidaGui2.pyDefaultFiles",
"AvidaGui2.pyFreezeDialogView",
"AvidaGui2.pyFreezeDialogCtrl",
@@ -68,6 +71,11 @@
"AvidaGui2.pyGraphCtrl",
"AvidaGui2.pyHardwareCPUTrace",
"AvidaGui2.pyHardwareTracer",
+ "AvidaGui2.pyHideShowButtonView",
+ "AvidaGui2.pyHideShowButtonCtrl",
+ "AvidaGui2.pyHideShowView",
+ "AvidaGui2.pyHideShowCtrl",
+ "AvidaGui2.pyInstructionDescriptionCtrl",
"AvidaGui2.pyInstructionSet",
"AvidaGui2.pyLiveControlsView",
"AvidaGui2.pyLiveControlsCtrl",
@@ -76,6 +84,8 @@
"AvidaGui2.pyNavBarCtrl",
"AvidaGui2.pyOrganismConfigureView",
"AvidaGui2.pyOrganismConfigureCtrl",
+ "AvidaGui2.pyOrganismDataView",
+ "AvidaGui2.pyOrganismDataCtrl",
"AvidaGui2.pyOrganismScopeView",
"AvidaGui2.pyOrganismScopeCtrl",
"AvidaGui2.pyPetriConfigureView",
Added: branches/developers/avida-edward/source/python/AvidaGui2/svn_commit.sh
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/svn_commit.sh 2006-04-04 15:51:40 UTC (rev 560)
+++ branches/developers/avida-edward/source/python/AvidaGui2/svn_commit.sh 2006-04-04 18:16:58 UTC (rev 561)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+SCRIPT_DIR=`dirname "$0"`
+
+svn commit || (echo "Can't 'svn commit' Avida-ED."; exit 1)
+revision_string=`svnversion` || (echo "Can't get Avida-ED's svn revision number."; exit 1)
+echo "svn_revision_string = 'Avida-ED v2.0.$revision_string'" > "$SCRIPT_DIR"/Avida_ED_version.py
Property changes on: branches/developers/avida-edward/source/python/AvidaGui2/svn_commit.sh
___________________________________________________________________
Name: svn:executable
+ *
More information about the Avida-cvs
mailing list